diff --git a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java b/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java index 94303777..27ce64ad 100644 --- a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java +++ b/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java @@ -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 = "昵称") diff --git a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java index 662a25ef..5c6ebdef 100644 --- a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java +++ b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java @@ -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 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);