Unverified Commit dc1bf052 authored by aiwenmo's avatar aiwenmo Committed by GitHub

[Optimization-943][pom] Optimizate config and static dir packaging (#944)

Co-authored-by: 's avatarwenmo <32723967+wenmo@users.noreply.github.com>
parent 5949e954
...@@ -220,6 +220,29 @@ ...@@ -220,6 +220,29 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven.resource.version}</version>
<executions>
<execution>
<id>copy-static</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>src/main/resources/static</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>../dlink-web/dist</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
...@@ -140,7 +140,7 @@ public class StudioServiceImpl implements StudioService { ...@@ -140,7 +140,7 @@ public class StudioServiceImpl implements StudioService {
JobConfig config = studioExecuteDTO.getJobConfig(); JobConfig config = studioExecuteDTO.getJobConfig();
buildSession(config); buildSession(config);
// To initialize java udf, but it has a bug in the product environment now. // To initialize java udf, but it has a bug in the product environment now.
// initUDF(config,studioExecuteDTO.getStatement()); initUDF(config, studioExecuteDTO.getStatement());
JobManager jobManager = JobManager.build(config); JobManager jobManager = JobManager.build(config);
JobResult jobResult = jobManager.executeSql(studioExecuteDTO.getStatement()); JobResult jobResult = jobManager.executeSql(studioExecuteDTO.getStatement());
RunTimeUtil.recovery(jobManager); RunTimeUtil.recovery(jobManager);
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
<directory>${project.parent.basedir}/dlink-admin/target/classes</directory> <directory>${project.parent.basedir}/dlink-admin/target/classes</directory>
<outputDirectory>config</outputDirectory> <outputDirectory>config</outputDirectory>
<includes> <includes>
<include>**/*.properties</include> <include>*.properties</include>
<include>**/*.yml</include> <include>*.yml</include>
<include>**/*.yaml</include> <include>*.yaml</include>
<include>**/*.xml</include> <include>*.xml</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
...@@ -31,9 +31,6 @@ ...@@ -31,9 +31,6 @@
<include>*.jar</include> <include>*.jar</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<outputDirectory>plugins</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory>${project.parent.basedir}/dlink-doc/sql</directory> <directory>${project.parent.basedir}/dlink-doc/sql</directory>
<outputDirectory>sql</outputDirectory> <outputDirectory>sql</outputDirectory>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment