Эх сурвалжийг харах

refactor(app): 优化小程序用户注册和登录逻辑

- 移除了 CommonConstant 中的 REGISTER_ORG_CODE 常量
-调整了 UserServiceImpl 中的用户注册逻辑,移除了与组织代码相关的操作
- 修改了用户昵称的更新逻辑,将其设置为用户的 realname 而不是 username
- 更新了 LoginUserVO 中的 userName 字段,使用用户的 realname
SheepHy 4 өдөр өмнө
parent
commit
63b4dc9a23

+ 0 - 3
national-motion-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -76,9 +76,6 @@ public interface CommonConstant {
 	 */
 	int OPERATE_TYPE_6 = 6;
 
-     /** 小程序用户注册关联orgCode */
-     String REGISTER_ORG_CODE = "A01A01";
-
 	/** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */
     Integer SC_INTERNAL_SERVER_ERROR_500 = 500;
     /** {@code 404 Not Found} (HTTP/1.0 - RFC 1945) */

+ 4 - 7
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/UserServiceImpl.java

@@ -33,7 +33,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import static org.jeecg.common.constant.CommonConstant.REGISTER_ORG_CODE;
 import static org.jeecg.common.constant.CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
 
 @Service
@@ -75,13 +74,11 @@ public class UserServiceImpl implements IUserService {
                             .setPassword(openid)
                             .setStatus(1)
                             .setDelFlag(0)
+                            .setUserIdentity(3)
                             .setSalt(oConvertUtils.randomGen(8))
                             .setCreateBy("admin")
                             .setRealname("微信用户")
-                            .setUsername("微信用户_" + UUID.randomUUID())
-                            .setOrgCode(REGISTER_ORG_CODE);
-                SysDepart sysDepart = sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery().eq(SysDepart::getOrgCode, REGISTER_ORG_CODE));
-                sysUserDepartMapper.insert(new SysUserDepart(user.getId(),sysDepart.getId()));
+                            .setUsername("微信用户_" + UUID.randomUUID());
                 boolean result = sysUserMapper.insert(user) > 0;
                     if (!result) {
                         throw new JeecgBootException("登录失败", SC_INTERNAL_SERVER_ERROR_500);
@@ -133,7 +130,7 @@ public class UserServiceImpl implements IUserService {
         if(null != nickName && !nickName.isEmpty()){
             sysUserMapper.update(null,Wrappers.<SysUser>lambdaUpdate()
                     .eq(SysUser::getId, user.getId())
-                    .set(SysUser::getUsername, nickName));
+                    .set(SysUser::getRealname, nickName));
         }else if(null != avatarUrl && !avatarUrl.isEmpty()){
             sysUserMapper.update(null,Wrappers.<SysUser>lambdaUpdate()
                     .eq(SysUser::getId, user.getId())
@@ -148,7 +145,7 @@ public class UserServiceImpl implements IUserService {
         SysUser sysUser = sysUserMapper.selectById(user.getId());
         return new LoginUserVO()
                 .setId(sysUser.getId())
-                .setUserName(sysUser.getUsername())
+                .setUserName(sysUser.getRealname())
                 .setUserAvatar(sysUser.getAvatar())
                 .setToken(JwtUtil.sign(sysUser.getUsername(), sysUser.getPassword()));
     }