Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
b8daa10f1b
100 измененных файлов: 423 добавлений и 1 удалений
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java
  3. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java
  4. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java
  5. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java
  6. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java
  7. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java
  8. +15
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  9. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java
  10. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java
  11. +10
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java
  12. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java
  13. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java
  14. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  15. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java
  16. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java
  17. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java
  18. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java
  19. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java
  20. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java
  21. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java
  22. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java
  23. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java
  24. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java
  25. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
  26. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java
  27. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java
  28. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java
  29. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java
  30. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  31. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  32. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java
  33. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java
  34. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  35. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  36. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java
  37. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  38. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java
  39. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java
  40. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
  41. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
  42. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java
  43. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  44. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java
  45. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
  46. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java
  47. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
  48. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  49. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java
  50. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
  51. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WxDataRuleTargetController.java
  52. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WxUserDataRuleController.java
  53. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java
  54. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java
  55. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
  56. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java
  57. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java
  58. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java
  59. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java
  60. +7
    -0
      mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java
  61. +4
    -0
      mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java
  62. +7
    -0
      mallinkBApi/src/main/java/com/iformall/controller/BaseController.java
  63. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/PosController.java
  64. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/UploadController.java
  65. +6
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java
  66. +9
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java
  67. +4
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java
  68. +10
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  69. +10
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  70. +14
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  71. +8
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  72. +6
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java
  73. +5
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  74. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java
  75. +8
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  76. +3
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java
  77. +5
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java
  78. +4
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java
  79. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java
  80. +7
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  81. +10
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  82. +4
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  83. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java
  84. +4
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java
  85. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java
  86. +3
    -0
      mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java
  87. +3
    -0
      mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java
  88. +11
    -0
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  89. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java
  90. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/UploadController.java
  91. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java
  92. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java
  93. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java
  94. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java
  95. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java
  96. +4
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
  97. +15
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  98. +7
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java
  99. +3
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  100. +7
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java Просмотреть файл

@@ -20,6 +20,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfiguration;
@@ -50,9 +51,11 @@ public class WebConfig implements WebMvcConfigurer {
@Autowired @Autowired
private CurrentTenantInterceptor tenantInterceptor; private CurrentTenantInterceptor tenantInterceptor;


@Lazy
@Autowired @Autowired
private MallResourceService mallResourceService; private MallResourceService mallResourceService;


@Lazy
@Autowired @Autowired
private AliyunOSS aliyunOSS; private AliyunOSS aliyunOSS;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java Просмотреть файл

@@ -6,11 +6,13 @@ import me.chanjar.weixin.mp.config.WxMpConfigStorage;
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;


@Component @Component
public class WechatMpConfig { public class WechatMpConfig {


@Lazy
@Autowired @Autowired
private WechatWebProperties wechatWebProperties; private WechatWebProperties wechatWebProperties;




+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java Просмотреть файл

@@ -14,6 +14,7 @@ import org.apache.shiro.session.UnknownSessionException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.StringRedisTemplate;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -26,12 +27,15 @@ import java.util.concurrent.TimeUnit;
public class AsyncTask { public class AsyncTask {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Lazy
@Autowired @Autowired
private WxTagsService wxTagsService; private WxTagsService wxTagsService;


@Lazy
@Autowired @Autowired
StringRedisTemplate stringRedisTemplate; StringRedisTemplate stringRedisTemplate;




+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java Просмотреть файл

@@ -18,6 +18,7 @@ import org.apache.shiro.session.UnknownSessionException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.StringRedisTemplate;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -32,12 +33,15 @@ import java.util.concurrent.TimeUnit;
public class BillDailyAsyncTask { public class BillDailyAsyncTask {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxBillDailyService wxBillDailyService; private WxBillDailyService wxBillDailyService;


@Lazy
@Autowired @Autowired
StringRedisTemplate stringRedisTemplate; StringRedisTemplate stringRedisTemplate;


@Lazy
@Autowired @Autowired
WxShopMapper wxShopMapper; WxShopMapper wxShopMapper;




+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java Просмотреть файл

@@ -22,6 +22,7 @@ import org.apache.shiro.session.UnknownSessionException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.StringRedisTemplate;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -39,18 +40,23 @@ import java.util.stream.Collectors;
public class ImportTemplateTask { public class ImportTemplateTask {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Lazy
@Autowired @Autowired
private WxTagsService wxTagsService; private WxTagsService wxTagsService;


@Lazy
@Autowired @Autowired
StringRedisTemplate stringRedisTemplate; StringRedisTemplate stringRedisTemplate;


@Lazy
@Autowired @Autowired
private WxBillAllService wxBillAllService; private WxBillAllService wxBillAllService;


@Lazy
@Autowired @Autowired
private WxMerchantMapper wxMerchantMapper; private WxMerchantMapper wxMerchantMapper;




+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java Просмотреть файл

@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.ArrayList; import java.util.ArrayList;
@@ -30,12 +31,15 @@ import java.util.List;
public class MemCouponController extends BaseController { public class MemCouponController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCouponChannelService couponChannelService; private WxCouponChannelService couponChannelService;


@Lazy
@Autowired @Autowired
private MemCouponFromDspService memCouponFromDspService; private MemCouponFromDspService memCouponFromDspService;


@Lazy
@Autowired @Autowired
private WxCouponService couponService; private WxCouponService couponService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java Просмотреть файл

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -24,6 +25,7 @@ public class UserBasicInfoAddressController extends BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private UserBasicInfoAddressService userBasicInfoAddressService; private UserBasicInfoAddressService userBasicInfoAddressService;




+ 15
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java Просмотреть файл

@@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.StringRedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -50,45 +51,59 @@ import java.util.stream.Collectors;
public class WxCUserBasicInfoController extends BaseController { public class WxCUserBasicInfoController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private String fmUploadDir; private String fmUploadDir;


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Lazy
@Autowired @Autowired
private WxCUserBasicChildService wxCUserBasicChildService; private WxCUserBasicChildService wxCUserBasicChildService;


@Lazy
@Autowired @Autowired
private WxCUserTagsService wxCUserTagsService; private WxCUserTagsService wxCUserTagsService;


@Lazy
@Autowired @Autowired
private WxCUserCarService wxCUserCarService; private WxCUserCarService wxCUserCarService;


@Lazy
@Autowired @Autowired
private WxCouponOrderService wxCouponOrderService; private WxCouponOrderService wxCouponOrderService;


@Lazy
@Autowired @Autowired
private WxCouponService wxCouponService; private WxCouponService wxCouponService;


@Lazy
@Autowired @Autowired
private WxLevelConfigService wxLevelConfigService; private WxLevelConfigService wxLevelConfigService;


@Lazy
@Autowired @Autowired
WxCarPayRecordService wxCarPayRecordService; WxCarPayRecordService wxCarPayRecordService;


@Lazy
@Autowired @Autowired
StringRedisTemplate stringRedisTemplate; StringRedisTemplate stringRedisTemplate;


@Lazy
@Autowired @Autowired
private AsyncTask asyncTask; private AsyncTask asyncTask;


@Lazy
@Autowired @Autowired
private ExcelService excelService; private ExcelService excelService;


@Lazy
@Autowired @Autowired
private WxMerchantMapper wxMerchantMapper; private WxMerchantMapper wxMerchantMapper;


@Lazy
@Autowired @Autowired
private WxCreditHistoryService wxCreditHistoryService; private WxCreditHistoryService wxCreditHistoryService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java Просмотреть файл

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
public class WxCUserCarController extends BaseController { public class WxCUserCarController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserCarService wxCUserCarService; private WxCUserCarService wxCUserCarService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java Просмотреть файл

@@ -5,6 +5,7 @@ import com.iformall.controller.base.BaseController;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@@ -22,6 +23,7 @@ import io.swagger.annotations.ApiOperation;
public class WxCUserController extends BaseController { public class WxCUserController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserService wxCUserService; private WxCUserService wxCUserService;




+ 10
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java Просмотреть файл

@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -41,14 +42,23 @@ import io.swagger.annotations.ApiOperation;
public class WxCUserDataController extends BaseController { public class WxCUserDataController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private CUserServiceFactory cuserFactory; private CUserServiceFactory cuserFactory;
@Lazy
@Autowired @Autowired
private WxUserVisitService wxUserVisitService; private WxUserVisitService wxUserVisitService;
@Lazy
@Autowired @Autowired
private WxCouponOrderService wxCouponOrderService; private WxCouponOrderService wxCouponOrderService;
@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;
@Lazy
@Autowired @Autowired
private WxMallService wxMallService; private WxMallService wxMallService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserFromController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -24,6 +25,7 @@ import javax.servlet.http.HttpServletResponse;
public class WxCUserFromController extends BaseController { public class WxCUserFromController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserFromService wxCUserFromService; private WxCUserFromService wxCUserFromService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java Просмотреть файл

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
public class WxCUserTagsController extends BaseController { public class WxCUserTagsController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserTagsService wxCUserTagsService; private WxCUserTagsService wxCUserTagsService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java Просмотреть файл

@@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -38,9 +39,11 @@ import java.util.Objects;
public class WxCreditHistoryController extends BaseController { public class WxCreditHistoryController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
WxCreditHistoryService wxCreditHistoryService; WxCreditHistoryService wxCreditHistoryService;


@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java Просмотреть файл

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +36,7 @@ import java.util.List;
public class WxLevelConfigController extends BaseController { public class WxLevelConfigController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxLevelConfigService wxLevelConfigService; private WxLevelConfigService wxLevelConfigService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java Просмотреть файл

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -24,9 +25,11 @@ import org.springframework.web.bind.annotation.*;
public class WxScoreHistoryController extends BaseController { public class WxScoreHistoryController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxScoreHistoryService wxScoreHistoryService; private WxScoreHistoryService wxScoreHistoryService;


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java Просмотреть файл

@@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -26,9 +27,11 @@ import org.springframework.web.bind.annotation.*;
public class WxScoreRulesController extends BaseController { public class WxScoreRulesController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxScoreRulesService wxScoreRulesService; private WxScoreRulesService wxScoreRulesService;


@Lazy
@Autowired @Autowired
private WxMallService wxMallService; private WxMallService wxMallService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java Просмотреть файл

@@ -13,12 +13,15 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@RequestMapping("wxUserChannel") @RequestMapping("wxUserChannel")
public class WxUserChannelController extends BaseController { public class WxUserChannelController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Lazy
@Autowired @Autowired
private WxUserChannelService wxUserChannelService; private WxUserChannelService wxUserChannelService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
public class WxMsgCallbackController extends BaseController { public class WxMsgCallbackController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMsgCallbackService wxMsgCallbackService; private WxMsgCallbackService wxMsgCallbackService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java Просмотреть файл

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
public class WxMsgConfigController extends BaseController { public class WxMsgConfigController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMsgConfigService wxMsgConfigService; private WxMsgConfigService wxMsgConfigService;




+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java Просмотреть файл

@@ -22,6 +22,7 @@ import org.apache.commons.io.IOUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;


@@ -37,12 +38,15 @@ import java.util.*;
public class WxMsgController extends BaseController { public class WxMsgController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private String fmUploadDir; private String fmUploadDir;


@Lazy
@Autowired @Autowired
private WxMsgService wxMsgService; private WxMsgService wxMsgService;


@Lazy
@Autowired @Autowired
WxTemplateMsgService wxTemplateMsgService; WxTemplateMsgService wxTemplateMsgService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
public class WxMsgModelController extends BaseController { public class WxMsgModelController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMsgModelService wxMsgModelService; private WxMsgModelService wxMsgModelService;




+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;


@@ -23,10 +24,15 @@ import java.util.List;
public class WxMsgRecordController extends BaseController { public class WxMsgRecordController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMsgRecordService wxMsgRecordService; private WxMsgRecordService wxMsgRecordService;
@Lazy
@Autowired @Autowired
private MqBaseProducer mqBaseProducer; private MqBaseProducer mqBaseProducer;
@Lazy
@Autowired @Autowired
private SendCallBackSmsServiceImpl sendCallBackSmsService; private SendCallBackSmsServiceImpl sendCallBackSmsService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
public class WxMsgSignatureController extends BaseController { public class WxMsgSignatureController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMsgSignatureService wxMsgSignatureService; private WxMsgSignatureService wxMsgSignatureService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java Просмотреть файл

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParams;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
public class WxMsgValidationcodeController extends BaseController { public class WxMsgValidationcodeController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMsgValidationcodeService wxMsgValidationcodeService; private WxMsgValidationcodeService wxMsgValidationcodeService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
public class WxMsgValidationcodeModelController extends BaseController { public class WxMsgValidationcodeModelController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMsgValidationcodeModelService wxMsgValidationcodeModelService; private WxMsgValidationcodeModelService wxMsgValidationcodeModelService;




+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/ocr/WxOcrController.java Просмотреть файл

@@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;


@@ -45,10 +46,15 @@ import org.springframework.web.multipart.MultipartFile;
public class WxOcrController extends BaseController { public class WxOcrController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxOcrService ocrService; private WxOcrService ocrService;
@Lazy
@Autowired @Autowired
private WxMerchantService merchantService; private WxMerchantService merchantService;
@Lazy
@Autowired @Autowired
private String ocrData; private String ocrData;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java Просмотреть файл

@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;


@@ -40,9 +41,11 @@ import io.swagger.annotations.ApiOperation;
public class AlipayController extends BaseController { public class AlipayController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private AliPayUtil aliPayUtil; private AliPayUtil aliPayUtil;
@Lazy
@Autowired @Autowired
private WxMallService mallService; private WxMallService mallService;




+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java Просмотреть файл

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
public class WxBillActionController extends BaseController { public class WxBillActionController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxBillActionService wxBillActionService; private WxBillActionService wxBillActionService;




+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -29,11 +30,14 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("wxBillAll") @RequestMapping("wxBillAll")
public class WxBillAllController extends BaseController { public class WxBillAllController extends BaseController {
@Lazy
@Autowired @Autowired
private WxBillAllService wxBillAllService; private WxBillAllService wxBillAllService;


private Logger logger = LoggerFactory.getLogger(WxBillAllController.class); private Logger logger = LoggerFactory.getLogger(WxBillAllController.class);


@Lazy
@Autowired @Autowired
WxPayAccountBillService wxPayAccountBillService; WxPayAccountBillService wxPayAccountBillService;




+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java Просмотреть файл

@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.StringRedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -40,15 +41,19 @@ import java.util.concurrent.TimeUnit;
@RequestMapping("wxBillDaily") @RequestMapping("wxBillDaily")
public class WxBillDailyController extends BaseController { public class WxBillDailyController extends BaseController {


@Lazy
@Autowired @Autowired
private String fmUploadDir; private String fmUploadDir;


@Lazy
@Autowired @Autowired
private WxBillDailyService wxBillDailyService; private WxBillDailyService wxBillDailyService;


@Lazy
@Autowired @Autowired
StringRedisTemplate stringRedisTemplate; StringRedisTemplate stringRedisTemplate;


@Lazy
@Autowired @Autowired
private BillDailyAsyncTask billDailyAsyncTask; private BillDailyAsyncTask billDailyAsyncTask;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java Просмотреть файл

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


/** /**
@@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("wxBillDeposit") @RequestMapping("wxBillDeposit")
public class WxBillDepositController extends BaseController { public class WxBillDepositController extends BaseController {
@Lazy
@Autowired @Autowired
private WxBillDepositService wxBillDepositService; private WxBillDepositService wxBillDepositService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiImplicitParams;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -25,6 +26,8 @@ import javax.servlet.http.HttpServletResponse;
@RestController @RestController
@RequestMapping("wxBillOther") @RequestMapping("wxBillOther")
public class WxBillOtherController extends BaseController { public class WxBillOtherController extends BaseController {
@Lazy
@Autowired @Autowired
private WxBillOtherService wxBillOtherService; private WxBillOtherService wxBillOtherService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java Просмотреть файл

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParams;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -24,6 +25,8 @@ import javax.servlet.http.HttpServletResponse;
@RestController @RestController
@RequestMapping("wxBillOtherDeposit") @RequestMapping("wxBillOtherDeposit")
public class WxBillOtherDepositController extends BaseController { public class WxBillOtherDepositController extends BaseController {
@Lazy
@Autowired @Autowired
private WxBillOtherDepositService wxBillOtherDepositService; private WxBillOtherDepositService wxBillOtherDepositService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -25,6 +26,8 @@ import javax.servlet.http.HttpServletResponse;
@RestController @RestController
@RequestMapping("wxBillProperty") @RequestMapping("wxBillProperty")
public class WxBillPropertyController extends BaseController { public class WxBillPropertyController extends BaseController {
@Lazy
@Autowired @Autowired
private WxBillPropertyService wxBillPropertyService; private WxBillPropertyService wxBillPropertyService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java Просмотреть файл

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


/** /**
@@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("wxBillPropertyDeposit") @RequestMapping("wxBillPropertyDeposit")
public class WxBillPropertyDepositController extends BaseController { public class WxBillPropertyDepositController extends BaseController {
@Lazy
@Autowired @Autowired
private WxBillPropertyDepositService wxBillPropertyDepositService; private WxBillPropertyDepositService wxBillPropertyDepositService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -27,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
public class WxBillRentController extends BaseController { public class WxBillRentController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxBillRentService wxBillRentService; private WxBillRentService wxBillRentService;




+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java Просмотреть файл

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -30,10 +31,15 @@ import javax.servlet.http.HttpServletResponse;
public class WxBillSettleController extends BaseController { public class WxBillSettleController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxBillSettleService wxBillSettleService; private WxBillSettleService wxBillSettleService;
@Lazy
@Autowired @Autowired
private WxBillSettleRecordService wxBillSettleRecordService; private WxBillSettleRecordService wxBillSettleRecordService;
@Lazy
@Autowired @Autowired
private WxBillAllService wxBillAllService; private WxBillAllService wxBillAllService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxGooagooController.java Просмотреть файл

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.Map; import java.util.Map;
@@ -21,6 +22,7 @@ import java.util.Map;
public class WxGooagooController extends BaseController { public class WxGooagooController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
WxGooagooService wxGooagooService; WxGooagooService wxGooagooService;




+ 8
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java Просмотреть файл

@@ -33,6 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@@ -55,24 +56,31 @@ public class HomeController extends BaseController {
@Value("${version}") @Value("${version}")
private String version; private String version;


@Lazy
@Autowired @Autowired
private Producer producer; private Producer producer;


@Lazy
@Autowired @Autowired
private MallUserInfoService mallUserInfoService; private MallUserInfoService mallUserInfoService;


@Lazy
@Autowired @Autowired
private MallUserRoleService mallUserRoleService; private MallUserRoleService mallUserRoleService;


@Lazy
@Autowired @Autowired
private WxAppinfoService appinfoService; private WxAppinfoService appinfoService;


@Lazy
@Autowired @Autowired
private WxMsgValidationcodeService wxMsgValidationcodeService; private WxMsgValidationcodeService wxMsgValidationcodeService;


@Lazy
@Autowired @Autowired
private MallUserActionService mallUserActionService; private MallUserActionService mallUserActionService;


@Lazy
@Autowired @Autowired
private WxMallService mallService; private WxMallService mallService;




+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java Просмотреть файл

@@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.ArrayList; import java.util.ArrayList;
@@ -34,12 +35,15 @@ public class MallRoleController extends BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private MallRoleService sysRoleService; private MallRoleService sysRoleService;


@Lazy
@Autowired @Autowired
private MallRolePermissionService sysRolePermissionService; private MallRolePermissionService sysRolePermissionService;


@Lazy
@Autowired @Autowired
private MallUserRoleService mallUserRoleService; private MallUserRoleService mallUserRoleService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java Просмотреть файл

@@ -12,12 +12,15 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@RequestMapping("mallUserAction") @RequestMapping("mallUserAction")
public class MallUserActionController extends BaseController { public class MallUserActionController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Lazy
@Autowired @Autowired
private MallUserActionService mallUserActionService; private MallUserActionService mallUserActionService;




+ 8
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java Просмотреть файл

@@ -22,6 +22,7 @@ import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@@ -39,24 +40,31 @@ public class MallUserInfoController extends BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
MallUserInfoService userInfoService; MallUserInfoService userInfoService;


@Lazy
@Autowired @Autowired
MallUserRoleService userRoleService; MallUserRoleService userRoleService;


@Lazy
@Autowired @Autowired
MallRoleService mallRoleService; MallRoleService mallRoleService;


@Lazy
@Autowired @Autowired
MallUserRoleService mallUserRoleService; MallUserRoleService mallUserRoleService;


@Lazy
@Autowired @Autowired
MallPermissionService mallPermissionService; MallPermissionService mallPermissionService;


@Lazy
@Autowired @Autowired
MallRolePermissionService mallRolePermissionService; MallRolePermissionService mallRolePermissionService;


@Lazy
@Autowired @Autowired
WxMsgValidationcodeService wxMsgValidationcodeService; WxMsgValidationcodeService wxMsgValidationcodeService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/SysConfigController.java Просмотреть файл

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;


@@ -27,6 +28,7 @@ import java.util.List;
public class SysConfigController extends BaseController { public class SysConfigController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private SysConfigService sysConfigService; private SysConfigService sysConfigService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java Просмотреть файл

@@ -25,6 +25,7 @@ import org.apache.shiro.util.Assert;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,9 +46,11 @@ import java.util.*;
public class SysMenuController extends BaseController { public class SysMenuController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private MallPermissionService mallPermissionService; private MallPermissionService mallPermissionService;


@Lazy
@Autowired @Autowired
private MallUserInfoService mallUserInfoService; private MallUserInfoService mallUserInfoService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/SysNoticeController.java Просмотреть файл

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;


@@ -19,6 +20,7 @@ import java.util.List;
public class SysNoticeController extends BaseController { public class SysNoticeController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private SysNoticeService sysNoticeService; private SysNoticeService sysNoticeService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java Просмотреть файл

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;


@@ -27,6 +28,7 @@ public class UploadController extends BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private AliyunOSS aliyunOSS; private AliyunOSS aliyunOSS;




+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -37,6 +37,7 @@ import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisCallback;
@@ -61,18 +62,23 @@ import java.util.*;
public class WechatLoginController extends BaseController { public class WechatLoginController extends BaseController {
private String WECHAT_PREV = "LOGIN:OPEN:"; private String WECHAT_PREV = "LOGIN:OPEN:";


@Lazy
@Autowired @Autowired
private WxMpService wxMpService; private WxMpService wxMpService;


@Lazy
@Autowired @Autowired
private MallUserInfoService mallUserInfoService; private MallUserInfoService mallUserInfoService;


@Lazy
@Autowired @Autowired
private MallUserRoleService mallUserRoleService; private MallUserRoleService mallUserRoleService;


@Lazy
@Autowired @Autowired
private MallUserActionService mallUserActionService; private MallUserActionService mallUserActionService;


@Lazy
@Autowired @Autowired
private WxMallService mallService; private WxMallService mallService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java Просмотреть файл

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
public class WxAdminLogController extends BaseController { public class WxAdminLogController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxAdminLogService wxAdminLogService; private WxAdminLogService wxAdminLogService;




+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java Просмотреть файл

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -30,10 +31,15 @@ import java.util.*;
public class WxBusinessController extends BaseController { public class WxBusinessController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxBusinessService wxBusinessService; private WxBusinessService wxBusinessService;
@Lazy
@Autowired @Autowired
private WxSubBusinessService wxSubBusinessService; private WxSubBusinessService wxSubBusinessService;
@Lazy
@Autowired @Autowired
private ExcelService excelService; private ExcelService excelService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/WxDataRuleTargetController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +31,7 @@ import java.util.List;
public class WxDataRuleTargetController extends BaseController { public class WxDataRuleTargetController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxDataRuleTargetService wxDataRuleTargetService; private WxDataRuleTargetService wxDataRuleTargetService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/WxUserDataRuleController.java Просмотреть файл

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


/** /**
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
public class WxUserDataRuleController extends BaseController { public class WxUserDataRuleController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxUserDataRuleService wxUserDataRuleService; private WxUserDataRuleService wxUserDataRuleService;




+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java Просмотреть файл

@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.StringRedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -36,12 +37,15 @@ import java.util.concurrent.TimeUnit;
public class WxImportTemplateController extends BaseController { public class WxImportTemplateController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private String fmUploadDir; private String fmUploadDir;


@Lazy
@Autowired @Autowired
StringRedisTemplate stringRedisTemplate; StringRedisTemplate stringRedisTemplate;


@Lazy
@Autowired @Autowired
private ImportTemplateTask importTemplateTask; private ImportTemplateTask importTemplateTask;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java Просмотреть файл

@@ -47,6 +47,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;


@@ -67,6 +68,7 @@ import java.util.Map;
public class VideoController extends BaseController { public class VideoController extends BaseController {
private Logger logger = LoggerFactory.getLogger(this.getClass()); private Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
VideoFactory videoFactory; VideoFactory videoFactory;


+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java Просмотреть файл

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.*; import java.util.*;


@@ -26,6 +27,7 @@ import java.util.*;
public class WxFlowAbleController extends BaseController { public class WxFlowAbleController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxFlowService wxFlowService; private WxFlowService wxFlowService;




+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/flowable/ContractTaskFinishHandler.java Просмотреть файл

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask; import org.flowable.task.service.delegate.DelegateTask;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -18,8 +19,12 @@ import java.util.Map;
*/ */
@Component(value="contractTaskFinishListener") @Component(value="contractTaskFinishListener")
public class ContractTaskFinishHandler implements TaskListener { public class ContractTaskFinishHandler implements TaskListener {
@Lazy
@Autowired @Autowired
private WxFlowService wxFlowService; private WxFlowService wxFlowService;
@Lazy
@Autowired @Autowired
private WxPropertyContractService wxPropertyContractService; private WxPropertyContractService wxPropertyContractService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java Просмотреть файл

@@ -18,6 +18,7 @@ import org.aspectj.lang.annotation.Pointcut;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
@@ -33,6 +34,7 @@ import java.util.Date;
public class SystemLogAspect { public class SystemLogAspect {
private static final Logger logger = LoggerFactory.getLogger(SystemLogAspect.class); private static final Logger logger = LoggerFactory.getLogger(SystemLogAspect.class);


@Lazy
@Autowired @Autowired
private MallUserActionService mallUserActionService; private MallUserActionService mallUserActionService;




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java Просмотреть файл

@@ -26,6 +26,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;


import java.io.Serializable; import java.io.Serializable;
@@ -41,6 +42,7 @@ import java.util.*;
@Component @Component
public class TableOperateAspect { public class TableOperateAspect {


@Lazy
@Autowired @Autowired
private InvestOperateRecordService operateRecordService; private InvestOperateRecordService operateRecordService;




+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java Просмотреть файл

@@ -19,6 +19,7 @@ import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
@@ -35,9 +36,11 @@ import java.util.HashSet;
public class UserDataRuleAspect { public class UserDataRuleAspect {
private static final Logger logger = LoggerFactory.getLogger(UserDataRuleAspect.class); private static final Logger logger = LoggerFactory.getLogger(UserDataRuleAspect.class);


@Lazy
@Autowired @Autowired
private WxUserDataRuleService wxUserDataRuleService; private WxUserDataRuleService wxUserDataRuleService;


@Lazy
@Autowired @Autowired
private WxRentContractMapper wxRentContractMapper; private WxRentContractMapper wxRentContractMapper;




+ 7
- 0
mallinkAdmin/src/main/java/com/iformall/shiro/ShiroService.java Просмотреть файл

@@ -9,6 +9,7 @@ import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;
import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.apache.shiro.web.servlet.AbstractShiroFilter;
import org.crazycake.shiro.RedisSessionDAO; import org.crazycake.shiro.RedisSessionDAO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;


import com.iformall.service.MallPermissionService; import com.iformall.service.MallPermissionService;


@@ -17,10 +18,16 @@ import com.iformall.service.MallPermissionService;
*/ */
//@Service //@Service
public class ShiroService { public class ShiroService {
@Lazy
@Autowired @Autowired
private ShiroFilterFactoryBean shiroFilterFactoryBean; private ShiroFilterFactoryBean shiroFilterFactoryBean;
@Lazy
@Autowired @Autowired
private MallPermissionService resourcesService; private MallPermissionService resourcesService;
@Lazy
@Autowired @Autowired
private RedisSessionDAO redisSessionDAO; private RedisSessionDAO redisSessionDAO;
/** /**


+ 4
- 0
mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java Просмотреть файл

@@ -17,6 +17,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired; 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.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations; import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -43,12 +44,15 @@ public class RedisCacheAspect {
*/ */
private static final String DELIMITER_KEY = ":"; private static final String DELIMITER_KEY = ":";


@Lazy
@Autowired @Autowired
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;


@Lazy
@Autowired @Autowired
RedisLock redisLock; RedisLock redisLock;


@Lazy
@Autowired @Autowired
private WxBuserTokenService userTokenService; private WxBuserTokenService userTokenService;




+ 7
- 0
mallinkBApi/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -18,6 +18,7 @@ import com.iformall.utils.Constant;
import com.iformall.utils.IPUtil; import com.iformall.utils.IPUtil;
import com.iformall.utils.MaUtil; import com.iformall.utils.MaUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -35,18 +36,24 @@ import java.util.Date;
public class BaseController { public class BaseController {
@Autowired @Autowired
private boolean isFmOpen; private boolean isFmOpen;
@Lazy
@Autowired @Autowired
private WxMerchantBUserService wxMerchantBUserService; private WxMerchantBUserService wxMerchantBUserService;


@Lazy
@Autowired @Autowired
private WxAppinfoService wxAppinfoService; private WxAppinfoService wxAppinfoService;


@Lazy
@Autowired @Autowired
private FmOpenService openService; private FmOpenService openService;


@Lazy
@Autowired @Autowired
private CUserTokenService cUserTokenService; private CUserTokenService cUserTokenService;
@Lazy
@Autowired @Autowired
MaUtil maUtil; MaUtil maUtil;




+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/PosController.java Просмотреть файл

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.Map; import java.util.Map;
@@ -23,6 +24,7 @@ import java.util.Map;
public class PosController extends BaseController { public class PosController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private PosBrunService posService; private PosBrunService posService;




+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/UploadController.java Просмотреть файл

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;


@@ -26,6 +27,7 @@ public class UploadController extends BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private AliyunOSS aliyunOSS; private AliyunOSS aliyunOSS;




+ 6
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java Просмотреть файл

@@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -31,10 +32,15 @@ import java.util.Map;
public class WxBillController extends BaseController { public class WxBillController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
WxBillAllService wxBillAllService; WxBillAllService wxBillAllService;
@Lazy
@Autowired @Autowired
WxMerchantService wxMerchantService; WxMerchantService wxMerchantService;
@Lazy
@Autowired @Autowired
WxBillSettleService wxBillSettleService; WxBillSettleService wxBillSettleService;




+ 9
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java Просмотреть файл

@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.math.BigDecimal; import java.math.BigDecimal;
@@ -37,27 +38,35 @@ import java.util.List;
public class WxCUserController extends BaseController { public class WxCUserController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Lazy
@Autowired @Autowired
private WxScoreRulesService wxScoreRulesService; private WxScoreRulesService wxScoreRulesService;


@Lazy
@Autowired @Autowired
private WxCUserTagsService wxCUserTagsService; private WxCUserTagsService wxCUserTagsService;


@Lazy
@Autowired @Autowired
private WxMerchantBUserService wxMerchantBUserService; private WxMerchantBUserService wxMerchantBUserService;


@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;


@Lazy
@Autowired @Autowired
private WxCUserFromBService wxCUserFromBService; private WxCUserFromBService wxCUserFromBService;


@Lazy
@Autowired @Autowired
private WxCUserService wxCUserService; private WxCUserService wxCUserService;


@Lazy
@Autowired @Autowired
private WxCreditHistoryService wxCreditHistoryService; private WxCreditHistoryService wxCreditHistoryService;




+ 4
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java Просмотреть файл

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.ArrayList; import java.util.ArrayList;
@@ -31,12 +32,15 @@ import java.util.Map;
public class WxCardPayController extends BaseController { public class WxCardPayController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
WxMerchantService wxMerchantService; WxMerchantService wxMerchantService;


@Lazy
@Autowired @Autowired
WxOrderService wxOrderService; WxOrderService wxOrderService;


@Lazy
@Autowired @Autowired
WxCardSpendService wxCardSpendService; WxCardSpendService wxCardSpendService;




+ 10
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Просмотреть файл

@@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


/** /**
@@ -39,14 +40,23 @@ import org.springframework.web.bind.annotation.*;
public class WxCashOutController extends BaseController { public class WxCashOutController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCashOutService wxCashOutService; private WxCashOutService wxCashOutService;
@Lazy
@Autowired @Autowired
WxCUserService wxCUserService; WxCUserService wxCUserService;
@Lazy
@Autowired @Autowired
WxMerchantService wxMerchantService; WxMerchantService wxMerchantService;
@Lazy
@Autowired @Autowired
WxMallService wxMallService; WxMallService wxMallService;
@Lazy
@Autowired @Autowired
WxPayAccountService wxPayAccountService; WxPayAccountService wxPayAccountService;


+ 10
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.ArrayList; import java.util.ArrayList;
@@ -36,14 +37,23 @@ import java.util.Map;
public class WxCouponChannelController extends BaseController { public class WxCouponChannelController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCouponChannelService wxCouponChannelService; private WxCouponChannelService wxCouponChannelService;
@Lazy
@Autowired @Autowired
private WxCouponChannelMapper wxCouponChannelMapper; private WxCouponChannelMapper wxCouponChannelMapper;
@Lazy
@Autowired @Autowired
private QrCodeService qrCodeService; private QrCodeService qrCodeService;
@Lazy
@Autowired @Autowired
private WxFlowService wxFlowService; private WxFlowService wxFlowService;
@Lazy
@Autowired @Autowired
private WxCouponService wxCouponService; private WxCouponService wxCouponService;




+ 14
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -41,18 +42,31 @@ import java.util.*;
public class WxCouponController extends BaseController { public class WxCouponController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCouponService wxCouponService; private WxCouponService wxCouponService;
@Lazy
@Autowired @Autowired
private WxCouponPasswordService couponPasswordService; private WxCouponPasswordService couponPasswordService;
@Lazy
@Autowired @Autowired
private WxCouponChannelMapper wxCouponChannelMapper; private WxCouponChannelMapper wxCouponChannelMapper;
@Lazy
@Autowired @Autowired
private WxFlowService wxFlowService; private WxFlowService wxFlowService;
@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;
@Lazy
@Autowired @Autowired
private WxMallService wxMallService; private WxMallService wxMallService;
@Lazy
@Autowired @Autowired
RedisLock redisLock; RedisLock redisLock;




+ 8
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Просмотреть файл

@@ -24,6 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; 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.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations; import org.springframework.data.redis.core.ValueOperations;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -41,24 +42,31 @@ import java.util.concurrent.TimeUnit;
public class WxCouponOrderController extends BaseController { public class WxCouponOrderController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;


@Lazy
@Autowired @Autowired
private WxCouponOrderService wxCouponOrderService; private WxCouponOrderService wxCouponOrderService;


@Lazy
@Autowired @Autowired
private WxCouponService wxCouponService; private WxCouponService wxCouponService;


@Lazy
@Autowired @Autowired
private WxMerchantBUserService wxMerchantBUserService; private WxMerchantBUserService wxMerchantBUserService;


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Lazy
@Autowired @Autowired
private WxCUserService wxCUserService; private WxCUserService wxCUserService;


@Lazy
@Autowired @Autowired
@Qualifier("couponDetailRedisTemplate") @Qualifier("couponDetailRedisTemplate")
RedisTemplate<String, WxCouponCVo> cdRedisTemplate; RedisTemplate<String, WxCouponCVo> cdRedisTemplate;


+ 6
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java Просмотреть файл

@@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@@ -36,11 +37,16 @@ import java.util.stream.Collectors;
@Api(description = "商户注券相关接口") @Api(description = "商户注券相关接口")
public class WxCouponSendController extends BaseController { public class WxCouponSendController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Lazy
@Autowired @Autowired
private WxCouponSendService wxCouponSendService; private WxCouponSendService wxCouponSendService;
@Lazy
@Autowired @Autowired
private WxCouponActionLogService wxCouponActionLogService; private WxCouponActionLogService wxCouponActionLogService;


@Lazy
@Resource @Resource
private WxCUserMapper wxCUserMapper; private WxCUserMapper wxCUserMapper;




+ 5
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java Просмотреть файл

@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.List; import java.util.List;
@@ -39,15 +40,19 @@ import java.util.Objects;
@Slf4j @Slf4j
public class WxCreditHistoryController extends BaseController { public class WxCreditHistoryController extends BaseController {


@Lazy
@Autowired @Autowired
private WxCreditHistoryService wxCreditHistoryService; private WxCreditHistoryService wxCreditHistoryService;


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;


@Lazy
@Autowired @Autowired
private WxCUserTagsService wxCUserTagsService; private WxCUserTagsService wxCUserTagsService;




+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -29,6 +30,7 @@ import java.util.List;
public class WxDateAmountRecordController extends BaseController { public class WxDateAmountRecordController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxDateAmountRecordService wxDateAmountRecordService; private WxDateAmountRecordService wxDateAmountRecordService;




+ 8
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java Просмотреть файл

@@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,24 +49,31 @@ public class WxInfoController extends BaseController {
@Autowired @Autowired
private boolean isFmOpen; private boolean isFmOpen;


@Lazy
@Autowired @Autowired
WxAppinfoService wxAppinfoService; WxAppinfoService wxAppinfoService;


@Lazy
@Autowired @Autowired
MallUserInfoService mallUserInfoService; MallUserInfoService mallUserInfoService;


@Lazy
@Autowired @Autowired
MallUserRoleService mallUserRoleService; MallUserRoleService mallUserRoleService;


@Lazy
@Autowired @Autowired
MallRolePermissionService mallRolePermissionService; MallRolePermissionService mallRolePermissionService;


@Lazy
@Autowired @Autowired
WxMerchantBUserService merchantBUserService; WxMerchantBUserService merchantBUserService;


@Lazy
@Autowired @Autowired
private CUserServiceFactory cuserFactory; private CUserServiceFactory cuserFactory;


@Lazy
@Autowired @Autowired
private WxMallService mallService; private WxMallService mallService;




+ 3
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java Просмотреть файл

@@ -18,6 +18,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
@@ -40,9 +41,11 @@ public class WxMallController extends BaseController {
@Value("${version}") @Value("${version}")
private String version; private String version;


@Lazy
@Autowired @Autowired
private WxMallService wxMallService; private WxMallService wxMallService;


@Lazy
@Autowired @Autowired
private WxAppinfoService wxAppinfoService; private WxAppinfoService wxAppinfoService;




+ 5
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java Просмотреть файл

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,15 +35,19 @@ import java.util.Map;
public class WxMemController extends BaseController { public class WxMemController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserService userService; private WxCUserService userService;


@Lazy
@Autowired @Autowired
private WxLevelConfigService wxLevelConfigService; private WxLevelConfigService wxLevelConfigService;


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;




+ 4
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java Просмотреть файл

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -22,12 +23,15 @@ import org.springframework.web.bind.annotation.*;
@Slf4j @Slf4j
public class WxMerchantController extends BaseController { public class WxMerchantController extends BaseController {


@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;


@Lazy
@Autowired @Autowired
private WxProfitSharingReceiverService wxProfitSharingReceiverService; private WxProfitSharingReceiverService wxProfitSharingReceiverService;


@Lazy
@Autowired @Autowired
private WxCUserService cUserService; private WxCUserService cUserService;




+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java Просмотреть файл

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +25,7 @@ import java.util.Map;
public class WxMerchantSubsidyController extends BaseController { public class WxMerchantSubsidyController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
WxMerchantSubsidyService wxMerchantSubsidyService; WxMerchantSubsidyService wxMerchantSubsidyService;




+ 7
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java Просмотреть файл

@@ -17,6 +17,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -28,10 +29,16 @@ import java.util.List;
@Api(description = "解单相关接口") @Api(description = "解单相关接口")
public class WxMerchantTradeDailyController extends BaseController { public class WxMerchantTradeDailyController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Lazy
@Autowired @Autowired
private WxMerchantTradeDailyService wxMerchantTradeDailyService; private WxMerchantTradeDailyService wxMerchantTradeDailyService;
@Lazy
@Autowired @Autowired
private WxMerchantBUserService wxMerchantBUserService; private WxMerchantBUserService wxMerchantBUserService;
@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;




+ 10
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Просмотреть файл

@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -36,30 +37,39 @@ import java.util.Map;
public class WxMicroPayController extends BaseController { public class WxMicroPayController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
WxMerchantBUserService wxMerchantBUserService; WxMerchantBUserService wxMerchantBUserService;


@Lazy
@Autowired @Autowired
WxMerchantService wxMerchantService; WxMerchantService wxMerchantService;


@Lazy
@Autowired @Autowired
WxOrderService wxOrderService; WxOrderService wxOrderService;


@Lazy
@Autowired @Autowired
WxPayOrderService wxPayOrderService; WxPayOrderService wxPayOrderService;


@Lazy
@Autowired @Autowired
WxRefundOrderService wxRefundOrderService; WxRefundOrderService wxRefundOrderService;


@Lazy
@Autowired @Autowired
WxAppinfoService wxAppinfoService; WxAppinfoService wxAppinfoService;


@Lazy
@Autowired @Autowired
WxCouponOrderService wxCouponOrderService; WxCouponOrderService wxCouponOrderService;


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;
@Lazy
@Autowired @Autowired
OrderFactory orderFactory; OrderFactory orderFactory;




+ 4
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java Просмотреть файл

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParams;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -28,12 +29,15 @@ import java.util.List;
public class WxMsgValidationcodeController extends BaseController { public class WxMsgValidationcodeController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxMsgValidationcodeService wxMsgValidationcodeService; private WxMsgValidationcodeService wxMsgValidationcodeService;


@Lazy
@Autowired @Autowired
private WxMerchantBUserService wxMerchantBUserService; private WxMerchantBUserService wxMerchantBUserService;


@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;




+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java Просмотреть файл

@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -30,6 +31,7 @@ import java.util.Map;
public class WxPayBillController extends BaseController { public class WxPayBillController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxPayBillService wxPayBillService; private WxPayBillService wxPayBillService;




+ 4
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java Просмотреть файл

@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.Map; import java.util.Map;
@@ -30,12 +31,15 @@ import java.util.Map;
public class WxRefundOrderController extends BaseController { public class WxRefundOrderController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCouponOrderService wxCouponOrderService; private WxCouponOrderService wxCouponOrderService;


@Lazy
@Autowired @Autowired
private WxAppinfoService wxAppinfoService; private WxAppinfoService wxAppinfoService;


@Lazy
@Autowired @Autowired
private WxRefundOrderService wxRefundOrderService; private WxRefundOrderService wxRefundOrderService;




+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java Просмотреть файл

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -22,6 +23,7 @@ import java.util.Map;
@Slf4j @Slf4j
public class WxTagController extends BaseController { public class WxTagController extends BaseController {


@Lazy
@Autowired @Autowired
private WxTagsService wxTagsService; private WxTagsService wxTagsService;




+ 3
- 0
mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java Просмотреть файл

@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


import java.util.Date; import java.util.Date;
@@ -41,9 +42,11 @@ public class PosBrunService {
@Autowired @Autowired
private String posUrl; private String posUrl;


@Lazy
@Autowired @Autowired
private PosOrderService posOrderService; private PosOrderService posOrderService;


@Lazy
@Autowired @Autowired
private PosPayOrderService posPayOrderService; private PosPayOrderService posPayOrderService;




+ 3
- 0
mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java Просмотреть файл

@@ -18,6 +18,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired; 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.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations; import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -47,9 +48,11 @@ public class RedisCacheAspect {
@Autowired @Autowired
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;


@Lazy
@Autowired @Autowired
RedisLock redisLock; RedisLock redisLock;


@Lazy
@Autowired @Autowired
private CUserTokenService cUserTokenService; private CUserTokenService cUserTokenService;




+ 11
- 0
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; 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.RedisTemplate;
import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.InitBinder;
@@ -42,34 +43,44 @@ public class BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private boolean isFmOpen; private boolean isFmOpen;


@Lazy
@Autowired @Autowired
private WxAppinfoService wxAppinfoService; private WxAppinfoService wxAppinfoService;


@Lazy
@Autowired @Autowired
private FmOpenService openService; private FmOpenService openService;


@Lazy
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Lazy
@Autowired @Autowired
private WxCUserBasicChildService wxCUserBasicChildService; private WxCUserBasicChildService wxCUserBasicChildService;
@Lazy
@Autowired @Autowired
private CUserTokenService cUserTokenService; private CUserTokenService cUserTokenService;


@Lazy
@Autowired @Autowired
private WxScoreRulesService wxScoreRulesService; private WxScoreRulesService wxScoreRulesService;


@Lazy
@Autowired @Autowired
private MemCouponFromDspService memCouponFromDspService; private MemCouponFromDspService memCouponFromDspService;
@Lazy
@Autowired @Autowired
@Qualifier("objectCommonRedisTemplate") @Qualifier("objectCommonRedisTemplate")
RedisTemplate<String, Object> objectCommonRedisTemplate; RedisTemplate<String, Object> objectCommonRedisTemplate;
@Lazy
@Autowired @Autowired
MaUtil maUtil; MaUtil maUtil;


+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/FengNiaoMapController.java Просмотреть файл

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


/** /**
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
public class FengNiaoMapController extends BaseController { public class FengNiaoMapController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private FengNiaoMapService fengNiaoMapService; private FengNiaoMapService fengNiaoMapService;




+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/UploadController.java Просмотреть файл

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;


@@ -26,6 +27,7 @@ public class UploadController extends BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private AliyunOSS aliyunOSS; private AliyunOSS aliyunOSS;




+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java Просмотреть файл

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@@ -22,6 +23,7 @@ public class UserBasicInfoAddressController extends BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private UserBasicInfoAddressService userBasicInfoAddressService; private UserBasicInfoAddressService userBasicInfoAddressService;




+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java Просмотреть файл

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,6 +38,7 @@ import java.util.Map;
public class WxActivityController extends BaseController { public class WxActivityController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxActivityService wxActivityService; private WxActivityService wxActivityService;




+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java Просмотреть файл

@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.List; import java.util.List;
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
public class WxActivityJoinController extends BaseController { public class WxActivityJoinController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxActivityJoinService wxActivityJoinService; private WxActivityJoinService wxActivityJoinService;




+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java Просмотреть файл

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.List; import java.util.List;
@@ -24,6 +25,7 @@ import java.util.stream.Collectors;
public class WxBusinessController extends BaseController { public class WxBusinessController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxBusinessService wxBusinessService; private WxBusinessService wxBusinessService;




+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java Просмотреть файл

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.ArrayList; import java.util.ArrayList;
@@ -30,6 +31,7 @@ public class WxCUserBasicSignController extends BaseController {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCUserBasicSignService wxCUserBasicSignService; private WxCUserBasicSignService wxCUserBasicSignService;




+ 4
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java Просмотреть файл

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,8 +36,11 @@ import java.util.List;
public class WxCampaignController extends BaseController { public class WxCampaignController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCampaignService wxCampaignService; private WxCampaignService wxCampaignService;
@Lazy
@Autowired @Autowired
private WxCouponChannelService wxCouponChannelService; private WxCouponChannelService wxCouponChannelService;




+ 15
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Просмотреть файл

@@ -22,6 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; 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.RedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@@ -35,45 +36,59 @@ import java.util.Map;
public class WxCarController extends BaseController { public class WxCarController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
WxParkService wxParkService; WxParkService wxParkService;


@Lazy
@Autowired @Autowired
WxCUserCarService wxCUserCarService; WxCUserCarService wxCUserCarService;


@Lazy
@Autowired @Autowired
WxMerchantService wxMerchantService; WxMerchantService wxMerchantService;


@Lazy
@Autowired @Autowired
WxCouponService couponService; WxCouponService couponService;


@Lazy
@Autowired @Autowired
WxCouponOrderService wxCouponOrderService; WxCouponOrderService wxCouponOrderService;


@Lazy
@Autowired @Autowired
WxScoreRulesService wxScoreRulesService; WxScoreRulesService wxScoreRulesService;


@Lazy
@Autowired @Autowired
WxCUserTagsService wxCUserTagsService; WxCUserTagsService wxCUserTagsService;


@Lazy
@Autowired @Autowired
WxCarCmdLogService wxCarCmdLogService; WxCarCmdLogService wxCarCmdLogService;


@Lazy
@Autowired @Autowired
WxCreditHistoryService wxCreditHistoryService; WxCreditHistoryService wxCreditHistoryService;


@Lazy
@Autowired @Autowired
WxCUserBasicInfoService wxCUserBasicInfoService; WxCUserBasicInfoService wxCUserBasicInfoService;
@Lazy
@Autowired @Autowired
ParkFactory parkFactory; ParkFactory parkFactory;
@Lazy
@Autowired @Autowired
ParkHelper parkHelper; ParkHelper parkHelper;
@Lazy
@Autowired @Autowired
EtcpHelper etcpHelper; EtcpHelper etcpHelper;
@Lazy
@Autowired @Autowired
@Qualifier("objectCommonRedisTemplate") @Qualifier("objectCommonRedisTemplate")
RedisTemplate<String, Object> redisTemplate; RedisTemplate<String, Object> redisTemplate;


+ 7
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java Просмотреть файл

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -59,21 +60,27 @@ import io.swagger.annotations.ApiOperation;
public class WxCardPayController extends BaseController { public class WxCardPayController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
WxMerchantService wxMerchantService; WxMerchantService wxMerchantService;


@Lazy
@Autowired @Autowired
WxOrderService wxOrderService; WxOrderService wxOrderService;


@Lazy
@Autowired @Autowired
WxCardInfoService wxCardInfoService; WxCardInfoService wxCardInfoService;


@Lazy
@Autowired @Autowired
WxCardSpendService wxCardSpendService; WxCardSpendService wxCardSpendService;


@Lazy
@Autowired @Autowired
WxCouponOrderService wxCouponOrderService; WxCouponOrderService wxCouponOrderService;


@Lazy
@Autowired @Autowired
WxCUserBasicInfoService wxCUserBasicInfoService; WxCUserBasicInfoService wxCUserBasicInfoService;




+ 3
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@@ -37,9 +38,11 @@ import io.swagger.annotations.ApiOperation;
public class WxCouponChannelController extends BaseController { public class WxCouponChannelController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCouponChannelService wxCouponChannelService; private WxCouponChannelService wxCouponChannelService;


@Lazy
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;




+ 7
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -14,6 +14,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; 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.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations; import org.springframework.data.redis.core.ValueOperations;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -45,13 +46,19 @@ import io.swagger.annotations.ApiOperation;
public class WxCouponController extends BaseController { public class WxCouponController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Lazy
@Autowired @Autowired
private WxCouponChannelService wxCouponChannelService; private WxCouponChannelService wxCouponChannelService;
@Lazy
@Autowired @Autowired
private WxCouponService couponService; private WxCouponService couponService;
@Lazy
@Autowired @Autowired
private WxMerchantService merchantService; private WxMerchantService merchantService;


@Lazy
@Autowired @Autowired
@Qualifier("couponDetailRedisTemplate") @Qualifier("couponDetailRedisTemplate")
RedisTemplate<String, WxCouponCVo> cdRedisTemplate; RedisTemplate<String, WxCouponCVo> cdRedisTemplate;


Некоторые файлы не были показаны из-за большого количества измененных файлов

Загрузка…
Отмена
Сохранить