Browse Source

fix 准备合并项目到微服务

杨兴卓 4 weeks ago
parent
commit
8fea204615

+ 6 - 2
xyzc-start/src/main/java/com/xyzc/start/controller/UserAuthController.java

@@ -10,10 +10,13 @@ import com.xyzc.start.domain.vo.XyConfigVo;
 import com.xyzc.start.service.ICaptchaService;
 import com.xyzc.start.service.IUserAuthService;
 import com.xyzc.start.service.IXyConfigService;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Enumeration;
+
 /**
  * 用户认证管理
  * 前端访问路由地址为: /user/auth
@@ -106,8 +109,9 @@ public class UserAuthController {
      * 退出登录
      */
     @PostMapping("logout")
-    public Result<String> logout() {
-//        userAuthService.logout();
+    public Result<String> logout(HttpServletRequest request) {
+        String authorization = request.getHeader("Authorization");
+        userAuthService.logout(authorization);
 
         return Result.ok("退出成功");
     }

+ 2 - 2
xyzc-start/src/main/java/com/xyzc/start/service/impl/WeiXinAuthServiceImpl.java

@@ -88,8 +88,8 @@ public class WeiXinAuthServiceImpl implements IWeiXinAuthService {
     @Override
     public TicketVo sacn(Long agentId) {
         // 获取商户信息,商户没有微信公众号,就返回错误信息
-        WxConfig agentConfig = (WxConfig) sysParamsCache.getAgentConfig(String.valueOf(agentId));
-        AssertUtils.notNull(agentConfig, ErrorCode.COMPANY_NO_OPEN_WEIXIN);
+//        WxConfig agentConfig = (WxConfig) sysParamsCache.getAgentConfig(String.valueOf(agentId));
+//        AssertUtils.notNull(agentConfig, ErrorCode.COMPANY_NO_OPEN_WEIXIN);
         try {
             // sceneStr 是扫码后微信返回的参数
             return generateQRCode("wx:sceneStr");