Commit 6e52693f authored by godkaikai's avatar godkaikai

打包优化

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