From 56fb1d75b74d5ea7555a55cc3838c547dc5f67ea Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 11 Jan 2022 21:40:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BE=AA=E7=8E=AF=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/mem/AsyncTask.java | 4 +++ .../controller/mem/BillDailyAsyncTask.java | 4 +++ .../controller/mem/ImportTemplateTask.java | 6 +++++ .../controller/mem/MemCouponController.java | 4 +++ .../mem/UserBasicInfoAddressController.java | 2 ++ .../mem/WxCUserBasicInfoController.java | 15 +++++++++++ .../controller/mem/WxCUserCarController.java | 2 ++ .../controller/mem/WxCUserController.java | 2 ++ .../controller/mem/WxCUserDataController.java | 10 +++++++ .../controller/mem/WxCUserFromController.java | 2 ++ .../controller/mem/WxCUserTagsController.java | 2 ++ .../mem/WxCreditHistoryController.java | 3 +++ .../mem/WxLevelConfigController.java | 2 ++ .../mem/WxScoreHistoryController.java | 3 +++ .../mem/WxScoreRulesController.java | 3 +++ .../mem/WxUserChannelController.java | 3 +++ .../msg/WxMsgCallbackController.java | 2 ++ .../controller/msg/WxMsgConfigController.java | 2 ++ .../controller/msg/WxMsgController.java | 4 +++ .../controller/msg/WxMsgModelController.java | 2 ++ .../controller/msg/WxMsgRecordController.java | 6 +++++ .../msg/WxMsgSignatureController.java | 2 ++ .../msg/WxMsgValidationcodeController.java | 2 ++ .../WxMsgValidationcodeModelController.java | 2 ++ .../controller/ocr/WxOcrController.java | 6 +++++ .../controller/pay/AlipayController.java | 3 +++ .../rent/WxBillActionController.java | 3 ++- .../controller/rent/WxBillAllController.java | 4 +++ .../rent/WxBillDailyController.java | 5 ++++ .../rent/WxBillDepositController.java | 3 +++ .../rent/WxBillOtherController.java | 3 +++ .../rent/WxBillOtherDepositController.java | 3 +++ .../rent/WxBillPropertyController.java | 3 +++ .../rent/WxBillPropertyDepositController.java | 3 +++ .../controller/rent/WxBillRentController.java | 2 ++ .../rent/WxBillSettleController.java | 6 +++++ .../controller/rent/WxGooagooController.java | 2 ++ .../controller/sys/HomeController.java | 8 ++++++ .../controller/sys/MallRoleController.java | 4 +++ .../sys/MallUserActionController.java | 3 +++ .../sys/MallUserInfoController.java | 8 ++++++ .../controller/sys/SysConfigController.java | 2 ++ .../controller/sys/SysMenuController.java | 3 +++ .../controller/sys/SysNoticeController.java | 2 ++ .../controller/sys/UploadController.java | 2 ++ .../controller/sys/WechatLoginController.java | 6 +++++ .../controller/sys/WxAdminLogController.java | 2 ++ .../controller/sys/WxBusinessController.java | 6 +++++ .../sys/WxDataRuleTargetController.java | 2 ++ .../sys/WxUserDataRuleController.java | 2 ++ .../template/WxImportTemplateController.java | 4 +++ .../controller/video/VideoController.java | 2 ++ .../workflow/WxFlowAbleController.java | 2 ++ .../flowable/ContractTaskFinishHandler.java | 5 ++++ .../com/iformall/log/SystemLogAspect.java | 2 ++ .../com/iformall/log/TableOperateAspect.java | 2 ++ .../com/iformall/log/UserDataRuleAspect.java | 3 +++ .../java/com/iformall/shiro/ShiroService.java | 7 +++++ .../iformall/controller/BaseController.java | 7 +++++ .../iformall/controller/PosController.java | 2 ++ .../iformall/controller/UploadController.java | 2 ++ .../iformall/controller/WxBillController.java | 6 +++++ .../controller/WxCUserController.java | 9 +++++++ .../controller/WxCardPayController.java | 4 +++ .../controller/WxCashOutController.java | 10 +++++++ .../controller/WxCouponChannelController.java | 10 +++++++ .../controller/WxCouponController.java | 14 ++++++++++ .../controller/WxCouponOrderController.java | 8 ++++++ .../controller/WxCouponSendController.java | 6 +++++ .../controller/WxCreditHistoryController.java | 5 ++++ .../WxDateAmountRecordController.java | 2 ++ .../iformall/controller/WxInfoController.java | 8 ++++++ .../iformall/controller/WxMallController.java | 3 +++ .../iformall/controller/WxMemController.java | 5 ++++ .../controller/WxMerchantController.java | 4 +++ .../WxMerchantSubsidyController.java | 2 ++ .../WxMerchantTradeDailyController.java | 7 +++++ .../controller/WxMicroPayController.java | 10 +++++++ .../WxMsgValidationcodeController.java | 4 +++ .../controller/WxPayBillController.java | 2 ++ .../controller/WxRefundOrderController.java | 4 +++ .../iformall/controller/WxTagController.java | 2 ++ .../com/iformall/service/PosBrunService.java | 3 +++ .../com/iformall/aop/RedisCacheAspect.java | 3 +++ .../iformall/controller/BaseController.java | 11 ++++++++ .../controller/FengNiaoMapController.java | 2 ++ .../iformall/controller/UploadController.java | 2 ++ .../UserBasicInfoAddressController.java | 2 ++ .../controller/WxActivityController.java | 2 ++ .../controller/WxActivityJoinController.java | 2 ++ .../controller/WxBusinessController.java | 2 ++ .../WxCUserBasicSignController.java | 2 ++ .../controller/WxCampaignController.java | 4 +++ .../iformall/controller/WxCarController.java | 15 +++++++++++ .../controller/WxCardPayController.java | 7 +++++ .../controller/WxCouponChannelController.java | 3 +++ .../controller/WxCouponController.java | 7 +++++ .../controller/WxCouponOrderController.java | 7 +++++ .../WxCouponPasswordController.java | 5 ++++ .../controller/WxCreditHistoryController.java | 3 +++ .../WxCuserFloatingLayerController.java | 2 ++ .../WxCustomizeModuleController.java | 2 ++ .../iformall/controller/WxGameController.java | 3 +++ .../controller/WxMallBuildingController.java | 2 ++ .../iformall/controller/WxMallController.java | 6 +++++ .../controller/WxMerchantController.java | 2 ++ .../controller/WxMiniappThemeController.java | 3 +++ .../iformall/controller/WxMsgController.java | 2 ++ .../WxMsgValidationcodeController.java | 4 +++ .../iformall/controller/WxOcrController.java | 6 ++++- .../controller/WxOpinionController.java | 2 ++ .../controller/WxOrderController.java | 7 +++++ .../controller/WxOrderGroupController.java | 5 ++++ .../iformall/controller/WxParkController.java | 2 ++ .../controller/WxPayOrderController.java | 8 ++++++ .../controller/WxPressOrderController.java | 7 +++++ .../controller/WxQuestionController.java | 4 +++ .../WxQuestionOneselfController.java | 4 +++ .../controller/WxScoreHistoryController.java | 2 ++ .../controller/WxTopicController.java | 2 ++ .../controller/WxUserGrantController.java | 14 ++++++++++ .../interceptor/AuthorizationInterceptor.java | 3 +++ ...oginUserHandlerMethodArgumentResolver.java | 2 ++ .../controller/callback/AliPayController.java | 6 +++++ .../controller/callback/JinMaoController.java | 8 ++++++ .../controller/callback/TtPayController.java | 8 +++++- .../callback/WxBusinessOrderController.java | 4 +++ .../callback/WxMsgCallbackController.java | 2 ++ .../callback/WxPayBillController.java | 3 +++ .../controller/callback/WxPayController.java | 4 +++ .../car/WxCarETCPCallBackController.java | 10 +++++++ .../car/WxCarTJDCallBackController.java | 9 +++++++ .../car/WxParkCallBackBaseController.java | 11 ++++++++ .../car/cyf/WxCarCYFCallBackController.java | 8 ++++++ .../WxCarHaiKangWeiShiCallBackController.java | 8 ++++++ .../WxCarJieShunCallBackController.java | 8 ++++++ .../controller/device/KwBoxV1Controller.java | 3 +++ .../device/WxDeviceScreenAdController.java | 7 +++++ .../official/WxMallApplyController.java | 2 ++ .../iformall/controller/HomeController.java | 2 ++ .../java/com/iformall/mq/MqBaseConsumer.java | 26 +++++++++++++++++++ .../iformall/mq/impl/RabbitMqConsumer.java | 2 ++ .../iformall/controller/BaseController.java | 2 ++ .../controller/NeuPosAdminController.java | 2 ++ ...oginUserHandlerMethodArgumentResolver.java | 2 ++ .../iformall/controller/BaseController.java | 4 +++ .../com/iformall/log/SystemLogAspect.java | 2 ++ .../com/iformall/aop/RedisCacheAspect.java | 4 +++ .../iformall/controller/BaseController.java | 3 +++ .../controller/UserBasicInfoController.java | 4 +++ .../UserThirdCircleOrderController.java | 5 +++- .../interceptor/AuthorizationInterceptor.java | 3 +++ .../iformall/controller/HomeController.java | 2 ++ .../controller/UserTagsController.java | 3 +++ .../iformall/schedule/ActivitySchedule.java | 5 ++++ .../schedule/BillNotificationSchedule.java | 4 +++ .../iformall/schedule/BillStatusSchedule.java | 3 +++ .../iformall/schedule/CashOutSchedule.java | 12 +++++++++ .../iformall/schedule/ChartDataSchedule.java | 8 ++++++ .../iformall/schedule/ContractSchedule.java | 4 +++ .../schedule/CouponExpiringSchedule.java | 7 +++++ .../schedule/CouponOrderExpiringSchedule.java | 10 +++++++ .../iformall/schedule/CouponSendSchedule.java | 17 ++++++++++++ .../schedule/DaliyAmountSchedule.java | 6 +++++ .../schedule/DeviceHbCheckSchedule.java | 5 +++- .../schedule/FloatingLayerSchedule.java | 2 ++ .../com/iformall/schedule/InvestSchedule.java | 22 ++++++++++++++++ .../schedule/LatePayBillActionSchedule.java | 5 ++++ .../iformall/schedule/MsgReSendSchedule.java | 4 +++ .../iformall/schedule/MsgSendingSchedule.java | 4 +++ .../schedule/OrderExpiringSchedule.java | 16 ++++++++++++ .../schedule/PowerBillAutoBuildSchedule.java | 7 +++++ .../schedule/SharingOrderRedoSchedule.java | 5 +++- ...edoScheduletttttttttttttttttttttttttt.java | 4 +++ .../schedule/SharingOrderResultSchedule.java | 4 +++ .../iformall/schedule/SysMonitorSchedule.java | 5 ++++ .../schedule/WeChatAccessTokenSchedule.java | 3 +++ .../schedule/WiwideTokenSchedule.java | 2 ++ .../iformall/schedule/WxAppVisitSchedule.java | 7 +++++ .../schedule/WxCUserCheckSchedule.java | 5 ++++ .../schedule/WxCUserTagsSchedule.java | 4 +++ .../schedule/WxMsgRecordSchedule.java | 2 ++ .../java/com/iformall/video/VideoFactory.java | 2 ++ .../video/aliyun/AliyunVideoExcutor.java | 4 +++ 184 files changed, 873 insertions(+), 6 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 782b0ed6b..60ff8ab14 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -14,6 +14,7 @@ import org.apache.shiro.session.UnknownSessionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -26,12 +27,15 @@ 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 09016f584..cca9d843b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java @@ -18,6 +18,7 @@ import org.apache.shiro.session.UnknownSessionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -32,12 +33,15 @@ import java.util.concurrent.TimeUnit; public class BillDailyAsyncTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @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 430ba2087..f4e47465b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -22,6 +22,7 @@ import org.apache.shiro.session.UnknownSessionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -39,18 +40,23 @@ import java.util.stream.Collectors; public class ImportTemplateTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxTagsService wxTagsService; + @Lazy @Autowired StringRedisTemplate stringRedisTemplate; + @Lazy @Autowired private WxBillAllService wxBillAllService; + @Lazy @Autowired private WxMerchantMapper wxMerchantMapper; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java index 61e84e8a5..eb3922ac4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java @@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -30,12 +31,15 @@ import java.util.List; public class MemCouponController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponChannelService couponChannelService; + @Lazy @Autowired private MemCouponFromDspService memCouponFromDspService; + @Lazy @Autowired private WxCouponService couponService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java index eea61baaf..0fa34f082 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java @@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -24,6 +25,7 @@ public class UserBasicInfoAddressController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private UserBasicInfoAddressService userBasicInfoAddressService; 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 e4a0fe757..475234505 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -50,45 +51,59 @@ import java.util.stream.Collectors; public class WxCUserBasicInfoController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private String fmUploadDir; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxCUserBasicChildService wxCUserBasicChildService; + @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired private WxCUserCarService wxCUserCarService; + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired private WxCouponService wxCouponService; + @Lazy @Autowired private WxLevelConfigService wxLevelConfigService; + @Lazy @Autowired WxCarPayRecordService wxCarPayRecordService; + @Lazy @Autowired StringRedisTemplate stringRedisTemplate; + @Lazy @Autowired private AsyncTask asyncTask; + @Lazy @Autowired private ExcelService excelService; + @Lazy @Autowired private WxMerchantMapper wxMerchantMapper; + @Lazy @Autowired private WxCreditHistoryService wxCreditHistoryService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java index fb768c5ae..5127fb809 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; public class WxCUserCarController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserCarService wxCUserCarService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java index 92bb50b21..bb17f7bd1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java @@ -5,6 +5,7 @@ import com.iformall.controller.base.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; @@ -22,6 +23,7 @@ import io.swagger.annotations.ApiOperation; public class WxCUserController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserService wxCUserService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index 155dc3543..949ce76d9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -41,14 +42,23 @@ import io.swagger.annotations.ApiOperation; public class WxCUserDataController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private CUserServiceFactory cuserFactory; + + @Lazy @Autowired private WxUserVisitService wxUserVisitService; + + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; + + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + + @Lazy @Autowired private WxMallService wxMallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java index d3de03d04..502e840cc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -24,6 +25,7 @@ import javax.servlet.http.HttpServletResponse; public class WxCUserFromController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserFromService wxCUserFromService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java index aa7d79cb8..9c782803a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; public class WxCUserTagsController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 1ec84780c..f6dd9eb88 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -38,9 +39,11 @@ import java.util.Objects; public class WxCreditHistoryController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxCreditHistoryService wxCreditHistoryService; + @Lazy @Autowired private WxMerchantService wxMerchantService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index 7dafae748..1eb54e6d5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; @@ -35,6 +36,7 @@ import java.util.List; public class WxLevelConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxLevelConfigService wxLevelConfigService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java index 685dd1be9..db8c3a507 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -24,9 +25,11 @@ import org.springframework.web.bind.annotation.*; public class WxScoreHistoryController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxScoreHistoryService wxScoreHistoryService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index 4ec4a677e..28d9112a9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -26,9 +27,11 @@ import org.springframework.web.bind.annotation.*; public class WxScoreRulesController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; + @Lazy @Autowired private WxMallService wxMallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java index 12ae8b7d7..ad9743b64 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java @@ -13,12 +13,15 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxUserChannel") public class WxUserChannelController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Lazy @Autowired private WxUserChannelService wxUserChannelService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java index 2a7770e4f..760dbe085 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*; public class WxMsgCallbackController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgCallbackService wxMsgCallbackService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java index ca0711d16..7a58c71cf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; public class WxMsgConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgConfigService wxMsgConfigService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index cef65c79e..44e9ea2d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -22,6 +22,7 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -37,12 +38,15 @@ import java.util.*; public class WxMsgController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private String fmUploadDir; + @Lazy @Autowired private WxMsgService wxMsgService; + @Lazy @Autowired WxTemplateMsgService wxTemplateMsgService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java index 8a9ee6640..b14f6ebd3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*; public class WxMsgModelController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgModelService wxMsgModelService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java index e82fd9c2c..5da2adbff 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -23,10 +24,15 @@ import java.util.List; public class WxMsgRecordController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgRecordService wxMsgRecordService; + + @Lazy @Autowired private MqBaseProducer mqBaseProducer; + + @Lazy @Autowired private SendCallBackSmsServiceImpl sendCallBackSmsService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java index 7e720295a..12013cb6a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*; public class WxMsgSignatureController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgSignatureService wxMsgSignatureService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java index 52a7eb909..6713eda8b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; public class WxMsgValidationcodeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java index 302b337b4..7b6d285e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*; public class WxMsgValidationcodeModelController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgValidationcodeModelService wxMsgValidationcodeModelService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java b/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java index 33e10eee1..46c915c63 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java @@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -45,10 +46,15 @@ import org.springframework.web.multipart.MultipartFile; public class WxOcrController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxOcrService ocrService; + + @Lazy @Autowired private WxMerchantService merchantService; + + @Lazy @Autowired private String ocrData; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java index af4358ef2..0dd3c9d15 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -40,9 +41,11 @@ import io.swagger.annotations.ApiOperation; public class AlipayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private AliPayUtil aliPayUtil; + @Lazy @Autowired private WxMallService mallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java index fdc2603ae..01fbd6916 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; public class WxBillActionController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - + @Lazy @Autowired private WxBillActionService wxBillActionService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 0b9cc44a1..efe25a49a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -29,11 +30,14 @@ import java.util.Map; @RestController @RequestMapping("wxBillAll") public class WxBillAllController extends BaseController { + + @Lazy @Autowired private WxBillAllService wxBillAllService; private Logger logger = LoggerFactory.getLogger(WxBillAllController.class); + @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; 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 92ba22cad..2293bbd1d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -40,15 +41,19 @@ import java.util.concurrent.TimeUnit; @RequestMapping("wxBillDaily") public class WxBillDailyController extends BaseController { + @Lazy @Autowired private String fmUploadDir; + @Lazy @Autowired private WxBillDailyService wxBillDailyService; + @Lazy @Autowired StringRedisTemplate stringRedisTemplate; + @Lazy @Autowired private BillDailyAsyncTask billDailyAsyncTask; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java index a302e319b..79d5436c1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; /** @@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxBillDeposit") public class WxBillDepositController extends BaseController { + + @Lazy @Autowired private WxBillDepositService wxBillDepositService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index 5b5626559..4058f7010 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiImplicitParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -25,6 +26,8 @@ import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("wxBillOther") public class WxBillOtherController extends BaseController { + + @Lazy @Autowired private WxBillOtherService wxBillOtherService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index 827b880ea..d12fe5fc2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -24,6 +25,8 @@ import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("wxBillOtherDeposit") public class WxBillOtherDepositController extends BaseController { + + @Lazy @Autowired private WxBillOtherDepositService wxBillOtherDepositService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 2f499f786..4e5e801f8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -25,6 +26,8 @@ import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("wxBillProperty") public class WxBillPropertyController extends BaseController { + + @Lazy @Autowired private WxBillPropertyService wxBillPropertyService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java index c825d3c10..c84f4011c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; /** @@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxBillPropertyDeposit") public class WxBillPropertyDepositController extends BaseController { + + @Lazy @Autowired private WxBillPropertyDepositService wxBillPropertyDepositService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index cfe7973e0..ca0b57f0f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -27,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; public class WxBillRentController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxBillRentService wxBillRentService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java index d59bc76f3..785f38ec8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java @@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -30,10 +31,15 @@ import javax.servlet.http.HttpServletResponse; public class WxBillSettleController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxBillSettleService wxBillSettleService; + + @Lazy @Autowired private WxBillSettleRecordService wxBillSettleRecordService; + + @Lazy @Autowired private WxBillAllService wxBillAllService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java index 1a23a74d2..5d0a2e48e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -21,6 +22,7 @@ import java.util.Map; public class WxGooagooController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxGooagooService wxGooagooService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index ea06d8393..4785c0d44 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.imageio.ImageIO; import javax.servlet.ServletException; @@ -55,24 +56,31 @@ public class HomeController extends BaseController { @Value("${version}") private String version; + @Lazy @Autowired private Producer producer; + @Lazy @Autowired private MallUserInfoService mallUserInfoService; + @Lazy @Autowired private MallUserRoleService mallUserRoleService; + @Lazy @Autowired private WxAppinfoService appinfoService; + @Lazy @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; + @Lazy @Autowired private MallUserActionService mallUserActionService; + @Lazy @Autowired private WxMallService mallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 70125f588..ea6336cc8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -34,12 +35,15 @@ public class MallRoleController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private MallRoleService sysRoleService; + @Lazy @Autowired private MallRolePermissionService sysRolePermissionService; + @Lazy @Autowired private MallUserRoleService mallUserRoleService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java index ce9921d22..873d0edbb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java @@ -12,12 +12,15 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("mallUserAction") public class MallUserActionController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Lazy @Autowired private MallUserActionService mallUserActionService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 39158e41d..ea4d252b3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -22,6 +22,7 @@ import org.apache.shiro.SecurityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -39,24 +40,31 @@ public class MallUserInfoController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired MallUserInfoService userInfoService; + @Lazy @Autowired MallUserRoleService userRoleService; + @Lazy @Autowired MallRoleService mallRoleService; + @Lazy @Autowired MallUserRoleService mallUserRoleService; + @Lazy @Autowired MallPermissionService mallPermissionService; + @Lazy @Autowired MallRolePermissionService mallRolePermissionService; + @Lazy @Autowired WxMsgValidationcodeService wxMsgValidationcodeService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java index cdcbd29ba..012f7f61b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java @@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -27,6 +28,7 @@ import java.util.List; public class SysConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private SysConfigService sysConfigService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index ce8bd4740..bf2889a77 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -25,6 +25,7 @@ import org.apache.shiro.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -45,9 +46,11 @@ import java.util.*; public class SysMenuController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private MallPermissionService mallPermissionService; + @Lazy @Autowired private MallUserInfoService mallUserInfoService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java index e3274b55a..ca2d8c1b6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -19,6 +20,7 @@ import java.util.List; public class SysNoticeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private SysNoticeService sysNoticeService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 496c8af0d..30c201c70 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -27,6 +28,7 @@ public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private AliyunOSS aliyunOSS; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 7a97516dd..e0f46dccc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -37,6 +37,7 @@ import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.dao.DataAccessException; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.core.RedisCallback; @@ -61,18 +62,23 @@ import java.util.*; public class WechatLoginController extends BaseController { private String WECHAT_PREV = "LOGIN:OPEN:"; + @Lazy @Autowired private WxMpService wxMpService; + @Lazy @Autowired private MallUserInfoService mallUserInfoService; + @Lazy @Autowired private MallUserRoleService mallUserRoleService; + @Lazy @Autowired private MallUserActionService mallUserActionService; + @Lazy @Autowired private WxMallService mallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java index f4613cd31..e4bc449ee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.*; public class WxAdminLogController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxAdminLogService wxAdminLogService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 68d24c571..9a268400e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; @@ -30,10 +31,15 @@ import java.util.*; public class WxBusinessController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxBusinessService wxBusinessService; + + @Lazy @Autowired private WxSubBusinessService wxSubBusinessService; + + @Lazy @Autowired private ExcelService excelService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxDataRuleTargetController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxDataRuleTargetController.java index 16a328d96..a67259afb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxDataRuleTargetController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxDataRuleTargetController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,6 +31,7 @@ import java.util.List; public class WxDataRuleTargetController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxDataRuleTargetService wxDataRuleTargetService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxUserDataRuleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxUserDataRuleController.java index eee9ec850..b9c6e705c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxUserDataRuleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxUserDataRuleController.java @@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; /** @@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*; public class WxUserDataRuleController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxUserDataRuleService wxUserDataRuleService; 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 b7bfe4e25..64f7a6804 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -36,12 +37,15 @@ import java.util.concurrent.TimeUnit; public class WxImportTemplateController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private String fmUploadDir; + @Lazy @Autowired StringRedisTemplate stringRedisTemplate; + @Lazy @Autowired private ImportTemplateTask importTemplateTask; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java index 72a284c40..235800362 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -47,6 +47,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -67,6 +68,7 @@ import java.util.Map; public class VideoController extends BaseController { private Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired VideoFactory videoFactory; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 266db19dc..1f3ec3779 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -26,6 +27,7 @@ import java.util.*; public class WxFlowAbleController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxFlowService wxFlowService; diff --git a/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java b/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java index 39982396e..cc9157815 100644 --- a/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java +++ b/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java @@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; @@ -18,8 +19,12 @@ import java.util.Map; */ @Component(value="contractTaskFinishListener") public class ContractTaskFinishHandler implements TaskListener { + + @Lazy @Autowired private WxFlowService wxFlowService; + + @Lazy @Autowired private WxPropertyContractService wxPropertyContractService; diff --git a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java index 465889699..e85f61047 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java @@ -18,6 +18,7 @@ import org.aspectj.lang.annotation.Pointcut; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -33,6 +34,7 @@ import java.util.Date; public class SystemLogAspect { private static final Logger logger = LoggerFactory.getLogger(SystemLogAspect.class); + @Lazy @Autowired private MallUserActionService mallUserActionService; diff --git a/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java index 3dee1b300..cb24b80b8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java @@ -26,6 +26,7 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.io.Serializable; @@ -41,6 +42,7 @@ import java.util.*; @Component public class TableOperateAspect { + @Lazy @Autowired private InvestOperateRecordService operateRecordService; diff --git a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java index acd100a64..f930f9424 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java @@ -19,6 +19,7 @@ import org.aspectj.lang.reflect.MethodSignature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -35,9 +36,11 @@ import java.util.HashSet; public class UserDataRuleAspect { private static final Logger logger = LoggerFactory.getLogger(UserDataRuleAspect.class); + @Lazy @Autowired private WxUserDataRuleService wxUserDataRuleService; + @Lazy @Autowired private WxRentContractMapper wxRentContractMapper; diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java b/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java index 5c311ac54..98d080598 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java @@ -9,6 +9,7 @@ import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver; import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.crazycake.shiro.RedisSessionDAO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import com.iformall.service.MallPermissionService; @@ -17,10 +18,16 @@ import com.iformall.service.MallPermissionService; */ //@Service public class ShiroService { + + @Lazy @Autowired private ShiroFilterFactoryBean shiroFilterFactoryBean; + + @Lazy @Autowired private MallPermissionService resourcesService; + + @Lazy @Autowired private RedisSessionDAO redisSessionDAO; /** diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index f0e14159f..299faceeb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -18,6 +18,7 @@ import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; import com.iformall.utils.MaUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RestController; @@ -35,18 +36,24 @@ import java.util.Date; public class BaseController { @Autowired private boolean isFmOpen; + + @Lazy @Autowired private WxMerchantBUserService wxMerchantBUserService; + @Lazy @Autowired private WxAppinfoService wxAppinfoService; + @Lazy @Autowired private FmOpenService openService; + @Lazy @Autowired private CUserTokenService cUserTokenService; + @Lazy @Autowired MaUtil maUtil; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosController.java index 58f8c5df2..9ebf61dbe 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosController.java @@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -23,6 +24,7 @@ import java.util.Map; public class PosController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private PosBrunService posService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java index 17b9706df..802b362ec 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -26,6 +27,7 @@ public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private AliyunOSS aliyunOSS; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index 595ac7cae..6d28929b7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @@ -31,10 +32,15 @@ import java.util.Map; public class WxBillController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxBillAllService wxBillAllService; + + @Lazy @Autowired WxMerchantService wxMerchantService; + + @Lazy @Autowired WxBillSettleService wxBillSettleService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 305eb1227..0f57e0f74 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; @@ -37,27 +38,35 @@ import java.util.List; public class WxCUserController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; + @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired private WxMerchantBUserService wxMerchantBUserService; + @Lazy @Autowired private WxMerchantService wxMerchantService; + @Lazy @Autowired private WxCUserFromBService wxCUserFromBService; + @Lazy @Autowired private WxCUserService wxCUserService; + @Lazy @Autowired private WxCreditHistoryService wxCreditHistoryService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 8c5bda4fd..a7e7820e0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -31,12 +32,15 @@ import java.util.Map; public class WxCardPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxMerchantService wxMerchantService; + @Lazy @Autowired WxOrderService wxOrderService; + @Lazy @Autowired WxCardSpendService wxCardSpendService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 9aa899e37..939232662 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; /** @@ -39,14 +40,23 @@ import org.springframework.web.bind.annotation.*; public class WxCashOutController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCashOutService wxCashOutService; + + @Lazy @Autowired WxCUserService wxCUserService; + + @Lazy @Autowired WxMerchantService wxMerchantService; + + @Lazy @Autowired WxMallService wxMallService; + + @Lazy @Autowired WxPayAccountService wxPayAccountService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 06a35a1eb..3a49a3f67 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -36,14 +37,23 @@ import java.util.Map; public class WxCouponChannelController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; + + @Lazy @Autowired private WxCouponChannelMapper wxCouponChannelMapper; + + @Lazy @Autowired private QrCodeService qrCodeService; + + @Lazy @Autowired private WxFlowService wxFlowService; + + @Lazy @Autowired private WxCouponService wxCouponService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index b28e7fbbf..c0046f6fb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -41,18 +42,31 @@ import java.util.*; public class WxCouponController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponService wxCouponService; + + @Lazy @Autowired private WxCouponPasswordService couponPasswordService; + + @Lazy @Autowired private WxCouponChannelMapper wxCouponChannelMapper; + + @Lazy @Autowired private WxFlowService wxFlowService; + + @Lazy @Autowired private WxMerchantService wxMerchantService; + + @Lazy @Autowired private WxMallService wxMallService; + + @Lazy @Autowired RedisLock redisLock; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 8f0f7c696..84ad5efad 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -24,6 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.web.bind.annotation.*; @@ -41,24 +42,31 @@ import java.util.concurrent.TimeUnit; public class WxCouponOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMerchantService wxMerchantService; + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired private WxCouponService wxCouponService; + @Lazy @Autowired private WxMerchantBUserService wxMerchantBUserService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxCUserService wxCUserService; + @Lazy @Autowired @Qualifier("couponDetailRedisTemplate") RedisTemplate cdRedisTemplate; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 49b28174a..adbdb0008 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -36,11 +37,16 @@ import java.util.stream.Collectors; @Api(description = "商户注券相关接口") public class WxCouponSendController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Lazy @Autowired private WxCouponSendService wxCouponSendService; + + @Lazy @Autowired private WxCouponActionLogService wxCouponActionLogService; + @Lazy @Resource private WxCUserMapper wxCUserMapper; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index f11d8adff..4a81089f7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -39,15 +40,19 @@ import java.util.Objects; @Slf4j public class WxCreditHistoryController extends BaseController { + @Lazy @Autowired private WxCreditHistoryService wxCreditHistoryService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxMerchantService wxMerchantService; + @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java index 6b2b2a11a..4d9e67e7c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -29,6 +30,7 @@ import java.util.List; public class WxDateAmountRecordController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxDateAmountRecordService wxDateAmountRecordService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 7f460703d..f34a72837 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -48,24 +49,31 @@ public class WxInfoController extends BaseController { @Autowired private boolean isFmOpen; + @Lazy @Autowired WxAppinfoService wxAppinfoService; + @Lazy @Autowired MallUserInfoService mallUserInfoService; + @Lazy @Autowired MallUserRoleService mallUserRoleService; + @Lazy @Autowired MallRolePermissionService mallRolePermissionService; + @Lazy @Autowired WxMerchantBUserService merchantBUserService; + @Lazy @Autowired private CUserServiceFactory cuserFactory; + @Lazy @Autowired private WxMallService mallService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java index 6ea8c3116..ba7d1c80b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -40,9 +41,11 @@ public class WxMallController extends BaseController { @Value("${version}") private String version; + @Lazy @Autowired private WxMallService wxMallService; + @Lazy @Autowired private WxAppinfoService wxAppinfoService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java index e5d544786..27acc29ef 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java @@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -34,15 +35,19 @@ import java.util.Map; public class WxMemController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserService userService; + @Lazy @Autowired private WxLevelConfigService wxLevelConfigService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxMerchantService wxMerchantService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index f02b29102..99a34356e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -22,12 +23,15 @@ import org.springframework.web.bind.annotation.*; @Slf4j public class WxMerchantController extends BaseController { + @Lazy @Autowired private WxMerchantService wxMerchantService; + @Lazy @Autowired private WxProfitSharingReceiverService wxProfitSharingReceiverService; + @Lazy @Autowired private WxCUserService cUserService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index 6eab1dfb4..37de26e24 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,6 +25,7 @@ import java.util.Map; public class WxMerchantSubsidyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxMerchantSubsidyService wxMerchantSubsidyService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 8718cfa4e..6bd21262f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -17,6 +17,7 @@ import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; @@ -28,10 +29,16 @@ import java.util.List; @Api(description = "解单相关接口") public class WxMerchantTradeDailyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Lazy @Autowired private WxMerchantTradeDailyService wxMerchantTradeDailyService; + + @Lazy @Autowired private WxMerchantBUserService wxMerchantBUserService; + + @Lazy @Autowired private WxMerchantService wxMerchantService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index 5131272a6..87be52fcb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -36,30 +37,39 @@ import java.util.Map; public class WxMicroPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxMerchantBUserService wxMerchantBUserService; + @Lazy @Autowired WxMerchantService wxMerchantService; + @Lazy @Autowired WxOrderService wxOrderService; + @Lazy @Autowired WxPayOrderService wxPayOrderService; + @Lazy @Autowired WxRefundOrderService wxRefundOrderService; + @Lazy @Autowired WxAppinfoService wxAppinfoService; + @Lazy @Autowired WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired OrderFactory orderFactory; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index fcca737fb..28391e17a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -16,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,12 +29,15 @@ import java.util.List; public class WxMsgValidationcodeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; + @Lazy @Autowired private WxMerchantBUserService wxMerchantBUserService; + @Lazy @Autowired private WxMerchantService wxMerchantService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java index 873bf5e86..bd6288975 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -30,6 +31,7 @@ import java.util.Map; public class WxPayBillController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxPayBillService wxPayBillService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java index a40af5662..3b46d42a6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -30,12 +31,15 @@ import java.util.Map; public class WxRefundOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired private WxAppinfoService wxAppinfoService; + @Lazy @Autowired private WxRefundOrderService wxRefundOrderService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java index 1e32ee6ed..3af540b35 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java @@ -8,6 +8,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,6 +23,7 @@ import java.util.Map; @Slf4j public class WxTagController extends BaseController { + @Lazy @Autowired private WxTagsService wxTagsService; diff --git a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java index ebe123113..979a47482 100644 --- a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java +++ b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java @@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.Date; @@ -41,9 +42,11 @@ public class PosBrunService { @Autowired private String posUrl; + @Lazy @Autowired private PosOrderService posOrderService; + @Lazy @Autowired private PosPayOrderService posPayOrderService; diff --git a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index f001c7912..9ef53a60c 100644 --- a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -18,6 +18,7 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; @@ -47,9 +48,11 @@ public class RedisCacheAspect { @Autowired private StringRedisTemplate stringRedisTemplate; + @Lazy @Autowired RedisLock redisLock; + @Lazy @Autowired private CUserTokenService cUserTokenService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 28a3f7b26..ce09118e1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -23,6 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; @@ -42,34 +43,44 @@ public class BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private boolean isFmOpen; + @Lazy @Autowired private WxAppinfoService wxAppinfoService; + @Lazy @Autowired private FmOpenService openService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxCUserBasicChildService wxCUserBasicChildService; + @Lazy @Autowired private CUserTokenService cUserTokenService; + @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; + @Lazy @Autowired private MemCouponFromDspService memCouponFromDspService; + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate objectCommonRedisTemplate; + @Lazy @Autowired MaUtil maUtil; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java b/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java index dcc47aec2..a5de005b1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; /** @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*; public class FengNiaoMapController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private FengNiaoMapService fengNiaoMapService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java index 26499de18..3a0760bad 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java @@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -26,6 +27,7 @@ public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private AliyunOSS aliyunOSS; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java index 06d41aa89..99f2357e8 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -22,6 +23,7 @@ public class UserBasicInfoAddressController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private UserBasicInfoAddressService userBasicInfoAddressService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java index 8c5fc0a07..829d50a83 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java @@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,6 +38,7 @@ import java.util.Map; public class WxActivityController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxActivityService wxActivityService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index c7c86f6e2..196d33750 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,6 +35,7 @@ import java.util.stream.Collectors; public class WxActivityJoinController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxActivityJoinService wxActivityJoinService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index aae158683..5d18373d6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -24,6 +25,7 @@ import java.util.stream.Collectors; public class WxBusinessController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxBusinessService wxBusinessService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java index f813852c3..7409f62af 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java @@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -30,6 +31,7 @@ public class WxCUserBasicSignController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserBasicSignService wxCUserBasicSignService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index e98afaf73..0975a0a58 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -35,8 +36,11 @@ import java.util.List; public class WxCampaignController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCampaignService wxCampaignService; + + @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 7897ac9a1..8bd5247d5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -22,6 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; @@ -35,45 +36,59 @@ import java.util.Map; public class WxCarController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxParkService wxParkService; + @Lazy @Autowired WxCUserCarService wxCUserCarService; + @Lazy @Autowired WxMerchantService wxMerchantService; + @Lazy @Autowired WxCouponService couponService; + @Lazy @Autowired WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired WxScoreRulesService wxScoreRulesService; + @Lazy @Autowired WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired WxCarCmdLogService wxCarCmdLogService; + @Lazy @Autowired WxCreditHistoryService wxCreditHistoryService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired ParkFactory parkFactory; + @Lazy @Autowired ParkHelper parkHelper; + @Lazy @Autowired EtcpHelper etcpHelper; + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 7ecbf1a61..37f38d221 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; @@ -59,21 +60,27 @@ import io.swagger.annotations.ApiOperation; public class WxCardPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxMerchantService wxMerchantService; + @Lazy @Autowired WxOrderService wxOrderService; + @Lazy @Autowired WxCardInfoService wxCardInfoService; + @Lazy @Autowired WxCardSpendService wxCardSpendService; + @Lazy @Autowired WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 3e20c1cda..d4fcda688 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; @@ -37,9 +38,11 @@ import io.swagger.annotations.ApiOperation; public class WxCouponChannelController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; + @Lazy @Autowired private WxMerchantService wxMerchantService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 796c1bf60..2876a9d91 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -14,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.web.bind.annotation.GetMapping; @@ -45,13 +46,19 @@ import io.swagger.annotations.ApiOperation; public class WxCouponController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; + + @Lazy @Autowired private WxCouponService couponService; + + @Lazy @Autowired private WxMerchantService merchantService; + @Lazy @Autowired @Qualifier("couponDetailRedisTemplate") RedisTemplate cdRedisTemplate; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 480a6262b..60a4f93ee 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -28,6 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; @@ -42,22 +43,28 @@ import java.util.concurrent.TimeUnit; public class WxCouponOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponService wxCouponService; + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired private MemCouponFromDspService memCouponFromDspService; + @Lazy @Autowired @Qualifier("couponDetailRedisTemplate") RedisTemplate cdRedisTemplate; + @Lazy @Autowired StringRedisTemplate stringRedisTemplate; + @Lazy @Autowired SysConfigService sysConfigService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index 89c1b2e97..45b19f5a9 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -26,15 +27,19 @@ import java.util.Map; public class WxCouponPasswordController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponPasswordService couponPasswordService; + @Lazy @Autowired private WxCouponService couponService; + @Lazy @Autowired private WxOrderService orderService; + @Lazy @Autowired private WxCUserBasicInfoService userService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index cbd79151c..3c3eafaf6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -30,9 +31,11 @@ public class WxCreditHistoryController extends BaseController{ private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCreditHistoryService wxCreditHistoryService; + @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java index 290d5349c..ee39e2f41 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController; public class WxCuserFloatingLayerController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxCuserFloatingLayerService wxCuserFloatingLayerService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java index d012d001b..b673125aa 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -22,6 +23,7 @@ public class WxCustomizeModuleController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxCustomizeModuleService wxCustomizeModuleService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index 798ea7a1b..999a05a63 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -25,9 +26,11 @@ import java.util.Map; public class WxGameController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxGameService wxGameService; + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java index a59c0b72e..f0f090e2b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*; public class WxMallBuildingController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMallBuildingService wxMallBuildingService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java index e9014513d..b3fe84108 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java @@ -15,6 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -28,18 +29,23 @@ public class WxMallController extends BaseController { @Value("${version}") private String version; + @Lazy @Autowired private WxMallService wxMallService; + @Lazy @Autowired private WxAppinfoService wxAppinfoService; + @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; + @Lazy @Autowired private WxLevelConfigService wxLevelConfigService; + @Lazy @Autowired private RedisService redisService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 5a6c6d5c4..411149f3f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.HashMap; @@ -29,6 +30,7 @@ import java.util.HashMap; public class WxMerchantController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMerchantService wxMerchantService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java index 43763c785..0799e86ff 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java @@ -17,6 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; @@ -31,9 +32,11 @@ public class WxMiniappThemeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxMiniappThemeService wxMiniappThemeService; + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate objectCommonRedisTemplate; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java index 4a1924216..9ac11ef5b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -25,6 +26,7 @@ import java.util.List; public class WxMsgController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxTemplateMsgService wxTemplateMsgService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index eae21c8f2..c2f54f8c8 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -33,12 +34,15 @@ import java.util.Date; public class WxMsgValidationcodeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; + @Lazy @Autowired private CUserServiceFactory cuserFactory; + @Lazy @Autowired private WxAppinfoService WxAppinfoService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOcrController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOcrController.java index ceac8a1f4..91d606f01 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOcrController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOcrController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,12 +31,15 @@ import org.springframework.web.bind.annotation.RestController; public class WxOcrController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxOcrService ocrService; + + @Lazy @Autowired private WxMallService mallService; - + @Lazy @Autowired private String ocrData; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOpinionController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOpinionController.java index 2e870ba14..d88cfadb0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOpinionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOpinionController.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @@ -26,6 +27,7 @@ public class WxOpinionController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxOpinionService wxOpinionService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index c8528b319..e207abd16 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -29,6 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; @@ -43,22 +44,28 @@ import java.util.Map; public class WxOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; + @Lazy @Autowired private WxOrderService wxOrderService; + @Lazy @Autowired private WxCouponService wxCouponService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired @Qualifier("couponDetailRedisTemplate") RedisTemplate cdRedisTemplate; + @Lazy @Autowired RedisLock redisLock; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java index a44003521..265eecf12 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java @@ -20,6 +20,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -31,15 +32,19 @@ import java.util.Map; public class WxOrderGroupController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxOrderService wxOrderService; + @Lazy @Autowired WxCouponService wxCouponService; + @Lazy @Autowired WxOrderGroupService wxOrderGroupService; + @Lazy @Autowired WxMallService wxMallService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java index 6e02b8094..8228d42b3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; public class WxParkController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxParkService wxParkService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 2bb1c9d07..db3fc18bc 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; @@ -50,24 +51,31 @@ import io.swagger.annotations.ApiOperation; public class WxPayOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxPayOrderService wxPayOrderService; + @Lazy @Autowired private WxOrderService wxOrderService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxPayAccountService wxPayAccountService; + @Lazy @Autowired private WxCouponService wxCouponService; + @Lazy @Autowired private WxAppinfoService wxAppinfoService; + @Lazy @Autowired OrderFactory orderFactory; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java index 22a61dd54..599877362 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java @@ -22,6 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.transaction.annotation.Transactional; @@ -38,23 +39,29 @@ import java.util.concurrent.TimeUnit; public class WxPressOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxOrderService wxOrderService; + @Lazy @Autowired WxCouponService wxCouponService; + @Lazy @Autowired WxOrderPressService wxOrderPressService; + @Lazy @Autowired @Qualifier("pressOrderRedisTemplate") RedisTemplate orderRedisTemplate; + @Lazy @Autowired @Qualifier("couponDetailRedisTemplate") RedisTemplate couponCVoRedisTemplate; + @Lazy @Autowired RedisLock redisLock; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java index 162d5da85..e0b850b3c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.configurationprocessor.json.JSONArray; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -31,12 +32,15 @@ import java.util.Random; public class WxQuestionController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxQuestionService wxQuestionService; + @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java index d68762b36..814092dc3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java @@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.HashMap; @@ -34,12 +35,15 @@ public class WxQuestionOneselfController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxQuestionOneselfService wxQuestionOneselfService; + @Lazy @Autowired private WxQuestionOneselfUserService wxQuestionOneselfUserService; + @Lazy @Autowired private WxQuestionOneselfLogService wxQuestionOneselfLogService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java index 4beb46dc0..c3f4c5e9c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*; public class WxScoreHistoryController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxScoreHistoryService wxScoreHistoryService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index 89f78cbd2..f136ad9e3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @@ -19,6 +20,7 @@ public class WxTopicController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxTopicService wxTopicService; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index be6b2c10a..8e20f7312 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -51,42 +52,55 @@ public class WxUserGrantController extends BaseController { @Autowired private boolean isFmOpen; + @Lazy @Autowired private CUserServiceFactory cuserFactory; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxCUserCarService wxCUserCarService; + @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; + @Lazy @Autowired WxLevelConfigService wxLevelConfigService; + @Lazy @Autowired WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired WxAppinfoService wxAppinfoService; + @Lazy @Autowired WxAuthorizerInfoService wxAuthorizerInfoService; + @Lazy @Autowired WxMerchantService wxMerchantService; + @Lazy @Autowired WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired WxCreditHistoryService wxCreditHistoryService; + @Lazy @Autowired WxMallService mallService; + @Lazy @Autowired private QrCodeService qrCodeService; diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index 2643230ad..6642a431c 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -11,6 +11,7 @@ import com.iformall.service.CUserTokenService; import com.iformall.utils.Constant; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -26,6 +27,8 @@ import javax.servlet.http.HttpServletResponse; */ @Component public class AuthorizationInterceptor extends HandlerInterceptorAdapter { + + @Lazy @Autowired private CUserTokenService cUserTokenService; diff --git a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java index db7f5b15a..02dd1e15f 100644 --- a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -7,6 +7,7 @@ import com.iformall.service.CUserTokenService; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.utils.Constant; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; import org.springframework.web.bind.support.WebDataBinderFactory; @@ -24,6 +25,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; @Component public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java index cbe4769d2..ef7c32020 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestBody; @@ -41,18 +42,23 @@ public class AliPayController extends BaseController { private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @Lazy @Autowired private AliPayUtil alipayUtil; + @Lazy @Autowired private WxMerchantService wxMerchantService; + @Lazy @Autowired private WxMallService mallService; + @Lazy @Autowired private AliPayCUserService aliPayCUserService; + @Lazy @Autowired AliBusinessCircleOrderService aliBusinessCircleOrderService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index 159ed7594..fa42f115e 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -50,20 +51,27 @@ public class JinMaoController extends BaseController { private final SimpleDateFormat sdf = new SimpleDateFormat("MMM d, yyyy K:m:s a", Locale.ENGLISH); + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired private JmSportOrderService jmSportOrderService; + @Lazy @Autowired private JinMaoOrderTagsDeveloper jinMaoOrderTagsDeveloper; + + @Lazy @Autowired private JinMaoUserTagsDeveloper jinMaoUserTagsDeveloper; + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java index c93899a0b..cea631fdf 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java @@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -38,22 +39,27 @@ public class TtPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - + @Lazy @Autowired private WxAppinfoService appinfoService; + @Lazy @Autowired private WxPayAccountService payAccountService; + @Lazy @Autowired private WxRefundOrderService wxRefundOrderService; + @Lazy @Autowired private WxPayOrderService wxPayOrderService; + @Lazy @Autowired private OrderFactory orderFactory; + @Lazy @Autowired private PayServiceFactory payServiceFactory; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java index c053d41b2..0c1bed1b7 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java @@ -22,6 +22,7 @@ import org.apache.shiro.web.servlet.ShiroHttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -43,12 +44,15 @@ public class WxBusinessOrderController extends BaseController { private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'+'mm:ss", Locale.CHINA); + @Lazy @Autowired WxMallService wxMallService; + @Lazy @Autowired WxPayAccountService wxPayAccountService; + @Lazy @Autowired WxBusinessCircleOrderService wxBusinessCircleOrderService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java index 3bf488541..3fb26d871 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java @@ -7,6 +7,7 @@ import com.iformall.service.WxMsgCallbackService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -17,6 +18,7 @@ import java.util.Map; public class WxMsgCallbackController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgCallbackService wxMsgCallbackService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayBillController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayBillController.java index db8ff0c2e..6cdcbabfe 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayBillController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayBillController.java @@ -13,6 +13,7 @@ import org.jdom2.JDOMException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -36,9 +37,11 @@ public class WxPayBillController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxPayBillService wxPayBillService; + @Lazy @Autowired private WxRefundOrderService wxRefundOrderService; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java index d7754fb13..4ca6449e6 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java @@ -18,6 +18,7 @@ import org.jdom2.JDOMException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -38,12 +39,15 @@ public class WxPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxPayOrderService wxPayOrderService; + @Lazy @Autowired private WxSubsidyService wxSubsidyService; + @Lazy @Autowired private MqBaseProducer mqBaseProducer; /** diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java index 51bae65a3..39ee99a43 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java @@ -24,6 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,30 +43,39 @@ import java.util.Map; public class WxCarETCPCallBackController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxParkService wxParkService; + @Lazy @Autowired WxCUserCarService wxCUserCarService; + @Lazy @Autowired WxMerchantService wxMerchantService; + @Lazy @Autowired WxCarCmdLogService wxCarCmdLogService; + @Lazy @Autowired WxCouponSendService wxCouponSendService; + @Lazy @Autowired WxCarPayRecordService wxCarPayRecordService; + @Lazy @Autowired WxCUserService wxCUserService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java index 7f06c5524..acaa2a694 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java @@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -32,27 +33,35 @@ import java.util.Map; public class WxCarTJDCallBackController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxParkService wxParkService; + @Lazy @Autowired WxCUserCarService wxCUserCarService; + @Lazy @Autowired WxMerchantService wxMerchantService; + @Lazy @Autowired WxCarCmdLogService wxCarCmdLogService; + @Lazy @Autowired WxCouponSendService wxCouponSendService; + @Lazy @Autowired WxCarPayRecordService wxCarPayRecordService; + @Lazy @Autowired WxCUserService wxCUserService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java index 592f9c4e8..1490d0040 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java @@ -28,6 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -45,36 +46,46 @@ import java.util.Map; public class WxParkCallBackBaseController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxParkService wxParkService; + @Lazy @Autowired WxCUserCarService wxCUserCarService; + @Lazy @Autowired WxMerchantService wxMerchantService; + @Lazy @Autowired WxCarCmdLogService wxCarCmdLogService; + @Lazy @Autowired WxCouponSendService wxCouponSendService; + @Lazy @Autowired WxCarPayRecordService wxCarPayRecordService; + @Lazy @Autowired WxCUserService wxCUserService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; + @Lazy @Autowired ParkFactory parkFactory; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java index dec4c40e7..d6dcf84e8 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/cyf/WxCarCYFCallBackController.java @@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -41,24 +42,31 @@ import java.util.Map; @RequestMapping("/cyfCarCallback") public class WxCarCYFCallBackController extends WxParkCallBackBaseController { + @Lazy @Autowired WxParkService wxParkService; + @Lazy @Autowired WxCarCmdLogService wxCarCmdLogService; + @Lazy @Autowired WxCUserService wxCUserService; + @Lazy @Autowired WxCUserCarService wxCUserCarService; + @Lazy @Autowired WxCouponSendService wxCouponSendService; + @Lazy @Autowired WxCarPayRecordService wxCarPayRecordService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java index 72830465c..22cf173c8 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java @@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -41,24 +42,31 @@ import java.util.Map; @RequestMapping("/hkwsCarCallback") public class WxCarHaiKangWeiShiCallBackController extends WxParkCallBackBaseController { + @Lazy @Autowired WxParkService wxParkService; + @Lazy @Autowired WxCarCmdLogService wxCarCmdLogService; + @Lazy @Autowired WxCUserService wxCUserService; + @Lazy @Autowired WxCUserCarService wxCUserCarService; + @Lazy @Autowired WxCouponSendService wxCouponSendService; + @Lazy @Autowired WxCarPayRecordService wxCarPayRecordService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java index b1454a31f..09f3ac1bd 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java @@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -41,24 +42,31 @@ import java.util.Map; @RequestMapping("/jieshunCarCallback") public class WxCarJieShunCallBackController extends WxParkCallBackBaseController { + @Lazy @Autowired WxParkService wxParkService; + @Lazy @Autowired WxCarCmdLogService wxCarCmdLogService; + @Lazy @Autowired WxCUserService wxCUserService; + @Lazy @Autowired WxCUserCarService wxCUserCarService; + @Lazy @Autowired WxCouponSendService wxCouponSendService; + @Lazy @Autowired WxCarPayRecordService wxCarPayRecordService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 497cb5623..772051a6e 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -22,6 +22,7 @@ import org.apache.commons.codec.digest.HmacUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; @@ -37,9 +38,11 @@ import java.util.stream.Collectors; public class KwBoxV1Controller extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private KwBoxService kwBoxService; + @Lazy @Autowired private KwBoxCmdHistoryService kwBoxCmdHistoryService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java b/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java index 1f07d1272..ff0cc815e 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -32,21 +33,27 @@ import java.util.Map; public class WxDeviceScreenAdController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxScreenAdService wxScreenAdService; + @Lazy @Autowired private WxMallService wxMallService; + @Lazy @Autowired private WxDeviceService wxDeviceService; + @Lazy @Autowired private WxCampaignService wxCampaignService; + @Lazy @Autowired private WxMerchantService wxMerchantService; + @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/official/WxMallApplyController.java b/mallinkCallback/src/main/java/com/iformall/controller/official/WxMallApplyController.java index 9a92d1591..ded4e59b7 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/official/WxMallApplyController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/official/WxMallApplyController.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiImplicitParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; @RestController @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; public class WxMallApplyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMallApplyService wxMallApplyService; diff --git a/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java b/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java index 4d19df045..1dff84b1e 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java @@ -17,6 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -33,6 +34,7 @@ public class HomeController { @Value("${spring.mail.username}") private String from; + @Lazy @Autowired private WxRefundOrderService wxRefundOrderService; diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index 0b8238b59..d2ade2f6f 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -8,6 +8,7 @@ import com.iformall.utils.JsonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; /** @@ -16,36 +17,61 @@ import org.springframework.stereotype.Service; @Service public class MqBaseConsumer { private final Logger log = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgRecordMapper wxMsgRecordMapper; + + @Lazy @Autowired private SendSmsServiceImpl sendSmsService; + + @Lazy @Autowired private SendCallBackSmsServiceImpl sendCallBackSmsService; + + @Lazy @Autowired private SendEmailServiceImpl sendEmailService; + + @Lazy @Autowired private SendSmartAppMsgServiceImpl sendSmartAppMsgService; + + @Lazy @Autowired private SendMpMsgServiceImpl sendMpMsgService; + + @Lazy @Autowired private SendWeappUniformMsgServiceImpl sendWeappUniformMsgService; + + @Lazy @Autowired private FmInsideOrderSuccessMsgServiceImpl fmInsideOrderSuccessMsgService; + + @Lazy @Autowired private FmInsideCouponVerifyMsgServiceImpl fmInsideCouponVerifyMsgService; + + @Lazy @Autowired private FmInsideCLoginMsgServiceImpl fmInsideCLoginMsgService; + + @Lazy @Autowired private MqBaseProducer mqBaseProducer; //@Autowired //private FmInsideNotifyPaySuccessMsgServiceImpl fmInsideNotifyPaySuccessMsgService; + + @Lazy @Autowired private FmInsideNotifyRefundSuccessMsgServiceImpl fmInsideNotifyRefundSuccessMsgService; + //@Autowired //UpdateCouponStockMsgServiceImpl updateCouponStockMsgService; + @Lazy @Autowired private FmInsideCashOutMsgServiceImpl fmInsideCashOutMsgService; diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java index d81e189c1..1bb451612 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java @@ -7,6 +7,7 @@ import org.springframework.amqp.core.*; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; @@ -18,6 +19,7 @@ public class RabbitMqConsumer extends MqBaseConsumer { //String queueName = "topic-1"; private String[] queuenames = null; + @Lazy @Autowired private AmqpAdmin amqpAdmin; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java index 47aee76e7..6462c8a83 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java @@ -25,6 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; @@ -44,6 +45,7 @@ public class BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate objectCommonRedisTemplate; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index ead9e9667..6efed7689 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -40,6 +41,7 @@ import javax.servlet.http.HttpServletResponse; public class NeuPosAdminController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private NeuPosOrderService neuPosOrderService; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java index db7f5b15a..02dd1e15f 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -7,6 +7,7 @@ import com.iformall.service.CUserTokenService; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.utils.Constant; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; import org.springframework.web.bind.support.WebDataBinderFactory; @@ -24,6 +25,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; @Component public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java index 9de3e25f0..04609e7f4 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java @@ -12,6 +12,7 @@ import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.IPUtil; import com.iformall.utils.MaUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RestController; @@ -25,12 +26,15 @@ public class BaseController { @Autowired private boolean isFmOpen; + @Lazy @Autowired private WxAppinfoService wxAppinfoService; + @Lazy @Autowired private FmOpenService openService; + @Lazy @Autowired MaUtil maUtil; diff --git a/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java b/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java index cbdabd81a..b4052ee65 100644 --- a/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java @@ -11,6 +11,7 @@ import org.aspectj.lang.annotation.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -24,6 +25,7 @@ import java.util.Map; public class SystemLogAspect { private static final Logger logger = LoggerFactory.getLogger(SystemLogAspect.class); + @Lazy @Autowired private PosActionLogService posActionLogService; diff --git a/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index f001c7912..aaf8486a3 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -18,6 +18,7 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; @@ -44,12 +45,15 @@ public class RedisCacheAspect { */ private static final String DELIMITER_KEY = ":"; + @Lazy @Autowired private StringRedisTemplate stringRedisTemplate; + @Lazy @Autowired RedisLock redisLock; + @Lazy @Autowired private CUserTokenService cUserTokenService; diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java index 4842392e4..f147fc2ea 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; @@ -27,10 +28,12 @@ public class BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate objectCommonRedisTemplate; + @Lazy @Autowired WxThirdPartyApiService wxThirdPartyApiService; diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java index 39a71a576..ed41e33d9 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -28,12 +29,15 @@ public class UserBasicInfoController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCUserService wxCUserService; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxLevelConfigService wxLevelConfigService; diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index 4b161e479..b83b46f19 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,13 +38,15 @@ public class UserThirdCircleOrderController extends BaseController { private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - + @Lazy @Autowired WxThirdPartyOrdersService thirdPartyOrdersService; + @Lazy @Autowired WxBusinessCircleOrderService wxBusinessCircleOrderService; + @Lazy @Autowired AliBusinessCircleOrderService aliBusinessCircleOrderService; diff --git a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index 8d7f68669..b1d8deacc 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -14,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -35,10 +36,12 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { private final String[] notKeys = {"sign","appId","appKey","signKey"}; + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; + @Lazy @Autowired WxThirdPartyApiService wxThirdPartyApiService; diff --git a/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java b/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java index ecfc89b22..522fa9c38 100644 --- a/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java @@ -10,6 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,6 +23,7 @@ public class HomeController { @Value("${version}") private String version; + @Lazy @Autowired private MqBaseProducer mqBaseProducer; diff --git a/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java b/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java index e33c7ecb1..c92287d24 100644 --- a/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java +++ b/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java @@ -15,6 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -24,9 +25,11 @@ import org.springframework.web.bind.annotation.RestController; public class UserTagsController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index e23f320aa..42b9d4934 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -33,15 +34,19 @@ public class ActivitySchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxActivityMapper wxActivityMapper; + @Lazy @Autowired private WxActivityJoinMapper wxActivityJoinMapper; + @Lazy @Autowired private MqBaseProducer mqBaseProducer; + @Lazy @Autowired private WxCampaignMapper wxCampaignMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index f7e0a4327..53838a36e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -11,6 +11,7 @@ import org.apache.commons.collections.map.HashedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -29,12 +30,15 @@ public class BillNotificationSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxBillAllMapper wxBillAllMapper; + @Lazy @Autowired private MqBaseProducer mqBaseProducer; + @Lazy @Autowired WxBillAllService wxBillAllService; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java index 0d67b0507..ca8357636 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java @@ -8,6 +8,7 @@ import com.iformall.service.WxBillAllService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -22,9 +23,11 @@ public class BillStatusSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxBillAllService wxBillAllService; + @Lazy @Autowired private WxMallMapper wxMallMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java index eff52c2c2..6caed1fe1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java @@ -22,6 +22,7 @@ import com.iformall.service.pay.service.cashout.entity.CashOutAdapterResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -38,16 +39,27 @@ public class CashOutSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCashOutMapper wxCashOutMapper; + + @Lazy @Autowired private WxMallMapper wxMallMapper; + + @Lazy @Autowired private WxMerchantMapper wxMerchantMapper; + + @Lazy @Autowired PayServiceFactory payServiceFactory; + + @Lazy @Autowired WxAppinfoService wxAppinfoService; + + @Lazy @Autowired WxPayAccountService wxPayAccountService; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index b24513e39..dd0c52de1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -32,24 +33,31 @@ public class ChartDataSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxCarCmdLogMapper wxCarCmdLogMapper; + @Lazy @Autowired WxMallMapper wxMallMapper; + @Lazy @Autowired WxCUserCarMapper wxCUserCarMapper; + @Lazy @Autowired WxChartDataMapper wxChartDataMapper; + @Lazy @Autowired WxCouponOrderMapper wxCouponOrderMapper; + @Lazy @Autowired WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; + @Lazy @Autowired WxCUserCarService wxCUserCarService; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index 2ab62f5ea..31330db4d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -25,12 +26,15 @@ import java.util.List; @Component public class ContractSchedule { + @Lazy @Autowired private WxRentContractService wxRentContractService; + @Lazy @Autowired private WxPropertyContractService wxPropertyContractService; + @Lazy @Autowired private WxMallMapper wxMallMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java index 4b6e6778c..b3435bbe4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -16,6 +16,7 @@ import com.iformall.utils.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -31,21 +32,27 @@ public class CouponExpiringSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponMapper wxCouponMapper; + @Lazy @Autowired private WxCouponChannelMapper wxCouponChannelMapper; + @Lazy @Autowired private WxCouponSendMapper wxCouponSendMapper; + @Lazy @Autowired private WxScreenAdMapper wxScreenAdMapper; + @Lazy @Autowired private WxGameMapper wxGameMapper; + @Lazy @Autowired private WxMallMapper wxMallMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 6c629f419..c9cc400ec 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -17,6 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -30,30 +31,39 @@ import java.util.List; public class CouponOrderExpiringSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCouponOrderMapper wxCouponOrderMapper; + @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; + @Lazy @Autowired private WxRefundOrderService wxRefundOrderService; + @Lazy @Autowired private WxProfitSharingOrderService wxProfitSharingOrderService; + @Lazy @Autowired private WxAppinfoMapper wxAppinfoMapper; + @Lazy @Autowired private WxPayOrderMapper wxPayOrderMapper; + @Lazy @Autowired private WxOrderMapper wxOrderMapper; + @Lazy @Autowired private WxOrderService wxOrderService; + @Lazy @Autowired private WxMallMapper wxMallMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index 613dcf960..058d9dce0 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -35,43 +36,59 @@ public class CouponSendSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMallMapper wxMallMapper; + @Lazy @Autowired private WxLevelConfigMapper WxLevelConfigMapper; + @Lazy @Autowired private WxLevelConfigService wxLevelConfigService; + @Lazy @Autowired private WxCUserBasicInfoMapper wxCUserBasicInfoMapper; + @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired private WxCouponSendMapper wxCouponSendMapper; + @Lazy @Autowired private WxCouponActionLogMapper wxCouponActionLogMapper; + @Lazy @Autowired private WxOrderService wxOrderService; + @Lazy @Autowired private WxCouponActionLogService wxCouponActionLogService; + @Lazy @Autowired private WxCouponSendConfigMapper couponSendConfigMapper; + @Lazy @Autowired private WxCouponSendService wxCouponSendService; + + @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; + @Lazy @Autowired private MqBaseProducer mqBaseProducer; + + @Lazy @Autowired private PushLimitService pushLimitService; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index 8a3b99467..d35bdd2f8 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -9,6 +9,7 @@ import com.iformall.service.WxDateAmountRecordService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -24,18 +25,23 @@ import java.util.*; public class DaliyAmountSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMallMapper wxMallMapper; + @Lazy @Autowired private WxMerchantMapper wxMerchantMapper; + @Lazy @Autowired private WxCouponOrderMapper wxCouponOrderMapper; + @Lazy @Autowired private WxDateAmountRecordService wxDateAmountRecordService; + @Autowired private WxOrderMapper wxOrderMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java index 48f2a84d7..e7db4142e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java @@ -10,6 +10,7 @@ import com.iformall.mapper.WxDeviceMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -23,13 +24,15 @@ public class DeviceHbCheckSchedule { private final int TIME_OUT_VALUE = 15 * 60 * 1000; //15分钟 - + @Lazy @Autowired WxDeviceMapper wxDeviceMapper; + @Lazy @Autowired KwBoxMapper kwBoxMapper; + @Autowired KwMeterMapper kwMeterMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java index 0ebafde20..edb7b0bc8 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java @@ -4,6 +4,7 @@ import com.iformall.mapper.WxCuserFloatingLayerMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -16,6 +17,7 @@ public class FloatingLayerSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxCuserFloatingLayerMapper wxCuserFloatingLayerMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index 61449f833..8960bbae2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; @@ -32,27 +33,48 @@ import java.util.*; public class InvestSchedule { public static final String[] ENV_STR = {"dev", "test"}; + + @Lazy @Autowired InvestBizService bizService; + + @Lazy @Autowired InvestTaskService taskService; + + @Lazy @Autowired InvestMessageService messageService; + + @Lazy @Autowired InvestDemandService demandService; + + @Lazy @Autowired InvestCustomerService customerService; + + @Lazy @Autowired InvestFollowRecordService followRecordService; + + @Lazy @Autowired InvestRemindService remindService; + + @Lazy @Resource WxMallMapper mallMapper; + + @Lazy @Autowired MallUserInfoService userInfoService; + + @Lazy @Autowired private MqBaseProducer mqBaseProducer; + @Lazy @Autowired Environment environment; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java index 1eac36b92..f821793e5 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java @@ -5,6 +5,7 @@ import com.iformall.mapper.WxBillRentMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -15,8 +16,12 @@ import org.springframework.stereotype.Component; @Component public class LatePayBillActionSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Lazy @Autowired private WxBillRentMapper wxBillRentMapper; + + @Autowired private WxBillPropertyMapper wxBillPropertyMapper; /** diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java index 7701fc425..d314679ff 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -9,6 +9,7 @@ import com.iformall.utils.JsonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.List; @@ -20,8 +21,11 @@ import java.util.List; public class MsgReSendSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgRecordService wxMsgRecordService; + + @Lazy @Autowired private MqBaseProducer mqBaseProducer; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index 8c3a2b45a..3e917dcd1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -28,10 +28,14 @@ public class MsgSendingSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxMsgMapper wxMsgMapper; + + @Lazy @Autowired private MqBaseProducer mqBaseProducer; + @Lazy @Autowired private WxMsgService WxMsgService; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 4a978797d..5e493658d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -11,6 +11,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -46,48 +47,63 @@ public class OrderExpiringSchedule { private final int NORMAL_TIME_OUT = 15 * 60 * 1000; //普通券 必须15分钟内支付 private final int PRESS_TIME_OUT = 60 * 60 * 1000; //砍价券 必须60分钟内支付 + @Lazy @Autowired WxOrderMapper wxOrderMapper; + @Lazy @Autowired WxOrderService wxOrderService; + @Lazy @Autowired WxOrderGroupMapper wxOrderGroupMapper; + @Lazy @Autowired WxAppinfoMapper wxAppinfoMapper; + @Lazy @Autowired WxRefundOrderService wxRefundOrderService; + @Lazy @Autowired WxCouponMapper wxCouponMapper; + @Lazy @Autowired WxPayOrderMapper wxPayOrderMapper; + @Lazy @Autowired WxCUserMapper wxCUserMapper; + @Lazy @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; + @Lazy @Autowired WxAppinfoService wxAppinfoService; + @Lazy @Autowired WxPayAccountMapper wxPayAccountMapper; + @Lazy @Autowired WxMallMapper wxMallMapper; + @Lazy @Autowired WxPayOrderService wxPayOrderService; + @Lazy @Autowired PayServiceFactory payServiceFactory; + @Lazy @Autowired OrderFactory orderFactory; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index 5eefd5672..9843b979b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -40,21 +41,27 @@ public class PowerBillAutoBuildSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxPowerBillAutoConfigMapper wxPowerBillAutoConfigMapper; + @Lazy @Autowired private WxMerchantPowerBillConfigMapper wxMerchantPowerBillConfigMapper; + @Lazy @Autowired private WxBillDailyService wxBillDailyService; + @Lazy @Autowired private WxMerchantShopMapper wxMerchantShopMapper; + @Lazy @Autowired KwMeterDataService kwMeterDataService; + @Lazy @Autowired KwMerchantMeterMapper kwMerchantMeterMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java index 342077133..138b2e04d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java @@ -15,6 +15,7 @@ import com.iformall.service.WxProfitSharingOrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -26,13 +27,15 @@ public class SharingOrderRedoSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxProfitSharingOrderService wxProfitSharingOrderService; + @Lazy @Autowired private WxProfitSharingOrderMapper wxProfitSharingOrderMapper; - + @Lazy @Autowired WxMallMapper wxMallMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoScheduletttttttttttttttttttttttttt.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoScheduletttttttttttttttttttttttttt.java index 9a342fbbf..e2cfdc38c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoScheduletttttttttttttttttttttttttt.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoScheduletttttttttttttttttttttttttt.java @@ -15,6 +15,7 @@ import com.iformall.service.WxProfitSharingOrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -26,12 +27,15 @@ public class SharingOrderRedoScheduletttttttttttttttttttttttttt { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxProfitSharingOrderService wxProfitSharingOrderService; + @Lazy @Autowired private WxProfitSharingOrderMapper wxProfitSharingOrderMapper; + @Lazy @Autowired WxMallMapper wxMallMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java index 2475f9d5b..7ab544550 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java @@ -9,6 +9,7 @@ import com.iformall.service.WxProfitSharingOrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -20,12 +21,15 @@ public class SharingOrderResultSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxProfitSharingOrderService wxProfitSharingOrderService; + @Lazy @Autowired private WxProfitSharingOrderMapper wxProfitSharingOrderMapper; + @Lazy @Autowired WxMallMapper wxMallMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java index df571f537..f6a97d56d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java @@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -20,15 +21,19 @@ public class SysMonitorSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private String fmMonitorEmails; + @Lazy @Autowired private boolean isFmMonitor; + @Lazy @Autowired private MailService mailService; + @Lazy @Autowired private SysMonitorMapper sysMonitorMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java index a8ab2ceb4..04404b8b4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java @@ -8,6 +8,7 @@ import me.chanjar.weixin.common.error.WxErrorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -23,9 +24,11 @@ public class WeChatAccessTokenSchedule { @Autowired private boolean isFmOpen; + @Lazy @Autowired WxAppinfoMapper wxAppinfoMapper; + @Lazy @Autowired MaUtil maUtil; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java index 9d480f90b..7a4540683 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java @@ -9,6 +9,7 @@ import com.iformall.utils.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.util.Calendar; @@ -22,6 +23,7 @@ public class WiwideTokenSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private WxWiwideInfoMapper wxWiwideInfoMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java index e98218694..17bad815c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -31,21 +32,27 @@ import com.iformall.service.WxUserVisitService; public class WxAppVisitSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private boolean isFmOpen; + @Lazy @Autowired private WxUserVisitService wxUserVisitService; + @Lazy @Autowired private WxAppinfoService WxAppinfoService; + @Lazy @Autowired private FmOpenService openService; + @Lazy @Autowired private WxMallService wxMallService; + @Lazy @Autowired MaUtil maUtil; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java index 08626bfb8..85950eb40 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java @@ -5,6 +5,7 @@ import com.iformall.service.MailService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -16,15 +17,19 @@ import java.util.Map; public class WxCUserCheckSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired private boolean isFmException; + @Lazy @Autowired private String fmExceptionEmails; + @Lazy @Autowired private MailService mailService; + @Lazy @Autowired private WxCUserMapper cUserMapper; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java index ba5a76232..e06bb62c2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java @@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -26,12 +27,15 @@ import com.iformall.service.WxMallService; public class WxCUserTagsSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; + @Lazy @Autowired WxMallService wxMallService; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgRecordSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgRecordSchedule.java index e8b6c0eb2..5ca434f7c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgRecordSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgRecordSchedule.java @@ -2,6 +2,7 @@ package com.iformall.schedule; import com.iformall.service.WxMsgRecordService; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -11,6 +12,7 @@ import javax.annotation.Resource; @Component public class WxMsgRecordSchedule { + @Lazy @Resource private WxMsgRecordService msgRecordService; diff --git a/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java b/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java index e8afbaddb..6569b8716 100644 --- a/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java +++ b/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java @@ -5,6 +5,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -16,6 +17,7 @@ public class VideoFactory { private Map excutorMap = null; + @Lazy @Autowired AliyunVideoExcutor aliyunExcutor; diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java index 7daefbf1e..44e1b056a 100644 --- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java +++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java @@ -14,6 +14,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import com.aliyuncs.DefaultAcsClient; @@ -31,12 +32,15 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class AliyunVideoExcutor implements VideoExcutor { + @Lazy @Autowired AliyunVideoConfig config; + @Lazy @Autowired AliyunVideoUploadThread thread; + @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate;