Browse Source

fix: wx模块循环依赖

dev
wangqing 4 years ago
parent
commit
32214f08d4
  1. 4
      tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
  2. 2
      tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/ScanHandler.java
  3. 4
      tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/scan/LoginScanStrategy.java
  4. 4
      tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/service/impl/WxMpUserMsgServiceImpl.java

4
tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java

@ -41,6 +41,7 @@ import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -65,12 +66,13 @@ public class UserProjectController {
private final SortUtils sortUtils; private final SortUtils sortUtils;
private final UserProjectThemeService userProjectThemeService; private final UserProjectThemeService userProjectThemeService;
private final UserProjectSettingService userProjectSettingService; private final UserProjectSettingService userProjectSettingService;
private final WxMpService wxMpService;
private final ProjectTemplateService projectTemplateService; private final ProjectTemplateService projectTemplateService;
private final ProjectTemplateItemService projectTemplateItemService; private final ProjectTemplateItemService projectTemplateItemService;
private final WxMpUserService wxMpUserService; private final WxMpUserService wxMpUserService;
private final RedisUtils redisUtils; private final RedisUtils redisUtils;
@Autowired
private WxMpService wxMpService;
/** /**
* 创建项目 * 创建项目

2
tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/ScanHandler.java

@ -1,7 +1,6 @@
package com.tduck.cloud.wx.mp.handler; package com.tduck.cloud.wx.mp.handler;
import com.tduck.cloud.wx.mp.handler.scan.ScanStrategyContext; import com.tduck.cloud.wx.mp.handler.scan.ScanStrategyContext;
import lombok.RequiredArgsConstructor;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.WxMpService;
@ -16,7 +15,6 @@ import java.util.Map;
* @author Binary Wang(https://github.com/binarywang) * @author Binary Wang(https://github.com/binarywang)
*/ */
@Component @Component
@RequiredArgsConstructor
public class ScanHandler extends AbstractHandler { public class ScanHandler extends AbstractHandler {
@Autowired @Autowired
private ScanStrategyContext scanStrategyContext; private ScanStrategyContext scanStrategyContext;

4
tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/scan/LoginScanStrategy.java

@ -1,6 +1,5 @@
package com.tduck.cloud.wx.mp.handler.scan; package com.tduck.cloud.wx.mp.handler.scan;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.tduck.cloud.common.util.RedisUtils; import com.tduck.cloud.common.util.RedisUtils;
@ -9,12 +8,10 @@ import com.tduck.cloud.wx.mp.entity.WxMpUserEntity;
import com.tduck.cloud.wx.mp.request.WxMpQrCodeGenRequest; import com.tduck.cloud.wx.mp.request.WxMpQrCodeGenRequest;
import com.tduck.cloud.wx.mp.service.WxMpUserMsgService; import com.tduck.cloud.wx.mp.service.WxMpUserMsgService;
import com.tduck.cloud.wx.mp.service.WxMpUserService; import com.tduck.cloud.wx.mp.service.WxMpUserService;
import lombok.RequiredArgsConstructor;
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@ -23,7 +20,6 @@ import java.util.concurrent.TimeUnit;
* @create : 2020-12-01 17:44 * @create : 2020-12-01 17:44
**/ **/
@Component @Component
public class LoginScanStrategy implements ScanStrategy { public class LoginScanStrategy implements ScanStrategy {
@Autowired @Autowired

4
tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/service/impl/WxMpUserMsgServiceImpl.java

@ -2,11 +2,11 @@ package com.tduck.cloud.wx.mp.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.tduck.cloud.wx.mp.service.WxMpUserMsgService; import com.tduck.cloud.wx.mp.service.WxMpUserMsgService;
import lombok.RequiredArgsConstructor;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage; import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
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;
/** /**
@ -16,6 +16,8 @@ import org.springframework.stereotype.Service;
**/ **/
@Service @Service
public class WxMpUserMsgServiceImpl implements WxMpUserMsgService { public class WxMpUserMsgServiceImpl implements WxMpUserMsgService {
@Lazy
@Autowired @Autowired
private WxMpService wxMpService; private WxMpService wxMpService;

Loading…
Cancel
Save