Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

回滚用户名登录

Browse Source
This commit is contained in:
wanggeng 2022-04-24 23:03:37 +08:00
parent 18806f981d
commit c05a762a67
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java
View File

@ -17,7 +17,6 @@ import ink.wgink.pojo.bos.LoginAppUser;
import ink.wgink.service.user.enums.UserStateEnum;
import ink.wgink.service.user.pojo.pos.UserPO;
import ink.wgink.service.user.service.IUserService;
import ink.wgink.util.RegexUtil;
import ink.wgink.util.date.DateUtil;
import ink.wgink.util.request.RequestUtil;
import org.apache.commons.lang3.StringUtils;
@ -59,12 +58,7 @@ public class AppSignServiceImpl extends BaseAppSignService implements IAppSignSe
public String defaultSign(AppLoginDefaultVO appLoginDefaultVO) throws Exception {
String userPassword = appLoginDefaultVO.getPassword();
checkApiLock(appLoginDefaultVO);
UserPO userPO;
if (RegexUtil.isPhone(appLoginDefaultVO.getUsername())) {
userPO = userService.getPOByPhone(appLoginDefaultVO.getUsername());
} else {
userPO = userService.getPOByUsername(appLoginDefaultVO.getUsername());
}
UserPO userPO = userService.getPOByUsername(appLoginDefaultVO.getUsername());
if (userPO == null) {
throw new SearchException("用户不存在");
}

10
login-base/src/main/java/ink/wgink/login/base/service/user/UserDetailServiceImpl.java
View File

@ -10,7 +10,6 @@ import ink.wgink.pojo.bos.LoginUser;
import ink.wgink.service.user.enums.UserStateEnum;
import ink.wgink.service.user.pojo.pos.UserPO;
import ink.wgink.service.user.service.IUserService;
import ink.wgink.util.RegexUtil;
import ink.wgink.util.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
@ -50,14 +49,7 @@ public class UserDetailServiceImpl implements UserDetailsService, IUserDetailChe
username = userInfo;
}
// 通过用户名查询
UserPO userPO;
if (RegexUtil.isPhone(username.toLowerCase())) {
// 手机登录
userPO = userService.getPOByPhone(username.toLowerCase());
} else {
// 用户名登录
userPO = userService.getPOByUsername(username.toLowerCase());
}
UserPO userPO = userService.getPOByUsername(username.toLowerCase());;
if (null == userPO) {
throw new UserAuthenticationException("账号不存在");
}

12
service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
View File

@ -115,12 +115,6 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
if (userDTO != null) {
throw new SearchException("用户已经存在");
}
if (StringUtils.isBlank(userVO.getUserPhone())) {
UserPO userPO = getPOByPhone(userVO.getUserPhone());
if (userPO != null) {
throw new SearchException("手机号已经存在");
}
}
userVO.setUserPassword(passwordEncoder.encode(DigestUtils.md5Hex(DigestUtils.md5Hex(DigestUtils.md5Hex(userVO.getUserPassword())))));
String userId = UUIDUtil.getUUID();
Map<String, Object> params = HashMapUtil.beanToMap(userVO);
@ -152,12 +146,6 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
if (!StringUtils.isBlank(userVO.getUserPassword())) {
userVO.setUserPassword(passwordEncoder.encode(DigestUtils.md5Hex(DigestUtils.md5Hex(DigestUtils.md5Hex(userVO.getUserPassword())))));
}
if (StringUtils.isBlank(userVO.getUserPhone())) {
UserPO userPO = getPOByPhone(userVO.getUserPhone());
if (userPO != null) {
throw new SearchException("手机号已经存在");
}
}
Map<String, Object> params = HashMapUtil.beanToMap(userVO);
setUpdateInfo(params);
params.put("userId", userId);