Commit 6e52693f authored by godkaikai's avatar godkaikai

打包优化

parent 136e9078
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
</configuration> </configuration>
</plugin>--> </plugin>-->
<plugin> <!--<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>${maven.resource.version}</version> <version>${maven.resource.version}</version>
...@@ -214,14 +214,14 @@ ...@@ -214,14 +214,14 @@
<overwrite>true</overwrite> <overwrite>true</overwrite>
<resources> <resources>
<resource> <resource>
<!-- 因为dlink-web打包目录在项目跟目录,所以从这里复制 --> &lt;!&ndash; 因为dlink-web打包目录在项目跟目录,所以从这里复制 &ndash;&gt;
<directory>../dlink-web/dist</directory> <directory>../dlink-web/dist</directory>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>-->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId> <artifactId>versions-maven-plugin</artifactId>
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</fileSet> </fileSet>
<!-- 将模块dlink-extends的常用jar文件放到打包目录/plugins下 --> <!-- 将模块dlink-extends的常用jar文件放到打包目录/plugins下 -->
<!--<fileSet> <fileSet>
<directory>${project.parent.basedir}/dlink-extends/target <directory>${project.parent.basedir}/dlink-extends/target
</directory> </directory>
<outputDirectory>plugins</outputDirectory> <outputDirectory>plugins</outputDirectory>
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,8 @@
</includes> </includes>
</fileSet> </fileSet>
&lt;!&ndash; 将模块dlink-extends的jar文件放到打包目录/extends下 &ndash;&gt; <!-- 将模块dlink-extends的jar文件放到打包目录/extends下 -->
<fileSet> <!--<fileSet>
<directory>${project.parent.basedir}/dlink-extends/target <directory>${project.parent.basedir}/dlink-extends/target
</directory> </directory>
<outputDirectory>extends</outputDirectory> <outputDirectory>extends</outputDirectory>
......
...@@ -118,12 +118,16 @@ public class JobConfig { ...@@ -118,12 +118,16 @@ public class JobConfig {
gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString(), gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString(),
config.get("flinkLibPath").toString(), config.get("flinkLibPath").toString(),
config.get("hadoopConfigPath").toString())); config.get("hadoopConfigPath").toString()));
AppConfig appConfig = new AppConfig();
if(config.containsKey("userJarPath")){ if(config.containsKey("userJarPath")){
gatewayConfig.setAppConfig(AppConfig.build( appConfig.setUserJarPath(config.get("userJarPath").toString());
config.get("userJarPath").toString(), if(config.containsKey("userJarMainAppClass")){
config.get("userJarParas").toString(), appConfig.setUserJarMainAppClass(config.get("userJarMainAppClass").toString());
config.get("userJarMainAppClass").toString() }
)); if(config.containsKey("userJarParas")){
appConfig.setUserJarParas(config.get("userJarParas").toString().split(" "));
}
gatewayConfig.setAppConfig(appConfig);
} }
if(config.containsKey("flinkConfig")){ if(config.containsKey("flinkConfig")){
gatewayConfig.setFlinkConfig(FlinkConfig.build((Map<String, String>)config.get("flinkConfig"))); gatewayConfig.setFlinkConfig(FlinkConfig.build((Map<String, String>)config.get("flinkConfig")));
......
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