Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Improve]Adapt to the front-end code, which can be used locally #321

Merged
merged 4 commits into from
Jul 6, 2023
Merged

[Improve]Adapt to the front-end code, which can be used locally #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc38b8e
Adapt to the front-end code, which can be used locally
Jul 5, 2023
be4343f
Merge remote-tracking branch 'upstream/dev' into dev
Jul 5, 2023
7d83c9d
Adapt to the front-end code, which can be used locally
liugddx Jul 5, 2023
59501d8
Adapt to the front-end code, which can be used locally
liugddx Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions datasophon-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,30 @@
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>front/**</exclude> <!-- 替换为您要排除的文件夹名称 -->
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>front/**</include> <!-- 替换为要删除的文件名 -->
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
6 changes: 0 additions & 6 deletions datasophon-api/src/main/resources/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,6 @@
<directoryMode>0755</directoryMode>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>${basedir}/../datasophon-api/src/main/resources/sql</directory>
<outputDirectory>sql</outputDirectory>
<directoryMode>0755</directoryMode>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>${basedir}/../datasophon-ui/dist</directory>
<outputDirectory>/conf/front/views</outputDirectory>
Expand Down
22 changes: 10 additions & 12 deletions datasophon-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,16 @@
<arguments>run build</arguments>
</configuration>
</execution>
<!-- deploy copy 这里无需再 copy 了，打包时，直接在 dist 下打包了
<execution>
<id>npm run deploy</id>
<goals>
<goal>npm</goal>
</goals>
<phase>install</phase>
<configuration>
<arguments>run deploy</arguments>
</configuration>
</execution>
-->
<execution>
<id>npm run deploy</id>
<goals>
<goal>npm</goal>
</goals>
<phase>install</phase>
<configuration>
<arguments>run deploy</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down