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

取消实体类密码校验

Browse Source
This commit is contained in:
WenG 2022-06-16 15:30:42 +08:00
parent 873b7cf90f
commit 45556c6419
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java
View File

@ -19,7 +19,6 @@ public class UserVO {
@CheckEmptyAnnotation(name = "用户名")
private String userUsername;
@ApiModelProperty(name = "userPassword", value = "密码")
@CheckEmptyAnnotation(name = "密码")
private String userPassword;
@ApiModelProperty(name = "userName", value = "昵称")
@CheckEmptyAnnotation(name = "昵称")

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

@ -120,7 +120,13 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
if (userDTO != null) {
throw new SearchException("用户已经存在");
}
userVO.setUserPassword(passwordEncoder.encode(DigestUtils.md5Hex(DigestUtils.md5Hex(DigestUtils.md5Hex(userVO.getUserPassword())))));
String password;
if (StringUtils.isBlank(userVO.getUserPassword())) {
password = defaultPassword;
} else {
password = userVO.getUserPassword();
}
userVO.setUserPassword(passwordEncoder.encode(DigestUtils.md5Hex(DigestUtils.md5Hex(DigestUtils.md5Hex(password)))));
String userId = UUIDUtil.getUUID();
Map<String, Object> params = HashMapUtil.beanToMap(userVO);
params.put("userId", userId);
@ -729,8 +735,7 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
UserPO userPO = getPO(securityComponent.getCurrentUser().getUserId());
String gmtCreate = userPO.getGmtCreate();
String gmtPasswordModified = userPO.getGmtPasswordModified();
if (StringUtils.equals(FIRST_LOGIN_CHANGE_PASSWORD_OPEN, firstLoginChangePassword) &&
(StringUtils.isBlank(gmtPasswordModified) || StringUtils.equals(gmtCreate.substring(0, 10), gmtPasswordModified.substring(0, 10)))) {
if (StringUtils.equals(FIRST_LOGIN_CHANGE_PASSWORD_OPEN, firstLoginChangePassword) && (StringUtils.isBlank(gmtPasswordModified) || StringUtils.equals(gmtCreate.substring(0, 10), gmtPasswordModified.substring(0, 10)))) {
return new SuccessResultData<>(PASSWORD_CHANGE);
}
DateTime gmtPasswordModifiedDateTime = null;
@ -891,10 +896,7 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
} catch (IOException e) {
throw new FileException("默认头像不存在");
}
try (
BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file));
BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(response.getOutputStream());
) {
try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)); BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(response.getOutputStream());) {
int readSize;
for (byte[] buf = new byte[IFileService.INPUT_STREAM_SIZE]; (readSize = bufferedInputStream.read(buf)) > -1; ) {
System.out.println(readSize);