From 796d3d4146cb6e9be0e02c4c1e09cdc52d4846ed Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 12 Jan 2022 03:27:04 +0800 Subject: [PATCH] rollback --- .../java/com/iformall/config/WebConfig.java | 1 - .../com/iformall/config/WechatMpConfig.java | 1 - .../controller/app/WxAppinfoController.java | 6 --- .../basic/MallSaleTypeController.java | 2 - .../controller/basic/WxBrandController.java | 4 -- .../basic/WxCustomizeModuleController.java | 2 - .../controller/basic/WxGroupController.java | 2 - .../basic/WxMallBuildingController.java | 2 - .../controller/basic/WxMallController.java | 2 - .../controller/basic/WxMapController.java | 9 ----- .../basic/WxMerchantBUserController.java | 2 - .../basic/WxMerchantController.java | 4 -- .../basic/WxMerchantShopController.java | 2 - .../basic/WxMiniappThemeController.java | 4 -- .../basic/WxProjectConfigController.java | 21 ---------- .../controller/basic/WxShopController.java | 2 - .../controller/basic/WxTagsController.java | 4 +- .../controller/car/WxCarController.java | 9 ----- .../controller/car/WxParkController.java | 2 - .../contract/WxContractBaseController.java | 2 - .../WxPropertyContractController.java | 14 ------- .../contract/WxRentContractController.java | 24 ------------ .../WxRentPropertyContractController.java | 8 ---- .../datatower/DataTowerController.java | 2 - .../datatower/WxChartDataController.java | 2 - .../WxMerchantTradeDailyController.java | 2 - .../datatower/WxUserStatisticsController.java | 4 -- .../datatower/WxUserStructureController.java | 9 ----- .../controller/device/KwBoxController.java | 3 -- .../device/KwMerchantMeterController.java | 3 -- .../controller/device/KwMeterController.java | 7 ---- .../device/KwMeterDataController.java | 2 - .../controller/device/WxDeviceController.java | 2 - .../device/WxScreenAdController.java | 4 -- .../controller/invest/InvestController.java | 2 - .../invest/InvestCustomerController.java | 3 -- .../invest/InvestDemandController.java | 2 - .../invest/InvestFollowRecordController.java | 5 --- .../invest/InvestMessageController.java | 5 --- .../invest/InvestOperateRecordController.java | 5 --- .../invest/InvestRemindController.java | 5 --- .../invest/InvestTaskController.java | 5 --- .../AliBusinessCircleOrderController.java | 2 - .../market/FengNiaoMapController.java | 2 - .../market/MarkingDataReportController.java | 4 -- .../market/PushLimitController.java | 2 - .../controller/market/UeditorController.java | 2 - .../market/WxActivityController.java | 2 - .../market/WxActivityJoinController.java | 2 - .../WxBusinessCircleOrderController.java | 2 - .../market/WxCampaignController.java | 4 -- .../market/WxCardPayController.java | 5 --- .../market/WxCashOutController.java | 8 ---- .../market/WxCouponActionLogController.java | 2 - .../market/WxCouponCarController.java | 2 - .../market/WxCouponChannelController.java | 12 ------ .../controller/market/WxCouponController.java | 13 ------- .../market/WxCouponInjectController.java | 6 --- .../market/WxCouponOrderController.java | 4 -- .../market/WxCouponPasswordController.java | 2 - .../market/WxCouponPresentController.java | 5 --- .../market/WxCouponSendConfigController.java | 2 - .../market/WxCouponSendController.java | 6 --- .../market/WxFloatingLayerController.java | 2 - .../controller/market/WxGameController.java | 2 - .../market/WxGameTemplateController.java | 2 - .../market/WxMerchantMicroPayController.java | 2 - .../WxMerchantPowerBillConfigController.java | 2 - .../market/WxMerchantSubsidyController.java | 2 - .../market/WxOpinionController.java | 2 - .../controller/market/WxOrderController.java | 6 --- .../market/WxOrderGroupController.java | 4 -- .../market/WxPayOrderController.java | 3 -- .../WxPowerBillAutoConfigController.java | 2 - .../market/WxPrepaymentController.java | 2 - .../WxProfitSharingOrderController.java | 2 - .../market/WxQuestionController.java | 2 - .../market/WxQuestionOneselfController.java | 3 -- .../market/WxRefundOrderController.java | 2 - .../market/WxSubsidyController.java | 2 - .../market/WxThirdPartyOrdersController.java | 2 - .../controller/market/WxTopicController.java | 3 -- .../market/WxUserCouponController.java | 3 +- .../iformall/controller/mem/AsyncTask.java | 1 - .../controller/mem/BillDailyAsyncTask.java | 2 - .../controller/mem/ImportTemplateTask.java | 5 --- .../controller/mem/MemCouponController.java | 4 -- .../mem/UserBasicInfoAddressController.java | 2 - .../mem/WxCUserBasicInfoController.java | 12 ------ .../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 | 3 -- .../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 | 5 --- .../controller/pay/AlipayController.java | 3 -- .../rent/WxBillActionController.java | 3 +- .../controller/rent/WxBillAllController.java | 4 -- .../rent/WxBillDailyController.java | 2 - .../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 | 1 - .../controller/video/VideoController.java | 2 - .../workflow/WxFlowAbleController.java | 2 - .../flowable/ContractTaskFinishHandler.java | 3 -- .../com/iformall/log/SystemLogAspect.java | 1 - .../com/iformall/log/TableOperateAspect.java | 1 - .../com/iformall/log/UserDataRuleAspect.java | 1 - .../java/com/iformall/shiro/ShiroService.java | 4 -- .../src/main/resources/application-prod.yml | 2 +- .../com/iformall/aop/RedisCacheAspect.java | 1 - .../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 | 1 - .../iformall/controller/BaseController.java | 10 ----- .../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 | 5 +-- .../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 | 2 - ...oginUserHandlerMethodArgumentResolver.java | 1 - .../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 - .../java/com/iformall/shiro/ShiroService.java | 4 -- .../iformall/controller/HomeController.java | 2 - .../java/com/iformall/mq/MqBaseConsumer.java | 26 +------------ .../iformall/mq/impl/RabbitMqConsumer.java | 1 - .../iformall/controller/BaseController.java | 2 - .../controller/NeuPosAdminController.java | 2 - ...oginUserHandlerMethodArgumentResolver.java | 1 - .../iformall/controller/BaseController.java | 4 -- .../com/iformall/log/SystemLogAspect.java | 1 - .../com/iformall/aop/RedisCacheAspect.java | 1 - .../iformall/controller/BaseController.java | 3 -- .../controller/UserBasicInfoController.java | 4 -- .../UserThirdCircleOrderController.java | 5 +-- .../interceptor/AuthorizationInterceptor.java | 1 - .../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 | 3 -- .../schedule/WeChatAccessTokenSchedule.java | 3 -- .../schedule/WiwideTokenSchedule.java | 2 - .../iformall/schedule/WxAppVisitSchedule.java | 6 --- .../schedule/WxCUserCheckSchedule.java | 3 -- .../schedule/WxCUserTagsSchedule.java | 4 -- .../schedule/WxMsgRecordSchedule.java | 2 - .../AliBusinessCircleOrderServiceImpl.java | 8 ---- .../service/impl/AliPayCUserServiceImpl.java | 1 - .../service/impl/CUserTokenServiceImpl.java | 9 ++--- .../service/impl/DataTowerServiceImpl.java | 4 -- .../service/impl/FengNiaoMapServiceImpl.java | 1 - .../service/impl/JmSportOrderServiceImpl.java | 3 +- .../impl/MallPermissionServiceImpl.java | 4 +- .../service/impl/MallResourceServiceImpl.java | 4 +- .../impl/MallRolePermissionServiceImpl.java | 2 +- .../service/impl/MallRoleServiceImpl.java | 4 +- .../impl/MallUserActionServiceImpl.java | 3 +- .../service/impl/MallUserInfoServiceImpl.java | 5 +-- .../service/impl/MallUserRoleServiceImpl.java | 5 +-- .../impl/MarkingDataReportServiceImpl.java | 10 ----- .../impl/MemCouponFromDspServiceImpl.java | 4 -- .../service/impl/NeuPosOrderServiceImpl.java | 4 +- .../service/impl/QrCodeServiceImpl.java | 10 +---- .../service/impl/TtCUserServiceImpl.java | 4 -- .../impl/WxActivityJoinServiceImpl.java | 3 -- .../service/impl/WxActivityServiceImpl.java | 2 - .../service/impl/WxBillAllServiceImpl.java | 14 ------- .../service/impl/WxBillDailyServiceImpl.java | 4 -- .../impl/WxBillDepositServiceImpl.java | 3 -- .../impl/WxBillOtherDepositServiceImpl.java | 4 -- .../service/impl/WxBillOtherServiceImpl.java | 4 -- .../WxBillPropertyDepositServiceImpl.java | 3 -- .../impl/WxBillPropertyServiceImpl.java | 5 --- .../service/impl/WxBillRentServiceImpl.java | 4 -- .../service/impl/WxBillSettleServiceImpl.java | 2 - .../WxBusinessCircleOrderServiceImpl.java | 8 ---- .../impl/WxCUserBasicInfoServiceImpl.java | 15 ++++---- .../impl/WxCUserBasicSignServiceImpl.java | 3 +- .../service/impl/WxCUserFromServiceImpl.java | 3 +- .../service/impl/WxCUserServiceImpl.java | 9 ++--- .../service/impl/WxCallBackServiceImpl.java | 2 - .../service/impl/WxCampaignServiceImpl.java | 3 -- .../service/impl/WxCardInfoServiceImpl.java | 2 - .../service/impl/WxCardSpendServiceImpl.java | 8 +--- .../service/impl/WxCashOutServiceImpl.java | 5 --- .../service/impl/WxChartServiceImpl.java | 12 +----- .../impl/WxCouponChannelServiceImpl.java | 5 --- .../impl/WxCouponInjectServiceImpl.java | 11 ------ .../impl/WxCouponOrderServiceImpl.java | 24 +++--------- .../impl/WxCouponPasswordServiceImpl.java | 2 - .../impl/WxCouponPresentServiceImpl.java | 3 -- .../service/impl/WxCouponSendServiceImpl.java | 9 ----- .../service/impl/WxCouponServiceImpl.java | 19 +++++----- .../impl/WxCreditHistoryServiceImpl.java | 8 ++-- .../impl/WxCustomizeModuleServiceImpl.java | 5 +-- .../service/impl/WxFlowServiceImpl.java | 19 +--------- .../service/impl/WxGameServiceImpl.java | 11 +++--- .../impl/WxLevelConfigServiceImpl.java | 3 +- .../impl/WxMallBuildingServiceImpl.java | 3 +- .../service/impl/WxMallServiceImpl.java | 3 +- .../service/impl/WxMerchantServiceImpl.java | 15 ++++---- .../impl/WxMerchantSubsidyServiceImpl.java | 3 +- .../impl/WxMerchantTradeDailyServiceImpl.java | 9 ++--- .../service/impl/WxMsgServiceImpl.java | 8 ++++ .../service/impl/WxOrderGroupServiceImpl.java | 9 ++--- .../service/impl/WxOrderPressServiceImpl.java | 3 +- .../service/impl/WxOrderServiceImpl.java | 38 +++++++++---------- .../service/impl/WxParkServiceImpl.java | 3 +- .../service/impl/WxPayAccountServiceImpl.java | 3 +- .../service/impl/WxPayBillServiceImpl.java | 5 +-- .../service/impl/WxPayOrderServiceImpl.java | 19 +++++----- .../impl/WxProfitSharingOrderServiceImpl.java | 5 +-- .../WxProfitSharingReceiverServiceImpl.java | 3 +- .../impl/WxProjectConfigServiceImpl.java | 22 ----------- .../impl/WxPropertyContractServiceImpl.java | 9 ++--- .../impl/WxQuestionOneselfServiceImpl.java | 3 +- .../WxQuestionOneselfUserServiceImpl.java | 5 +-- .../impl/WxRefundOrderServiceImpl.java | 5 +-- .../impl/WxRentContractServiceImpl.java | 15 ++++---- .../WxRentPropertyContractServiceImpl.java | 7 ++-- .../service/impl/WxScoreRulesServiceImpl.java | 7 ++-- .../service/impl/WxScreenAdServiceImpl.java | 5 +-- .../service/impl/WxShopServiceImpl.java | 3 +- .../service/impl/WxSubsidyServiceImpl.java | 3 +- .../service/impl/WxTagsServiceImpl.java | 5 +-- .../impl/WxTemplateMsgServiceImpl.java | 6 +-- .../impl/WxThirdPartyOrdersServiceImpl.java | 13 +++---- .../service/impl/WxTopicServiceImpl.java | 5 +-- .../invest/impl/InvestBaseServiceImpl.java | 2 - .../invest/impl/InvestBizServiceImpl.java | 16 -------- .../impl/InvestCustomerServiceImpl.java | 3 -- .../invest/impl/InvestDemandServiceImpl.java | 4 -- .../impl/InvestFollowRecordServiceImpl.java | 3 -- .../service/kw/impl/KwBoxServiceImpl.java | 3 -- .../impl/FmInsideCLoginMsgServiceImpl.java | 6 +-- .../impl/FmInsideCashOutMsgServiceImpl.java | 2 - .../FmInsideCouponVerifyMsgServiceImpl.java | 6 +-- ...sideNotifyRefundSuccessMsgServiceImpl.java | 2 - .../FmInsideOrderSuccessMsgServiceImpl.java | 8 ++-- .../msg/impl/SendCallBackSmsServiceImpl.java | 5 +-- .../msg/impl/SendMpMsgServiceImpl.java | 3 +- .../msg/impl/SendSmartAppMsgServiceImpl.java | 6 +-- .../service/msg/impl/SendSmsServiceImpl.java | 2 - .../impl/SendWeappUniformMsgServiceImpl.java | 3 +- .../impl/UpdateCouponStockMsgServiceImpl.java | 3 +- .../iformall/service/order/OrderFactory.java | 8 ++-- .../batch/BaseBatchOrderAdapterService.java | 2 - .../iformall/service/park/ParkFactory.java | 13 +------ .../service/park/impl/BaseParkService.java | 3 +- .../service/park/impl/etcp/EtcpHelper.java | 12 +++--- .../HaiKangWeiShiParkCallbackService.java | 7 ++-- .../HaiKangWeiShiParkService.java | 9 ++--- .../jieshun/JieShunParkCallbackService.java | 5 +-- .../park/impl/jieshun/JieShunParkService.java | 3 +- .../park/impl/shangan/ShangAnParkService.java | 3 +- .../service/park/impl/tjd/TJDParkService.java | 11 +++--- .../service/park/impl/util/ParkHelper.java | 25 ++++++------ .../tags/jinmao/JinMaoOrderTagsDeveloper.java | 5 +-- .../tags/jinmao/JinMaoUserTagsDeveloper.java | 4 +- .../service/tt/impl/TtOrderServiceImpl.java | 7 ++-- .../java/com/iformall/video/VideoFactory.java | 2 - .../video/aliyun/AliyunVideoExcutor.java | 1 - 384 files changed, 229 insertions(+), 1707 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java index aded6cc06..d4e06206b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java @@ -20,7 +20,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Lazy; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.cors.CorsConfiguration; diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java index 9848d2fcb..4433386c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java @@ -6,7 +6,6 @@ import me.chanjar.weixin.mp.config.WxMpConfigStorage; import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @Component diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index decbae87e..ee92d4f17 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -22,7 +22,6 @@ 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.ServletException; import javax.servlet.http.HttpServletRequest; @@ -38,23 +37,18 @@ import java.util.concurrent.Executors; public class WxAppinfoController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxAppinfoService wxAppinfoService; - @Lazy @Autowired private WxMerchantMapper wxMerchantMapper; - @Lazy @Autowired private QrCodeService qrCodeService; - @Lazy @Autowired private WxCouponChannelMapper wxCouponChannelMapper; - @Lazy @Autowired WxCouponMapper wxCouponMapper; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/MallSaleTypeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/MallSaleTypeController.java index 740966b4b..17f7bed81 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/MallSaleTypeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/MallSaleTypeController.java @@ -13,7 +13,6 @@ 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; @@ -26,7 +25,6 @@ import java.util.Arrays; public class MallSaleTypeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private MallSaleTypeService mallSaleTypeService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index ba2c93015..221cc814d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -18,7 +18,6 @@ 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.util.List; @@ -33,11 +32,8 @@ import java.util.Map; public class WxBrandController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxBrandService wxBrandService; - - @Lazy @Autowired private WxMerchantService wxMerchantService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java index 02fdd1174..681a88733 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxCustomizeModuleController.java @@ -16,7 +16,6 @@ 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; @@ -28,7 +27,6 @@ public class WxCustomizeModuleController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired WxCustomizeModuleService wxCustomizeModuleService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java index 2d88944d8..c01941f64 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java @@ -12,7 +12,6 @@ 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,7 +19,6 @@ import org.springframework.web.bind.annotation.*; public class WxGroupController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxGroupService wxGroupService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index 23b57c47d..32e377604 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -14,7 +14,6 @@ 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.*; @@ -25,7 +24,6 @@ import java.util.List; public class WxMallBuildingController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxMallBuildingService wxMallBuildingService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index e6112370c..4030ffe15 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -9,7 +9,6 @@ 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 @@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.*; public class WxMallController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxMallService wxMallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java index aa035526a..336ca5439 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java @@ -15,7 +15,6 @@ 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; @@ -30,35 +29,27 @@ import java.util.Map; public class WxMapController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxShopService wxShopService; - @Lazy @Autowired private WxMerchantService wxMerchantService; - @Lazy @Autowired private WxRentContractService wxRentContractService; - @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; - @Lazy @Autowired private WxCardSpendService wxCardSpendService; - @Lazy @Autowired private WxBusinessCircleOrderService wxBusinessCircleOrderService; - @Lazy @Autowired private AliBusinessCircleOrderService aliBusinessCircleOrderService; - @Lazy @Autowired private WxCreditHistoryService wxCreditHistoryService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java index 067ccf5f6..bf6af813f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java @@ -9,7 +9,6 @@ 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 @@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.*; public class WxMerchantBUserController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxMerchantBUserService wxMerchantBUserService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 24e94fd07..42d0b919b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -24,7 +24,6 @@ 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; @@ -40,11 +39,8 @@ import java.util.Map; public class WxMerchantController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxMerchantService wxMerchantService; - - @Lazy @Autowired private QrCodeService qrCodeService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java index 919340774..49a23b3f6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java @@ -13,7 +13,6 @@ 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,7 +20,6 @@ import org.springframework.web.bind.annotation.*; public class WxMerchantShopController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxMerchantShopService wxMerchantShopService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java index 487332fc0..e8472708a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java @@ -23,7 +23,6 @@ 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.util.Assert; import org.springframework.web.bind.annotation.*; @@ -41,11 +40,8 @@ public class WxMiniappThemeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired WxMiniappThemeService wxMiniappThemeService; - - @Lazy @Autowired WxAppinfoService wxAppinfoService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index e6765a3bc..80d2fc30d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -23,7 +23,6 @@ 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.util.Assert; import org.springframework.web.bind.annotation.*; @@ -37,83 +36,63 @@ import java.util.concurrent.TimeUnit; public class WxProjectConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired WxProjectConfigService wxProjectConfigService; - @Lazy @Autowired WxCouponSendConfigService wxCouponSendConfigService; - @Lazy @Autowired WxMallService wxMallService; - @Lazy @Autowired WxPayAccountService wxPayAccountService; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; - @Lazy @Autowired MallUserInfoService userInfoService; - @Lazy @Autowired WxAppinfoService wxAppinfoService; - @Lazy @Autowired WxMsgConfigService wxMsgConfigService; - @Lazy @Autowired WxParkService wxParkService; - @Lazy @Autowired WxWiWideInfoService wxWiWideInfoService; - @Lazy @Autowired WxAuthorizerInfoService wxAuthorizerInfoService; - @Lazy @Autowired WxWeappExtSetService wxWeappExtSetService; - @Lazy @Autowired WxScoreRulesService wxScoreRulesService; - @Lazy @Autowired WxTemplateMsgService wxTemplateMsgService; - @Lazy @Autowired WxQuestionService wxQuestionService; - @Lazy @Autowired WxMsgValidationcodeModelService wxMsgValidationcodeModelService; - @Lazy @Autowired WxFlowConfigService wxFlowConfigService; - @Lazy @Autowired WxMallBuildingService wxMallBuildingService; - @Lazy @Autowired MallUserInfoService mallUserInfoService; - @Lazy @Autowired private WechatWebProperties wechatWebProperties; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index d0d1d0dca..297caf9f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -14,7 +14,6 @@ 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; @@ -29,7 +28,6 @@ import java.util.Map; public class WxShopController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxShopService wxShopService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java index bb2b0baf3..f41abb8fc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java @@ -7,7 +7,6 @@ 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.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -26,11 +25,10 @@ import io.swagger.annotations.ApiOperation; public class WxTagsController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxTagsService wxTagsService; - @Lazy + @Autowired private WxCUserTagsService wxCUserTagsService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index 3b1e46467..9d841aa45 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java @@ -26,7 +26,6 @@ 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; @@ -42,35 +41,27 @@ public class WxCarController extends BaseController { TJDUtil tjd = new TJDUtil(); - @Lazy @Autowired WxParkService wxParkService; - @Lazy @Autowired WxCUserCarService wxCUserCarService; - @Lazy @Autowired WxMerchantService wxMerchantService; - @Lazy @Autowired WxCarCmdLogService wxCarCmdLogService; - @Lazy @Autowired WxCouponService wxCouponService; - @Lazy @Autowired WxCouponCarService wxCouponCarService; - @Lazy @Autowired WxFlowService wxFlowService; - @Lazy @Autowired WxCouponMapper wxCouponMapper; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java index 9deda50cc..9727cd6b0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java @@ -13,7 +13,6 @@ 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,7 +20,6 @@ import org.springframework.web.bind.annotation.*; public class WxParkController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxParkService wxParkService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java index 7ac86191f..ff3cc4d94 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.RestController; import com.iformall.controller.base.BaseController; @@ -23,7 +22,6 @@ import com.iformall.service.WxFlowService; @RestController public class WxContractBaseController extends BaseController{ - @Lazy @Autowired private WxFlowService wxFlowService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index bbcc35716..473cdf465 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -43,7 +43,6 @@ 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; @@ -63,31 +62,18 @@ import java.util.Map; public class WxPropertyContractController extends WxContractBaseController { private Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxPropertyContractService wxPropertyContractService; - - @Lazy @Autowired private WxBillPropertyService wxBillPropertyService; - - @Lazy @Autowired private WxPropertyContractMapper wxPropertyContractMapper; - - @Lazy @Autowired private WxRentPropertyContractService wxRentPropertyContractService; - - @Lazy @Autowired WxMallBuildingService buildingService; - - @Lazy @Autowired WxMallFloorService floorService; - - @Lazy @Autowired private WxShopService wxShopService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 69bc97f83..5104a37c2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -14,7 +14,6 @@ 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; @@ -78,51 +77,28 @@ import io.swagger.annotations.ApiImplicitParams; public class WxRentContractController extends WxContractBaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxRentContractService wxRentContractService; - - @Lazy @Autowired private WxBillRentService wxBillRentService; - - @Lazy @Autowired private WxPayAccountBillService payAccountBillService; - - @Lazy @Autowired private WxMerchantService wxMerchantService; - - @Lazy @Autowired private WxRentContractMapper wxRentContractMapper; - - @Lazy @Autowired WxBillRentMapper wxBillRentMapper; - - @Lazy @Autowired WxBillPropertyMapper wxBillPropertyMapper; - - @Lazy @Autowired private WxRentPropertyContractService wxRentPropertyContractService; - - @Lazy @Autowired private WxShopService wxShopService; - - @Lazy @Autowired WxPropertyContractService wxPropertyContractService; - - @Lazy @Autowired WxMallBuildingService buildingService; - - @Lazy @Autowired WxMallFloorService floorService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index e8fab35d3..24761609e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -29,7 +29,6 @@ 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.*; /** @@ -40,19 +39,12 @@ import org.springframework.web.bind.annotation.*; public class WxRentPropertyContractController extends WxContractBaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxRentPropertyContractService wxRentPropertyContractService; - - @Lazy @Autowired WxMallBuildingService buildingService; - - @Lazy @Autowired WxMallFloorService floorService; - - @Lazy @Autowired private WxShopService wxShopService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java index 89b433291..b61bd0c62 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -12,7 +12,6 @@ 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.ServletOutputStream; @@ -31,7 +30,6 @@ public class DataTowerController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private DataTowerService dataTowerService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java index 5ed8d6471..4720420d8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java @@ -12,7 +12,6 @@ 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; @@ -24,7 +23,6 @@ public class WxChartDataController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxChartDataService wxChartDataService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 6b0c867fc..cea346286 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -16,7 +16,6 @@ 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; @@ -29,7 +28,6 @@ import java.util.Date; public class WxMerchantTradeDailyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxMerchantTradeDailyService wxMerchantTradeDailyService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java index 64a3453c8..920416df4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java @@ -14,7 +14,6 @@ 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.math.BigDecimal; @@ -27,15 +26,12 @@ import java.util.*; public class WxUserStatisticsController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired private CUserServiceFactory cuserFactory; - @Lazy @Autowired private WxMallService wxMallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index 38f9f8050..5b6474cd1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -21,7 +21,6 @@ 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; @@ -35,35 +34,27 @@ import java.util.*; public class WxUserStructureController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired private WxCUserService wxCUserService; - @Lazy @Autowired private WxLevelConfigService wxLevelConfigService; - @Lazy @Autowired private WxCUserCarService wxCUserCarService; - @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; - @Lazy @Autowired private WxUserChannelService wxUserChannelService; - @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; - @Lazy @Autowired private WxMallService wxMallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java index 4e554459c..fef2ae82c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java @@ -19,7 +19,6 @@ 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; @@ -30,11 +29,9 @@ import java.util.List; public class KwBoxController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private KwBoxService kwBoxService; - @Lazy @Autowired private KwMeterService kwMeterService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java index 15d415259..3c6d4abf9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java @@ -18,7 +18,6 @@ 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.*; @@ -28,11 +27,9 @@ import org.springframework.web.bind.annotation.*; public class KwMerchantMeterController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private KwMerchantMeterService kwMerchantMeterService; - @Lazy @Autowired private KwMeterDataService kwMeterDataService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 33d4f6728..4515788ba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -34,7 +34,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; 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; @@ -50,27 +49,21 @@ import java.util.Optional; public class KwMeterController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private KwMeterService kwMeterService; - @Lazy @Autowired private KwMeterDataService kwMeterDataService; - @Lazy @Autowired private KwMerchantMeterService kwMerchantMeterService; - @Lazy @Autowired private KwBoxService kwBoxService; - @Lazy @Autowired private ExcelService excelService; - @Lazy @Autowired private WxMerchantService wxMerchantService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java index b96e849b9..2ed579d25 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java @@ -20,7 +20,6 @@ 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.text.SimpleDateFormat; @@ -37,7 +36,6 @@ import java.util.*; public class KwMeterDataController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private KwMeterDataService kwMeterDataService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java index 145656ac3..f94ef98ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java @@ -17,7 +17,6 @@ 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; @@ -28,7 +27,6 @@ import java.util.List; public class WxDeviceController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxDeviceService wxDeviceService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java index 0af048ef5..163051be3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java @@ -18,7 +18,6 @@ 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 @@ -27,15 +26,12 @@ import org.springframework.web.bind.annotation.*; public class WxScreenAdController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxScreenAdService wxScreenAdService; - @Lazy @Autowired private WxCampaignService wxCampaignService; - @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java index b045da502..013470a95 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java @@ -8,7 +8,6 @@ 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.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,7 +23,6 @@ import java.util.Map; @Api(tags = "招商模块-其它接口") public class InvestController extends InvestBaseController { - @Lazy @Autowired private InvestBizService bizService ; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java index cafafdaee..c675ce312 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java @@ -14,7 +14,6 @@ import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -34,11 +33,9 @@ import java.util.List; @Api(tags = "招商模块-客户信息") public class InvestCustomerController extends InvestBaseController{ - @Lazy @Autowired private InvestBizService investBizService; - @Lazy @Autowired private InvestCustomerService investCustomerService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java index 9ac28e4b0..6f110cd3e 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java @@ -5,7 +5,6 @@ import com.iformall.service.invest.InvestCustomerService; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.Arrays; @@ -24,7 +23,6 @@ import java.util.Arrays; @Api(tags = "招商模块-客户需求") public class InvestDemandController extends InvestBaseController { - @Lazy @Autowired private InvestCustomerService customerService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java index ba706fb31..a97f02fdb 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java @@ -12,7 +12,6 @@ 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.*; import java.util.Arrays; @@ -30,12 +29,8 @@ import java.util.Arrays; @RequestMapping("invest/followrecord") @Api(tags = "招商模块-跟踪记录") public class InvestFollowRecordController extends InvestBaseController { - - @Lazy @Autowired private InvestFollowRecordService investFollowRecordService; - - @Lazy @Autowired private InvestBizService bizService ; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestMessageController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestMessageController.java index bf7e1f418..37f340baa 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestMessageController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestMessageController.java @@ -11,7 +11,6 @@ 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.*; import java.util.Arrays; @@ -29,12 +28,8 @@ import java.util.Arrays; @RequestMapping("invest/message") @Api(tags = "招商模块-消息提醒") public class InvestMessageController extends InvestBaseController { - - @Lazy @Autowired private InvestMessageService investRemindService; - - @Lazy @Autowired private InvestBizService bizService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java index b83588a99..8e42fc21e 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -13,7 +13,6 @@ 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.*; import java.util.Arrays; @@ -32,12 +31,8 @@ import java.util.Collection; @RequestMapping("invest/operaterecord") @Api(tags = "招商模块-操作记录") public class InvestOperateRecordController extends InvestBaseController { - - @Lazy @Autowired private InvestOperateRecordService investOperateRecordService; - - @Lazy @Autowired private InvestBizService bizService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index 45b39068d..8987ac499 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.Arrays; @@ -34,12 +33,8 @@ import java.util.Arrays; @RequestMapping("invest/remind") @Api(tags = "招商模块-预约提醒") public class InvestRemindController extends InvestBaseController { - - @Lazy @Autowired private InvestRemindService investRemindService; - - @Lazy @Autowired private InvestBizService bizService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java index 778cbe9b3..b9d213f25 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -11,7 +11,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import java.util.Arrays; @@ -29,12 +28,8 @@ import java.util.Arrays; @RequestMapping("invest/task") @Api(tags = "招商模块-招商任务") public class InvestTaskController extends InvestBaseController { - - @Lazy @Autowired private InvestTaskService investTaskService; - - @Lazy @Autowired private InvestBizService bizService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index 96b4de21c..cf9b22e36 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -18,7 +18,6 @@ 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.RequestMapping; @@ -35,7 +34,6 @@ import java.util.Map; public class AliBusinessCircleOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private AliBusinessCircleOrderService aliBusinessCircleOrderService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java index 945ac8118..08aca96b0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/FengNiaoMapController.java @@ -12,7 +12,6 @@ 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.*; /** @@ -24,7 +23,6 @@ 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/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java index 8b61ec09b..b4f73e4d5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java @@ -14,7 +14,6 @@ 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; @@ -33,11 +32,8 @@ import java.util.List; public class MarkingDataReportController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private MarkingDataReportService markingDataReportService; - - @Lazy @Autowired private WxMallService wxMallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java index 1e011b504..2865a6997 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java @@ -10,7 +10,6 @@ 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 @@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*; public class PushLimitController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private PushLimitService pushLimitService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java index df47e5f53..ddda9aa8c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java @@ -3,7 +3,6 @@ package com.iformall.controller.market; import com.iformall.ueditor.ActionEnter; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -16,7 +15,6 @@ import javax.servlet.http.HttpServletRequest; @Api(description = "网页bannner图接口") public class UeditorController { - @Lazy @Autowired private ActionEnter actionEnter; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index b606cf840..c7d8dc453 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -17,7 +17,6 @@ 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.*; /** @@ -29,7 +28,6 @@ import org.springframework.web.bind.annotation.*; public class WxActivityController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxActivityService wxActivityService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index fa573ef64..a9bd6bb82 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -16,7 +16,6 @@ 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; @@ -31,7 +30,6 @@ import javax.servlet.http.HttpServletResponse; public class WxActivityJoinController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxActivityJoinService wxActivityJoinService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index a4134c14a..6e2f38578 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -17,7 +17,6 @@ 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; @@ -31,7 +30,6 @@ import java.util.Map; public class WxBusinessCircleOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxBusinessCircleOrderService wxBusinessCircleOrderService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index c7b3e228e..36a91e652 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -25,7 +25,6 @@ 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; @@ -37,15 +36,12 @@ import java.util.List; public class WxCampaignController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCampaignService wxCampaignService; - @Lazy @Autowired WxCouponService wxCouponService; - @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 5f3d6c229..a080e1e2c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -25,7 +25,6 @@ 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; @@ -43,19 +42,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 WxCardInfoService wxCardInfoService; - @Lazy @Autowired WxCardSpendService wxCardSpendService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java index 2297163b4..67fac7bf0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashOutController.java @@ -23,7 +23,6 @@ import java.util.Map; 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.*; /** @@ -37,19 +36,12 @@ 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; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java index 4ead9c1eb..cbc505a6b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java @@ -14,7 +14,6 @@ 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 @@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.*; public class WxCouponActionLogController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponActionLogService wxCouponActionLogService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java index 60189b7ce..fd72e59a3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java @@ -14,7 +14,6 @@ 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 @@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.*; public class WxCouponCarController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponCarService wxCouponCarService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 87feb01b6..2b5edaa6f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -28,7 +28,6 @@ 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; @@ -42,27 +41,16 @@ 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 WxAppinfoController wxAppinfoController; - - @Lazy @Autowired private WxCouponChannelMapper wxCouponChannelMapper; - - @Lazy @Autowired private QrCodeService qrCodeService; - - @Lazy @Autowired private WxFlowService wxFlowService; - - @Lazy @Autowired private WxCouponService wxCouponService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index d4022a27e..6db793090 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -33,7 +33,6 @@ 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; @@ -46,31 +45,19 @@ 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 WxMallService wxMallService; - - @Lazy @Autowired RedisLock redisLock; - @Lazy @Autowired private WxPayAccountService wxPayAccountService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java index c461be30b..737f842e7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java @@ -19,7 +19,6 @@ 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 @@ -28,15 +27,10 @@ import org.springframework.web.bind.annotation.*; public class WxCouponInjectController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponInjectService wxCouponInjectService; - - @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; - - @Lazy @Autowired private WxMsgModelService wxMsgModelService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 6da00d0e7..5a05d0a43 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -23,7 +23,6 @@ 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,15 +35,12 @@ import java.util.Map; public class WxCouponOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; - @Lazy @Autowired private WxRefundOrderService wxRefundOrderService; - @Lazy @Autowired private WxAppinfoService wxAppinfoService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index fd7c44642..98fdf1c3e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -16,7 +16,6 @@ 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.*; /** @@ -28,7 +27,6 @@ import org.springframework.web.bind.annotation.*; public class WxCouponPasswordController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponPasswordService wxCouponPasswordService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java index 0dffbcc6c..5149453f2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java @@ -23,7 +23,6 @@ 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; @@ -40,19 +39,15 @@ import java.util.Set; public class WxCouponPresentController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponPresentService wxCouponPresentService; - @Lazy @Autowired PushLimitService pushLimitService; - @Lazy @Autowired WxCouponService wxCouponService; - @Lazy @Autowired WxCouponPasswordService wxCouponPasswordService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java index e4862ea9e..6b2c77c38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java @@ -14,7 +14,6 @@ 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; @@ -25,7 +24,6 @@ import java.util.Date; public class WxCouponSendConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponSendConfigService wxCouponSendConfigService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 432f8670a..3afea2e6a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -23,7 +23,6 @@ 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; @@ -35,15 +34,10 @@ import java.util.Objects; public class WxCouponSendController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponSendService wxCouponSendService; - - @Lazy @Autowired private WxCouponService wxCouponService; - - @Lazy @Autowired private WxCouponActionLogService wxCouponActionLogService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java index 7f14fa5e3..3a59ba99b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java @@ -19,7 +19,6 @@ 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.*; /** @@ -31,7 +30,6 @@ import org.springframework.web.bind.annotation.*; public class WxFloatingLayerController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired WxFloatingLayerService wxFloatingLayerService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java index 5be0e45bf..0dc9d0f01 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -19,7 +19,6 @@ 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 @@ -28,7 +27,6 @@ import org.springframework.web.bind.annotation.*; public class WxGameController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxGameService wxGameService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java index 6e709922a..8e6a74e8b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java @@ -14,7 +14,6 @@ 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; @@ -25,7 +24,6 @@ import java.util.List; public class WxGameTemplateController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxGameTemplateService wxGameTemplateService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index fc8bbc920..858f572bd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -14,7 +14,6 @@ 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.*; @@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.*; public class WxMerchantMicroPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private MarkingDataReportService markingDataReportService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java index f66c97ed0..9c58585d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java @@ -15,7 +15,6 @@ 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.*; @@ -28,7 +27,6 @@ import org.springframework.web.bind.annotation.*; public class WxMerchantPowerBillConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxMerchantPowerBillConfigService wxMerchantPowerBillConfigService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index 77800be78..a0b8a94eb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -18,7 +18,6 @@ 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; @@ -34,7 +33,6 @@ import java.util.Map; public class WxMerchantSubsidyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired WxMerchantSubsidyService wxMerchantSubsidyService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOpinionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOpinionController.java index bc25f5596..9cc511224 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOpinionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOpinionController.java @@ -15,7 +15,6 @@ 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,7 +25,6 @@ public class WxOpinionController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxOpinionService wxOpinionService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 9442e318d..2822316d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -32,7 +32,6 @@ 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; @@ -48,23 +47,18 @@ 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 WxCUserService wxCUserService; - @Lazy @Autowired private WxCouponService wxCouponService; - @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 729f160e2..7e8893da2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -15,7 +15,6 @@ 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; @@ -32,11 +31,8 @@ import javax.servlet.http.HttpServletResponse; public class WxOrderGroupController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired WxOrderGroupService wxOrderGroupService; - - @Lazy @Autowired WxMallService wxMallService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java index 23d64810f..0373d6bfc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java @@ -20,7 +20,6 @@ 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; @@ -31,11 +30,9 @@ import java.util.Map; public class WxPayOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxOrderService wxOrderService; - @Lazy @Autowired private WxPayOrderService wxPayOrderService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java index 49bc009e1..3e1d988a0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java @@ -15,7 +15,6 @@ 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.*; @@ -28,7 +27,6 @@ import org.springframework.web.bind.annotation.*; public class WxPowerBillAutoConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxPowerBillAutoConfigService wxPowerBillAutoConfigService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPrepaymentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPrepaymentController.java index 2d15975a6..9e672567d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPrepaymentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPrepaymentController.java @@ -16,7 +16,6 @@ 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.*; @@ -29,7 +28,6 @@ import org.springframework.web.bind.annotation.*; public class WxPrepaymentController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired WxPrepaymentService wxPrepaymentService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java index 9a68b503c..63d4aa213 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java @@ -17,7 +17,6 @@ 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; @@ -34,7 +33,6 @@ import javax.servlet.http.HttpServletResponse; public class WxProfitSharingOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxProfitSharingOrderService wxProfitSharingOrderService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java index fd6af2b99..b8d94ddd0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java @@ -15,7 +15,6 @@ 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; @@ -27,7 +26,6 @@ import java.util.List; public class WxQuestionController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxQuestionService wxQuestionService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java index 73aac6736..2526acc2b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionOneselfController.java @@ -19,7 +19,6 @@ 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; @@ -33,11 +32,9 @@ public class WxQuestionOneselfController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxQuestionOneselfService wxQuestionOneselfService; - @Lazy @Autowired private WxQuestionOneselfUserService wxQuestionOneselfUserService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java index bcc1c347c..5fd66d5a2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java @@ -6,7 +6,6 @@ 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 com.github.pagehelper.PageInfo; @@ -25,7 +24,6 @@ import io.swagger.annotations.ApiOperation; public class WxRefundOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxRefundOrderService wxRefundOrderService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java index 460c04608..cad230013 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java @@ -9,7 +9,6 @@ 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 com.github.pagehelper.PageInfo; @@ -33,7 +32,6 @@ import java.util.Map; public class WxSubsidyController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxSubsidyService wxSubsidyService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java index 74815f516..d13a17908 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java @@ -18,7 +18,6 @@ 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.RequestMapping; @@ -35,7 +34,6 @@ import java.util.Map; public class WxThirdPartyOrdersController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxThirdPartyOrdersService wxThirdPartyOrdersOrderService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java index 73b7a2085..d6a290540 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java @@ -16,7 +16,6 @@ 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; @@ -25,8 +24,6 @@ import java.util.Date; @Api(description = "专题相关接口") public class WxTopicController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Lazy @Autowired private WxTopicService wxTopicService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java index 5c73d223b..3d70f850a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java @@ -11,7 +11,6 @@ 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.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; public class WxUserCouponController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy + @Autowired private WxUserCouponService wxUserCouponService; 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 cda43c66d..782b0ed6b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -14,7 +14,6 @@ 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; 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 c10bd07e0..09016f584 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java @@ -18,7 +18,6 @@ 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; @@ -33,7 +32,6 @@ import java.util.concurrent.TimeUnit; public class BillDailyAsyncTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxBillDailyService wxBillDailyService; 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 635a895e5..430ba2087 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -22,7 +22,6 @@ 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; @@ -40,22 +39,18 @@ 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; @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 eb3922ac4..61e84e8a5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java @@ -19,7 +19,6 @@ 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; @@ -31,15 +30,12 @@ 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 0fa34f082..eea61baaf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java @@ -15,7 +15,6 @@ 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 @@ -25,7 +24,6 @@ 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 e41739739..e4a0fe757 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -29,7 +29,6 @@ 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; @@ -54,35 +53,27 @@ public class WxCUserBasicInfoController extends BaseController { @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; @@ -92,15 +83,12 @@ public class WxCUserBasicInfoController extends BaseController { @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 5127fb809..fb768c5ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java @@ -13,7 +13,6 @@ 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,7 +20,6 @@ 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 bb17f7bd1..92bb50b21 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java @@ -5,7 +5,6 @@ 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; @@ -23,7 +22,6 @@ 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 949ce76d9..155dc3543 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -22,7 +22,6 @@ 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; @@ -42,23 +41,14 @@ 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 502e840cc..d3de03d04 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java @@ -14,7 +14,6 @@ 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,7 +24,6 @@ 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 9c782803a..aa7d79cb8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java @@ -13,7 +13,6 @@ 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,7 +20,6 @@ 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 f6dd9eb88..1ec84780c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -26,7 +26,6 @@ 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; @@ -39,11 +38,9 @@ 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 1eb54e6d5..7dafae748 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -9,7 +9,6 @@ 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; @@ -36,7 +35,6 @@ 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 db8c3a507..685dd1be9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java @@ -17,7 +17,6 @@ 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 @@ -25,11 +24,9 @@ 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 28d9112a9..4ec4a677e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -18,7 +18,6 @@ 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 @@ -27,11 +26,9 @@ 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 ad9743b64..12ae8b7d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java @@ -13,15 +13,12 @@ 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 760dbe085..2a7770e4f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java @@ -14,7 +14,6 @@ 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,7 +21,6 @@ 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 7a58c71cf..ca0711d16 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java @@ -13,7 +13,6 @@ 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,7 +20,6 @@ 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 d0b3f19ed..cef65c79e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -22,7 +22,6 @@ 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; @@ -41,11 +40,9 @@ public class WxMsgController extends BaseController { @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 b14f6ebd3..8a9ee6640 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java @@ -14,7 +14,6 @@ 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,7 +21,6 @@ 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 5da2adbff..e82fd9c2c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -14,7 +14,6 @@ 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; @@ -24,15 +23,10 @@ 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 12013cb6a..7e720295a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -14,7 +14,6 @@ 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,7 +21,6 @@ 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 6713eda8b..52a7eb909 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -13,7 +13,6 @@ 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 @@ -21,7 +20,6 @@ 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 7b6d285e0..302b337b4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java @@ -14,7 +14,6 @@ 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,7 +21,6 @@ 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 991af093c..33e10eee1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java @@ -37,7 +37,6 @@ 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; @@ -46,14 +45,10 @@ 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; - @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 0dd3c9d15..af4358ef2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java @@ -16,7 +16,6 @@ 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; @@ -41,11 +40,9 @@ 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 01fbd6916..fdc2603ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java @@ -13,7 +13,6 @@ 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; @@ -28,7 +27,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 efe25a49a..0b9cc44a1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -16,7 +16,6 @@ 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,14 +29,11 @@ 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 7c1c38ebe..92ba22cad 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -20,7 +20,6 @@ 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; @@ -44,7 +43,6 @@ public class WxBillDailyController extends BaseController { @Autowired private String fmUploadDir; - @Lazy @Autowired private WxBillDailyService wxBillDailyService; 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 79d5436c1..a302e319b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -12,7 +12,6 @@ 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.*; /** @@ -21,8 +20,6 @@ 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 4058f7010..5b5626559 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -14,7 +14,6 @@ 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; @@ -26,8 +25,6 @@ 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 d12fe5fc2..827b880ea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -13,7 +13,6 @@ 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,8 +24,6 @@ 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 4e5e801f8..2f499f786 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -14,7 +14,6 @@ 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; @@ -26,8 +25,6 @@ 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 c84f4011c..c825d3c10 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -12,7 +12,6 @@ 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.*; /** @@ -21,8 +20,6 @@ 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 ca0b57f0f..cfe7973e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -14,7 +14,6 @@ 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; @@ -28,7 +27,6 @@ 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 785f38ec8..d59bc76f3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java @@ -18,7 +18,6 @@ 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; @@ -31,15 +30,10 @@ 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 5d0a2e48e..1a23a74d2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java @@ -9,7 +9,6 @@ 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; @@ -22,7 +21,6 @@ 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 4785c0d44..ea06d8393 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -33,7 +33,6 @@ 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; @@ -56,31 +55,24 @@ 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 ea6336cc8..70125f588 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -21,7 +21,6 @@ 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; @@ -35,15 +34,12 @@ 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 873d0edbb..ce9921d22 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java @@ -12,15 +12,12 @@ 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 ea4d252b3..39158e41d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -22,7 +22,6 @@ 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.*; @@ -40,31 +39,24 @@ 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 012f7f61b..cdcbd29ba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java @@ -16,7 +16,6 @@ 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; @@ -28,7 +27,6 @@ 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 bf2889a77..ce8bd4740 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -25,7 +25,6 @@ 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; @@ -46,11 +45,9 @@ 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 ca2d8c1b6..e3274b55a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java @@ -8,7 +8,6 @@ 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; @@ -20,7 +19,6 @@ 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 30c201c70..496c8af0d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -13,7 +13,6 @@ 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; @@ -28,7 +27,6 @@ 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 e0f46dccc..7a97516dd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -37,7 +37,6 @@ 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; @@ -62,23 +61,18 @@ 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 e4bc449ee..f4613cd31 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java @@ -8,7 +8,6 @@ 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 @@ -16,7 +15,6 @@ 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 9a268400e..68d24c571 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -18,7 +18,6 @@ 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; @@ -31,15 +30,10 @@ 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 a67259afb..16a328d96 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxDataRuleTargetController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxDataRuleTargetController.java @@ -14,7 +14,6 @@ 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; @@ -31,7 +30,6 @@ 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 b9c6e705c..eee9ec850 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxUserDataRuleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxUserDataRuleController.java @@ -15,7 +15,6 @@ 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.*; /** @@ -27,7 +26,6 @@ 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 bf7cf433a..b7bfe4e25 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java @@ -16,7 +16,6 @@ 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; 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 235800362..72a284c40 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -47,7 +47,6 @@ 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; @@ -68,7 +67,6 @@ 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 1f3ec3779..266db19dc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -17,7 +17,6 @@ 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.*; @@ -27,7 +26,6 @@ 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 af3ab2056..39982396e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java +++ b/mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java @@ -8,7 +8,6 @@ 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; @@ -19,10 +18,8 @@ import java.util.Map; */ @Component(value="contractTaskFinishListener") public class ContractTaskFinishHandler implements TaskListener { - @Autowired private WxFlowService wxFlowService; - @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 aae669d6f..465889699 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java @@ -18,7 +18,6 @@ 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; diff --git a/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java index 5ae8f6887..3dee1b300 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java @@ -26,7 +26,6 @@ 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; diff --git a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java index 450305b93..acd100a64 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java @@ -19,7 +19,6 @@ 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; diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java b/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java index 2ba14f902..5c311ac54 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java @@ -9,7 +9,6 @@ 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; @@ -18,13 +17,10 @@ import com.iformall.service.MallPermissionService; */ //@Service public class ShiroService { - @Autowired private ShiroFilterFactoryBean shiroFilterFactoryBean; - @Autowired private MallPermissionService resourcesService; - @Autowired private RedisSessionDAO redisSessionDAO; /** diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index cbf76d435..e692e1296 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -3,7 +3,7 @@ spring: include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://rm-2zel9i9t555zy7lft.mysql.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowMultiQueries=true + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowMultiQueries=true username: ENC(nUefcxWYlMS/1cDxikIKwA==) password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index 749e8022c..88609543c 100644 --- a/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -17,7 +17,6 @@ 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; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index 299faceeb..f0e14159f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -18,7 +18,6 @@ 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; @@ -36,24 +35,18 @@ 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 9ebf61dbe..58f8c5df2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosController.java @@ -13,7 +13,6 @@ 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; @@ -24,7 +23,6 @@ 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 802b362ec..17b9706df 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -11,7 +11,6 @@ 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,7 +26,6 @@ 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 6d28929b7..595ac7cae 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -18,7 +18,6 @@ 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; @@ -32,15 +31,10 @@ 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 0f57e0f74..305eb1227 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -22,7 +22,6 @@ 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; @@ -38,35 +37,27 @@ 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 a7e7820e0..8c5bda4fd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -16,7 +16,6 @@ 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; @@ -32,15 +31,12 @@ 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 939232662..9aa899e37 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -26,7 +26,6 @@ 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.*; /** @@ -40,23 +39,14 @@ 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 3a49a3f67..06a35a1eb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -23,7 +23,6 @@ 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; @@ -37,23 +36,14 @@ 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 c0046f6fb..b28e7fbbf 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -29,7 +29,6 @@ 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; @@ -42,31 +41,18 @@ 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 84ad5efad..8f0f7c696 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -24,7 +24,6 @@ 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.*; @@ -42,31 +41,24 @@ 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 adbdb0008..49b28174a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -24,7 +24,6 @@ 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.*; @@ -37,16 +36,11 @@ 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 4a81089f7..f11d8adff 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -27,7 +27,6 @@ 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; @@ -40,19 +39,15 @@ 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 4d9e67e7c..6b2b2a11a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java @@ -14,7 +14,6 @@ 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,7 +29,6 @@ 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 f34a72837..7f460703d 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -24,7 +24,6 @@ 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; @@ -49,31 +48,24 @@ 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 ba7d1c80b..6ea8c3116 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java @@ -18,7 +18,6 @@ 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; @@ -41,11 +40,9 @@ 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 27acc29ef..e5d544786 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java @@ -17,7 +17,6 @@ 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; @@ -35,19 +34,15 @@ 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 99a34356e..f02b29102 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -14,7 +14,6 @@ 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 @@ -23,15 +22,12 @@ 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 37de26e24..6eab1dfb4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -11,7 +11,6 @@ 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; @@ -25,7 +24,6 @@ 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 6bd21262f..8718cfa4e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -17,7 +17,6 @@ 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; @@ -29,16 +28,10 @@ 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 87be52fcb..5131272a6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -20,7 +20,6 @@ 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; @@ -37,39 +36,30 @@ 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 28391e17a..fcca737fb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -16,7 +16,6 @@ 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; @@ -29,15 +28,12 @@ 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 bd6288975..873bf5e86 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java @@ -16,7 +16,6 @@ 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; @@ -31,7 +30,6 @@ 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 3b46d42a6..a40af5662 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java @@ -20,7 +20,6 @@ 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; @@ -31,15 +30,12 @@ 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 3af540b35..1e32ee6ed 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java @@ -8,7 +8,6 @@ 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; @@ -23,7 +22,6 @@ 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 979a47482..ebe123113 100644 --- a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java +++ b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java @@ -19,7 +19,6 @@ 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; @@ -42,11 +41,9 @@ 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 d8858af09..f001c7912 100644 --- a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -18,7 +18,6 @@ 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; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index fd872a8c8..28a3f7b26 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -23,7 +23,6 @@ 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; @@ -46,40 +45,31 @@ public class BaseController { @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 a5de005b1..dcc47aec2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java @@ -14,7 +14,6 @@ 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,7 +25,6 @@ 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 3a0760bad..26499de18 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java @@ -11,7 +11,6 @@ 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,7 +26,6 @@ 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 99f2357e8..06d41aa89 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java @@ -13,7 +13,6 @@ 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 @@ -23,7 +22,6 @@ 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 829d50a83..8c5fc0a07 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java @@ -18,7 +18,6 @@ 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; @@ -38,7 +37,6 @@ 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 196d33750..c7c86f6e2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -20,7 +20,6 @@ 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; @@ -35,7 +34,6 @@ 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 5d18373d6..aae158683 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -13,7 +13,6 @@ 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; @@ -25,7 +24,6 @@ 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 7409f62af..f813852c3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java @@ -16,7 +16,6 @@ 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,7 +30,6 @@ 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 0975a0a58..e98afaf73 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -19,7 +19,6 @@ 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; @@ -36,11 +35,8 @@ 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 8bd5247d5..7897ac9a1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -22,7 +22,6 @@ 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.*; @@ -36,59 +35,45 @@ 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 37f38d221..7ecbf1a61 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -12,7 +12,6 @@ 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; @@ -60,27 +59,21 @@ 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 d4fcda688..3e20c1cda 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -10,7 +10,6 @@ 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; @@ -38,11 +37,9 @@ 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 2876a9d91..796c1bf60 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -14,7 +14,6 @@ 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; @@ -46,19 +45,13 @@ 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 60a4f93ee..480a6262b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -28,7 +28,6 @@ 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; @@ -43,28 +42,22 @@ 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 45b19f5a9..89c1b2e97 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -15,7 +15,6 @@ 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; @@ -27,19 +26,15 @@ 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 3c3eafaf6..cbd79151c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -20,7 +20,6 @@ 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 @@ -31,11 +30,9 @@ 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 ee39e2f41..290d5349c 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java @@ -14,7 +14,6 @@ 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; @@ -28,7 +27,6 @@ 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 b673125aa..d012d001b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCustomizeModuleController.java @@ -11,7 +11,6 @@ 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; @@ -23,7 +22,6 @@ 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 999a05a63..798ea7a1b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -14,7 +14,6 @@ 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.*; @@ -26,11 +25,9 @@ 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 f0f090e2b..a59c0b72e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java @@ -6,7 +6,6 @@ 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 @@ -14,7 +13,6 @@ 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 b3fe84108..e9014513d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java @@ -15,7 +15,6 @@ 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.*; @@ -29,23 +28,18 @@ 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 411149f3f..5a6c6d5c4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -17,7 +17,6 @@ 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; @@ -30,7 +29,6 @@ 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 0799e86ff..43763c785 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java @@ -17,7 +17,6 @@ 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.*; @@ -32,11 +31,9 @@ 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 9ac11ef5b..4a1924216 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgController.java @@ -11,7 +11,6 @@ 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; @@ -26,7 +25,6 @@ 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 c2f54f8c8..eae21c8f2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -21,7 +21,6 @@ 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; @@ -34,15 +33,12 @@ 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 52bd74e03..ceac8a1f4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOcrController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOcrController.java @@ -17,7 +17,6 @@ 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; @@ -31,14 +30,12 @@ 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; + @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 d88cfadb0..2e870ba14 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOpinionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOpinionController.java @@ -16,7 +16,6 @@ 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.*; @@ -27,7 +26,6 @@ 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 e207abd16..c8528b319 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -29,7 +29,6 @@ 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.*; @@ -44,28 +43,22 @@ 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 265eecf12..a44003521 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java @@ -20,7 +20,6 @@ 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; @@ -32,19 +31,15 @@ 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 8228d42b3..6e02b8094 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java @@ -10,7 +10,6 @@ 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; @@ -21,7 +20,6 @@ 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 db3fc18bc..2bb1c9d07 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -9,7 +9,6 @@ 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; @@ -51,31 +50,24 @@ 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 599877362..22a61dd54 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java @@ -22,7 +22,6 @@ 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; @@ -39,29 +38,23 @@ 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 e0b850b3c..162d5da85 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java @@ -18,7 +18,6 @@ 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; @@ -32,15 +31,12 @@ 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 814092dc3..d68762b36 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java @@ -21,7 +21,6 @@ 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; @@ -35,15 +34,12 @@ 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 c3f4c5e9c..4beb46dc0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -14,7 +14,6 @@ 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,7 +21,6 @@ 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 f136ad9e3..89f78cbd2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -9,7 +9,6 @@ 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.*; @@ -20,7 +19,6 @@ 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 8e20f7312..be6b2c10a 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -27,7 +27,6 @@ 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; @@ -52,55 +51,42 @@ 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 f2de01340..2643230ad 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -11,7 +11,6 @@ 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; @@ -27,7 +26,6 @@ import javax.servlet.http.HttpServletResponse; */ @Component public class AuthorizationInterceptor extends HandlerInterceptorAdapter { - @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 d4550989f..db7f5b15a 100644 --- a/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/mallinkCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -7,7 +7,6 @@ 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; 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 ef7c32020..cbe4769d2 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -15,7 +15,6 @@ 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; @@ -42,23 +41,18 @@ 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 fa42f115e..159ed7594 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -16,7 +16,6 @@ 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; @@ -51,27 +50,20 @@ 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 cea631fdf..c93899a0b 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java @@ -23,7 +23,6 @@ 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; @@ -39,27 +38,22 @@ 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 0c1bed1b7..c053d41b2 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java @@ -22,7 +22,6 @@ 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; @@ -44,15 +43,12 @@ 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 3fb26d871..3bf488541 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java @@ -7,7 +7,6 @@ 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; @@ -18,7 +17,6 @@ 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 6cdcbabfe..db8ff0c2e 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayBillController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayBillController.java @@ -13,7 +13,6 @@ 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; @@ -37,11 +36,9 @@ 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 4ca6449e6..d7754fb13 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java @@ -18,7 +18,6 @@ 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; @@ -39,15 +38,12 @@ 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 39ee99a43..51bae65a3 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,7 +24,6 @@ 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; @@ -43,39 +42,30 @@ 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 acaa2a694..7f06c5524 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,7 +17,6 @@ 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; @@ -33,35 +32,27 @@ 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 1490d0040..592f9c4e8 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,7 +28,6 @@ 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; @@ -46,46 +45,36 @@ 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 d6dcf84e8..dec4c40e7 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,7 +20,6 @@ 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; @@ -42,31 +41,24 @@ 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 22cf173c8..72830465c 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,7 +20,6 @@ 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; @@ -42,31 +41,24 @@ 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 09f3ac1bd..b1454a31f 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,7 +20,6 @@ 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; @@ -42,31 +41,24 @@ 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 772051a6e..497cb5623 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -22,7 +22,6 @@ 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; @@ -38,11 +37,9 @@ 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 ff0cc815e..1f07d1272 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java @@ -19,7 +19,6 @@ 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; @@ -33,27 +32,21 @@ 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 ded4e59b7..9a92d1591 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/official/WxMallApplyController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/official/WxMallApplyController.java @@ -10,7 +10,6 @@ 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 @@ -18,7 +17,6 @@ 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/mallinkCallback/src/main/java/com/iformall/shiro/ShiroService.java b/mallinkCallback/src/main/java/com/iformall/shiro/ShiroService.java index f8fdf5b14..a9621c7b7 100644 --- a/mallinkCallback/src/main/java/com/iformall/shiro/ShiroService.java +++ b/mallinkCallback/src/main/java/com/iformall/shiro/ShiroService.java @@ -7,7 +7,6 @@ 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 java.util.LinkedHashMap; import java.util.Map; @@ -17,13 +16,10 @@ import java.util.Map; */ //@Service public class ShiroService { - @Autowired private ShiroFilterFactoryBean shiroFilterFactoryBean; - @Autowired private MallPermissionService resourcesService; - @Autowired private RedisSessionDAO redisSessionDAO; /** diff --git a/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java b/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java index 1dff84b1e..4d19df045 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java @@ -17,7 +17,6 @@ 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; @@ -34,7 +33,6 @@ 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 6334411f0..0b8238b59 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -8,7 +8,6 @@ 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; /** @@ -17,57 +16,36 @@ import org.springframework.stereotype.Service; @Service public class MqBaseConsumer { private final Logger log = LoggerFactory.getLogger(this.getClass()); - - @Lazy + @Autowired + private WxMsgRecordMapper wxMsgRecordMapper; @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; - @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 b67d8a39a..d81e189c1 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/impl/RabbitMqConsumer.java @@ -7,7 +7,6 @@ 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; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java index 6462c8a83..47aee76e7 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/BaseController.java @@ -25,7 +25,6 @@ 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; @@ -45,7 +44,6 @@ 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 6efed7689..ead9e9667 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -19,7 +19,6 @@ 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; @@ -41,7 +40,6 @@ 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 d4550989f..db7f5b15a 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -7,7 +7,6 @@ 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; diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java index 04609e7f4..9de3e25f0 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/BaseController.java @@ -12,7 +12,6 @@ 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; @@ -26,15 +25,12 @@ 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 6c3ee89c1..cbdabd81a 100644 --- a/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkPosApi/src/main/java/com/iformall/log/SystemLogAspect.java @@ -11,7 +11,6 @@ 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; diff --git a/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index d8858af09..f001c7912 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkPublicApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -18,7 +18,6 @@ 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; diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java index f147fc2ea..4842392e4 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/BaseController.java @@ -9,7 +9,6 @@ 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; @@ -28,12 +27,10 @@ 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 ed41e33d9..39a71a576 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java @@ -16,7 +16,6 @@ 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; @@ -29,15 +28,12 @@ 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 b83b46f19..4b161e479 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -18,7 +18,6 @@ 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; @@ -38,15 +37,13 @@ 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 a987bdda5..8d7f68669 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -14,7 +14,6 @@ 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; diff --git a/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java b/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java index 522fa9c38..ecfc89b22 100644 --- a/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkSchedule/src/main/java/com/iformall/controller/HomeController.java @@ -10,7 +10,6 @@ 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; @@ -23,7 +22,6 @@ 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 c92287d24..e33c7ecb1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java +++ b/mallinkSchedule/src/main/java/com/iformall/controller/UserTagsController.java @@ -15,7 +15,6 @@ 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; @@ -25,11 +24,9 @@ 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 42b9d4934..e23f320aa 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -16,7 +16,6 @@ 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; @@ -34,19 +33,15 @@ 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 53838a36e..f7e0a4327 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -11,7 +11,6 @@ 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; @@ -30,15 +29,12 @@ 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 ca8357636..0d67b0507 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java @@ -8,7 +8,6 @@ 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; @@ -23,11 +22,9 @@ 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 6caed1fe1..eff52c2c2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java @@ -22,7 +22,6 @@ 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; @@ -39,27 +38,16 @@ 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 dd0c52de1..b24513e39 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -14,7 +14,6 @@ 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,31 +32,24 @@ 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 31330db4d..2ab62f5ea 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -11,7 +11,6 @@ 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; @@ -26,15 +25,12 @@ 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 b3435bbe4..4b6e6778c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -16,7 +16,6 @@ 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; @@ -32,27 +31,21 @@ 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 c9cc400ec..6c629f419 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -17,7 +17,6 @@ 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; @@ -31,39 +30,30 @@ 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 058d9dce0..613dcf960 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -16,7 +16,6 @@ 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; @@ -36,59 +35,43 @@ 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 2195dba51..8a3b99467 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -9,7 +9,6 @@ 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; @@ -25,23 +24,18 @@ 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; - @Lazy @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 1079c129e..48f2a84d7 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DeviceHbCheckSchedule.java @@ -10,7 +10,6 @@ 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; @@ -24,15 +23,13 @@ public class DeviceHbCheckSchedule { private final int TIME_OUT_VALUE = 15 * 60 * 1000; //15分钟 - @Lazy + @Autowired WxDeviceMapper wxDeviceMapper; - @Lazy @Autowired KwBoxMapper kwBoxMapper; - @Lazy @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 edb7b0bc8..0ebafde20 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java @@ -4,7 +4,6 @@ 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; @@ -17,7 +16,6 @@ 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 8960bbae2..61449f833 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -18,7 +18,6 @@ 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; @@ -33,48 +32,27 @@ 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 89364d0f4..1eac36b92 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java @@ -5,7 +5,6 @@ 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; @@ -16,12 +15,8 @@ import org.springframework.stereotype.Component; @Component public class LatePayBillActionSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Lazy @Autowired private WxBillRentMapper wxBillRentMapper; - - @Lazy @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 d314679ff..7701fc425 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -9,7 +9,6 @@ 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; @@ -21,11 +20,8 @@ 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 3e917dcd1..8c3a2b45a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -28,14 +28,10 @@ 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 5e493658d..4a978797d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -11,7 +11,6 @@ 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; @@ -47,63 +46,48 @@ 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 9843b979b..5eefd5672 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -17,7 +17,6 @@ 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; @@ -41,27 +40,21 @@ 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 138b2e04d..342077133 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java @@ -15,7 +15,6 @@ 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; @@ -27,15 +26,13 @@ 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 e2cfdc38c..9a342fbbf 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoScheduletttttttttttttttttttttttttt.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoScheduletttttttttttttttttttttttttt.java @@ -15,7 +15,6 @@ 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; @@ -27,15 +26,12 @@ 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 7ab544550..2475f9d5b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java @@ -9,7 +9,6 @@ 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; @@ -21,15 +20,12 @@ 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 97bef3399..df571f537 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SysMonitorSchedule.java @@ -9,7 +9,6 @@ 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; @@ -27,11 +26,9 @@ public class SysMonitorSchedule { @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 04404b8b4..a8ab2ceb4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WeChatAccessTokenSchedule.java @@ -8,7 +8,6 @@ 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; @@ -24,11 +23,9 @@ 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 7a4540683..9d480f90b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WiwideTokenSchedule.java @@ -9,7 +9,6 @@ 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; @@ -23,7 +22,6 @@ 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 1fc582e81..e98218694 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java @@ -15,7 +15,6 @@ 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,23 +34,18 @@ public class WxAppVisitSchedule { @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 6426235df..08626bfb8 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java @@ -5,7 +5,6 @@ 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; @@ -23,11 +22,9 @@ public class WxCUserCheckSchedule { @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 e06bb62c2..ba5a76232 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java @@ -8,7 +8,6 @@ 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; @@ -27,15 +26,12 @@ 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 5ca434f7c..e8b6c0eb2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgRecordSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgRecordSchedule.java @@ -2,7 +2,6 @@ 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; @@ -12,7 +11,6 @@ import javax.annotation.Resource; @Component public class WxMsgRecordSchedule { - @Lazy @Resource private WxMsgRecordService msgRecordService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 395e7bdd5..16c309209 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -16,7 +16,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -33,34 +32,27 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder private static final String ALI_CIRCLE_KEY = "CIRCLE:ALI:"; - @Lazy @Autowired ExcelService excelService; - @Lazy @Autowired RedisLock redisLock; @Autowired AliBusinessCircleOrderMapper aliBusinessCircleOrderMapper; - @Lazy @Autowired WxMerchantService wxMerchantService; - @Lazy @Autowired AliPayCUserService aliPayCUserService; - @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired WxCreditHistoryService creditHistoryService; - @Lazy @Autowired WxCouponSendService wxCouponSendService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliPayCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliPayCUserServiceImpl.java index f5b189a0d..26a7de4ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliPayCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliPayCUserServiceImpl.java @@ -14,7 +14,6 @@ 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.Service; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/CUserTokenServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/CUserTokenServiceImpl.java index 5463cfd4a..89abbd1b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/CUserTokenServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/CUserTokenServiceImpl.java @@ -15,7 +15,6 @@ 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.Service; @@ -26,15 +25,13 @@ public class CUserTokenServiceImpl implements CUserTokenService { @Autowired WxCUserMapper wxCUserMapper; - @Lazy - @Autowired - CUserServiceFactory cuserFactory; - - @Lazy @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate baseCUserTokenRedisTemplate; + @Autowired + CUserServiceFactory cuserFactory; + private EnumAppPlat getPlat(String token) { if(token.endsWith(Constant.TOKEN_WXC_END)){ return EnumAppPlat.WX; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 2130a2331..a6de44f36 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -25,7 +25,6 @@ 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.stereotype.Service; import java.math.BigDecimal; @@ -84,15 +83,12 @@ public class DataTowerServiceImpl implements DataTowerService { @Autowired private WxMallMapper wxMallMapper; - @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; - @Lazy @Autowired private WxCouponChannelService wxCouponChannelService; - @Lazy @Autowired private WxCUserCarService wxCUserCarService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java index af9cda85f..023b1faaa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/FengNiaoMapServiceImpl.java @@ -5,7 +5,6 @@ import com.iformall.mapper.FengNiaoMapConfigMapper; import com.iformall.service.FengNiaoMapService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @Service diff --git a/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java index 5a1e17c31..c800200e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java @@ -4,12 +4,12 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.po.JmSportOrder; +import com.iformall.domain.po.MemCouponFromDsp; import com.iformall.mapper.*; import com.iformall.service.JmSportOrderService; 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; @@ -20,6 +20,7 @@ public class JmSportOrderServiceImpl implements JmSportOrderService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private JmSportOrderMapper jmSportOrderMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index df0d20ce3..dac7c2105 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -24,7 +24,6 @@ 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.*; @@ -32,7 +31,7 @@ import java.util.*; @Service public class MallPermissionServiceImpl implements MallPermissionService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - + @Autowired private MallPermissionMapper mallPermissionMapper; @@ -41,7 +40,6 @@ public class MallPermissionServiceImpl implements MallPermissionService { @Autowired private WxMallMapper wxMallMapper; - @Autowired private WxLogicPermissionMapper logicPermissionDao; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java index 63db0e66f..85d34d0de 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallResourceServiceImpl.java @@ -6,16 +6,16 @@ import com.iformall.domain.po.MallResource; import com.iformall.mapper.MallResourceMapper; import com.iformall.service.MallResourceService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class MallResourceServiceImpl implements MallResourceService { - + @Autowired MallResourceMapper mallResourceMapper; + @Override public PageInfo listAsPage(MallResource record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallResourceMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java index 86ab54b0e..65e8768e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java @@ -12,7 +12,6 @@ import com.iformall.service.MallRolePermissionService; 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.ArrayList; @@ -26,6 +25,7 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService @Autowired MallRolePermissionMapper mallUserRolePermissionMapper; + @Override public PageInfo listAsPage(MallRolePermission record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallUserRolePermissionMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java index 2a85f1ed9..a6bed2016 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java @@ -10,7 +10,6 @@ import com.iformall.service.MallRoleService; 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.HashMap; @@ -20,10 +19,11 @@ import java.util.Map; @Service public class MallRoleServiceImpl implements MallRoleService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - + @Autowired MallRoleMapper mallRoleMapper; + @Override public PageInfo listAsPage(MallRole record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallRoleMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java index 04bda044f..04794a58c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java @@ -8,7 +8,6 @@ import com.iformall.domain.vo.MallUserActionVo; import com.iformall.mapper.MallUserActionMapper; import com.iformall.service.MallUserActionService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @@ -16,7 +15,7 @@ import java.util.Date; @Service public class MallUserActionServiceImpl implements MallUserActionService { - + @Autowired MallUserActionMapper mallUserActionMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 002dab73f..e2e41be9f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -23,7 +23,6 @@ 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 org.springframework.transaction.annotation.Transactional; @@ -33,7 +32,6 @@ import java.util.stream.Collectors; @Service public class MallUserInfoServiceImpl implements MallUserInfoService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired @@ -53,11 +51,10 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Autowired MallRolePermissionMapper mallRolePermissionMapper; - + @Autowired WxMsgValidationcodeMapper wxMsgValidationcodeMapper; - @Lazy @Autowired private WxMallService mallService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java index 158fbcd67..481781c5a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java @@ -15,22 +15,21 @@ import com.iformall.service.MallUserRoleService; 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.List; @Service public class MallUserRoleServiceImpl implements MallUserRoleService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - + @Autowired MallUserRoleMapper mallUserRoleMapper; @Autowired MallRolePermissionMapper mallRolePermissionMapper; + @Override public PageInfo listAsPage(MallUserRole record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallUserRoleMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 97be7749d..12a8be7df 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -22,7 +22,6 @@ 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 javax.servlet.http.HttpServletRequest; @@ -37,34 +36,25 @@ import java.util.stream.Collectors; */ @Service public class MarkingDataReportServiceImpl implements MarkingDataReportService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponOrderMapper wxCouponOrderMapper; - @Autowired private WxCouponActionLogMapper wxCouponActionLogMapper; - @Autowired private WxCarCmdLogMapper wxCarCmdLogMapper; - @Autowired private WxUserVisitMapper wxUserVisitMapper; - @Autowired private WxCouponMapper wxCouponMapper; - @Autowired private WxOrderMapper wxOrderMapper; @Autowired private WxMallMapper wxMallMapper; - - @Lazy @Autowired private ExcelService excelService; - @Lazy @Autowired private WxCouponOrderService wxCouponOrderService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java index b04fe9d72..f8f8c6db3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java @@ -19,7 +19,6 @@ import com.iformall.service.WxOrderService; 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 com.iformall.common.IdWorker; @@ -36,13 +35,10 @@ public class MemCouponFromDspServiceImpl implements MemCouponFromDspService { @Autowired private WxCouponMapper couponMapper; - @Lazy @Autowired private WxOrderService wxOrderService; - @Lazy @Autowired private WxCUserService wxCUserService; - @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java index 5b22c00da..92b66b42e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -20,7 +20,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @Service @@ -28,8 +27,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { @Autowired NeuPosOrderMasterExtMapper neuPosOrderMasterExtMapper; - - @Lazy + @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java index 9c3ff39f4..e6c0deb6e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java @@ -17,7 +17,6 @@ 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 javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,20 +28,15 @@ import java.util.*; */ @Service public class QrCodeServiceImpl implements QrCodeService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Lazy @Autowired private WxAppinfoService wxAppinfoService; - + @Autowired + private boolean isFmOpen; @Autowired private String fmUploadDir; - - @Lazy @Autowired private PayServiceFactory payServiceFactory; - @Autowired private AliyunOSS aliyunOSS; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java index dda90165d..0792fb6ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java @@ -22,7 +22,6 @@ 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.Service; @@ -37,15 +36,12 @@ public class TtCUserServiceImpl implements TtCUserService { @Autowired private TtCUserMapper ttCUserMapper; - @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired private WxScoreRulesService wxScoreRulesService; - @Lazy @Autowired private WxCUserTagsService wxCUserTagsService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index f2849508b..a055c4f7d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -24,7 +24,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -53,7 +52,6 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Autowired WxActivityMapper wxActivityMapper; - @Lazy @Autowired ExcelService excelService; @@ -69,7 +67,6 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Autowired WxCreditHistoryMapper wxCreditHistoryMapper; - @Lazy @Autowired WxCreditHistoryService wxCreditHistoryService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 991913875..0cf499bc8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -22,7 +22,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -43,7 +42,6 @@ public class WxActivityServiceImpl implements WxActivityService { @Autowired WxActivityMapper wxActivityMapper; - @Lazy @Autowired WxCampaignService wxCampaignService; @Autowired diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index eef9db325..22e1ae0d5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -28,7 +28,6 @@ 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.stereotype.Service; @@ -50,31 +49,24 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Autowired WxBillAllMapper wxBillAllMapper; - @Lazy @Autowired WxBillDailyService wxBillDailyService; - @Lazy @Autowired WxBillDepositService wxBillDepositService; - @Lazy @Autowired WxBillPropertyDepositService wxBillPropertyDepositService; - @Lazy @Autowired WxBillPropertyService wxBillPropertyService; - @Lazy @Autowired WxBillRentService wxBillRentService; - @Lazy @Autowired WxBillOtherService wxBillOtherService; - @Lazy @Autowired WxBillOtherDepositService wxBillOtherDepositService; @@ -99,14 +91,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Autowired WxBillOtherDepositMapper wxBillOtherDepositMapper; - @Lazy @Autowired ExcelService excelService; @Autowired MqBaseProducer mqBaseProducer; - @Lazy @Autowired WxBillActionService wxBillActionService; @@ -134,18 +124,14 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Autowired StringRedisTemplate stringRedisTemplate; - @Lazy @Autowired WxBillSettleRecordService wxBillSettleRecordService; - @Lazy @Autowired WxBillSettleService wxBillSettleService; @Autowired WxBillSettleRecordMapper wxBillSettleRecordMapper; - - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 37dfc67b5..b0a3a09f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -25,7 +25,6 @@ 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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,10 +47,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Autowired WxShopMapper wxShopMapper; - @Lazy @Autowired WxBillActionService wxBillActionService; - @Lazy @Autowired ExcelService excelService; @Autowired @@ -60,7 +57,6 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { WxMerchantShopMapper wxMerchantShopMapper; @Autowired WxMerchantMapper wxMerchantMapper; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 5ef438901..1e378b98c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -23,7 +23,6 @@ import com.iformall.utils.DateUtils; 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 org.springframework.transaction.annotation.Transactional; @@ -43,11 +42,9 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Autowired WxBillDepositMapper wxBillDepositMapper; - @Lazy @Autowired WxBillActionService wxBillActionService; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index fb8a7dbf0..014ebb89e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -21,7 +21,6 @@ import com.iformall.utils.DateUtils; 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 org.springframework.transaction.annotation.Transactional; @@ -46,15 +45,12 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Autowired WxMerchantMapper wxMerchantMapper; - @Lazy @Autowired WxBillActionService wxBillActionService; - @Lazy @Autowired ExcelService excelService; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 0bae20072..8fe040f62 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -21,7 +21,6 @@ import com.iformall.utils.DateUtils; 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 org.springframework.transaction.annotation.Transactional; @@ -46,15 +45,12 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { @Autowired WxMerchantMapper wxMerchantMapper; - @Lazy @Autowired WxBillActionService wxBillActionService; - @Lazy @Autowired ExcelService excelService; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index 2fb3cd2a9..c58dc6462 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -23,7 +23,6 @@ import com.iformall.utils.DateUtils; 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 org.springframework.transaction.annotation.Transactional; @@ -42,10 +41,8 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Autowired WxBillPropertyDepositMapper wxBillPropertyDepositMapper; - @Lazy @Autowired WxBillActionService wxBillActionService; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index a3da608c9..14f822c72 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -21,7 +21,6 @@ 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 org.springframework.transaction.annotation.Transactional; @@ -44,20 +43,16 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Autowired WxBillPropertyDepositMapper wxBillPropertyDepositMapper; - @Lazy @Autowired WxBillActionService wxBillActionService; - @Lazy @Autowired ExcelService excelService; @Autowired WxBillActionMapper wxBillActionMapper; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; - @Lazy @Autowired WxBillPropertyDepositService wxBillPropertyDepositService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 55de3c975..a8c9b8b19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -23,7 +23,6 @@ import org.joda.time.format.DateTimeFormatter; 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 org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; @@ -45,7 +44,6 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxBillRentMapper wxBillRentMapper; @Autowired WxBillDepositMapper wxBillDepositMapper; - @Lazy @Autowired WxBillActionService wxBillActionService; @Autowired @@ -56,10 +54,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxRentContractMapper wxRentContractMapper; @Autowired WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; - @Lazy @Autowired WxBillDepositService wxBillDepositService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index fc4173777..1f97492e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -16,7 +16,6 @@ import com.iformall.service.WxFlowService; import com.iformall.utils.DateUtils; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -59,7 +58,6 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { private WxBillSettleRecordMapper wxBillSettleRecordMapper; @Autowired private WxMerchantSubsidyMapper wxMerchantSubsidyMapper; - @Lazy @Autowired private ExcelService excelService; @Autowired diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 8414c0a78..0a5400960 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -16,7 +16,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -34,7 +33,6 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe private final String WX_CIRCLE_KEY = "CIRCLE:WX:"; - @Lazy @Autowired ExcelService excelService; @@ -44,27 +42,21 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe @Autowired WxBusinessCircleOrderMapper wxBusinessCircleOrderMapper; - @Lazy @Autowired WxMerchantService wxMerchantService; - @Lazy @Autowired WxCUserService wxCUserService; - @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired WxCreditHistoryService creditHistoryService; - @Lazy @Autowired WxCallBackService wxCallBackService; - @Lazy @Autowired WxCouponSendService wxCouponSendService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index fa96ed7a3..c13bba856 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -23,7 +23,6 @@ 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.stereotype.Service; @@ -61,13 +60,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Autowired WxCreditHistoryMapper creditHistoryMapper; - @Lazy + @Autowired WxCUserTagsService wxCUserTagsService; - @Lazy + @Autowired WxCUserBasicChildService wxCUserBasicChildService; - @Lazy + @Autowired WxScoreRulesService wxScoreRulesService; @@ -76,16 +75,16 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Autowired WxCarPayRecordMapper wxCarPayRecordMapper; - @Lazy + @Autowired ExcelService excelService; - @Lazy + @Autowired WxCreditHistoryService wxCreditHistoryService; - @Lazy + @Autowired WxLevelConfigService wxLevelConfigService; - @Lazy + @Autowired WxTagsService wxTagsService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java index 83bb77b7a..1ff7d1cb6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java @@ -18,7 +18,6 @@ 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.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +36,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { @Autowired WxCUserBasicSignMapper wxCUserBasicSignMapper; - @Lazy + @Autowired WxCreditHistoryService wxCreditHistoryService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java index 9c317a916..d7b2fa755 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java @@ -13,7 +13,6 @@ 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.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -34,7 +33,7 @@ public class WxCUserFromServiceImpl implements WxCUserFromService, IExcelExportS @Autowired WxMerchantMapper wxMerchantMapper; - @Lazy + @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 4117cd627..4f4567845 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -22,7 +22,6 @@ 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.Service; @@ -35,19 +34,19 @@ public class WxCUserServiceImpl implements WxCUserService { @Autowired WxCUserMapper wxCUserMapper; - @Lazy + @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy + @Autowired private WxScoreRulesService wxScoreRulesService; - @Lazy + @Autowired private WxCUserTagsService wxCUserTagsService; @Autowired private MqBaseProducer mqBaseProducer; - @Lazy + @Autowired private CUserTokenService cUserTokenService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java index 008f136a8..9f1f0058f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.service.*; 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.text.SimpleDateFormat; @@ -23,7 +22,6 @@ public class WxCallBackServiceImpl implements WxCallBackService { private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'+'mm:ss", Locale.CHINA); - @Lazy @Autowired WxPayAccountService wxPayAccountService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index e5969b27b..6d45d313c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -23,7 +23,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -48,11 +47,9 @@ public class WxCampaignServiceImpl implements WxCampaignService { @Autowired WxCouponChannelMapper wxCouponChannelMapper; - @Lazy @Autowired WxCouponService wxCouponService; - @Lazy @Autowired QrCodeService qrCodeService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java index 20cf67c1b..708f82ae7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.mapper.WxCardInfoMapper; import com.iformall.service.ExcelService; import com.iformall.service.WxCardInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -22,7 +21,6 @@ public class WxCardInfoServiceImpl implements WxCardInfoService { @Autowired WxCardInfoMapper wxCardInfoMapper; - @Lazy @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 52b1cb831..b768e855c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -20,7 +20,6 @@ import com.iformall.utils.PayUtils; 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -63,23 +62,18 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Autowired WxCouponOrderMapper wxCouponOrderMapper; - @Lazy @Autowired WxProfitSharingOrderService profitSharingOrderService; - @Lazy @Autowired ExcelService excelService; - @Lazy @Autowired WxCreditHistoryService wxCreditHistoryService; - @Lazy @Autowired WxScoreRulesService wxScoreRulesService; - - @Lazy + @Autowired WxCashOutService wxCashOutService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java index ac24c2d8b..1607f0209 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java @@ -36,7 +36,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -55,16 +54,12 @@ public class WxCashOutServiceImpl implements WxCashOutService { RedisLock redisLock; @Autowired MqBaseProducer mqBaseProducer; - @Lazy @Autowired private WxFlowService wxFlowService; - @Lazy @Autowired PayServiceFactory payServiceFactory; - @Lazy @Autowired WxAppinfoService wxAppinfoService; - @Lazy @Autowired WxPayAccountService wxPayAccountService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 842c6a394..6042d0656 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -27,7 +27,6 @@ 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.math.BigDecimal; @@ -71,7 +70,6 @@ public class WxChartServiceImpl implements WxChartDataService { WxLevelConfigMapper wxLevelConfigMapper; @Autowired WxCUserTagsMapper wxCUserTagsMapper; - @Lazy @Autowired WxCouponService wxCouponService; @Autowired @@ -84,31 +82,23 @@ public class WxChartServiceImpl implements WxChartDataService { WxBillOtherMapper wxBillOtherMapper; @Autowired WxBillAllMapper wxBillAllMapper; - @Lazy @Autowired MarkingDataReportService markingDataReportService; - @Lazy @Autowired WxBusinessService wxBusinessService; - @Lazy + @Autowired WxCouponOrderService wxCouponOrderService; - @Lazy @Autowired KwMeterDataService kwMeterDataService; - @Lazy @Autowired KwMerchantMeterService kwMerchantMeterService; - @Lazy @Autowired KwMeterService kwMeterService; - @Lazy @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired private WxCUserService wxCUserService; - @Lazy @Autowired private WxCUserCarService wxCUserCarService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index f75192105..35230ef13 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -24,7 +24,6 @@ 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.stereotype.Service; @@ -39,20 +38,16 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Autowired WxCouponChannelMapper wxCouponChannelMapper; - @Lazy @Autowired WxCouponService wxCouponService; @Autowired WxMerchantMapper wxMerchantMapper; @Autowired WxCouponMerchantMapper wxCouponMerchantMapper; - @Lazy @Autowired WxScreenAdService wxScreenAdService; - @Lazy @Autowired WxOrderService wxOrderService; - @Lazy @Autowired QrCodeService qrCodeService; @Autowired diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index 3d09dd842..934046a57 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -18,7 +18,6 @@ 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.*; @@ -30,43 +29,33 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { @Autowired WxCouponInjectMapper couponInjectMapper; - @Lazy @Autowired WxCouponOrderService wxCouponOrderService; - @Lazy @Autowired WxCouponService wxCouponService; - @Lazy @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired WxCUserService wxCUserService; - @Lazy @Autowired WxCouponActionLogService wxCouponActionLogService; - @Lazy @Autowired WxMsgService wxMsgService; - @Lazy @Autowired WxMsgModelService wxMsgModelService; - @Lazy @Autowired WxMsgConfigService wxMsgConfigService; - @Lazy @Autowired PushLimitService pushLimitService; - @Lazy @Autowired WxOrderService wxOrderService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index c93ce2b5d..8cdfb99c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -44,7 +44,6 @@ 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.Service; import org.springframework.transaction.annotation.Propagation; @@ -83,15 +82,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; - @Lazy @Autowired WxOrderService wxOrderService; - @Lazy @Autowired WxCouponSendService wxCouponSendService; - @Lazy @Autowired WxProfitSharingOrderService wxProfitSharingOrderService; @@ -110,7 +106,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxCouponMapper wxCouponMapper; - @Lazy @Autowired WxAppinfoService wxAppinfoService; @@ -135,19 +130,16 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxAuthorizerInfoMapper authorizerInfoMapper; - @Lazy @Autowired ExcelService excelService; - @Lazy + @Autowired WxCreditHistoryService wxCreditHistoryService; - @Lazy @Autowired WxScoreRulesService wxScoreRulesService; - @Lazy @Autowired WxMsgLimitService wxMsgLimitService; @@ -156,12 +148,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxPayOrderMapper payOrderMapper; - - @Lazy + @Autowired PayServiceFactory payServiceFactory; - - @Lazy + @Autowired WxCashOutService cashOutService; @@ -171,18 +161,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired RedisLock redisLock; - - @Lazy + @Autowired OrderFactory orderFactory; - - @Lazy + @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy @Autowired SysConfigService sysConfigService; - @Lazy @Autowired WxMerchantBUserService wxMerchantBUserService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 95ec8e948..0a5d6213d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -15,7 +15,6 @@ import com.iformall.service.WxCouponPasswordService; 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 javax.servlet.http.HttpServletRequest; @@ -32,7 +31,6 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { @Autowired WxCouponPasswordMapper wxCouponPasswordMapper; - @Lazy @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java index e2229a583..21fe05c9c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java @@ -20,7 +20,6 @@ import com.iformall.service.msg.impl.SendSmsServiceImpl; 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.stereotype.Service; @@ -39,11 +38,9 @@ public class WxCouponPresentServiceImpl implements WxCouponPresentService { @Autowired WxCouponPasswordMapper wxCouponPasswordMapper; - @Lazy @Autowired WxAppinfoService wxAppinfoService; - @Lazy @Autowired private MqBaseProducer mqBaseProducer; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 159397fa2..49f838f70 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -27,7 +27,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -40,22 +39,18 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { @Autowired WxCouponSendMapper wxCouponSendMapper; - @Lazy @Autowired WxCouponService wxCouponService; - @Lazy @Autowired WxCouponActionLogService wxCouponActionLogService; @Autowired WxCouponSendConfigMapper wxCouponSendConfigMapper; - @Lazy @Autowired WxOrderService wxOrderService; @Autowired WxCouponOrderMapper wxCouponOrderMapper; @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; - @Lazy @Autowired PushLimitService pushLimitService; @Autowired @@ -64,20 +59,16 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { WxCUserMapper wxCUserMapper; @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; - @Lazy @Autowired WxAppinfoService wxAppinfoService; @Autowired WxAuthorizerInfoMapper authorizerInfoMapper; - @Lazy @Autowired WxMsgLimitService wxMsgLimitService; @Autowired WxCouponMerchantMapper wxCouponMerchantMapper; - @Lazy @Autowired WxTemplateMsgService wxTemplateMsgService; - @Lazy @Autowired WxMsgService wxMsgService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index e4fad395c..a4944d2e6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -38,7 +38,6 @@ 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.Service; import org.springframework.transaction.annotation.Isolation; @@ -65,16 +64,16 @@ public class WxCouponServiceImpl implements WxCouponService { @Autowired WxMerchantMapper wxMerchantMapper; - @Lazy + @Autowired WxCouponChannelService wxCouponChannelService; - @Lazy + @Autowired WxCouponSendService wxCouponSendService; - @Lazy + @Autowired WxOrderService wxOrderService; - @Lazy + @Autowired WxScreenAdService wxScreenAdService; @@ -86,7 +85,7 @@ public class WxCouponServiceImpl implements WxCouponService { @Autowired WxCouponPasswordMapper couponPasswordMapper; - @Lazy + @Autowired WxCouponPasswordService couponPasswordService; @@ -98,16 +97,16 @@ public class WxCouponServiceImpl implements WxCouponService { @Autowired WxCardTransferInfoMapper wxCardTransferInfoMapper; - @Lazy + @Autowired ExcelService excelService; - @Lazy + @Autowired WxCardDataExporter cardDataExporter; - @Lazy + @Autowired WxCouponDataExporter couponDataExporter; - @Lazy + @Autowired WxPressDataExporter pressDataExporter; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index e4a2867b6..876cc7a9c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -68,7 +68,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Autowired MallUserInfoMapper mallUserInfoMapper; - @Lazy + @Autowired WxScoreRulesService wxScoreRulesService; @@ -80,20 +80,20 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Autowired RedisLock redisLock; - @Lazy + @Autowired ExcelService excelService; @Autowired WxLevelConfigMapper wxLevelConfigMapper; - @Lazy + @Autowired private WxMallService wxMallService; @Lazy @Autowired private WxMsgService wxMsgService; - @Lazy + @Autowired private WxTemplateMsgService wxTemplateMsgService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCustomizeModuleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCustomizeModuleServiceImpl.java index 1baf375fa..832d8e962 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCustomizeModuleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCustomizeModuleServiceImpl.java @@ -13,7 +13,6 @@ import com.iformall.service.WxMiniappThemeService; 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -28,10 +27,10 @@ public class WxCustomizeModuleServiceImpl implements WxCustomizeModuleService { @Autowired WxCustomizeModuleMapper wxCustomizeModuleMapper; - @Lazy + @Autowired WxMiniappThemeService wxMiniappThemeService; - @Lazy + @Autowired WxAppinfoService wxAppinfoService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 7b5aabc13..63290729a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -41,7 +41,6 @@ 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.Service; import org.springframework.transaction.annotation.Propagation; @@ -59,33 +58,24 @@ import java.util.*; @Service public class WxFlowServiceImpl implements WxFlowService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private RuntimeService runtimeService; - @Lazy @Autowired private TaskService taskService; - @Lazy @Autowired private RepositoryService repositoryService; - @Lazy @Autowired private ProcessEngine processEngine; - @Lazy @Autowired private WxRentContractService wxRentContractService; - @Lazy @Autowired private WxFlowRecordService wxFlowRecordService; - @Lazy @Autowired private MallUserInfoService mallUserInfoService; - @Lazy @Autowired private WxPropertyContractMapper wxPropertyContractMapper; @Autowired private WxPropertyContractService wxPropertyContractService; - @Lazy @Autowired private WxFlowRecordMapper wxFlowRecordMapper; @Autowired @@ -94,28 +84,23 @@ public class WxFlowServiceImpl implements WxFlowService { private WxFlowModelMapper wxFlowModelMapper; @Autowired private WxFlowConfigMapper wxFlowConfigMapper; - @Lazy @Autowired private WxBillAllService wxBillAllService; @Autowired private WxCouponMapper wxCouponMapper; - @Lazy @Autowired private WxCouponService wxCouponService; @Autowired private WxRentContractMapper wxRentContractMapper; @Autowired private WxBillSettleMapper wxBillSettleMapper; - @Lazy @Autowired private WxBillSettleService wxBillSettleService; - @Lazy - @Autowired - private WxCashOutService wxCashOutService; @Autowired @Qualifier("couponChannelRedisTemplate") RedisTemplate> cdRedisTemplate; - + @Autowired + private WxCashOutService wxCashOutService; @Override public void wxFlowConfigInit(String tenantId) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index 351f1aa98..717a6b250 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -29,7 +29,6 @@ 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.stereotype.Service; @@ -54,25 +53,25 @@ public class WxGameServiceImpl implements WxGameService { @Autowired WxCouponChannelMapper wxCouponChannelMapper; - @Lazy + @Autowired WxCouponService wxCouponService; @Autowired WxCouponOrderMapper wxCouponOrderMapper; - @Lazy + @Autowired WxCouponChannelService wxCouponChannelService; - @Lazy + @Autowired WxGameTemplateService wxGameTemplateService; @Autowired WxGameActionLogMapper wxGameActionLogMapper; - @Lazy + @Autowired private QrCodeService qrCodeService; - @Lazy + @Autowired private WxOrderService wxOrderService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 34a300a9a..e35266b6d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -26,7 +26,6 @@ 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.stereotype.Service; @@ -52,7 +51,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; - @Lazy + @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index 1b9036c04..40616f8d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -22,7 +22,6 @@ 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.Service; @@ -32,7 +31,7 @@ import java.util.stream.Collectors; @Service public class WxMallBuildingServiceImpl implements WxMallBuildingService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy + @Autowired WxMallService wxMallService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index e54420f01..fc0a5e5e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -23,7 +23,6 @@ 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.stereotype.Service; @@ -47,7 +46,7 @@ public class WxMallServiceImpl implements WxMallService { @Autowired WxMallFloorMapper wxMallFloorMapper; - @Lazy + @Autowired MallUserInfoService userInfoService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 9b483f204..2e5a068a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -25,7 +25,6 @@ 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 org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; @@ -67,10 +66,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxCouponMapper wxCouponMapper; - @Lazy + @Autowired WxCouponService wxCouponService; - @Lazy + @Autowired WxProfitSharingReceiverService wxProfitSharingReceiverService; @@ -85,13 +84,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxCouponMerchantMapper wxCouponMerchantMapper; - @Lazy + @Autowired WxRentContractService wxRentContractService; - @Lazy + @Autowired WxLevelConfigService wxLevelConfigService; - @Lazy + @Autowired ExcelService excelService; @@ -100,10 +99,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxProfitSharingReceiverMapper wxProfitSharingReceiverMapper; - @Lazy + @Autowired WxPropertyContractService wxPropertyContractService; - @Lazy + @Autowired WxMallService wxMallService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 3b54188cc..fbbb32997 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -13,7 +13,6 @@ import com.iformall.service.ExcelService; import com.iformall.service.WxMerchantSubsidyService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -30,7 +29,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { @Autowired WxMerchantSubsidyMapper wxMerchantSubsidyMapper; - @Lazy + @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index b3c15fc51..1a6ede0cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -19,7 +19,6 @@ import com.iformall.utils.DateUtils; 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 javax.servlet.http.HttpServletRequest; @@ -34,16 +33,16 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Autowired WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; - @Lazy + @Autowired WxMerchantBUserService wxMerchantBUserService; - @Lazy + @Autowired WxMerchantService wxMerchantService; - @Lazy + @Autowired WxMallService wxMallService; - @Lazy + @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 45c14f407..51c2c08f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -41,12 +41,15 @@ import java.util.stream.Collectors; public class WxMsgServiceImpl implements WxMsgService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Lazy @Autowired WxMsgMapper wxMsgMapper; + @Lazy @Autowired WxCUserMapper wxCUserMapper; + @Lazy @Autowired WxMsgConfigMapper wxMsgConfigMapper; @@ -54,18 +57,23 @@ public class WxMsgServiceImpl implements WxMsgService { @Autowired WxCUserTagsService wxCUserTagsService; + @Lazy @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; + @Lazy @Autowired WxMsgCallbackMapper wxMsgCallbackMapper; + @Lazy @Autowired WxMsgModelMapper wxMsgModelMapper; + @Lazy @Autowired WxTemplateMsgMapper wxTemplateMsgMapper; + @Lazy @Autowired MqBaseProducer mqBaseProducer; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index d04006afb..1846aea47 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -24,7 +24,6 @@ import com.iformall.utils.RedisLock; 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -48,7 +47,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { @Autowired WxOrderMapper wxOrderMapper; - @Lazy + @Autowired WxOrderService wxOrderService; @@ -66,7 +65,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { @Autowired WxAppinfoMapper wxAppinfoMapper; - @Lazy + @Autowired WxRefundOrderService wxRefundOrderService; @@ -78,10 +77,10 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { @Autowired WxPayOrderMapper wxPayOrderMapper; - @Lazy + @Autowired ExcelService excelService; - @Lazy + @Autowired WxOrderGroupDataExporter orderGroupDataExporter; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java index 51d8ed5b4..50d9af0e9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java @@ -25,7 +25,6 @@ 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.Service; @@ -50,7 +49,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { @Autowired WxCUserMapper userMapper; - @Lazy + @Autowired WxMsgLimitService wxMsgLimitService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index a4b4f5a87..31949ed5f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory; import org.springframework.aop.framework.AopContext; 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.stereotype.Service; @@ -114,13 +113,13 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxCouponOrderMapper wxCouponOrderMapper; - @Lazy + @Autowired WxCouponOrderService wxCouponOrderService; - @Lazy + @Autowired WxCUserService wxCUserService; - @Lazy + @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; @@ -129,22 +128,22 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; - @Lazy + @Autowired WxAppinfoService wxAppinfoService; - @Lazy + @Autowired WxPayOrderService wxPayOrderService; - @Lazy + @Autowired WxScoreRulesService wxScoreRulesService; - @Lazy + @Autowired WxCUserTagsService wxCUserTagsService; - @Lazy + @Autowired WxCouponActionLogService wxCouponActionLogService; - @Lazy + @Autowired WxProfitSharingOrderService wxProfitSharingOrderService; @@ -153,7 +152,7 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxCardInfoMapper wxCardInfoMapper; - @Lazy + @Autowired WxCouponSendService wxCouponSendService; @@ -162,7 +161,7 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxOrderGroupMapper wxOrderGroupMapper; - @Lazy + @Autowired WxCreditHistoryService wxCreditHistoryService; @@ -174,32 +173,31 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired private WxCUserBasicInfoMapper wxCUserBasicInfoMapper; - @Lazy + @Autowired private WxMsgLimitService wxMsgLimitService; @Autowired private WxCouponPasswordMapper couponPasswordMapper; - @Lazy + @Autowired ExcelService excelService; - @Lazy + @Autowired WxCouponService wxCouponService; - @Lazy + @Autowired WxCouponChannelService wxCouponChannelService; @Autowired WxBatchOrderMapper wxBatchOrderMapper; - @Lazy - @Autowired - OrderFactory orderFactory; @Autowired @Qualifier("couponDetailRedisTemplate") RedisTemplate cdRedisTemplate; - + + @Autowired + OrderFactory orderFactory; @Override public PageInfo listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java index 9c9972a15..b10aaefc1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java @@ -13,7 +13,6 @@ import com.iformall.service.WxParkService; 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 com.iformall.common.IdWorker; import org.springframework.transaction.annotation.Transactional; @@ -24,7 +23,7 @@ public class WxParkServiceImpl implements WxParkService { @Autowired WxParkMapper wxParkMapper; - @Lazy + @Autowired WxMallService wxMallService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java index fd6cb2511..2fe5696ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java @@ -16,7 +16,6 @@ import com.iformall.utils.MaUtil; 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 com.iformall.common.IdWorker; @@ -26,7 +25,7 @@ public class WxPayAccountServiceImpl implements WxPayAccountService { @Autowired WxPayAccountMapper wxPayAccountMapper; - @Lazy + @Autowired WxAppinfoService wxAppinfoService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java index eb353130d..ebbfff2c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -24,7 +24,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -50,13 +49,13 @@ public class WxPayBillServiceImpl implements WxPayBillService { @Autowired WxBillAllMapper wxBillAllMapper; - @Lazy + @Autowired WxBillAllService wxBillAllService; @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; - @Lazy + @Autowired private WxBillSettleService wxBillSettleService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 9663a722e..8e4cc6f31 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -39,7 +39,6 @@ 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.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -50,6 +49,9 @@ import java.util.*; @Service public class WxPayOrderServiceImpl implements WxPayOrderService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxPayOrderServiceImpl wxPayOrderServiceImpl; @Autowired WxAppinfoMapper wxAppinfoMapper; @@ -57,7 +59,6 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; - @Lazy @Autowired WxCUserService wxCUserService; @@ -66,7 +67,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Autowired WxOrderMapper wxOrderMapper; - @Lazy + @Autowired WxOrderService wxOrderService; @@ -87,13 +88,13 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Autowired WxProfitSharingReceiverMapper wxProfitSharingReceiverMapper; - @Lazy + @Autowired WxCouponOrderService wxCouponOrderService; - @Lazy + @Autowired WxAppinfoService wxAppinfoService; - @Lazy + @Autowired WxOrderGroupService wxOrderGroupService; @@ -102,16 +103,16 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Autowired PosCouponOrderVerifyMapper posCouponOrderVerifyMapper; - @Lazy + @Autowired PayServiceFactory payServiceFactory; - @Lazy + @Autowired WxCashOutService cashOutService; @Autowired WxBatchOrderMapper wxBatchOrderMapper; - @Lazy + @Autowired OrderFactory orderFactory; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 6e061e44d..9aa2938f9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -36,7 +36,6 @@ 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 org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; @@ -79,10 +78,10 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ @Autowired WxCardSpendMapper wxCardSpendMapper; - @Lazy + @Autowired PayServiceFactory payServiceFactory; - @Lazy + @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index f1db18e60..54e7b06ee 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -35,7 +35,6 @@ 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; @@ -68,7 +67,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv WxMerchantMapper wxMerchantMapper; @Autowired private MqBaseProducer mqBaseProducer; - @Lazy + @Autowired PayServiceFactory payServiceFactory; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index d06b3c49f..e2654b38e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -10,7 +10,6 @@ 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.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -25,67 +24,46 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { @Autowired WxProjectConfigMapper wxProjectConfigMapper; - @Lazy @Autowired WxMallService wxMallService; - @Lazy @Autowired WxCouponSendConfigService wxCouponSendConfigService; - @Lazy @Autowired WxMallBuildingService wxMallBuildingService; - @Lazy @Autowired WxMallFloorService wxMallFloorService; - @Lazy @Autowired WxPayAccountService wxPayAccountService; - @Lazy @Autowired WxPayAccountBillService wxPayAccountBillService; - @Lazy @Autowired WxAppinfoService wxAppinfoService; - @Lazy @Autowired WxAuthorizerInfoService wxAuthorizerInfoService; - @Lazy @Autowired MallUserInfoService mallUserInfoService; - @Lazy @Autowired MallRoleService mallRoleService; - @Lazy @Autowired MallUserRoleService mallUserRoleService; - @Lazy @Autowired MallPermissionService mallPermissionService; - @Lazy @Autowired MallRolePermissionService mallRolePermissionService; - @Lazy @Autowired WxMsgConfigService wxMsgConfigService; - @Lazy @Autowired WxParkService wxParkService; - @Lazy @Autowired WxScoreRulesService wxScoreRulesService; - @Lazy @Autowired WxTemplateMsgService wxTemplateMsgService; - @Lazy @Autowired WxQuestionService wxQuestionService; - @Lazy @Autowired WxMsgValidationcodeModelService wxMsgValidationcodeModelService; - @Lazy @Autowired WxFlowService wxFlowService; - @Lazy @Autowired MallUserInfoService userInfoService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index af9a91b59..a3665f58e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -22,7 +22,6 @@ 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 org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -64,16 +63,16 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Autowired WxRentContractMapper wxRentContractMapper; - @Lazy + @Autowired WxFlowService wxFlowService; - @Lazy + @Autowired WxFlowRecordService wxFlowRecordService; - @Lazy + @Autowired WxRentContractService wxRentContractService; - @Lazy + @Autowired WxPayAccountBillService wxPayAccountBillService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java index 2f785228c..4cce1f0b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java @@ -20,7 +20,6 @@ import com.iformall.service.WxQuestionOneselfService; 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +40,7 @@ public class WxQuestionOneselfServiceImpl implements WxQuestionOneselfService { @Autowired WxCampaignMapper wxCampaignMapper; - @Lazy + @Autowired WxCampaignService wxCampaignService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfUserServiceImpl.java index b4b1d7f5b..c605e3be2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfUserServiceImpl.java @@ -23,7 +23,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -48,10 +47,10 @@ public class WxQuestionOneselfUserServiceImpl implements WxQuestionOneselfUserSe @Autowired WxQuestionOneselfTopicMapper wxQuestionOneselfTopicMapper; - @Lazy + @Autowired WxCreditHistoryService wxCreditHistoryService; - @Lazy + @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index e67b0b3d1..28d879ed1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -33,7 +33,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -58,7 +57,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Autowired WxPayAccountMapper wxPayAccountMapper; - @Lazy + @Autowired WxOrderService wxOrderService; @@ -85,7 +84,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Autowired WxCardInfoMapper cardInfoMapper; - @Lazy + @Autowired PayServiceFactory payServiceFactory; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 909738a47..b677e93cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -34,7 +34,6 @@ import org.joda.time.format.DateTimeFormatter; 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 org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -63,7 +62,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Autowired WxShopMapper wxShopMapper; - @Lazy + @Autowired WxMerchantService wxMerchantService; @@ -87,16 +86,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Autowired WxBrandMapper WxBrandMapper; - @Lazy + @Autowired WxFlowRecordService wxFlowRecordService; - @Lazy + @Autowired RuntimeService runtimeService; - @Lazy + @Autowired private TaskService taskService; - @Lazy + @Autowired private WxFlowService wxFlowService; @@ -108,10 +107,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Autowired WxBillPropertyMapper wxBillPropertyMapper; - @Lazy + @Autowired WxPropertyContractService wxPropertyContractService; - @Lazy + @Autowired WxPayAccountBillService wxPayAccountBillService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index ac952cf08..7dbaa22a3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -24,7 +24,6 @@ import com.iformall.service.WxRentPropertyContractService; 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 org.springframework.util.CollectionUtils; @@ -45,13 +44,13 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract @Autowired WxPropertyContractMapper wxPropertyContractMapper; - @Lazy + @Autowired WxPropertyContractService wxPropertyContractService; - @Lazy + @Autowired WxRentContractService wxRentContractService; - @Lazy + @Autowired WxFlowRecordService wxFlowRecordService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 83fd5bfb5..eac62a601 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -20,7 +20,6 @@ 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.Service; @@ -40,15 +39,15 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { @Autowired WxCUserMapper wxCUserMapper; @Autowired - WxMerchantMapper wxMerchantMapper; - @Lazy - @Autowired WxCUserService wxCUserService; @Autowired @Qualifier("scoreRuleRedisTemplate") RedisTemplate scoreRulesRedisTemplate; + @Autowired + WxMerchantMapper wxMerchantMapper; + @Override public void wxScoreRulesInit(String tenantId) { WxScoreRules wxScoreRules = new WxScoreRules(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java index d7453626f..8479b5a53 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -25,7 +25,6 @@ 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.stereotype.Service; import java.util.Date; @@ -37,13 +36,13 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { @Autowired WxScreenAdMapper wxScreenAdMapper; - @Lazy + @Autowired WxAppinfoService wxAppinfoService; @Autowired WxCouponChannelMapper wxCouponChannelMapper; - @Lazy + @Autowired WxMerchantService wxMerchantService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index bcd96bd59..e4f21908f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -24,7 +24,6 @@ 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 javax.servlet.http.HttpServletRequest; @@ -41,7 +40,7 @@ public class WxShopServiceImpl implements WxShopService { @Autowired WxMerchantShopMapper wxMerchantShopMapper; - @Lazy + @Autowired ExcelService excelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java index 98e750101..863094885 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java @@ -28,7 +28,6 @@ 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 com.iformall.common.IdWorker; @@ -46,7 +45,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { @Autowired WxAppinfoMapper wxAppinfoMapper; - @Lazy + @Autowired WxAppinfoService wxAppinfoService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java index 42855e608..a55bcb473 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java @@ -16,7 +16,6 @@ import com.iformall.service.WxTagsTypeService; 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 com.iformall.common.IdWorker; @@ -26,10 +25,10 @@ public class WxTagsServiceImpl implements WxTagsService { @Autowired WxTagsMapper wxTagsMapper; - @Lazy + @Autowired private WxTagsTypeService wxTagsTypeService; - @Lazy + @Autowired private WxTagsGroupService wxTagsGroupService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java index 6b3069225..95b60e3f0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -23,7 +23,6 @@ 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; @@ -38,13 +37,12 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { @Autowired private boolean isFmOpen; - @Lazy @Autowired private WxAppinfoService wxAppinfoService; - @Lazy + @Autowired private FmOpenService openService; - @Lazy + @Autowired MaUtil maUtil; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 805c8332c..a647cb566 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -17,7 +17,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -35,7 +34,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService private final Logger logger = LoggerFactory.getLogger(this.getClass()); private static final String THIRD_CIRCLE_KEY = "CIRCLE:TH:"; - @Lazy + @Autowired ExcelService excelService; @@ -44,19 +43,19 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService @Autowired WxThirdPartyOrdersMapper wxThirdPartyOrdersMapper; - @Lazy + @Autowired WxMerchantService wxMerchantService; - @Lazy + @Autowired WxCUserService wxCUserService; - @Lazy + @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy + @Autowired WxCreditHistoryService wxCreditHistoryService; - @Lazy + @Autowired WxCouponSendService wxCouponSendService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index f12ac7556..8a94377ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -24,7 +24,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import com.iformall.common.ResultData; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; @@ -46,10 +45,10 @@ public class WxTopicServiceImpl implements WxTopicService { @Autowired private WxCouponChannelMapper wxCouponChannelMapper; - @Lazy + @Autowired private QrCodeService qrCodeService; - @Lazy + @Autowired private WxCouponChannelService wxCouponChannelService; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index 1032a99cd..4d87f6b62 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -28,7 +28,6 @@ import com.iformall.utils.JsonUtil; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import java.io.Serializable; import java.util.ArrayList; @@ -40,7 +39,6 @@ import java.util.stream.Collectors; public class InvestBaseServiceImpl, T> extends ServiceImpl implements InvestBaseService { - @Lazy @Autowired private InvestMessageService messageService; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index c0938b157..6cac49e00 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -32,7 +32,6 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,49 +47,34 @@ import java.util.function.Function; @Service public class InvestBizServiceImpl implements InvestBizService { - @Lazy @Autowired private InvestDemandService demandService; - @Lazy @Autowired private InvestTaskService taskService; - @Lazy @Autowired private InvestFollowRecordService followRecordService; - @Lazy @Autowired private InvestOperateRecordService operateRecordService; - @Lazy @Autowired private InvestRemindService remindService; - @Lazy @Autowired private InvestMessageService messageService; - @Lazy @Autowired private WxShopService shopService; - @Lazy @Autowired private InvestCustomerService customerService; - @Lazy @Autowired private WxBrandService brandService; - @Lazy @Autowired private MallUserInfoService userInfoService; - @Lazy @Autowired private WxBusinessService businessService; - @Lazy @Autowired private WxRentContractService rentContractService; - @Lazy @Autowired private ExcelService excelService; - @Autowired StringRedisTemplate stringRedisTemplate; - @Autowired private String fmUploadDir; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java index 7870de844..9f3da6fe6 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java @@ -13,7 +13,6 @@ import com.iformall.service.WxBusinessService; import com.iformall.service.invest.InvestCustomerService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.io.Serializable; @@ -26,10 +25,8 @@ import static com.iformall.service.invest.InvestHelper.isTrue; @Service public class InvestCustomerServiceImpl extends InvestBaseServiceImpl implements InvestCustomerService { - @Lazy @Autowired private WxBrandService brandService; - @Lazy @Autowired private WxBusinessService businessService ; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java index 750ea97b2..dbc0ba1c1 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java @@ -10,7 +10,6 @@ import com.iformall.service.WxShopService; import com.iformall.service.invest.InvestCustomerService; import com.iformall.service.invest.InvestDemandService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.*; @@ -19,13 +18,10 @@ import java.util.*; @Service public class InvestDemandServiceImpl extends InvestBaseServiceImpl implements InvestDemandService { - @Lazy @Autowired private WxShopService shopService; - @Lazy @Autowired private MallUserInfoService userInfoService; - @Lazy @Autowired private InvestCustomerService customerService; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java index 9abb8e8a1..2f6c4f4a4 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java @@ -14,7 +14,6 @@ import com.iformall.service.invest.InvestFollowRecordService; import com.iformall.service.invest.InvestHelper; import com.iformall.service.invest.InvestTaskService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.Date; @@ -24,10 +23,8 @@ import java.util.Objects; @Service public class InvestFollowRecordServiceImpl extends InvestBaseServiceImpl implements InvestFollowRecordService { - @Lazy @Autowired private InvestDemandService demandService ; - @Lazy @Autowired private InvestTaskService taskService ; diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index 614fba1af..d481e45a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -19,7 +19,6 @@ import org.apache.rocketmq.common.filter.impl.Op; 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.*; @@ -33,11 +32,9 @@ public class KwBoxServiceImpl implements KwBoxService { @Autowired KwBoxMapper kwBoxMapper; - @Lazy @Autowired KwMeterDataService kwMeterDataService; - @Lazy @Autowired KwMeterService kwMeterService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java index bdea07d67..e490c543d 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java @@ -17,7 +17,6 @@ import com.iformall.service.msg.MsgSendService; 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; @@ -31,10 +30,11 @@ import java.util.Date; public class FmInsideCLoginMsgServiceImpl implements MsgSendService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private CUserServiceFactory cuserFactory; - @Lazy + + private BasicCUserService basicCUserService; + @Autowired private WxCUserFromService wxCUserFromService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCashOutMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCashOutMsgServiceImpl.java index fadcebd2a..bfc30f9e1 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCashOutMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCashOutMsgServiceImpl.java @@ -8,7 +8,6 @@ import com.iformall.service.msg.MsgSendService; 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,7 +15,6 @@ import org.springframework.stereotype.Service; public class FmInsideCashOutMsgServiceImpl implements MsgSendService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCashOutService wxCashOutService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java index 2b5a82aab..740678eba 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java @@ -11,7 +11,6 @@ import com.iformall.service.msg.MsgSendService; 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; /** @@ -23,13 +22,12 @@ import org.springframework.stereotype.Service; public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxCouponOrderService couponOrderService; - @Lazy + @Autowired private WxMerchantBUserService merchantBUserService; - @Lazy + @Autowired private WxMerchantService merchantService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyRefundSuccessMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyRefundSuccessMsgServiceImpl.java index c982cb143..16dd02b67 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyRefundSuccessMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideNotifyRefundSuccessMsgServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.service.msg.MsgSendService; 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.Map; @@ -23,7 +22,6 @@ import java.util.Map; public class FmInsideNotifyRefundSuccessMsgServiceImpl implements MsgSendService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxRefundOrderService wxRefundOrderService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java index 4c9bccbc2..328dddda4 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java @@ -16,7 +16,6 @@ import com.iformall.service.msg.MsgSendService; 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; /** @@ -28,16 +27,15 @@ import org.springframework.stereotype.Service; public class FmInsideOrderSuccessMsgServiceImpl implements MsgSendService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy @Autowired private WxOrderService orderService; - @Lazy + @Autowired private WxCUserBasicInfoService userService; - @Lazy + @Autowired private WxCouponService couponService; - @Lazy + @Autowired private WxCouponChannelService couponChannelService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index e612ab447..5ec0645c7 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -21,7 +21,6 @@ import com.iformall.utils.DateUtils; 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.List; @@ -38,17 +37,15 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { private WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; @Autowired private WxMsgValidationcodeMapper wxMsgValidationcodeMapper; - @Lazy @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; @Autowired private WxMsgModelMapper wxMsgModelMapper; @Autowired private WxMsgMapper wxMsgMapper; - @Lazy @Autowired private WxMsgService wxMsgService; - @Lazy + @Autowired private WxMsgLimitService wxMsgLimitService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java index e63f61dc7..b8dce4782 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java @@ -17,7 +17,6 @@ import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage; 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.ArrayList; @@ -33,7 +32,7 @@ public class SendMpMsgServiceImpl implements MsgSendService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxTemplateMsgMapper wxTemplateMsgMapper; - @Lazy + @Autowired private FmOpenService openService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index c99ee299b..725a76f2a 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -22,7 +22,6 @@ 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.stereotype.Service; import java.util.ArrayList; @@ -41,16 +40,15 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { private boolean isFmOpen; @Autowired private WxTemplateMsgMapper wxTemplateMsgMapper; - @Lazy @Autowired private WxAppinfoService wxAppinfoService; - @Lazy + @Autowired private FmOpenService openService; @Autowired private WxCUserMapper wxCUserMapper; - @Lazy + @Autowired MaUtil maUtil; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index a2e69601a..fa38bc82f 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -22,7 +22,6 @@ 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.stereotype.Service; import java.util.Date; import java.util.List; @@ -42,7 +41,6 @@ public class SendSmsServiceImpl implements MsgSendService { private WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; @Autowired private WxMsgValidationcodeMapper wxMsgValidationcodeMapper; - @Lazy @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java index e6bda1834..e3ae39ed4 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java @@ -20,7 +20,6 @@ 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.ArrayList; @@ -40,7 +39,7 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService { @Autowired private WxTemplateMsgMapper wxTemplateMsgMapper; - @Lazy + @Autowired private FmOpenService openService; diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java index 5dd73c457..5714748c3 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java @@ -3,7 +3,6 @@ package com.iformall.service.msg.impl; 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 com.iformall.domain.po.msg.BaseMsg; @@ -19,7 +18,7 @@ import com.iformall.service.msg.MsgSendService; @Service public class UpdateCouponStockMsgServiceImpl implements MsgSendService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy + @Autowired private WxCouponService wxCouponService; diff --git a/mallinkService/src/main/java/com/iformall/service/order/OrderFactory.java b/mallinkService/src/main/java/com/iformall/service/order/OrderFactory.java index 4f416fac2..65e9326cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/OrderFactory.java +++ b/mallinkService/src/main/java/com/iformall/service/order/OrderFactory.java @@ -1,7 +1,6 @@ package com.iformall.service.order; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.iformall.enums.EnumComposeOrder; @@ -13,16 +12,15 @@ import com.iformall.service.order.impl.batch.OneNumberOneOrderBatchOrderAdapterS @Service public class OrderFactory { - @Lazy @Autowired OneNumberOneOrderBatchOrderAdapterService oneNumberOneOrderBatchOrderAdapterService; - @Lazy + @Autowired MulityNumberOneOrderBatchOrderAdapterService mulityNumberOneOrderBatchOrderAdapterService; - @Lazy + @Autowired SingleOrderAdapterService singleOrderAdapterService; - @Lazy + @Autowired CouponPackageOrderAdapterService couponPackageOrderAdapterService; diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java index 8c3dc65bd..95413cd6b 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java @@ -7,7 +7,6 @@ import java.util.List; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxCouponOrderMapper; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -45,7 +44,6 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic WxCouponOrderMapper wxCouponOrderMapper; @Autowired WxCouponMapper wxCouponMapper; - @Lazy @Autowired WxOrderService wxOrderService; diff --git a/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java b/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java index fa25e9f8b..24899d84c 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java +++ b/mallinkService/src/main/java/com/iformall/service/park/ParkFactory.java @@ -4,7 +4,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.iformall.common.ErrorCode; @@ -23,34 +22,26 @@ import com.iformall.service.park.impl.tjd.TJDParkService; @Service public class ParkFactory { - @Lazy + @Autowired CYFParkService cyfService; - @Lazy @Autowired BoLinkParkService bolinkService; - @Lazy @Autowired DaHuaParkService daHuaService; - @Lazy @Autowired ShangAnParkService shangAnService; - @Lazy @Autowired TJDParkService tjdService; - @Lazy @Autowired JieShunParkService jieshunService; - @Lazy @Autowired HaiKangWeiShiParkService haikangWeishiService; - @Lazy + @Autowired CYFParkCallbackService cyfCallbackService; - @Lazy @Autowired JieShunParkCallbackService jieshunCallBackService; - @Lazy @Autowired HaiKangWeiShiParkCallbackService haikangWeishiCallBackService; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/BaseParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/BaseParkService.java index 5eb9e707b..b374729fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/BaseParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/BaseParkService.java @@ -4,7 +4,6 @@ import java.util.HashMap; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.iformall.common.ResultData; @@ -14,7 +13,7 @@ import com.iformall.service.park.impl.util.ParkHelper; @Service public class BaseParkService { - @Lazy + @Autowired ParkHelper parkHelper; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java index 698820786..6c194f7fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java @@ -9,7 +9,6 @@ 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 org.springframework.web.bind.annotation.RequestBody; @@ -43,20 +42,19 @@ public class EtcpHelper { private final Logger logger = LoggerFactory.getLogger(EtcpHelper.class); private ETCPUtil etcp = new ETCPUtil(); - - @Lazy + @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy + @Autowired WxCUserCarService wxCUserCarService; - @Lazy + @Autowired WxMerchantService wxMerchantService; - @Lazy + @Autowired WxCouponOrderService wxCouponOrderService; - @Lazy + @Autowired ParkHelper parkHelper; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkCallbackService.java index 1cb2129ec..731f13a76 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkCallbackService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkCallbackService.java @@ -8,7 +8,6 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSON; @@ -39,11 +38,11 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Service public class HaiKangWeiShiParkCallbackService extends BaseParkService implements ParkBatchCallBackAdapterService { - - @Lazy + + @Autowired HaiKangWeiShiParkService haiKangWeiShiParkService; - @Lazy + @Autowired WxParkService wxParkService; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java index c837fa173..f3353718e 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java @@ -9,7 +9,6 @@ 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.Service; @@ -58,18 +57,16 @@ import com.iformall.utils.RedisLock; public class HaiKangWeiShiParkService extends BaseParkService implements ParkAdapterService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy - @Autowired - ParkHelper parkHelper; @Autowired - RedisLock redisLock; + ParkHelper parkHelper; @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; - + @Autowired + RedisLock redisLock; HaiKangWeiShiUtil haikang = new HaiKangWeiShiUtil(); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java index 8c3f8af85..ab53e3ca9 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java @@ -8,7 +8,6 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSON; @@ -34,10 +33,10 @@ import lombok.extern.slf4j.Slf4j; @Service public class JieShunParkCallbackService extends BaseParkService implements ParkBatchCallBackAdapterService { - @Lazy + @Autowired JieShunParkService jieshunParkService; - @Lazy + @Autowired WxParkService wxParkService; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java index 90912336a..57702dbbd 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java @@ -9,7 +9,6 @@ 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.Service; @@ -55,7 +54,7 @@ import com.iformall.utils.RedisLock; public class JieShunParkService extends BaseParkService implements ParkAdapterService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy + @Autowired ParkHelper parkHelper; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java index 89302f8a0..713aed2be 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java @@ -5,7 +5,6 @@ import java.util.Map; 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 com.alibaba.fastjson.JSON; @@ -26,7 +25,7 @@ import com.iformall.service.park.impl.BaseParkService; public class ShangAnParkService extends BaseParkService implements ParkAdapterService{ private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy + @Autowired WxCouponOrderService wxCouponOrderService; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java index f7ab9796e..71f3459b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java @@ -7,7 +7,6 @@ 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 org.springframework.web.bind.annotation.RequestBody; @@ -38,21 +37,21 @@ import com.iformall.service.park.impl.util.ParkHelper; public class TJDParkService extends BaseParkService implements ParkAdapterService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Lazy + @Autowired ParkHelper parkHelper; TJDUtil tjd = new TJDUtil(); - @Lazy + @Autowired WxCUserCarService wxCUserCarService; - @Lazy + @Autowired WxScoreRulesService wxScoreRulesService; - @Lazy + @Autowired WxCUserTagsService wxCUserTagsService; - @Lazy + @Autowired WxCouponService couponService; diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java index 740a15103..a4d64b724 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java @@ -7,7 +7,6 @@ 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 com.iformall.common.ErrorCode; @@ -28,18 +27,18 @@ import com.iformall.service.WxScoreRulesService; @Service public class ParkHelper { private final Logger logger = LoggerFactory.getLogger(ParkHelper.class); - @Lazy - @Autowired - WxCUserCarService wxCUserCarService; - @Lazy - @Autowired - WxScoreRulesService wxScoreRulesService; - @Lazy - @Autowired - WxCUserTagsService wxCUserTagsService; - @Lazy - @Autowired - WxCreditHistoryService wxCreditHistoryService; + + @Autowired + WxCUserCarService wxCUserCarService; + + @Autowired + WxScoreRulesService wxScoreRulesService; + + @Autowired + WxCUserTagsService wxCUserTagsService; + + @Autowired + WxCreditHistoryService wxCreditHistoryService; public WxCUserCar getOne(WxPark park, Long cuUserId,String carNumber,EnumCarVendor carVendor) { WxCUserCar userCar = new WxCUserCar(); diff --git a/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoOrderTagsDeveloper.java b/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoOrderTagsDeveloper.java index 04e10c027..70e6110ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoOrderTagsDeveloper.java +++ b/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoOrderTagsDeveloper.java @@ -5,7 +5,6 @@ import java.util.Date; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.iformall.domain.po.JmSportOrder; @@ -21,11 +20,9 @@ import com.iformall.service.tags.TagsDeveloper; @Service public class JinMaoOrderTagsDeveloper implements TagsDeveloper { - - @Lazy + @Autowired WxCUserTagsServiceHelper wxCUserTagsServiceHelper; - @Lazy @Autowired WxCUserTagsService wxCUserTagsService; diff --git a/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoUserTagsDeveloper.java b/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoUserTagsDeveloper.java index c9002f919..43ae986fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoUserTagsDeveloper.java +++ b/mallinkService/src/main/java/com/iformall/service/tags/jinmao/JinMaoUserTagsDeveloper.java @@ -4,7 +4,6 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.iformall.domain.po.WxCUserBasicInfo; @@ -18,10 +17,9 @@ import com.iformall.service.tags.TagsDeveloper; @Service public class JinMaoUserTagsDeveloper implements TagsDeveloper{ - @Lazy + @Autowired WxCUserTagsServiceHelper wxCUserTagsServiceHelper; - @Lazy @Autowired WxCUserTagsService wxCUserTagsService; diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java index 332ff2517..885ef3215 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java @@ -25,7 +25,6 @@ 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 org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -60,13 +59,13 @@ public class TtOrderServiceImpl implements TtOrderService { // @Autowired // private WxCUserBasicInfoService wxCUserBasicInfoService; - @Lazy + @Autowired private TtCUserService ttCUserService; - @Lazy + @Autowired private WxAppinfoService wxAppinfoService; - @Lazy + @Autowired private WxPayAccountService payAccountService; diff --git a/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java b/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java index 6569b8716..e8afbaddb 100644 --- a/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java +++ b/mallinkVideo/src/main/java/com/iformall/video/VideoFactory.java @@ -5,7 +5,6 @@ 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; @@ -17,7 +16,6 @@ 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 114891044..7daefbf1e 100644 --- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java +++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java @@ -14,7 +14,6 @@ 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;