xxl-job更换为baomidou jobs

SLN/%PUBPRJ%-core/pom.xml.ftl

@@ -95,10 +95,10 @@ TARGET=PSSYSTEM
             <artifactId>liquibase-core</artifactId>
         </dependency>
 
-        <!--xxl-job定时服务 -->
+        <!--baomidou-jobs定时服务 -->
         <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
+            <groupId>com.baomidou</groupId>
+            <artifactId>jobs-spring-boot-starter</artifactId>
         </dependency>
 
 	</dependencies>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/config/XxlJobConfig.java.ftl

@@ -2,82 +2,24 @@
 TARGET=PSSYSTEM
 </#ibiztemplate>
 package ${pub.getPKGCodeName()}.core.util.config;
+<#assign enableBackService=false>
+<#if sys.getAllPSSysBackServices()??>
+    <#list sys.getAllPSSysBackServices() as backService>
+        <#assign enableBackService=true>
+        <#break>
+    </#list>
+</#if>
 
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
+<#if enableBackService>
+import com.baomidou.jobs.starter.EnableJobs;
+</#if>
 
-/**
- * xxl-job config
- *  分布式任务调度平台XXL-JOB配置加载
- * @author xuxueli 2017-04-28
- */
+
+<#if enableBackService>
+@EnableJobs
+</#if>
 @Configuration
 public class XxlJobConfig {
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-
-    @Value("${r'${xxl.job.admin.addresses:}'}")
-    private String adminAddresses;
-
-    @Value("${r'${xxl.job.accessToken:}'}")
-    private String accessToken;
-
-    @Value("${r'$'}{xxl.job.executor.appname:${sys.getName()}}")
-    private String appName;
-
-    @Value("${r'${xxl.job.executor.ip:127.0.0.1}'}")
-    private String ip;
-
-   @Value("${r'${xxl.job.executor.port:9999}'}")
-   private int port;
-
-    @Value("${r'${xxl.job.executor.logpath:/app/joblog}'}")
-    private String logPath;
-
-    @Value("${r'${xxl.job.executor.logretentiondays:-1}'}")
-    private int logRetentionDays;
-
-    @Bean(initMethod = "start", destroyMethod = "destroy")
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        if(!StringUtils.isEmpty(adminAddresses)){
-            logger.info(">>>>>>>>>>> xxl-job config init.");
-            logger.info(">>>>>>>>>>> adminAddresses:"+adminAddresses);
-            logger.info(">>>>>>>>>>> appName:"+appName);
-            logger.info(">>>>>>>>>>> ip:"+ip);
-            logger.info(">>>>>>>>>>> port:"+port);
-            XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-            xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-            xxlJobSpringExecutor.setAppName(appName);
-            xxlJobSpringExecutor.setIp(ip);
-            xxlJobSpringExecutor.setPort(port);
-            xxlJobSpringExecutor.setAccessToken(accessToken);
-            xxlJobSpringExecutor.setLogPath(logPath);
-            xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-            return xxlJobSpringExecutor;
-        }
-        
-        logger.info(">>>>>>>>>>> xxl-job config not init.");
-        return null;
-    }
 
-    /**
-     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
-     *
-     *      1、引入依赖：
-     *          <dependency>
-     *             <groupId>org.springframework.cloud</groupId>
-     *             <artifactId>spring-cloud-commons</artifactId>
-     *             <version>${r'${version}"'}</version>
-     *         </dependency>
-     *
-     *      2、配置文件，或者容器启动变量
-     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-     *
-     *      3、获取IP
-     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-     */
 }

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/util/job/%ITEM%JobHandler.java.ftl

@@ -3,18 +3,17 @@ TARGET=PSSYSBACKSERVICE
 </#ibiztemplate>
 package ${pub.getPKGCodeName()}.core.util.job;
 
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
-import com.xxl.job.core.handler.annotation.JobHandler;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.jobs.api.JobsResponse;
+import com.baomidou.jobs.exception.JobsException;
+import com.baomidou.jobs.handler.IJobsHandler;
 import org.springframework.stereotype.Component;
 
-@JobHandler(value="${item.codeName}JobHandler")
-@Component
-public class ${item.codeName}JobHandler extends IJobHandler {
+@Component("${item.codeName}JobHandler")
+public class ${item.codeName}JobHandler implements  IJobsHandler {
 
     @Override
-    public ReturnT<String> execute(String params) throws Exception {
-        return new ReturnT(200, "服务调用成功");
+    public JobsResponse execute(String tenantId, String param) throws JobsException {
+        System.out.println("执行 DemoJobHandler tenantId=" + tenantId + ",param=" + param);
+        return JobsResponse.ok();
     }
 }

SLN/%PUBPRJ%-dependencies/pom.xml.ftl

@@ -78,8 +78,8 @@ TARGET=PSSYSTEM
         <!--httpClient -->
         <openfeign-httpclient.version>11.0</openfeign-httpclient.version>
 
-        <!--xxl-job定时服务 -->
-        <xxl-job.version>2.1.0</xxl-job.version>
+        <!--baomidou-jobs定时服务 -->
+        <baomidou-jobs.version>1.0.3</baomidou-jobs.version>
 
         <#if sys.getAllPSSystemDBConfigs()??>
         <#list sys.getAllPSSystemDBConfigs() as dbConfig>
@@ -279,9 +279,9 @@ TARGET=PSSYSTEM
             </dependency>
 
             <dependency>
-                <groupId>com.xuxueli</groupId>
-                <artifactId>xxl-job-core</artifactId>
-                <version>${r'${xxl-job.version}'}</version>
+                <groupId>com.baomidou</groupId>
+                <artifactId>jobs-spring-boot-starter</artifactId>
+                <version>${r'${baomidou-jobs.version}'}</version>
             </dependency>
 
         </dependencies>

SLN/%PUBPRJ%-util/src/main/resources/application-sys.yml.ftl

@@ -213,16 +213,10 @@ ibiz:
   enablePermissionValid: ${enableDataAcc}
   cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
 
-#xxl-job定时服务
-xxl:
-  job:
-    accessToken:
-    admin:
-      addresses: #127.0.0.1
-    executor:
-      appname: ${sys.getName()}
-      ip:
-      port: 9999
-      logpath: /app/joblog
-      logretentiondays: -1
+### jobs
+jobs:
+  admin-address: http://127.0.0.1:40005
+  app-name: ${sys.getName()}
+  app-port: 9999
+    #app-ip: 127.0.0.1