qdintc/fishery-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 用户普通登录，接口新增几个字段。

Browse Source
This commit is contained in:
tianyongbao
2026-04-12 12:07:54 +08:00
parent ff07f77694
commit c604c84a08
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intc-admin/src/main/java/com/intc/web/service/impl/EmailAuthStrategy.java
View File

@@ -50,8 +50,11 @@ public class EmailAuthStrategy implements IAuthStrategy {
String tenantId = loginBody.getTenantId(); String tenantId = loginBody.getTenantId();
String email = loginBody.getEmail(); String email = loginBody.getEmail();
String emailCode = loginBody.getEmailCode(); String emailCode = loginBody.getEmailCode();
// 用于保存用户信息
SysUserVo[] userHolder = new SysUserVo[1];
LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
SysUserVo user = loadUserByEmail(email); SysUserVo user = loadUserByEmail(email);
userHolder[0] = user;
loginService.checkLogin(LoginType.EMAIL, tenantId, user.getUserName(), () -> !validateEmailCode(tenantId, email, emailCode)); loginService.checkLogin(LoginType.EMAIL, tenantId, user.getUserName(), () -> !validateEmailCode(tenantId, email, emailCode));
// 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
return loginService.buildLoginUser(user); return loginService.buildLoginUser(user);
@@ -72,6 +75,10 @@ public class EmailAuthStrategy implements IAuthStrategy {
loginVo.setAccessToken(StpUtil.getTokenValue()); loginVo.setAccessToken(StpUtil.getTokenValue());
loginVo.setExpireIn(StpUtil.getTokenTimeout()); loginVo.setExpireIn(StpUtil.getTokenTimeout());
loginVo.setClientId(client.getClientId()); loginVo.setClientId(client.getClientId());
loginVo.setUserId(loginUser.getUserId());
loginVo.setUserName(loginUser.getUsername());
loginVo.setNickName(loginUser.getNickname());
loginVo.setPhonenumber(userHolder[0].getPhonenumber());
return loginVo; return loginVo;
} }

7
intc-admin/src/main/java/com/intc/web/service/impl/PasswordAuthStrategy.java
View File

@@ -62,8 +62,11 @@ public class PasswordAuthStrategy implements IAuthStrategy {
if (captchaEnabled) { if (captchaEnabled) {
validateCaptcha(tenantId, username, code, uuid); validateCaptcha(tenantId, username, code, uuid);
} }
// 用于保存用户信息（包括手机号）
SysUserVo[] userHolder = new SysUserVo[1];
LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
SysUserVo user = loadUserByUsername(username); SysUserVo user = loadUserByUsername(username);
userHolder[0] = user; // 保存用户信息
loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword())); loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword()));
// 此处可根据登录用户的数据不同 自行创建 loginUser // 此处可根据登录用户的数据不同 自行创建 loginUser
return loginService.buildLoginUser(user); return loginService.buildLoginUser(user);
@@ -84,6 +87,10 @@ public class PasswordAuthStrategy implements IAuthStrategy {
loginVo.setAccessToken(StpUtil.getTokenValue()); loginVo.setAccessToken(StpUtil.getTokenValue());
loginVo.setExpireIn(StpUtil.getTokenTimeout()); loginVo.setExpireIn(StpUtil.getTokenTimeout());
loginVo.setClientId(client.getClientId()); loginVo.setClientId(client.getClientId());
loginVo.setUserId(loginUser.getUserId());
loginVo.setUserName(loginUser.getUsername());
loginVo.setNickName(loginUser.getNickname());
loginVo.setPhonenumber(userHolder[0].getPhonenumber());
return loginVo; return loginVo;
} }

7
intc-admin/src/main/java/com/intc/web/service/impl/SocialAuthStrategy.java
View File

@@ -80,8 +80,11 @@ public class SocialAuthStrategy implements IAuthStrategy {
} else { } else {
social = list.get(0); social = list.get(0);
} }
// 用于保存用户信息
SysUserVo[] userHolder = new SysUserVo[1];
LoginUser loginUser = TenantHelper.dynamic(social.getTenantId(), () -> { LoginUser loginUser = TenantHelper.dynamic(social.getTenantId(), () -> {
SysUserVo user = loadUser(social.getUserId()); SysUserVo user = loadUser(social.getUserId());
userHolder[0] = user;
// 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
return loginService.buildLoginUser(user); return loginService.buildLoginUser(user);
}); });
@@ -101,6 +104,10 @@ public class SocialAuthStrategy implements IAuthStrategy {
loginVo.setAccessToken(StpUtil.getTokenValue()); loginVo.setAccessToken(StpUtil.getTokenValue());
loginVo.setExpireIn(StpUtil.getTokenTimeout()); loginVo.setExpireIn(StpUtil.getTokenTimeout());
loginVo.setClientId(client.getClientId()); loginVo.setClientId(client.getClientId());
loginVo.setUserId(loginUser.getUserId());
loginVo.setUserName(loginUser.getUsername());
loginVo.setNickName(loginUser.getNickname());
loginVo.setPhonenumber(userHolder[0].getPhonenumber());
return loginVo; return loginVo;
} }