登录修改

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

@@ -80,6 +80,7 @@ public class XcxAuthStrategy implements IAuthStrategy {
         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));
+        model.setExtra(LoginHelper.OPEN_ID, openid);
         // 生成token
         LoginHelper.login(loginUser, model);
 

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

@@ -74,6 +74,7 @@ public class XcxPhoneAuthStrategy implements IAuthStrategy {
         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));
+        model.setExtra(LoginHelper.OPEN_ID, loginBody.getOpenId());
         // 生成token
         LoginHelper.login(loginUser, model);
 

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -39,6 +39,7 @@ public class LoginHelper {
     public static final String DEPT_CATEGORY_KEY = "deptCategory";
     public static final String CLIENT_KEY = "clientid";
     public static final String YS_USER_ID = "ysUserId";
+    public static final String OPEN_ID = "openId";
 
     /**
      * 登录系统 基于 设备类型
@@ -96,6 +97,13 @@ public class LoginHelper {
         return Convert.toStr(getExtra(YS_USER_ID));
     }
 
+    /**
+     * 获取用户id
+     */
+    public static String getOpenId() {
+        return Convert.toStr(getExtra(YS_USER_ID));
+    }
+
     /**
      * 获取用户账户
      */