删除微信code登录

yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -97,17 +97,11 @@ public class AuthController {
         if ("wxcp".equals(dto.getCode())){
             cpuser = cpUserService.getByUserId("test");
         }else{
-            if (dto.getPlatform().equalsIgnoreCase("WX")){
+            //企业微信
-                //普通微信
+            WxCpMaJsCode2SessionResult session = wxCpService.jsCode2Session(dto.getCode());
-                WxMaJscode2SessionResult result = wxMaService.jsCode2SessionInfo(dto.getCode());
+            log.info("企业微信登录信息:{}", session);
-                log.info("微信登录信息,{}", result);
+            cpuser = cpUserService.getByUserId(session.getUserId());
-                cpuser = cpUserService.getByUserId(result.getUnionid());
+
-            }else{
-                //企业微信
-                WxCpMaJsCode2SessionResult session = wxCpService.jsCode2Session(dto.getCode());
-                log.info("企业微信登录信息:{}", session);
-                cpuser = cpUserService.getByUserId(session.getUserId());
-            }
         }
 
         if (ObjectUtil.isEmpty(cpuser)){
@@ -118,12 +112,8 @@ public class AuthController {
         if (ObjectUtil.isEmpty(user)){
             CommonResult.error(ErrorCodeConstants.USER_NOT_EXISTS.getCode(),"未发现绑定的企业用户，暂时无法登录，请联系管理员");
         }else {
-            if (dto.getPlatform().equalsIgnoreCase("WX")){
+            user.setCpUserId(cpuser.getUserId());
-                //暂时用微信小程序登录
+            userService.updateUser(UserConvert.INSTANCE.convertFromEntity(user));
-            }else{
-                user.setCpUserId(cpuser.getUserId());
-                userService.updateUser(UserConvert.INSTANCE.convertFromEntity(user));
-            }
         }
 
         AuthLoginReqVO login = AuthLoginReqVO.builder()