From 6f65d618266c8605dddbb0311a361c85d3612ad8 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 12 Jan 2022 02:56:06 +0800 Subject: [PATCH] fix bug --- .../src/main/java/com/iformall/controller/mem/AsyncTask.java | 3 --- .../java/com/iformall/controller/mem/BillDailyAsyncTask.java | 2 -- .../java/com/iformall/controller/mem/ImportTemplateTask.java | 1 - .../iformall/controller/mem/WxCUserBasicInfoController.java | 2 -- .../com/iformall/controller/rent/WxBillDailyController.java | 2 -- .../controller/template/WxImportTemplateController.java | 2 -- .../src/main/java/com/iformall/flowable/FlowableConfig.java | 2 +- mallinkAdmin/src/main/resources/application.yml | 4 ++-- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index 60ff8ab14..cda43c66d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -27,15 +27,12 @@ import java.util.concurrent.TimeUnit; public class AsyncTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired private WxTagsService wxTagsService; - @Lazy @Autowired StringRedisTemplate stringRedisTemplate; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java index cca9d843b..c10bd07e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java @@ -37,11 +37,9 @@ public class BillDailyAsyncTask { @Autowired private WxBillDailyService wxBillDailyService; - @Lazy @Autowired StringRedisTemplate stringRedisTemplate; - @Lazy @Autowired WxShopMapper wxShopMapper; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java index f4e47465b..635a895e5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -48,7 +48,6 @@ public class ImportTemplateTask { @Autowired private WxTagsService wxTagsService; - @Lazy @Autowired StringRedisTemplate stringRedisTemplate; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 4501941c3..e41739739 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -86,11 +86,9 @@ public class WxCUserBasicInfoController extends BaseController { @Autowired WxCarPayRecordService wxCarPayRecordService; - @Lazy @Autowired StringRedisTemplate stringRedisTemplate; - @Lazy @Autowired private AsyncTask asyncTask; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 68e13804d..7c1c38ebe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -48,11 +48,9 @@ public class WxBillDailyController extends BaseController { @Autowired private WxBillDailyService wxBillDailyService; - @Lazy @Autowired StringRedisTemplate stringRedisTemplate; - @Lazy @Autowired private BillDailyAsyncTask billDailyAsyncTask; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java index af37b5ee2..bf7cf433a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java @@ -40,11 +40,9 @@ public class WxImportTemplateController extends BaseController { @Autowired private String fmUploadDir; - @Lazy @Autowired StringRedisTemplate stringRedisTemplate; - @Lazy @Autowired private ImportTemplateTask importTemplateTask; diff --git a/mallinkAdmin/src/main/java/com/iformall/flowable/FlowableConfig.java b/mallinkAdmin/src/main/java/com/iformall/flowable/FlowableConfig.java index efbb7771a..0c71fc1d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/flowable/FlowableConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/flowable/FlowableConfig.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * date: 2018/4/7 * desc: flowable配置----为放置生成的流程图中中文乱码 */ -//@Configuration +@Configuration public class FlowableConfig implements EngineConfigurationConfigurer { diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index 16cae6a87..64f6dd78e 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -38,8 +38,8 @@ spring: # publisher-confirms: true # virtual-host: / # FLOWABLE - #flowable: - #async-executor-activate: false + flowable: + async-executor-activate: false aop: proxy-target-class: true auto: true