更改 Password 实现。

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Password.java

@@ -3,15 +3,11 @@ package xyz.zhouxy.plusone.system.domain.model.account;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nonnull;
-
 import org.springframework.util.Assert;
 
 import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
-import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
 import xyz.zhouxy.plusone.domain.IValueObject;
-import xyz.zhouxy.plusone.exception.BizException;
 import xyz.zhouxy.plusone.system.util.PasswordUtil;
 
 /**
@@ -24,30 +20,19 @@ public class Password implements IValueObject {
     private static final Pattern PATTERN = PatternConsts.PASSWORD;
     private static final String DEFAULT_PASSWORD = "A1b2C3d4";
 
-    @Nonnull
     private final String passwordVal;
-    @Nonnull
     private final String saltVal;
 
     private Password(String password) {
-        if (password == null) {
-            throw new IllegalArgumentException("密码不能为空");
-        }
-        if (!PATTERN.matcher(password).matches()) {
-            throw new IllegalArgumentException("密码格式不符合要求");
-        }
-        var salt = PasswordUtil.generateRandomSalt();
-        if (salt == null) {
-            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：生成随机盐失败");
-        }
+        Assert.notNull(password, "密码不能为空");
+        Assert.isTrue(PATTERN.matcher(password).matches(), "密码格式不符合要求");
+        String salt = PasswordUtil.generateRandomSalt();
         this.saltVal = salt;
         this.passwordVal = PasswordUtil.hashPassword(password, salt);
     }
 
     private Password(String password, String salt) {
-        if (password == null || salt == null) {
-            throw new IllegalArgumentException("password 和 salt 不能为空");
-        }
+        Assert.isTrue(password != null && salt != null, "password 和 salt 不能为空");
         this.passwordVal = password;
         this.saltVal = salt;
     }