qp plugin init

wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/assembly/assembly.xml

@@ -32,7 +32,7 @@
         <!-- 把项目的配置文件，打包进zip文件的config目录 -->
         <fileSet>
             <directory>${project.basedir}/src/main/resources</directory>
-            <outputDirectory>conf</outputDirectory>
+            <outputDirectory>config</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}</directory>

wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/java/com/wanhua/frameless/stationv3/config/StationV3CollectorJobConfig.java

@@ -47,9 +47,7 @@ public class StationV3CollectorJobConfig {
         xxlJobExecutor.setLogRetentionDays(Integer.valueOf(xxlJobProp.getProperty("xxl.job.executor.logretentiondays")));
 
         // registry job bean
-        xxlJobExecutor.setXxlJobBeanList(Arrays.asList(new StationV3CollectorJob()));
+        xxlJobExecutor.setXxlJobBeanList(Arrays.asList(new StationV3CollectorJob(), new LngCollectorJob()));
-
-        xxlJobExecutor.setXxlJobBeanList(Arrays.asList(new LngCollectorJob()));
 
         // start executor
         try {

wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/resources/xxl-job-executor.properties

@@ -1,13 +1,13 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=https://10.201.1.101:8082/internal/etl/xxl-job-admin
+xxl.job.admin.addresses=http://172.22.62.105/internal/etl/xxl-job-admin
 
 ### xxl-job, access token
 xxl.job.accessToken=default_token
 
 ### xxl-job executor appname
-xxl.job.executor.appname=gsmsv3-collect
+xxl.job.executor.appname=qpsy-interbase2
 ### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=https://10.201.1.101:8082
+xxl.job.executor.address=http://172.22.62.105
 ### xxl-job executor server-info
 xxl.job.executor.ip=
 xxl.job.executor.port=19998

xxl-job-admin/src/main/resources/templates/common/common.macro.ftl

@@ -58,8 +58,7 @@
 	<#-- common -->
     <script src="${request.contextPath}/static/js/common.1.js"></script>
     <script>
-		<#--var base_url = '${request.contextPath}';-->
+		var base_url = '${request.contextPath}';
-		var base_url = 'https://10.201.1.101:8082/internal/etl/xxl-job-admin';
         var I18n = ${I18nUtil.getMultString()};
 	</script>