From 2e4689d557d0585cb86fc77fd7f14bb40db7e50f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 26 十月 2021 18:30:02 +0800
Subject: [PATCH] update 更新xxl-job执行器开关功能
---
ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java | 2 ++
ruoyi-admin/src/main/resources/application-prod.yml | 2 ++
ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java | 2 ++
ruoyi-admin/src/main/resources/application-dev.yml | 2 ++
4 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index c77d512..015b302 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -16,6 +16,8 @@
--- # xxl-job 閰嶇疆
xxl:
job:
+ # 鎵ц鍣ㄥ紑鍏�
+ enabled: true
# 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆�
admin-addresses: http://localhost:9100/xxl-job-admin
# 鎵ц鍣ㄩ�氳TOKEN锛氶潪绌烘椂鍚敤
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 32ebb7c..9aac0e3 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -16,6 +16,8 @@
--- # xxl-job 閰嶇疆
xxl:
job:
+ # 鎵ц鍣ㄥ紑鍏�
+ enabled: true
# 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆�
admin-addresses: http://172.30.0.92:9100/xxl-job-admin
# 鎵ц鍣ㄩ�氳TOKEN锛氶潪绌烘椂鍚敤
diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java b/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java
index 5986e3b..2df063e 100644
--- a/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java
+++ b/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java
@@ -5,6 +5,7 @@
import com.yomahub.tlog.springboot.lifecircle.TLogXxljobEnhanceInit;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -18,6 +19,7 @@
@Configuration
@EnableConfigurationProperties(XxlJobProperties.class)
@AllArgsConstructor
+@ConditionalOnProperty(prefix = "xxl.job", name = "enabled", havingValue = "true")
public class XxlJobConfig {
private final XxlJobProperties xxlJobProperties;
diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java b/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java
index d7b8dbe..f2c755a 100644
--- a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java
+++ b/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java
@@ -13,6 +13,8 @@
@ConfigurationProperties(prefix = "xxl.job")
public class XxlJobProperties {
+ private Boolean enabled;
+
private String adminAddresses;
private String accessToken;
--
Gitblit v1.9.3