修改互联网生成的用户信息和微信小程序生成的用户信息对照

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java

@@ -59,7 +59,6 @@ public class OauthLoginHlwService {
     private static final String REDIS_KEY_PORTAL_USER_MAPPING = "hlw:user:mapping:";
     // 门户 Token 存储前缀（Redis 键：门户 userId → 门户 Token 信息）
     private static final String REDIS_KEY_PORTAL_TOKEN = "hlw:token:";
-    private static final String USER_KEY="hlw_";
 
     final private int expireTime=30;
     protected static final long MILLIS_SECOND = 1000;
@@ -111,14 +110,14 @@ public class OauthLoginHlwService {
         String cacheKey = REDIS_KEY_PORTAL_USER_MAPPING + idCard;
         String localUsername = redisCache.getCacheObject(cacheKey);
         if (StringUtils.isNotBlank(localUsername)) {
-            updateUserInfo(localUsername,wwTyInfo);
+            updateUserInfo(wwTyInfo);
             return localUsername;
         }
 
         SysUser localUser=sysUserService.selectUserByIdCard(wwTyInfo.getIdno());
         if (localUser == null) {
             // 本地无用户，自动创建
-            localUser = createLocalUser(cacheKey,wwTyInfo);
+            localUser = createLocalUser(wwTyInfo);
             // 缓存门户UserID与本地用户名的映射（有效期1天，可调整）
             redisCache.setCacheObject(cacheKey, localUser.getUserName(), 1, TimeUnit.DAYS);
             return localUser.getUserName();
@@ -143,20 +142,19 @@ public class OauthLoginHlwService {
     /**
      * 自动创建本地用户
      */
-    private SysUser createLocalUser(String localUsername,WwTyInfo wwTyInfo) {
+    private SysUser createLocalUser(WwTyInfo wwTyInfo) {
         SysUser newUser = new SysUser();
+        String localUsername=StringUtil.USER_KEY+wwTyInfo.getIdno();
         switch (wwTyInfo.getUsertype()) {
             case "1"://个人
                 newUser.setNickName(wwTyInfo.getName());
                 newUser.setIdCard(wwTyInfo.getIdno());
                 newUser.setRoleIds(new Long[]{parseStringToLoing(StringUtil.SYS_QZZ)});
-                newUser.setUserName(localUsername);
                 break;
             default://单位
                 newUser.setNickName(wwTyInfo.getEnterprisename());
                 newUser.setIdCard(wwTyInfo.getEnterprisecode());
                 newUser.setRoleIds(new Long[]{parseStringToLoing(StringUtil.SYS_QY)});
-                newUser.setUserName(localUsername);
                 //企业联系人->现根据社会信用代码查询企业信息
                 Company company=companyService.queryCodeCompany(wwTyInfo.getEnterprisecode());
                 if(company!=null){
@@ -169,6 +167,7 @@ public class OauthLoginHlwService {
         }
         newUser.setPassword(SecurityUtils.encryptPassword("123456"));
         newUser.setDelFlag("0");
+        newUser.setUserName(localUsername);
         sysUserService.insertUser(newUser);
         return newUser;
     }
@@ -247,10 +246,10 @@ public class OauthLoginHlwService {
 
     /**
      * 修改个人信息
-     * @param localUsername
      * @param wwTyInfo
      */
-    private void updateUserInfo(String localUsername,WwTyInfo wwTyInfo){
+    private void updateUserInfo(WwTyInfo wwTyInfo){
+        String localUsername=StringUtil.USER_KEY+wwTyInfo.getIdno();
         SysUser sysUser=new SysUser();
         switch (wwTyInfo.getUsertype()){
             case "1":