From 62e650d60002fd6e37155b1b6629b40b7948d361 Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Tue, 13 Sep 2022 10:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=9A=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=92=8C=E4=B8=80=E6=AC=A1=E6=80=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 smtweb-framework/bpm/src/main/resources/config/application.yaml     | 1 +
 .../main/java/cc/smtweb/framework/core/CoreAutoConfiguration.java   | 3 +++
 .../src/main/java/cc/smtweb/framework/core/common/SwConsts.java     | 2 ++
 .../main/java/cc/smtweb/framework/core/systask/BaseSysService.java  | 6 ------
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/resources/config/application.yaml b/smtweb-framework/bpm/src/main/resources/config/application.yaml
index f2f87e9..16677bf 100644
--- a/smtweb-framework/bpm/src/main/resources/config/application.yaml
+++ b/smtweb-framework/bpm/src/main/resources/config/application.yaml
@@ -1,5 +1,6 @@
 smtweb:
   machine-id: 1
+  enable-job: true
   file:
     local-path: /data/sw/files/
     url: http://127.0.0.1:8888/sw/files/
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/CoreAutoConfiguration.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/CoreAutoConfiguration.java
index b410dd6..2ceab74 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/CoreAutoConfiguration.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/CoreAutoConfiguration.java
@@ -23,10 +23,13 @@ public class CoreAutoConfiguration implements WebMvcConfigurer {
      */
     @Value("${smtweb.machine-id}")
     private int machineId;
+    @Value("${smtweb.enable-job}")
+    private boolean enableJob;
 
     @Bean
     public IdGenerator idGenerator() {
         SwConsts.SysParam.machineId = machineId;
+        SwConsts.SysParam.enableJob = enableJob;
         return new IdGenerator(machineId);
     }
 
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java
index c883c75..6eeb901 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java
@@ -13,6 +13,8 @@ public interface SwConsts {
         public static String RUN_PROJECTS = "";
         //启动时赋值:服务器编号
         public static int machineId;
+        //是否执行定时任务
+        public static boolean enableJob = false;
     }
 
     //错误码
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/BaseSysService.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/BaseSysService.java
index f7331bf..66e1a35 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/BaseSysService.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/BaseSysService.java
@@ -21,12 +21,6 @@ public abstract class BaseSysService implements Runnable {
 
     @Override
     public void run() {
-        boolean isNeedJob = true;
-        if (!isNeedJob) {
-            log.debug(getTitle() + ":::未开启需要执行任务，忽略执行.........");
-            return;
-        }
-
         try {
             final String id = this.getClass().getName();
             SingleRequestHelper.singleRequest(SwConsts.REDIS_KEY_BASE_JOB, id, "任务执行中，本次忽略.........", new SingleRequestHelper.ISingleWork() {