小程序授权登录恢复

ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java

 package org.dromara.auth.service.impl;
 
+import cn.dev33.satoken.stp.SaLoginModel;
+import cn.dev33.satoken.stp.StpUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -9,14 +11,19 @@ import org.dromara.auth.service.IAuthStrategy;
 import org.dromara.auth.service.SysLoginService;
 import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.weixin.dto.WxAuthReq;
 import org.dromara.common.weixin.dto.WxAuthResp;
 import org.dromara.common.weixin.utils.WeixinUtils;
 import org.dromara.server.api.RemoteServerService;
+import org.dromara.server.api.domain.RemoteUser;
 import org.dromara.system.api.RemoteUserService;
 import org.dromara.system.api.domain.vo.RemoteClientVo;
+import org.dromara.system.api.model.XcxLoginUser;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 /**
  * 邮件认证策略
  *
@@ -50,37 +57,37 @@ public class XcxAuthStrategy implements IAuthStrategy {
 
         // 校验 appid + appsrcret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid
         String openid = auth.getOpenId();
-//        XcxLoginUser loginUser = remoteUserService.getUserInfoByOpenid(openid, loginBody.getTenantId());
+        XcxLoginUser loginUser = remoteUserService.getUserInfoByOpenid(openid, loginBody.getTenantId());
 
         // 用户不存在 返回 openid
-
+        if (loginBody == null) {
             LoginVo loginVo = new LoginVo();
             loginVo.setOpenid(openid);
             loginVo.setScope(auth.getSessionKey());
             return loginVo;
+        }
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+
+        SaLoginModel model = new SaLoginModel();
+        model.setDevice(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
 
-//        loginUser.setClientKey(client.getClientKey());
-//        loginUser.setDeviceType(client.getDeviceType());
-//
-//        SaLoginModel model = new SaLoginModel();
-//        model.setDevice(client.getDeviceType());
-//        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
-//        // 例如: 后台用户30分钟过期 app用户1天过期
-//        model.setTimeout(client.getTimeout());
-//        model.setActiveTimeout(client.getActiveTimeout());
-//
-//        RemoteUser ru = remoteServerService.getUserByPhone(loginUser.getTenantId(), loginUser.getPhone());
-//        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
-//        model.setExtra(LoginHelper.YS_USER_ID, Optional.ofNullable(ru).map(RemoteUser::getUserNo).orElse(null));
-//        // 生成token
-//        LoginHelper.login(loginUser, model);
-//
-//        LoginVo loginVo = new LoginVo();
-//        loginVo.setAccessToken(StpUtil.getTokenValue());
-//        loginVo.setExpireIn(StpUtil.getTokenTimeout());
-//        loginVo.setClientId(client.getClientId());
-//        loginVo.setOpenid(openid);
-//        return loginVo;
+        RemoteUser ru = remoteServerService.getUserByPhone(loginUser.getTenantId(), loginUser.getPhone());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        model.setExtra(LoginHelper.YS_USER_ID, Optional.ofNullable(ru).map(RemoteUser::getUserNo).orElse(null));
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        loginVo.setOpenid(openid);
+        return loginVo;
     }
 
 }