用户加密密码

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -737,7 +737,7 @@ public class AccountServiceImpl implements AccountService {
             if (org.apache.commons.lang3.StringUtils.isNotBlank(subUsersRequestDto.getPassword()))
                 password = subUsersRequestDto.getPassword();
             else
-                password = Aes.aesEncrypt(makeRandomPassword(8));
+                password = makeRandomPassword(8);
 
             authUser.setPassword(password);
             authUser.setPhone(existing.getPhoneNumber());
@@ -762,6 +762,8 @@ public class AccountServiceImpl implements AccountService {
             if (user.getWhiteList() != null && user.getWhiteList().size() > 0)
                 whiteList.addAll(user.getWhiteList());
             account.setWhiteList(whiteList);
+            if (!org.apache.commons.lang3.StringUtils.isNotBlank(subUsersRequestDto.getPassword()))
+                password = Aes.aesEncrypt(password);
             account.setPassword(password);
             repository.save(account);
 
@@ -804,8 +806,9 @@ public class AccountServiceImpl implements AccountService {
             if (subUsersRequestDto.getPassword() != null) {
                 com.edgec.browserbackend.auth.domain.User user = new com.edgec.browserbackend.auth.domain.User();
                 user.setUsername(username);
-                if (subUsersRequestDto.getPassword() != null)
-                    user.setPassword(subUsersRequestDto.getPassword());
+                if (subUsersRequestDto.getPassword() != null) {
+                    user.setPassword(Aes.aesDecrypt(subUsersRequestDto.getPassword()));
+                }
                 userAuthService.resetUserPassword(user);
             }
 
@@ -820,7 +823,7 @@ public class AccountServiceImpl implements AccountService {
                 whiteList.addAll(subUsersRequestDto.getWhiteList());
             childAccount.setWhiteList(whiteList);
             if (org.apache.commons.lang3.StringUtils.isNotBlank(subUsersRequestDto.getPassword()))
-                childAccount.setPassword(Aes.aesEncrypt(subUsersRequestDto.getPassword()));
+                childAccount.setPassword(subUsersRequestDto.getPassword());
             repository.save(childAccount);
         }