diff --git a/cf-module-infra/cf-module-infra-biz/pom.xml b/cf-module-infra/cf-module-infra-biz/pom.xml index 12c54e28c..ce4dcb882 100644 --- a/cf-module-infra/cf-module-infra-biz/pom.xml +++ b/cf-module-infra/cf-module-infra-biz/pom.xml @@ -86,10 +86,10 @@ - + @@ -219,6 +219,10 @@ com.cf.imes cf-spring-boot-starter-mq + + com.cf.imes + cf-spring-boot-starter-job + diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/AccessLogCleanJob.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/AccessLogCleanJob.java index 6d39bb51b..3327652c6 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/AccessLogCleanJob.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/AccessLogCleanJob.java @@ -2,9 +2,8 @@ package com.cf.imes.module.infra.job.logger; import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.module.infra.service.logger.ApiAccessLogService; -/*import com.xxl.job.core.handler.annotation.XxlJob;*/ +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import jakarta.annotation.Resource; @@ -31,9 +30,8 @@ public class AccessLogCleanJob { */ private static final Integer DELETE_LIMIT = 100; - /* @XxlJob("accessLogCleanJob")*/ + @XxlJob("accessLogCleanJob") @OrganIgnore - @Scheduled(cron = "0 0 * * * ?") public void execute() { Integer count = apiAccessLogService.cleanAccessLog(JOB_CLEAN_RETAIN_DAY, DELETE_LIMIT); log.info("[execute][定时执行清理访问日志数量 ({}) 个]", count); diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/ErrorLogCleanJob.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/ErrorLogCleanJob.java index 7852d2c8c..7f1a2c69e 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/ErrorLogCleanJob.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/ErrorLogCleanJob.java @@ -2,9 +2,8 @@ package com.cf.imes.module.infra.job.logger; import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.module.infra.service.logger.ApiErrorLogService; -/*import com.xxl.job.core.handler.annotation.XxlJob;*/ +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import jakarta.annotation.Resource; @@ -31,9 +30,8 @@ public class ErrorLogCleanJob { */ private static final Integer DELETE_LIMIT = 100; - /*@XxlJob("errorLogCleanJob")*/ + @XxlJob("errorLogCleanJob") @OrganIgnore - @Scheduled(cron = "0 0 2 * * ?") public void execute() { Integer count = apiErrorLogService.cleanErrorLog(JOB_CLEAN_RETAIN_DAY,DELETE_LIMIT); log.info("[execute][定时执行清理错误日志数量 ({}) 个]", count); diff --git a/cf-module-infra/cf-module-infra-biz/src/main/resources/application-dev.yaml b/cf-module-infra/cf-module-infra-biz/src/main/resources/application-dev.yaml index a8318903b..1601dfdbb 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/resources/application-dev.yaml +++ b/cf-module-infra/cf-module-infra-biz/src/main/resources/application-dev.yaml @@ -90,9 +90,9 @@ spring: --- #################### 定时任务相关配置 #################### xxl: job: - enabled: false + enabled: enable admin: - addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 + addresses: http://192.168.1.205:28080/xxl-job-admin # 调度中心部署跟地址 --- #################### 服务保障相关配置 #################### diff --git a/cf-module-infra/cf-module-infra-biz/src/main/resources/application.yaml b/cf-module-infra/cf-module-infra-biz/src/main/resources/application.yaml index bebf59fa6..4a5bbacfa 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/resources/application.yaml +++ b/cf-module-infra/cf-module-infra-biz/src/main/resources/application.yaml @@ -46,6 +46,13 @@ logging: file: name: ${user.home}/logs/${spring.application.name} # 日志文件名,全路径 +xxl: + job: + executor: + appname: ${spring.application.name} # 执行器 AppName + logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 + accessToken: default_token # 执行器通讯TOKEN + --- #################### 接口文档配置 #################### springdoc: diff --git a/cf-module-system/cf-module-system-biz/pom.xml b/cf-module-system/cf-module-system-biz/pom.xml index da102c821..464481b4a 100644 --- a/cf-module-system/cf-module-system-biz/pom.xml +++ b/cf-module-system/cf-module-system-biz/pom.xml @@ -114,10 +114,10 @@ - + @@ -304,6 +304,10 @@ com.cf.imes cf-spring-boot-starter-biz-pay + + com.cf.imes + cf-spring-boot-starter-job + diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/job/pay/PayOrderExpireJob.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/job/pay/PayOrderExpireJob.java index b6686142b..540a09593 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/job/pay/PayOrderExpireJob.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/job/pay/PayOrderExpireJob.java @@ -2,9 +2,9 @@ package com.cf.imes.module.system.job.pay; import cn.hutool.core.text.CharSequenceUtil; import com.cf.imes.module.system.service.pay.PayOrderService; +import com.xxl.job.core.handler.annotation.XxlJob; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** @@ -21,7 +21,7 @@ public class PayOrderExpireJob { @Resource private PayOrderService payOrderService; - @Scheduled(cron = "0 0/1 * * * ?") + @XxlJob("payOrderExpireJob") public String execute() { int count = payOrderService.expirePayOrder(); if (count > 0) { diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml index c4400475f..45ce3e868 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml @@ -93,9 +93,9 @@ spring: --- #################### 定时任务相关配置 #################### xxl: job: - enabled: false + enabled: true admin: - addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 + addresses: http://192.168.1.205:28080/xxl-job-admin # 调度中心部署跟地址 --- #################### 服务保障相关配置 #################### diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml index 38dd24293..510d53791 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml @@ -46,6 +46,12 @@ logging: file: name: ${user.home}/logs/${spring.application.name} # 日志文件名,全路径 +xxl: + job: + executor: + appname: ${spring.application.name} # 执行器 AppName + logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 + accessToken: default_token # 执行器通讯TOKEN --- #################### 接口文档配置 ####################