From eb2ed78669ce89a5b11b373d499ece24e1fda514 Mon Sep 17 00:00:00 2001
From: xieke <xieke89@163.com>
Date: Thu, 26 Sep 2024 09:05:52 +0800
Subject: [PATCH] qp plugin init

---
 .../src/main/assembly/assembly.xml                          | 2 +-
 .../stationv3/config/StationV3CollectorJobConfig.java       | 4 +---
 .../src/main/resources/xxl-job-executor.properties          | 6 +++---
 .../src/main/resources/templates/common/common.macro.ftl    | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/assembly/assembly.xml b/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/assembly/assembly.xml
index 9d27028d..9fd11c53 100644
--- a/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/assembly/assembly.xml
+++ b/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>
diff --git a/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/java/com/wanhua/frameless/stationv3/config/StationV3CollectorJobConfig.java b/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/java/com/wanhua/frameless/stationv3/config/StationV3CollectorJobConfig.java
index 31048816..ec693006 100644
--- a/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/java/com/wanhua/frameless/stationv3/config/StationV3CollectorJobConfig.java
+++ b/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 LngCollectorJob()));
+        xxlJobExecutor.setXxlJobBeanList(Arrays.asList(new StationV3CollectorJob(), new LngCollectorJob()));
 
         // start executor
         try {
diff --git a/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/resources/xxl-job-executor.properties b/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/resources/xxl-job-executor.properties
index eed99cda..d5670185 100644
--- a/wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/resources/xxl-job-executor.properties
+++ b/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
diff --git a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl
index a52c7a4f..aace849f 100644
--- a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl
+++ b/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 = 'https://10.201.1.101:8082/internal/etl/xxl-job-admin';
+		var base_url = '${request.contextPath}';
         var I18n = ${I18nUtil.getMultString()};
 	</script>