shiyue 11 mesi fa
parent
commit
0417b7eaa7

+ 39 - 39
energy-manage-service/src/main/java/com/energy/manage/service/config/xxl/XxlJobConfig.java

@@ -9,46 +9,46 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @Description: xxlJob配置
  */
-//@Configuration
+@Configuration
 @Slf4j
 public class XxlJobConfig {
 
-//    @Value("${xxl.job.admin.addresses}")
-//    private String adminAddresses;
-//
-//    @Value("${xxl.job.admin.accessToken}")
-//    private String accessToken;
-//
-//    @Value("${xxl.job.executor.appname}")
-//    private String appname;
-//
-//    @Value("${xxl.job.executor.address}")
-//    private String address;
-//
-//    @Value("${xxl.job.executor.ip}")
-//    private String ip;
-//
-//    @Value("${xxl.job.executor.port}")
-//    private int port;
-//
-//    @Value("${xxl.job.executor.logpath}")
-//    private String logPath;
-//
-//    @Value("${xxl.job.executor.logretentiondays}")
-//    private int logRetentionDays;
-//
-//    @Bean
-//    public XxlJobSpringExecutor xxlJobExecutor() {
-//        log.info(">>>>>>>>>>> xxl-job config init.");
-//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-//        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-//        xxlJobSpringExecutor.setAppname(appname);
-//        xxlJobSpringExecutor.setAddress(address);
-//        xxlJobSpringExecutor.setIp(ip);
-//        xxlJobSpringExecutor.setPort(port);
-//        xxlJobSpringExecutor.setAccessToken(accessToken);
-//        xxlJobSpringExecutor.setLogPath(logPath);
-//        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-//        return xxlJobSpringExecutor;
-//    }
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.admin.accessToken}")
+    private String accessToken;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appname;
+
+    @Value("${xxl.job.executor.address}")
+    private String address;
+
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        log.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppname(appname);
+        xxlJobSpringExecutor.setAddress(address);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+        return xxlJobSpringExecutor;
+    }
 }

+ 0 - 0
energy-manage-service/src/main/resources/config/README.MD → energy-manage-service/src/main/resources/confback/README.MD


+ 8 - 8
energy-manage-service/src/main/resources/config/application.properties → energy-manage-service/src/main/resources/confback/application.properties

@@ -99,14 +99,14 @@ logging.level.com.energy.manage.service.mappers= debug
 knife4j.enable=true
 
 #xxl-job
-xxl.job.admin.addresses = http://192.168.50.241:16800/xxl-job-admin
-xxl.job.accessToken =
-xxl.job.executor.appname = xxl-job-executor-sample
-xxl.job.executor.address =
-xxl.job.executor.ip =
-xxl.job.executor.port = 9999
-xxl.job.executor.logpath = /Users/shiyue/Downloads/logs/xxl
-xxl.job.executor.logretentiondays = 30
+#xxl.job.admin.addresses = http://192.168.50.241:16800/xxl-job-admin
+#xxl.job.accessToken =
+#xxl.job.executor.appname = xxl-job-executor-sample
+#xxl.job.executor.address =
+#xxl.job.executor.ip =
+#xxl.job.executor.port = 9999
+#xxl.job.executor.logpath = /Users/shiyue/Downloads/logs/xxl
+#xxl.job.executor.logretentiondays = 30
 
 
 #kafka

+ 0 - 0
energy-manage-service/src/main/resources/config/credentials.json → energy-manage-service/src/main/resources/confback/credentials.json