添加 TODO，不放行全部域名，通过配置文件配置允许访问的域名。

Reviewed-on: http://zhouxy.xyz:3000/ZhouXY108/plusone-admin/pulls/1

README.md

@@ -19,3 +19,10 @@
 目前项目还没完成，开发中……
 
 相关的文档和介绍完善中……
+
+## 编码规约
+### 关于 null
+1. 方法默认参数不为 `null`，**可以**在 Javadoc 中对参数进行说明，如“...(must not be {@code null}[ or empty string])”。方法内部**必须**做参数校验，如使用 Assert 等工具类。
+2. 如果参数允许为空，**必须**为参数添加 `@Nullable` 注解，并在 Javadoc 中对参数进行说明，如“...(may be {@code null})”。
+3. 除极特殊的情况，方法默认**不返回 `null`**，如可能返回一个对象表示值的缺失，则**必须**使用 `Optional`，**绝不在返回类型为 Optional 的方法中返回 `null`**。
+4. 在极其特殊的情况下，方法需要返回 `null`，**必须**给方法加上 `@Nullable` 注解，并在 Javadoc 中详细说明。

err_code.json

@@ -222,6 +222,10 @@
               {
                 "code": 4040201,
                 "description": "不支持的 PrincipalType"
+              },
+              {
+                "code": 4040209,
+                "description": "不支持的菜单类型"
               }
             ]
           },

plusone-basic/plusone-basic-application/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>plusone-basic</artifactId>

plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/AllExceptionHandlerConfig.java

@@ -1,10 +1,13 @@
 package xyz.zhouxy.plusone.exception.handler;
 
+import javax.annotation.Nonnull;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
+import xyz.zhouxy.plusone.commons.exception.handler.AllExceptionHandler;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
 
 /**
  * AllExceptionHandlerConfig
@@ -14,7 +17,7 @@ import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHo
 public class AllExceptionHandlerConfig {
 
     @Bean
-    AllExceptionHandler getAllExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    AllExceptionHandler getAllExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         return new AllExceptionHandler(exceptionInfoHolder);
     }
 }

plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/DefaultExceptionHandler.java

@@ -1,5 +1,7 @@
 package xyz.zhouxy.plusone.exception.handler;
 
+import javax.annotation.Nonnull;
+
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -11,7 +13,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import lombok.extern.slf4j.Slf4j;
-import xyz.zhouxy.plusone.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 
 /**
  * 默认异常的处理器
@@ -40,7 +43,7 @@ import xyz.zhouxy.plusone.util.RestfulResult;
 @Order(Ordered.LOWEST_PRECEDENCE - 1)
 @Slf4j
 public class DefaultExceptionHandler extends BaseExceptionHandler {
-    public DefaultExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    public DefaultExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
         set(IllegalArgumentException.class, 4010000, "格式错误", HttpStatus.FORBIDDEN);
         set(DataAccessException.class, 6030000, "数据库错误", HttpStatus.INTERNAL_SERVER_ERROR, true);
@@ -59,7 +62,7 @@ public class DefaultExceptionHandler extends BaseExceptionHandler {
             DataAccessException.class,
             MethodArgumentNotValidException.class
     })
-    public ResponseEntity<RestfulResult> handleException(Exception e) {
+    public ResponseEntity<UnifiedResponse> handleException(Exception e) {
         log.error(e.getMessage(), e);
         return buildExceptionResponse(e);
     }

plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/SysExceptionHandler.java

@@ -0,0 +1,29 @@
+package xyz.zhouxy.plusone.exception.handler;
+
+import javax.annotation.Nonnull;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import lombok.extern.slf4j.Slf4j;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
+import xyz.zhouxy.plusone.exception.SysException;
+
+@RestControllerAdvice
+@Slf4j
+public class SysExceptionHandler extends BaseExceptionHandler {
+
+    public SysExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
+        super(exceptionInfoHolder);
+    }
+
+    @ExceptionHandler({ SysException.class })
+    public ResponseEntity<UnifiedResponse> handleException(@Nonnull Exception e) {
+        log.error(e.getMessage(), e);
+        HttpStatus httpStatus = getHttpStatus(e);
+        return new ResponseEntity<>(UnifiedResponse.error(getErrorCode(e), "系统错误"), httpStatus);
+    }
+}

plusone-basic/plusone-basic-common/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>plusone-basic</artifactId>
@@ -39,17 +39,17 @@
         <dependency>
             <groupId>xyz.zhouxy.plusone</groupId>
             <artifactId>plusone-commons</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>xyz.zhouxy.plusone</groupId>
-            <artifactId>plusone-validator</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>xyz.zhouxy.plusone</groupId>
+            <artifactId>plusone-validator</artifactId>
+            <version>0.1.3-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>xyz.zhouxy.plusone</groupId>
             <artifactId>plusone-exception-handler</artifactId>
-            <version>0.0.6-SNAPSHOT</version>
+            <version>0.0.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/constant/ErrorCodeConsts.java

@@ -2,4 +2,10 @@ package xyz.zhouxy.plusone.constant;
 
 public class ErrorCodeConsts {
     public static final int DEFAULT_ERROR_CODE = 9999999;
+    public static final int DEFAULT_SYS_ERROR_CODE = 5000000;
+    public static final int DEFAULT_BIZ_ERROR_CODE = 4000000;
+
+    private ErrorCodeConsts() {
+        throw new IllegalStateException("Utility class");
+    }
 }

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/exception/BizException.java

@@ -0,0 +1,39 @@
+package xyz.zhouxy.plusone.exception;
+
+import xyz.zhouxy.plusone.commons.exception.BaseRuntimeException;
+
+/**
+ * 业务异常
+ *
+ * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
+ */
+public class BizException extends BaseRuntimeException {
+    @java.io.Serial
+    private static final long serialVersionUID = -5524759033245815405L;
+
+    public static final String DEFAULT_ERROR_CODE = "4000000";
+
+    public BizException(String code, String msg) {
+        super(code, msg);
+    }
+
+    public BizException(String code, Throwable cause) {
+        super(code, cause);
+    }
+
+    public BizException(String code, String msg, Throwable cause) {
+        super(code, msg, cause);
+    }
+
+    public static BizException of(String msg) {
+        return new BizException(DEFAULT_ERROR_CODE, msg);
+    }
+
+    public static BizException of(Throwable cause) {
+        return new BizException(DEFAULT_ERROR_CODE, cause);
+    }
+
+    public static BizException of(String msg, Throwable cause) {
+        return new BizException(DEFAULT_ERROR_CODE, msg, cause);
+    }
+}

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/exception/DataNotExistException.java

@@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.ResponseStatus;
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  */
 @ResponseStatus(HttpStatus.NOT_FOUND)
-public class DataNotExistException extends PlusoneException {
+public class DataNotExistException extends BizException {
 
     @java.io.Serial
     private static final long serialVersionUID = 6536955800679703111L;
 
-    public static final int ERROR_CODE = 4110100;
+    public static final String ERROR_CODE = "4110100";
 
     public DataNotExistException() {
         super(ERROR_CODE, "数据不存在");

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/exception/DataOperationResultException.java

@@ -8,18 +8,17 @@ import org.springframework.web.bind.annotation.ResponseStatus;
  *
  * <p>
  * 暂时先这样，后续完善异常体系时可能会更改。
- * </p>
  *
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  * @see xyz.zhouxy.plusone.util.AssertResult
  */
 @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-public class DataOperationResultException extends PlusoneException {
+public class DataOperationResultException extends SysException {
 
     @java.io.Serial
     private static final long serialVersionUID = -9220765735990318186L;
 
-    public static final int ERROR_CODE = 4110200;
+    public static final String ERROR_CODE = "4110200";
 
     public DataOperationResultException() {
         super(ERROR_CODE, "数据操作结果不符合预期");

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/exception/SysException.java

@@ -0,0 +1,34 @@
+package xyz.zhouxy.plusone.exception;
+
+import xyz.zhouxy.plusone.commons.exception.BaseRuntimeException;
+
+public class SysException extends BaseRuntimeException {
+    @java.io.Serial
+    private static final long serialVersionUID = 8821240827443168118L;
+
+    public static final String DEFAULT_ERROR_CODE = "5000000";
+
+    public SysException(String code, String msg) {
+        super(code, msg);
+    }
+
+    public SysException(String code, Throwable cause) {
+        super(code, cause);
+    }
+
+    public SysException(String code, String msg, Throwable cause) {
+        super(code, msg, cause);
+    }
+
+    public static SysException of(String msg) {
+        return new SysException(DEFAULT_ERROR_CODE, msg);
+    }
+
+    public static SysException of(Throwable cause) {
+        return new SysException(DEFAULT_ERROR_CODE, cause);
+    }
+
+    public static SysException of(String msg, Throwable cause) {
+        return new SysException(DEFAULT_ERROR_CODE, msg, cause);
+    }
+}

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/exception/UserOperationException.java

@@ -9,33 +9,33 @@ import org.springframework.web.bind.annotation.ResponseStatus;
  * @author ZhouXY
  */
 @ResponseStatus(HttpStatus.BAD_REQUEST)
-public class UserOperationException extends PlusoneException {
+public class UserOperationException extends BizException {
 
     @java.io.Serial
     private static final long serialVersionUID = 4371055414421991940L;
 
-    public static final int DEFAULT_ERROR_CODE = 4040600;
+    public static final String DEFAULT_ERROR_CODE = "4040600";
 
-    public UserOperationException(String msg) {
+    public UserOperationException(String code, String msg) {
-        super(DEFAULT_ERROR_CODE, msg);
-    }
-
-    public UserOperationException(String msg, Throwable cause) {
-        super(DEFAULT_ERROR_CODE, msg, cause);
-    }
-
-    public UserOperationException(int code, String msg) {
         super(code, msg);
     }
 
-    public UserOperationException(int code, Throwable cause) {
+    public UserOperationException(String code, Throwable cause) {
         super(code, cause);
     }
 
-    public UserOperationException(int code, String msg, Throwable cause) {
+    public UserOperationException(String code, String msg, Throwable cause) {
         super(code, msg, cause);
     }
 
+    public static UserOperationException of(String msg) {
+        return new UserOperationException(DEFAULT_ERROR_CODE, msg);
+    }
+
+    public static UserOperationException of(String msg, Throwable cause) {
+        return new UserOperationException(DEFAULT_ERROR_CODE, msg, cause);
+    }
+
     /**
      * 无效的操作
      *
@@ -52,7 +52,7 @@ public class UserOperationException extends PlusoneException {
      * @return 异常对象
      */
     public static UserOperationException invalidOperation(String msg) {
-        return new UserOperationException(4040604, msg);
+        return new UserOperationException("4040604", msg);
     }
 
 }

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/util/PlusoneStrUtil.java

@@ -1,9 +1,5 @@
 package xyz.zhouxy.plusone.util;
 
-import java.util.Objects;
-import java.util.regex.Pattern;
-
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
@@ -27,17 +23,4 @@ public class PlusoneStrUtil {
         return StringUtils.hasLength(value) ? value : EMPTY_STR;
     }
 
-    public static String checkString(String value, String regex, String message) {
-        Assert.notNull(value, message);
-        Assert.isTrue(Pattern.matches(regex, value), message);
-        return value;
-    }
-
-    public static String checkStringNullable(String value, String regex, String message) {
-        return Objects.nonNull(value) ? checkString(value, regex, message) : null;
-    }
-
-    public static String checkStringOrDefault(String value, String regex, String message) {
-        return StringUtils.hasText(value) ? checkString(value, regex, message) : "";
-    }
 }

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/util/RandomUtil.java

@@ -0,0 +1,18 @@
+package xyz.zhouxy.plusone.util;
+
+import java.security.SecureRandom;
+
+public final class RandomUtil {
+    private RandomUtil() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static String randomStr(char[] sourceCharacters, int length) {
+        SecureRandom random = new SecureRandom();
+        char[] result = new char[length];
+        for (int i = 0; i < length; i++) {
+            result[i] = sourceCharacters[random.nextInt(sourceCharacters.length)];
+        }
+        return String.valueOf(result);
+    }
+}

plusone-basic/plusone-basic-common/src/test/java/xyz/zhouxy/plusone/util/RandomUtilTests.java

@@ -0,0 +1,23 @@
+package xyz.zhouxy.plusone.util;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+class RandomUtilTests {
+
+    @Test
+    void testRandom() {
+        String[] s = new String[20];
+        for (int i = 0; i < 20; i++) {
+            s[i] = RandomUtil.randomStr(
+                    "0123456789qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM~`!@#$%^&*()_-+={[\\|/:;\"',.<>?]}"
+                            .toCharArray(),
+                    28);
+        }
+        log.info("{}", Arrays.toString(s));
+    }
+}

plusone-basic/plusone-basic-domain/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>xyz.zhouxy</groupId>
@@ -15,11 +15,6 @@
             <groupId>xyz.zhouxy</groupId>
         </dependency>
 
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -28,12 +23,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.13.4</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.13.4</version>
             </dependency>
     </dependencies>
 </project>

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java

@@ -1,32 +1,33 @@
 package xyz.zhouxy.plusone.constant;
 
-import xyz.zhouxy.plusone.util.Enumeration;
+import java.util.Collection;
-import xyz.zhouxy.plusone.util.EnumerationValuesHolder;
+
+import javax.annotation.Nonnull;
+
+import xyz.zhouxy.plusone.commons.util.Enumeration;
 
 /**
  * 实体状态
  *
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  */
-public class EntityStatus extends Enumeration<EntityStatus> {
+public final class EntityStatus extends Enumeration<EntityStatus> {
 
-    private EntityStatus(int value, String name) {
+    private EntityStatus(int id, @Nonnull String name) {
-        super(value, name);
+        super(id, name);
     }
 
     // 常量
     public static final EntityStatus AVAILABLE = new EntityStatus(0, "正常");
     public static final EntityStatus DISABLED = new EntityStatus(1, "禁用");
 
-    private static final EnumerationValuesHolder<EntityStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
+    private static final ValueSet<EntityStatus> VALUE_SET = ValueSet.of(AVAILABLE, DISABLED);
-            new EntityStatus[] { AVAILABLE, DISABLED });
 
-    public static EntityStatus of(int value) {
+    public static EntityStatus of(int id) {
-        return ENUMERATION_VALUES.get(value);
+        return VALUE_SET.get(id);
     }
 
-    @Override
+    public static Collection<EntityStatus> constants() {
-    public String toString() {
+        return VALUE_SET.getValues();
-        return "EntityStatus" + super.toString();
     }
 }

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/RegexConsts.java

@@ -1,27 +0,0 @@
-package xyz.zhouxy.plusone.constant;
-
-/**
- * 正则表达式常量
- *
- * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
- */
-public final class RegexConsts {
-
-    public static final String DATE = "^\\d{4}-\\d{2}-\\d{2}";
-
-    public static final String PASSWORD = "^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[\\w\\\\!#$%&'*\\+\\-/=?^`{|}~@\\(\\)\\[\\]\",\\.;':><]{8,32}$";
-
-    public static final String CAPTCHA = "^[0-9A-Za-z]{4,6}$";
-
-    public static final String EMAIL = "^\\w+([-+.]\\w+)*@[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})*(\\.(?![0-9]+$)[a-zA-Z0-9][-0-9A-Za-z]{0,62})$";
-
-    public static final String MOBILE_PHONE = "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$";
-
-    public static final String USERNAME = "^[\\da-zA-Z_.@\\\\]{4,36}$";
-
-    public static final String NICKNAME = "^[\\da-zA-Z_.@\\\\]{4,36}$";
-
-    private RegexConsts() {
-        throw new IllegalStateException("Utility class");
-    }
-}

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/domain/DomainEvent.java

@@ -1,6 +1,7 @@
 package xyz.zhouxy.plusone.domain;
 
-import cn.hutool.core.lang.UUID;
+import java.util.UUID;
+
 import lombok.Getter;
 
 /**
@@ -16,11 +17,11 @@ import lombok.Getter;
  */
 @Getter
 public abstract class DomainEvent {
-    private String identifier;
+    private final String identifier;
-    private long happenedAt;
+    private final long happenedAt;
 
     protected DomainEvent() {
-        this.identifier = UUID.randomUUID().toString(true);
+        this.identifier = UUID.randomUUID().toString();
         this.happenedAt = System.currentTimeMillis();
     }
 }

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/domain/Entity.java

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import xyz.zhouxy.plusone.commons.annotation.Overridable;
+
 /**
  * 实体
  *
@@ -26,7 +28,29 @@ public abstract class Entity<ID extends Serializable> {
 
     public abstract Optional<ID> getId();
 
-    protected void addDomainEvent(DomainEvent domainEvent) {
+    protected final void addDomainEvent(DomainEvent domainEvent) {
         domainEvents.add(domainEvent);
     }
+
+    public final List<DomainEvent> getDomainEvents() {
+        return List.copyOf(domainEvents);
+    }
+
+    @Override
+    @Overridable
+    public boolean equals(Object obj) {
+        return super.equals(obj);
+    }
+
+    @Override
+    @Overridable
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    @Overridable
+    public String toString() {
+        return super.toString();
+    }
 }

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/domain/IDomainEventPublisher.java

@@ -0,0 +1,8 @@
+package xyz.zhouxy.plusone.domain;
+
+public interface IDomainEventPublisher {
+
+    void publish(DomainEvent domainEvent);
+
+    <T extends DomainEvent> void subsrcibe(IDomainEventSubscriber<T> subscriber);
+}

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/domain/IDomainEventSubscriber.java

@@ -0,0 +1,11 @@
+package xyz.zhouxy.plusone.domain;
+
+/**
+ * 领域事件消费者
+ */
+public interface IDomainEventSubscriber<T extends DomainEvent> {
+
+    void handleEvent(final T event);
+
+    Class<T> subscribedToEventType();
+}

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/domain/ValidatableStringRecord.java

@@ -1,34 +0,0 @@
-package xyz.zhouxy.plusone.domain;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * 带校验的字符串值对象
- *
- * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
- */
-public abstract class ValidatableStringRecord implements IValueObject {
-
-    protected String value;
-    protected final String format;
-
-    protected ValidatableStringRecord(String format) {
-        this.format = format;
-    }
-
-    @JsonIgnore
-    protected boolean isValid() {
-        return value.matches(format);
-    }
-
-    @JsonValue
-    public String value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-}

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/util/RegexUtil.java

@@ -1,36 +0,0 @@
-package xyz.zhouxy.plusone.util;
-
-import java.util.regex.Pattern;
-
-public class RegexUtil {
-
-    private RegexUtil() {
-        throw new IllegalStateException("Utility class");
-    }
-
-    public static boolean matches(CharSequence input, String regex) {
-        return Pattern.matches(regex, input);
-    }
-
-    public static boolean matchesOr(CharSequence input, String... regexs) {
-        boolean isMatched;
-        for (var regex : regexs) {
-            isMatched = Pattern.matches(regex, input);
-            if (isMatched) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean matchesAnd(CharSequence input, String... regexs) {
-        boolean isMatched;
-        for (var regex : regexs) {
-            isMatched = Pattern.matches(regex, input);
-            if (!isMatched) {
-                return false;
-            }
-        }
-        return true;
-    }
-}

plusone-basic/plusone-basic-infrastructure/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="https://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>xyz.zhouxy</groupId>

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/exception/config/PlusoneExceptionHandlerConfig.java

@@ -5,7 +5,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
 
 @Configuration
 public class PlusoneExceptionHandlerConfig {

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/jdbc/BeanPropertyParamSource.java

@@ -1,8 +1,12 @@
 package xyz.zhouxy.plusone.jdbc;
 
 import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.lang.Nullable;
 
+import xyz.zhouxy.plusone.commons.base.IWithCode;
+import xyz.zhouxy.plusone.commons.base.IWithIntCode;
+
 /**
  * 扩展了 {@link BeanPropertySqlParameterSource}，在将 POJO 转换为
  * {@link org.springframework.jdbc.core.namedparam.SqlParameterSource} 时，
@@ -25,8 +29,14 @@ public class BeanPropertyParamSource extends BeanPropertySqlParameterSource {
     @Nullable
     public Object getValue(String paramName) throws IllegalArgumentException {
         Object value = super.getValue(paramName);
-       if (value instanceof Enum) {
+        if (value instanceof Enum<?> e) {
-           return ((Enum<?>) value).ordinal();
+            if (value instanceof IWithCode<?> c) {
+                return c.getCode();
+            }
+            if (value instanceof IWithIntCode c) {
+                return c.getCode();
+            }
+            return e.ordinal();
         }
         return value;
     }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/jdbc/JdbcEntityDaoSupport.java

@@ -63,10 +63,12 @@ public abstract class JdbcEntityDaoSupport<T extends Entity<ID>, ID extends Seri
 
     protected abstract T mapRow(ResultSet rs) throws SQLException;
 
+    @Deprecated
     protected void setRowMapper(@Nonnull RowMapper<T> rowMapper) {
         this.rowMapper = rowMapper;
     }
 
+    @Deprecated
     protected void setResultSetExtractor(@Nonnull ResultSetExtractor<Optional<T>> resultSetExtractor) {
         this.resultSetExtractor = resultSetExtractor;
     }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/jdbc/JdbcFactory.java

@@ -7,8 +7,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import xyz.zhouxy.plusone.spring.SpringContextHolder;
 
 /**
- * 全局单例，由 Spring 装配好的对象。
+ * 通过静态方法获取 Spring 容器中的 {@link JdbcTemplate} 和
- * 可通过静态方法获取 Spring 容器中的 {@link JdbcTemplate} 和
  * {@link NamedParameterJdbcTemplate} 对象。
  *
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
@@ -17,17 +16,19 @@ import xyz.zhouxy.plusone.spring.SpringContextHolder;
  */
 public final class JdbcFactory {
 
-    private static final ApplicationContext CONTEXT = SpringContextHolder.getContext();
+    private static final ApplicationContext SPRING_APPLICATION_CONTEXT = SpringContextHolder.getContext();
+    private static final JdbcTemplate JDBC_TEMPLATE = SPRING_APPLICATION_CONTEXT.getBean(JdbcTemplate.class);
+    private static final NamedParameterJdbcTemplate NAMED_PARAMETER_JDBC_TEMPLATE = SPRING_APPLICATION_CONTEXT.getBean(NamedParameterJdbcTemplate.class);
 
     private JdbcFactory() {
         throw new IllegalStateException("Utility class");
     }
 
     public static JdbcTemplate getJdbcTemplate() {
-        return CONTEXT.getBean(JdbcTemplate.class);
+        return JDBC_TEMPLATE;
     }
 
     public static NamedParameterJdbcTemplate getNamedParameterJdbcTemplate() {
-        return CONTEXT.getBean(NamedParameterJdbcTemplate.class);
+        return NAMED_PARAMETER_JDBC_TEMPLATE;
     }
 }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/jdbc/JdbcRepositorySupport.java

@@ -8,6 +8,9 @@ import javax.annotation.Nonnull;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 
+import com.google.common.base.Preconditions;
+
+import xyz.zhouxy.plusone.commons.annotation.Overridable;
 import xyz.zhouxy.plusone.domain.AggregateRoot;
 import xyz.zhouxy.plusone.domain.IRepository;
 
@@ -19,35 +22,33 @@ public abstract class JdbcRepositorySupport<T extends AggregateRoot<ID>, ID exte
         super(namedParameterJdbcTemplate);
     }
 
+    @Overridable
     protected abstract void doDelete(@Nonnull T entity);
 
+    @Overridable
     protected abstract Optional<T> doFindById(@Nonnull ID id);
 
+    @Overridable
     protected abstract T doInsert(@Nonnull T entity);
 
+    @Overridable
     protected abstract T doUpdate(@Nonnull T entity);
 
     @Override
     public final void delete(T entity) {
-        if (entity == null) {
+        Preconditions.checkArgument(entity != null, "Cannot delete null.");
-            throw new IllegalArgumentException("Cannot delete null.");
-        }
         doDelete(entity);
     }
 
     @Override
     public final Optional<T> find(ID id) {
-        if (id == null) {
+        Preconditions.checkArgument(id != null, "Id cannot be null.");
-            throw new IllegalArgumentException("Id cannot be null.");
-        }
         return doFindById(id);
     }
 
     @Override
     public final T save(T entity) {
-        if (entity == null) {
+        Preconditions.checkArgument(entity != null, "Cannot save null.");
-            throw new IllegalArgumentException("Cannot save null.");
-        }
         return entity.getId().isPresent() ? doUpdate(entity) : doInsert(entity);
     }
 

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/jdbc/PlusoneJdbcDaoSupport.java

@@ -14,9 +14,10 @@ import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.util.CollectionUtils;
 
+import xyz.zhouxy.plusone.commons.util.Numbers;
 import xyz.zhouxy.plusone.exception.DataOperationResultException;
-import xyz.zhouxy.plusone.util.NumberUtil;
 
 public abstract class PlusoneJdbcDaoSupport {
     protected final NamedParameterJdbcTemplate jdbc;
@@ -68,13 +69,13 @@ public abstract class PlusoneJdbcDaoSupport {
         return queryForStream(sql, new MapSqlParameterSource(paramName, value), elementType);
     }
 
-    protected final boolean queryExists(String sql, SqlParameterSource parameterSource) {
+    protected final boolean queryForBool(String sql, SqlParameterSource parameterSource) {
-        Boolean isExists = this.jdbc.queryForObject(sql, parameterSource, Boolean.TYPE);
+        Boolean result = this.jdbc.queryForObject(sql, parameterSource, Boolean.TYPE);
-        return Boolean.TRUE.equals(isExists);
+        return Boolean.TRUE.equals(result);
     }
 
-    protected final boolean queryExists(String sql, String paramName, Object value) {
+    protected final boolean queryForBool(String sql, String paramName, Object value) {
-        return queryExists(sql, new MapSqlParameterSource(paramName, value));
+        return queryForBool(sql, new MapSqlParameterSource(paramName, value));
     }
 
     protected final int update(String sql, SqlParameterSource parameterSource) {
@@ -85,66 +86,66 @@ public abstract class PlusoneJdbcDaoSupport {
         return update(sql, new MapSqlParameterSource(paramName, value));
     }
 
-    protected final int batchUpdate(String sql, SqlParameterSource[] batchArgs) {
+    protected final long batchUpdate(String sql, SqlParameterSource[] batchArgs) {
         int[] i = this.jdbc.batchUpdate(sql, batchArgs);
-        return NumberUtil.sum(i);
+        return Numbers.sum(i);
     }
 
-    protected final <T> int batchUpdate(String sql, Stream<T> c,
+    protected final <T> long batchUpdate(String sql, Stream<T> c,
             @Nonnull Function<T, SqlParameterSource> paramSourceBuilder) {
         int[] i = this.jdbc.batchUpdate(sql, buildSqlParameterSourceArray(c, paramSourceBuilder));
-        return NumberUtil.sum(i);
+        return Numbers.sum(i);
     }
 
-    protected final <T> int batchUpdate(String sql, Collection<T> c,
+    protected final <T> long batchUpdate(String sql, Collection<T> c,
             @Nonnull Function<T, SqlParameterSource> paramSourceBuilder) {
         int[] i = this.jdbc.batchUpdate(sql, buildSqlParameterSourceArray(c, paramSourceBuilder));
-        return NumberUtil.sum(i);
+        return Numbers.sum(i);
     }
 
-    protected static final <T> void assertResultEquals(T result, T expectedValue) {
+    protected static <T> void assertResultEquals(T result, T expectedValue) {
         if (!Objects.equals(result, expectedValue)) {
             throw new DataOperationResultException();
         }
     }
 
-    protected static final <T> void assertResultEquals(T result, T expectedValue, Function<T, String> errMsg) {
+    protected static <T> void assertResultEquals(T result, T expectedValue, Function<T, String> errMsg) {
         if (!Objects.equals(result, expectedValue)) {
             throw new DataOperationResultException(errMsg.apply(result));
         }
     }
 
-    protected static final <T> void assertResultEquals(T result, T expectedValue, String msgTemplate, Object... args) {
+    protected static <T> void assertResultEquals(T result, T expectedValue, String msgTemplate, Object... args) {
         if (!Objects.equals(result, expectedValue)) {
             throw new DataOperationResultException(String.format(msgTemplate, args));
         }
     }
 
-    protected static final <T, E extends Throwable> void assertResultEqualsOrThrow(T result, T expectedValue,
+    protected static <T, E extends Throwable> void assertResultEqualsOrThrow(T result, T expectedValue,
             Function<T, E> e) throws E {
         if (!Objects.equals(result, expectedValue)) {
             throw e.apply(result);
         }
     }
 
-    protected static final void assertUpdateOneRow(int result) {
+    protected static void assertUpdateOneRow(int result) {
         assertResultEquals(result, 1);
     }
 
-    protected static final void assertUpdateOneRow(int result, Function<Integer, String> errMsg) {
+    protected static void assertUpdateOneRow(int result, Function<Integer, String> errMsg) {
         assertResultEquals(result, 1, errMsg);
     }
 
-    protected static final void assertUpdateOneRow(int result, String msgTemplate, Object... args) {
+    protected static void assertUpdateOneRow(int result, String msgTemplate, Object... args) {
         assertResultEquals(result, 1, msgTemplate, args);
     }
 
-    protected static final <E extends Throwable> void assertUpdateOneRowOrThrow(int result, Function<Integer, E> e)
+    protected static <E extends Throwable> void assertUpdateOneRowOrThrow(int result, Function<Integer, E> e)
             throws E {
         assertResultEqualsOrThrow(result, 1, e);
     }
 
-    protected static final <T> SqlParameterSource[] buildSqlParameterSourceArray(
+    protected static <T> SqlParameterSource[] buildSqlParameterSourceArray(
             T[] c,
             @Nonnull Function<T, SqlParameterSource> paramSourceBuilder) {
         if (c == null || c.length == 0) {
@@ -153,16 +154,16 @@ public abstract class PlusoneJdbcDaoSupport {
         return buildSqlParameterSourceArray(Arrays.stream(c), paramSourceBuilder);
     }
 
-    protected static final <T> SqlParameterSource[] buildSqlParameterSourceArray(
+    protected static <T> SqlParameterSource[] buildSqlParameterSourceArray(
             Collection<T> c,
             @Nonnull Function<T, SqlParameterSource> paramSourceBuilder) {
-        if (c == null || c.isEmpty()) {
+        if (CollectionUtils.isEmpty(c)) {
             return new SqlParameterSource[] {};
         }
         return buildSqlParameterSourceArray(c.stream(), paramSourceBuilder);
     }
 
-    protected static final <T> SqlParameterSource[] buildSqlParameterSourceArray(
+    protected static <T> SqlParameterSource[] buildSqlParameterSourceArray(
             Stream<T> stream,
             @Nonnull Function<T, SqlParameterSource> paramSourceBuilder) {
         Objects.requireNonNull(stream);

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/jdbc/common/ResultMapper.java

@@ -8,7 +8,7 @@ import java.sql.SQLException;
  *
  * <p>
  * 通过在 {@link #map(ResultSet)} 中配置 {@link ResultSet} 到对象的映射，
- * 可将 {@link #rowMapper(ResultSet, int)} 的方法应用，
+ * 可将 {@link #rowMapper(ResultSet, int)} 的方法引用，
  * 直接当成 {@link org.springframework.jdbc.core.RowMapper} 对象传给
  * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
  * 的查询方法，

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/oss/FastDFSException.java

@@ -6,6 +6,7 @@ package xyz.zhouxy.plusone.oss;
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  */
 public class FastDFSException extends Exception {
+    private static final long serialVersionUID = 7871031982887742468L;
 
     public FastDFSException() {
     }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/oss/FastDFSUtil.java

@@ -1,8 +1,17 @@
 package xyz.zhouxy.plusone.oss;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.csource.common.MyException;
 import org.csource.common.NameValuePair;
@@ -14,7 +23,11 @@ import org.csource.fastdfs.TrackerServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.io.Files;
+
 import lombok.Getter;
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
+import xyz.zhouxy.plusone.exception.SysException;
 
 public class FastDFSUtil {
 
@@ -44,7 +57,7 @@ public class FastDFSUtil {
      * @throws FastDFSException
      */
     public String[] upload(FastDFSFile file) throws FastDFSException {
-        logger.info("File Name: {}, File Length: {}", file.getName(), file.getContent().length);
+        logger.info("File Name: {}, File Length: {}", file.getFileName(), file.getContent().length);
 
         NameValuePair[] metaList = new NameValuePair[1];
         metaList[0] = new NameValuePair("author", file.getAuthor());
@@ -63,7 +76,7 @@ public class FastDFSUtil {
                     uploadResults[0], uploadResults[1], System.currentTimeMillis() - startTime);
 
         } catch (IOException e) {
-            throw new FastDFSException("IO Exception when uploadind the file:" + file.getName(), e);
+            throw new FastDFSException("IO Exception when uploadind the file:" + file.getFileName(), e);
         } catch (MyException e) {
             throw new FastDFSException(e);
         }
@@ -109,18 +122,72 @@ public class FastDFSUtil {
         }
     }
 
-    @Getter
     public static final class FastDFSFile {
-        private String name;
+        @Getter
-        private byte[] content;
+        private final String fileName;
-        private String ext;
+        private final byte[] content;
-        private String md5;
+        @Getter
-        private String author;
+        private final String ext;
+        @Getter
+        private final String md5;
+        @Getter
+        private final String author;
 
-        public FastDFSFile(String name, byte[] content, String ext) {
+        private FastDFSFile(@Nonnull File file, @Nullable String author) throws IOException {
-            this.name = name;
+            this.fileName = file.getName();
+            this.content = Files.toByteArray(file);
+            this.ext = Files.getFileExtension(fileName);
+            this.md5 = md5Hex(content);
+            this.author = author;
+        }
+
+        private FastDFSFile(@Nonnull String fileName, @Nonnull byte[] content, @Nullable String author) {
+            this.fileName = fileName;
             this.content = content;
-            this.ext = ext;
+            this.ext = Files.getFileExtension(fileName);
+            this.md5 = md5Hex(content);
+            this.author = author;
+        }
+
+        @Nonnull
+        @StaticFactoryMethod(FastDFSFile.class)
+        public static FastDFSFile of(@Nonnull File file) throws IOException {
+            return new FastDFSFile(file, null);
+        }
+
+        @Nonnull
+        @StaticFactoryMethod(FastDFSFile.class)
+        public static FastDFSFile of(@Nonnull File file, @Nullable String author) throws IOException {
+            return new FastDFSFile(file, author);
+        }
+
+        @Nonnull
+        @StaticFactoryMethod(FastDFSFile.class)
+        public static FastDFSFile of(@Nonnull String fileName, @Nonnull byte[] content) {
+            return new FastDFSFile(fileName, content, null);
+        }
+
+        @Nonnull
+        @StaticFactoryMethod(FastDFSFile.class)
+        public static FastDFSFile of(@Nonnull String fileName, @Nonnull byte[] content, @Nullable String author) {
+            return new FastDFSFile(fileName, content, author);
+        }
+
+        public byte[] getContent() {
+            return Arrays.copyOf(content, content.length);
+        }
+
+        @Nonnull
+        private static String md5Hex(byte[] data) {
+            try {
+                MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+                messageDigest.update(data);
+                byte[] result = messageDigest.digest();
+                var sha512Hex = new BigInteger(1, result).toString(16);
+                return Objects.requireNonNull(sha512Hex);
+            } catch (NoSuchAlgorithmException e) {
+                throw SysException.of(e);
+            }
         }
     }
 }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/sms/TencentSmsServiceImpl.java

@@ -1,5 +1,7 @@
 package xyz.zhouxy.plusone.sms;
 
+import org.springframework.stereotype.Service;
+
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.common.profile.ClientProfile;
@@ -8,11 +10,8 @@ import com.tencentcloudapi.sms.v20210111.SmsClient;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
 
-import org.springframework.stereotype.Service;
-
 import lombok.extern.slf4j.Slf4j;
-import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
+import xyz.zhouxy.plusone.exception.SysException;
-import xyz.zhouxy.plusone.exception.PlusoneException;
 import xyz.zhouxy.plusone.sms.SmsProperties.SmsCredentialProperties;
 import xyz.zhouxy.plusone.sms.SmsProperties.SmsHttpProperties;
 import xyz.zhouxy.plusone.sms.SmsProperties.SmsProxyProperties;
@@ -69,7 +68,7 @@ public class TencentSmsServiceImpl implements SmsService {
 
         } catch (TencentCloudSDKException e) {
             log.error(e.getMessage(), e);
-            throw new PlusoneException(ErrorCodeConsts.DEFAULT_ERROR_CODE, e);
+            throw SysException.of(e);
         }
     }
 

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/spring/SpringContextHolder.java

@@ -4,15 +4,13 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-public class SpringContextHolder {
+public enum SpringContextHolder {
+
+    INSTANCE
+    ;
 
     private ApplicationContext context;
 
-    private static final SpringContextHolder INSTANCE = new SpringContextHolder();
-
-    private SpringContextHolder() {
-    }
-
     public static ApplicationContext getContext() {
         return INSTANCE.context;
     }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/validator/InvalidInputExceptionHandler.java

@@ -1,13 +1,15 @@
 package xyz.zhouxy.plusone.validator;
 
+import javax.annotation.Nonnull;
+
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
 
 @RestControllerAdvice
 public class InvalidInputExceptionHandler extends BaseExceptionHandler {
 
-    public InvalidInputExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    public InvalidInputExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
         set(InvalidInputException.class, InvalidInputException.ERROR_CODE, "无效的用户输入");
     }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/web/config/WebCorsConfig.java

@@ -12,6 +12,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class WebCorsConfig implements WebMvcConfigurer {
 
+    // TODO 不放行全部，通过配置文件配置允许访问的域名
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")

plusone-basic/plusone-basic-infrastructure/src/test/java/xyz/zhouxy/plusone/validatortest/BaseValidatorTest.java

@@ -1,11 +1,13 @@
 package xyz.zhouxy.plusone.validatortest;
 
+import java.util.regex.Pattern;
+
 import org.junit.jupiter.api.Test;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import xyz.zhouxy.plusone.constant.RegexConsts;
+import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 import xyz.zhouxy.plusone.validator.BaseValidator;
 
 class BaseValidatorTest {
@@ -34,11 +36,11 @@ class LoginCommandValidator extends BaseValidator<LoginCommand> {
     private LoginCommandValidator() {
         ruleForString(LoginCommand::getAccount)
                 .notNull("邮箱地址不能为空")
-                .matchesOr(new String[] { RegexConsts.EMAIL, RegexConsts.MOBILE_PHONE },
+                .matchesOne(new Pattern[] { PatternConsts.EMAIL, PatternConsts.MOBILE_PHONE },
                         value -> new RuntimeException('"' + value + "\" 不是邮箱地址或手机号"));
         ruleForString(LoginCommand::getPwd)
                 .notNull("密码不能为空")
                 .notEmpty("密码不能为空")
-                .matches(RegexConsts.PASSWORD, "密码格式错误");
+                .matches(PatternConsts.PASSWORD, "密码格式错误");
     }
 }

plusone-basic/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>plusone</artifactId>
@@ -7,9 +7,7 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>xyz.zhouxy</groupId>
     <artifactId>plusone-basic</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 

plusone-start/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>plusone</artifactId>
@@ -7,10 +7,7 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>xyz.zhouxy</groupId>
     <artifactId>plusone-start</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-
     <name>plusone-start</name>
 
     <description>参考 DDD 落地的脚手架</description>

plusone-start/src/main/java/xyz/zhouxy/plusone/PlusoneApplication.java

@@ -3,14 +3,10 @@ package xyz.zhouxy.plusone;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import lombok.extern.slf4j.Slf4j;
-
 @SpringBootApplication
-@Slf4j
 public class PlusoneApplication {
 
     public static void main(String[] args) {
-        log.debug("Plusone started!");
         SpringApplication.run(PlusoneApplication.class, args);
     }
 

plusone-start/src/test/java/xyz/zhouxy/plusone/AccountQueriesTests.java

@@ -0,0 +1,33 @@
+package xyz.zhouxy.plusone;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import lombok.extern.slf4j.Slf4j;
+import xyz.zhouxy.plusone.system.application.query.AccountQueries;
+import xyz.zhouxy.plusone.system.application.query.params.AccountQueryParams;
+import xyz.zhouxy.plusone.system.application.query.result.AccountOverview;
+
+@Slf4j
+@SpringBootTest(classes = PlusoneApplication.class)
+class AccountQueriesTests {
+
+    @Resource
+    AccountQueries accountQueries;
+
+    @Test
+    void testQueryPage() {
+        AccountQueryParams queryParams = new AccountQueryParams();
+        // queryParams.setOrderBy(List.of("email", "mobile_phone", "id"));
+        queryParams.setSize(20);
+        queryParams.setPageNum(1L);
+        queryParams.setOrderBy(Collections.emptyList());
+        List<AccountOverview> l = accountQueries.queryAccountOverview(queryParams);
+        log.info("l: {}", l);
+    }
+}

plusone-start/src/test/java/xyz/zhouxy/plusone/FastDFSTests.java

@@ -1,12 +1,11 @@
 package xyz.zhouxy.plusone;
 
-import java.io.FileInputStream;
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import javax.annotation.Resource;
 
-import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -24,10 +23,7 @@ class FastDFSTests {
 
     @Test
     void testOSS() throws FileNotFoundException, IOException, FastDFSException {
-        try (FileInputStream in = new FileInputStream("D:\\ZhouXY\\Desktop\\666.png");) {
+        String[] upload = fastDFSUtil.upload(FastDFSFile.of(new File("D:\\ZhouXY\\Desktop\\666.png")));
-            byte[] content = IOUtils.toByteArray(in);
-            String[] upload = fastDFSUtil.upload(new FastDFSFile("666.png", content, "png"));
         log.info(String.join("/", upload));
     }
 }
-}

plusone-start/src/test/java/xyz/zhouxy/plusone/SerialTests.java

@@ -5,14 +5,14 @@ import java.io.ObjectStreamClass;
 import org.junit.jupiter.api.Test;
 
 import lombok.extern.slf4j.Slf4j;
-import xyz.zhouxy.plusone.exception.PlusoneException;
+import xyz.zhouxy.plusone.exception.*;
 
 @Slf4j
 class SerialTests {
 
     @Test
     void testSerialVersionUID() {
-        var cl = PlusoneException.class;
+        var cl = SysException.class;
         var c = ObjectStreamClass.lookup(cl);
         var uid = c.getSerialVersionUID();
         log.info("\n    @java.io.Serial" +

plusone-start/src/test/java/xyz/zhouxy/plusone/TestAop.java

@@ -1,5 +1,7 @@
 package xyz.zhouxy.plusone;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import javax.annotation.Resource;
 
 import org.junit.jupiter.api.Test;
@@ -25,6 +27,7 @@ class TestAop {
         command.setPrincipal("Code108");
         command.setPassword("2333");
         command.setRememberMe(false);
+        assertNotNull(service);
         LoginInfoViewObject loginInfo = service.loginByPassword(command);
         System.err.println(loginInfo);
     }

plusone-system/plusone-system-application/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>plusone-system</artifactId>

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/exception/AccountLoginException.java

@@ -1,22 +1,22 @@
-package xyz.zhouxy.plusone.system.application.exception;
+package xyz.zhouxy.plusone.system.application.common.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import xyz.zhouxy.plusone.exception.PlusoneException;
+import xyz.zhouxy.plusone.exception.BizException;
 
 @ResponseStatus(HttpStatus.BAD_REQUEST)
-public class AccountLoginException extends PlusoneException {
+public class AccountLoginException extends BizException {
     @java.io.Serial
     private static final long serialVersionUID = -3040996790739138556L;
 
-    private static final int DEFAULT_ERR_CODE = 4030000;
+    private static final String DEFAULT_ERR_CODE = "4030000";
 
     private AccountLoginException() {
         super(DEFAULT_ERR_CODE, "用户登录异常");
     }
 
-    private AccountLoginException(int code, String message) {
+    private AccountLoginException(String code, String message) {
         super(code, message);
     }
 
@@ -25,7 +25,7 @@ public class AccountLoginException extends PlusoneException {
     }
 
     public static AccountLoginException accountNotExistException(String msg) {
-        return new AccountLoginException(4030101, msg);
+        return new AccountLoginException("4030101", msg);
     }
 
     public static AccountLoginException otpErrorException() {
@@ -33,7 +33,7 @@ public class AccountLoginException extends PlusoneException {
     }
 
     public static AccountLoginException otpErrorException(String msg) {
-        return new AccountLoginException(4030501, msg);
+        return new AccountLoginException("4030501", msg);
     }
 
     public static AccountLoginException otpNotExistsException() {
@@ -41,7 +41,7 @@ public class AccountLoginException extends PlusoneException {
     }
 
     public static AccountLoginException otpNotExistsException(String msg) {
-        return new AccountLoginException(4030502, msg);
+        return new AccountLoginException("4030502", msg);
     }
 
     public static AccountLoginException passwordErrorException() {
@@ -49,6 +49,6 @@ public class AccountLoginException extends PlusoneException {
     }
 
     public static AccountLoginException passwordErrorException(String msg) {
-        return new AccountLoginException(4030200, msg);
+        return new AccountLoginException("4030200", msg);
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/exception/AccountRegisterException.java

@@ -0,0 +1,57 @@
+package xyz.zhouxy.plusone.system.application.common.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import xyz.zhouxy.plusone.exception.BizException;
+
+@ResponseStatus(HttpStatus.BAD_REQUEST)
+public class AccountRegisterException extends BizException {
+
+    @java.io.Serial
+    private static final long serialVersionUID = 7580245181633370195L;
+
+    public AccountRegisterException() {
+        this("4020000", "用户注册错误");
+    }
+
+    public AccountRegisterException(String message) {
+        this("4020000", message);
+    }
+
+    public AccountRegisterException(Throwable cause) {
+        super("4020000", cause);
+    }
+
+    public AccountRegisterException(String code, String message) {
+        super(code, message);
+    }
+
+    public AccountRegisterException(String code, Throwable cause) {
+        super(code, cause);
+    }
+
+    public static AccountRegisterException emailOrMobilePhoneRequiredException() {
+        return new AccountRegisterException("4020300", "邮箱和手机号应至少绑定一个");
+    }
+
+    public static AccountRegisterException usernameAlreadyExists(String username) {
+        return new AccountRegisterException("4020400", String.format("用户名 %s 已存在", username));
+    }
+
+    public static AccountRegisterException emailAlreadyExists(String value) {
+        return new AccountRegisterException("4020500", String.format("邮箱 %s 已存在", value));
+    }
+
+    public static AccountRegisterException mobilePhoneAlreadyExists(String value) {
+        return new AccountRegisterException("4020600", String.format("手机号 %s 已存在", value));
+    }
+
+    public static AccountRegisterException codeErrorException() {
+        return new AccountRegisterException("4020701", "校验码错误");
+    }
+
+    public static AccountRegisterException codeNotExistsException() {
+        return new AccountRegisterException("4020702", "校验码不存在或已过期");
+    }
+}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/exception/UnsupportedMenuTypeException.java

@@ -1,4 +1,4 @@
-package xyz.zhouxy.plusone.system.application.exception;
+package xyz.zhouxy.plusone.system.application.common.exception;
 
 import xyz.zhouxy.plusone.validator.InvalidInputException;
 
@@ -7,11 +7,13 @@ public class UnsupportedMenuTypeException extends InvalidInputException {
     @java.io.Serial
     private static final long serialVersionUID = -769169844015637730L;
 
+    public static final String ERROR_CODE = "4040209";
+
     public UnsupportedMenuTypeException() {
         this("不支持的菜单类型");
     }
 
     public UnsupportedMenuTypeException(String message) {
-        super(message);
+        super(ERROR_CODE, message);
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/exception/UnsupportedPrincipalTypeException.java

@@ -0,0 +1,32 @@
+package xyz.zhouxy.plusone.system.application.common.exception;
+
+import xyz.zhouxy.plusone.exception.BizException;
+
+/**
+ * 不支持的 Principal 类型出现时抛出的异常
+ *
+ * @author <a href="https://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ */
+public class UnsupportedPrincipalTypeException extends BizException {
+
+    private static final long serialVersionUID = 5207757290868470762L;
+
+    public static final String ERR_CODE = "4040201";
+    private static final String DEFAULT_ERROR_MSG = "不支持的 PrincipalType";
+
+    public UnsupportedPrincipalTypeException() {
+        super(ERR_CODE, DEFAULT_ERROR_MSG);
+    }
+
+    public UnsupportedPrincipalTypeException(String msg) {
+        super(ERR_CODE, msg);
+    }
+
+    public UnsupportedPrincipalTypeException(Throwable cause) {
+        super(ERR_CODE, cause);
+    }
+
+    public UnsupportedPrincipalTypeException(String msg, Throwable cause) {
+        super(ERR_CODE, msg, cause);
+    }
+}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/exception/handler/AccountLoginExceptionHandler.java

@@ -0,0 +1,26 @@
+package xyz.zhouxy.plusone.system.application.common.exception.handler;
+
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
+import xyz.zhouxy.plusone.system.application.common.exception.AccountLoginException;
+
+@RestControllerAdvice
+public class AccountLoginExceptionHandler extends BaseExceptionHandler {
+
+    public AccountLoginExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
+        super(exceptionInfoHolder);
+    }
+
+    @ExceptionHandler({ AccountLoginException.class })
+    public ResponseEntity<UnifiedResponse> handleException(Exception e) {
+        return buildExceptionResponse(Objects.requireNonNull(e));
+    }
+}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/exception/handler/SaTokenExceptionHandler.java

@@ -1,4 +1,6 @@
-package xyz.zhouxy.plusone.system.application.exception.handler;
+package xyz.zhouxy.plusone.system.application.common.exception.handler;
+
+import javax.annotation.Nonnull;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -14,8 +16,8 @@ import cn.dev33.satoken.exception.NotSafeException;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.exception.SameTokenInvalidException;
 import lombok.extern.slf4j.Slf4j;
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
-import xyz.zhouxy.plusone.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 
 /**
  * Sa-Token 异常处理器
@@ -27,7 +29,7 @@ import xyz.zhouxy.plusone.util.RestfulResult;
 public class SaTokenExceptionHandler extends BaseExceptionHandler {
 
 
-    public SaTokenExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    public SaTokenExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
         set(NotPermissionException.class, 4030103, "会话未能通过权限认证", HttpStatus.FORBIDDEN);
         set(NotRoleException.class, 4030103, "会话未能通过角色认证", HttpStatus.FORBIDDEN);
@@ -50,7 +52,7 @@ public class SaTokenExceptionHandler extends BaseExceptionHandler {
     }
 
     @ExceptionHandler(SaTokenException.class)
-    public ResponseEntity<RestfulResult> handleSaTokenException(SaTokenException e) {
+    public ResponseEntity<UnifiedResponse> handleSaTokenException(SaTokenException e) {
         log.error(e.getMessage(), e);
         return buildExceptionResponse(e);
     }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/model/AuthenticationInfo.java

@@ -0,0 +1,138 @@
+package xyz.zhouxy.plusone.system.application.common.model;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import java.util.OptionalDouble;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import xyz.zhouxy.plusone.exception.BizException;
+
+public class AuthenticationInfo<T> {
+
+    /** token 值 */
+    private final String token;
+
+    /** 此 token 对应的LoginId，未登录时不会构建此类的实例 */
+    private final T loginId;
+
+    /** 账号类型 */
+    private final String loginType;
+
+    /** 登录设备类型 */
+    private final String deviceType;
+
+    /** 自定义数据 */
+    @Nonnull
+    private final Map<String, Object> metadata;
+
+    private AuthenticationInfo(String token, T loginId, String loginType, String deviceType,
+            @Nonnull Map<String, Object> metadata) {
+        this.token = token;
+        this.loginId = loginId;
+        this.loginType = loginType;
+        this.deviceType = deviceType;
+        this.metadata = metadata;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public T getLoginId() {
+        return loginId;
+    }
+
+    public String getLoginType() {
+        return loginType;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    private Object getObjFromMetadata(String key) {
+        if (this.metadata.containsKey(key)) {
+            return this.metadata.get(key);
+        }
+        throw BizException.of(String.format("不存在 key 为 \"%s\"的元数据。", key));
+    }
+
+    public OptionalDouble getMetadataAsDouble(String key) {
+        Object valObj = getObjFromMetadata(key);
+        if (valObj instanceof Double val) {
+            return OptionalDouble.of(val.doubleValue());
+        }
+        return OptionalDouble.empty();
+    }
+
+    public OptionalLong getMetadataAsLong(String key) {
+        Object valObj = getObjFromMetadata(key);
+        if (valObj instanceof Long val) {
+            return OptionalLong.of(val.longValue());
+        }
+        return OptionalLong.empty();
+    }
+
+    public OptionalInt getMetadataAsInt(String key) {
+        Object valObj = getObjFromMetadata(key);
+        if (valObj instanceof Integer val) {
+            return OptionalInt.of(val.intValue());
+        }
+        return OptionalInt.empty();
+    }
+
+    public Optional<String> getMetadataAsString(String key) {
+        Object valObj = getObjFromMetadata(key);
+        if (valObj instanceof String val) {
+            return Optional.of(val);
+        }
+        return Optional.empty();
+    }
+
+    @SuppressWarnings("unchecked")
+    public <C> Optional<C> getMetadata(String key, Class<C> type) {
+        Object valObj = getObjFromMetadata(key);
+        if (valObj == null || !type.isAssignableFrom(valObj.getClass())) {
+            return Optional.empty();
+        }
+        return Optional.of((C) valObj);
+    }
+
+    // ==========================================
+    // builder
+
+    public static <T> Builder<T> builder(String token, T loginId, String loginType, String deviceType) {
+        return new Builder<>(token, loginId, loginType, deviceType);
+    }
+
+    public static final class Builder<T> {
+        private final String token;
+        private final T loginId;
+        private final String loginType;
+        private final String deviceType;
+
+        @Nonnull
+        private final Map<String, Object> meta = new ConcurrentHashMap<>();
+
+        private Builder(String token, T loginId, String loginType, String deviceType) {
+            this.token = token;
+            this.loginId = loginId;
+            this.loginType = loginType;
+            this.deviceType = deviceType;
+        }
+
+        public <C> Builder<T> putMetadata(String key, @Nullable C value) {
+            this.meta.put(key, value);
+            return this;
+        }
+
+        public AuthenticationInfo<T> build() {
+            return new AuthenticationInfo<>(token, loginId, loginType, deviceType, meta);
+        }
+    }
+}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/model/PlusoneContext.java

@@ -0,0 +1,21 @@
+package xyz.zhouxy.plusone.system.application.common.model;
+
+public class PlusoneContext {
+    private static final ThreadLocal<AuthenticationInfo<Long>> context = new ThreadLocal<>();
+
+    public static void setContext(AuthenticationInfo<Long> value) {
+        context.set(value);
+    }
+
+    public static AuthenticationInfo<Long> getContext() {
+        return context.get();
+    }
+
+    public static void remove() {
+        context.remove();
+    }
+
+    private PlusoneContext() {
+        throw new IllegalStateException("Utility class");
+    }
+}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/util/MenuUtil.java

@@ -1,61 +0,0 @@
-package xyz.zhouxy.plusone.system.application.common.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import xyz.zhouxy.plusone.domain.IWithOrderNumber;
-import xyz.zhouxy.plusone.system.application.query.result.MenuViewObject;
-import xyz.zhouxy.plusone.system.domain.model.menu.Menu.MenuType;
-
-/**
- * 菜单工具类
- *
- * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
- */
-public class MenuUtil {
-    private MenuUtil() {
-        throw new IllegalStateException("Utility class");
-    }
-
-    /**
-     * 构建菜单树
-     *
-     * @param allMenus 菜单列表
-     * @return 菜单树
-     */
-    public static List<MenuViewObject> buildMenuTree(Collection<MenuViewObject> allMenus) {
-        // 先排序，保证添加到 rootMenus 中的顺序，以及 addChild 添加的子菜单的顺序
-        allMenus = allMenus.stream()
-                .sorted(Comparator.comparing(IWithOrderNumber::getOrderNumber))
-                .toList();
-
-        // 一级菜单
-        List<MenuViewObject> rootMenus = new ArrayList<>();
-        // key: 菜单 id; value: 菜单对象. 方便根据 id 查找相应对象。
-        Map<Long, MenuViewObject> menuListMap = new HashMap<>();
-
-        for (var menu : allMenus) {
-            // 添加 MENU_LIST 到 map 中，方便后面调用对象的方法
-            if (menu.getType() == MenuType.MENU_LIST.ordinal()) {
-                menuListMap.put(menu.getId(), menu);
-            }
-            // 一级菜单
-            if (menu.getParentId() == 0) {
-                rootMenus.add(menu);
-            }
-        }
-        for (var menu : allMenus) {
-            var parent = menuListMap.getOrDefault(menu.getParentId(), null);
-            // 父菜单存在于 map 中，调用父菜单的 addChild 方法将当前菜单添加为父菜单的子菜单。
-            if (parent != null) {
-                parent.addChild(menu);
-            }
-        }
-
-        return rootMenus;
-    }
-}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/util/PrincipalType.java

@@ -1,18 +1,20 @@
 package xyz.zhouxy.plusone.system.application.common.util;
 
+import java.util.regex.Pattern;
+
 import lombok.Getter;
-import xyz.zhouxy.plusone.constant.RegexConsts;
+import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 
 public enum PrincipalType {
-    EMAIL(RegexConsts.EMAIL),
+    EMAIL(PatternConsts.EMAIL),
-    MOBILE_PHONE(RegexConsts.MOBILE_PHONE),
+    MOBILE_PHONE(PatternConsts.MOBILE_PHONE),
-    USERNAME(RegexConsts.USERNAME)
+    USERNAME(PatternConsts.USERNAME)
     ;
 
     @Getter
-    private final String regex;
+    private final Pattern regex;
 
-    PrincipalType(String regex) {
+    PrincipalType(Pattern regex) {
         this.regex = regex;
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/common/util/PrincipalUtil.java

@@ -2,11 +2,11 @@ package xyz.zhouxy.plusone.system.application.common.util;
 
 import javax.annotation.Nullable;
 
+import xyz.zhouxy.plusone.system.application.common.exception.UnsupportedPrincipalTypeException;
 import xyz.zhouxy.plusone.system.domain.model.account.Email;
 import xyz.zhouxy.plusone.system.domain.model.account.MobilePhone;
 import xyz.zhouxy.plusone.system.domain.model.account.Principal;
 import xyz.zhouxy.plusone.system.domain.model.account.Username;
-import xyz.zhouxy.plusone.validator.InvalidInputException;
 
 /**
  * 根据字面值，判断并生成 {@link Principal} 值对象。
@@ -16,7 +16,7 @@ import xyz.zhouxy.plusone.validator.InvalidInputException;
  * @see Username
  * @see Email
  * @see MobilePhone
- * @see InvalidInputException
+ * @see UnsupportedPrincipalTypeException
  */
 public class PrincipalUtil {
 
@@ -30,11 +30,11 @@ public class PrincipalUtil {
         }
         PrincipalType[] principalTypes = PrincipalType.values();
         for (var principalType : principalTypes) {
-            if (principal.matches(principalType.getRegex())) {
+            if (principalType.getRegex().matcher(principal).matches()) {
                 return principalType;
             }
         }
-        throw InvalidInputException.unsupportedPrincipalTypeException();
+        throw new UnsupportedPrincipalTypeException();
     }
 
     public static Principal getPrincipal(@Nullable String principal) {
@@ -48,7 +48,7 @@ public class PrincipalUtil {
         if (principalType == PrincipalType.USERNAME) {
             return Username.of(principal);
         }
-        throw InvalidInputException.unsupportedPrincipalTypeException();
+        throw new UnsupportedPrincipalTypeException();
     }
 
     public static Principal getEmailOrMobilePhone(@Nullable String principal) {
@@ -59,6 +59,6 @@ public class PrincipalUtil {
         if (principalType == PrincipalType.MOBILE_PHONE) {
             return MobilePhone.of(principal);
         }
-        throw InvalidInputException.unsupportedPrincipalTypeException("输入邮箱地址或手机号");
+        throw new UnsupportedPrincipalTypeException("输入邮箱地址或手机号");
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/exception/AccountRegisterException.java

@@ -1,57 +0,0 @@
-package xyz.zhouxy.plusone.system.application.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-import xyz.zhouxy.plusone.exception.PlusoneException;
-
-@ResponseStatus(HttpStatus.BAD_REQUEST)
-public class AccountRegisterException extends PlusoneException {
-
-    @java.io.Serial
-    private static final long serialVersionUID = 7580245181633370195L;
-
-    public AccountRegisterException() {
-        this(4020000, "用户注册错误");
-    }
-
-    public AccountRegisterException(String message) {
-        this(4020000, message);
-    }
-
-    public AccountRegisterException(Throwable cause) {
-        super(4020000, cause);
-    }
-
-    public AccountRegisterException(int code, String message) {
-        super(code, message);
-    }
-
-    public AccountRegisterException(int code, Throwable cause) {
-        super(code, cause);
-    }
-
-    public static AccountRegisterException emailOrMobilePhoneRequiredException() {
-        return new AccountRegisterException(4020300, "邮箱和手机号应至少绑定一个");
-    }
-
-    public static AccountRegisterException usernameAlreadyExists(String username) {
-        return new AccountRegisterException(4020400, String.format("用户名 %s 已存在", username));
-    }
-
-    public static AccountRegisterException emailAlreadyExists(String value) {
-        return new AccountRegisterException(4020500, String.format("邮箱 %s 已存在", value));
-    }
-
-    public static AccountRegisterException mobilePhoneAlreadyExists(String value) {
-        return new AccountRegisterException(4020600, String.format("手机号 %s 已存在", value));
-    }
-
-    public static AccountRegisterException codeErrorException() {
-        return new AccountRegisterException(4020701, "校验码错误");
-    }
-
-    public static AccountRegisterException codeNotExistsException() {
-        return new AccountRegisterException(4020702, "校验码不存在或已过期");
-    }
-}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/exception/handler/AccountLoginExceptionHandler.java

@@ -1,24 +0,0 @@
-package xyz.zhouxy.plusone.system.application.exception.handler;
-
-import javax.annotation.Nonnull;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler;
-import xyz.zhouxy.plusone.system.application.exception.AccountLoginException;
-import xyz.zhouxy.plusone.util.RestfulResult;
-
-@RestControllerAdvice
-public class AccountLoginExceptionHandler extends BaseExceptionHandler {
-
-    public AccountLoginExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
-        super(exceptionInfoHolder);
-    }
-
-    @ExceptionHandler({ AccountLoginException.class })
-    public ResponseEntity<RestfulResult> handleException(@Nonnull Exception e) {
-        return buildExceptionResponse(e);
-    }
-}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/AccountQueries.java

@@ -2,12 +2,14 @@ package xyz.zhouxy.plusone.system.application.query;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.apache.ibatis.annotations.Mapper;
 
+import xyz.zhouxy.plusone.commons.util.PageDTO;
 import xyz.zhouxy.plusone.system.application.query.params.AccountQueryParams;
 import xyz.zhouxy.plusone.system.application.query.result.AccountDetails;
 import xyz.zhouxy.plusone.system.application.query.result.AccountOverview;
-import xyz.zhouxy.plusone.util.PageDTO;
 
 /**
  * 账号信息查询器
@@ -23,6 +25,7 @@ public interface AccountQueries {
         return PageDTO.of(content, total);
     }
 
+    @Nonnull
     List<AccountOverview> queryAccountOverview(AccountQueryParams queryParams);
 
     long count(AccountQueryParams queryParams);

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/params/AccountQueryParams.java

@@ -5,14 +5,14 @@ import java.time.LocalDate;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import xyz.zhouxy.plusone.util.PagingAndSortingQueryParams;
+import xyz.zhouxy.plusone.commons.util.PagingAndSortingQueryParams;
 
 /**
  * 账号信息查询参数
  *
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  */
-@ToString
+@ToString(callSuper = true)
 public class AccountQueryParams extends PagingAndSortingQueryParams {
 
     public AccountQueryParams() {
@@ -29,7 +29,6 @@ public class AccountQueryParams extends PagingAndSortingQueryParams {
                 "update_time");
     }
 
-    // TODO【添加】 注解参数校验
     private @Getter @Setter Long id;
     private @Getter @Setter String username;
     private @Getter @Setter String email;

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/params/DictQueryParams.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import xyz.zhouxy.plusone.util.PagingAndSortingQueryParams;
+import xyz.zhouxy.plusone.commons.util.PagingAndSortingQueryParams;
 
 /**
  * 数据字典查询参数

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/params/RoleQueryParams.java

@@ -5,7 +5,7 @@ import java.time.LocalDate;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import xyz.zhouxy.plusone.util.PagingAndSortingQueryParams;
+import xyz.zhouxy.plusone.commons.util.PagingAndSortingQueryParams;
 
 /**
  * 角色信息查询参数

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/result/MenuViewObject.java

@@ -2,9 +2,10 @@ package xyz.zhouxy.plusone.system.application.query.result;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Comparator;
+import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
@@ -81,18 +82,18 @@ public class MenuViewObject implements IWithOrderNumber {
     List<Action> actions;
 
     // MENU_LIST
-    List<MenuViewObject> children;
+    SortedSet<MenuViewObject> children;
 
     public void addChild(MenuViewObject child) {
         if (this.children == null) {
-            this.children = new ArrayList<>();
+            this.children = new TreeSet<>();
         }
         this.children.add(child);
     }
 
     public void addChildren(Collection<MenuViewObject> children) {
         if (this.children == null) {
-            this.children = new ArrayList<>();
+            this.children = new TreeSet<>();
         }
         this.children.addAll(children);
     }
@@ -109,7 +110,7 @@ public class MenuViewObject implements IWithOrderNumber {
         viewObject.icon = menu.getIcon();
         viewObject.hidden = menu.isHidden();
         viewObject.orderNumber = menu.getOrderNumber();
-        viewObject.status = menu.getStatus().getValue();
+        viewObject.status = menu.getStatus().getId();
         viewObject.remarks = menu.getRemarks();
         if (viewObject.type == MenuType.MENU_ITEM.ordinal()) {
             viewObject.component = menu.getComponent();
@@ -121,11 +122,33 @@ public class MenuViewObject implements IWithOrderNumber {
     }
 
     public List<MenuViewObject> getChildren() {
-        return Objects.nonNull(this.children)
+        return this.children == null || this.children.isEmpty()
-                ? this.children
+                ? Collections.emptyList()
-                        .stream()
+                : new ArrayList<>(this.children);
-                        .sorted(Comparator.comparing(IWithOrderNumber::getOrderNumber))
+    }
-                        .toList()
+
-                : null;
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        MenuViewObject other = (MenuViewObject) obj;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        return true;
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AccountContextService.java

@@ -1,7 +1,6 @@
 package xyz.zhouxy.plusone.system.application.service;
 
 import java.util.List;
-import java.util.Optional;
 
 import javax.annotation.Resource;
 
@@ -9,8 +8,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import cn.dev33.satoken.stp.StpLogic;
+import xyz.zhouxy.plusone.system.application.common.exception.AccountLoginException;
+import xyz.zhouxy.plusone.system.application.common.exception.UnsupportedPrincipalTypeException;
 import xyz.zhouxy.plusone.system.application.common.util.PrincipalUtil;
-import xyz.zhouxy.plusone.system.application.exception.AccountLoginException;
 import xyz.zhouxy.plusone.system.application.query.AccountQueries;
 import xyz.zhouxy.plusone.system.application.query.result.AccountDetails;
 import xyz.zhouxy.plusone.system.application.query.result.MenuViewObject;
@@ -23,7 +23,6 @@ import xyz.zhouxy.plusone.system.domain.model.account.AccountRepository;
 import xyz.zhouxy.plusone.system.domain.model.account.Email;
 import xyz.zhouxy.plusone.system.domain.model.account.MobilePhone;
 import xyz.zhouxy.plusone.system.domain.model.account.Principal;
-import xyz.zhouxy.plusone.validator.InvalidInputException;
 
 /**
  * 账号对当前帐号进行操作
@@ -91,13 +90,14 @@ public class AccountContextService {
     public void changePasswordByOtp(ChangePasswordByOtpCommand command) {
 
         var principal = command.getAccount();
-        Optional<Account> account = switch (command.getPrincipalType()) {
+        boolean accountExists = switch (command.getPrincipalType()) {
-            case EMAIL -> accountRepository.findByEmail(Email.of(principal));
+            case EMAIL -> accountRepository.existsEmail(Email.of(principal));
-            case MOBILE_PHONE -> accountRepository.findByMobilePhone(MobilePhone.of(principal));
+            case MOBILE_PHONE -> accountRepository.existsMobilePhone(MobilePhone.of(principal));
-            default -> throw InvalidInputException.unsupportedPrincipalTypeException("输入邮箱地址或手机号");
+            default -> throw new UnsupportedPrincipalTypeException("输入邮箱地址或手机号");
         };
-        account.orElseThrow(AccountLoginException::accountNotExistException);
+        if (accountExists) {
-
+            throw AccountLoginException.accountNotExistException();
+        }
         mailAndSmsVerifyService.checkOtp(principal, command.getOtp());
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AccountManagementService.java

@@ -14,8 +14,9 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 
+import xyz.zhouxy.plusone.commons.util.PageDTO;
 import xyz.zhouxy.plusone.exception.DataNotExistException;
-import xyz.zhouxy.plusone.system.application.exception.AccountRegisterException;
+import xyz.zhouxy.plusone.system.application.common.exception.AccountRegisterException;
 import xyz.zhouxy.plusone.system.application.query.AccountQueries;
 import xyz.zhouxy.plusone.system.application.query.params.AccountQueryParams;
 import xyz.zhouxy.plusone.system.application.query.result.AccountDetails;
@@ -25,11 +26,12 @@ import xyz.zhouxy.plusone.system.application.service.command.UpdateAccountComman
 import xyz.zhouxy.plusone.system.domain.model.account.Account;
 import xyz.zhouxy.plusone.system.domain.model.account.AccountInfo;
 import xyz.zhouxy.plusone.system.domain.model.account.AccountRepository;
+import xyz.zhouxy.plusone.system.domain.model.account.AccountStatus;
 import xyz.zhouxy.plusone.system.domain.model.account.Email;
 import xyz.zhouxy.plusone.system.domain.model.account.MobilePhone;
+import xyz.zhouxy.plusone.system.domain.model.account.Sex;
 import xyz.zhouxy.plusone.system.domain.model.account.Username;
 import xyz.zhouxy.plusone.util.AssertResult;
-import xyz.zhouxy.plusone.util.PageDTO;
 
 /**
  * 账号管理
@@ -67,9 +69,13 @@ public class AccountManagementService {
                 mobilePhone,
                 command.getPassword(),
                 command.getPasswordConfirmation(),
-                command.getStatus(),
+                AccountStatus.of(command.getStatus()),
                 command.getRoleRefs(),
-                AccountInfo.of(command.getNickname(), command.getAvatar(), command.getSex()),
+                AccountInfo.builder()
+                        .nickname(command.getNickname())
+                        .avatar(command.getAvatar())
+                        .sex(Sex.of(command.getSex()))
+                        .build(),
                 adminAuthLogic.getLoginIdAsLong());
         accountRepository.save(account);
     }
@@ -87,8 +93,7 @@ public class AccountManagementService {
         Assert.isTrue(Objects.equals(id, command.getId()), "参数错误: id 不匹配");
         Account account = accountRepository.find(id)
                 .orElseThrow(() -> new DataNotExistException("该账号不存在"));
-        account.setAccountInfo(command.getNickname(), command.getAvatar(), command.getSex());
+        account.setAccountInfo(command.getNickname(), command.getAvatar(), Sex.of(command.getSex()));
-        account.setUpdatedBy(adminAuthLogic.getLoginIdAsLong());
         accountRepository.save(account);
     }
 

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AdminLoginService.java

@@ -6,9 +6,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import cn.hutool.core.lang.Assert;
+import xyz.zhouxy.plusone.system.application.common.exception.AccountLoginException;
+import xyz.zhouxy.plusone.system.application.common.exception.UnsupportedPrincipalTypeException;
 import xyz.zhouxy.plusone.system.application.common.util.PrincipalType;
 import xyz.zhouxy.plusone.system.application.common.util.PrincipalUtil;
-import xyz.zhouxy.plusone.system.application.exception.AccountLoginException;
 import xyz.zhouxy.plusone.system.application.query.AccountQueries;
 import xyz.zhouxy.plusone.system.application.query.result.LoginInfoViewObject;
 import xyz.zhouxy.plusone.system.application.service.command.LoginByOtpCommand;
@@ -18,7 +19,6 @@ import xyz.zhouxy.plusone.system.domain.model.account.AccountRepository;
 import xyz.zhouxy.plusone.system.domain.model.account.Email;
 import xyz.zhouxy.plusone.system.domain.model.account.MobilePhone;
 import xyz.zhouxy.plusone.system.domain.model.account.Username;
-import xyz.zhouxy.plusone.validator.InvalidInputException;
 import xyz.zhouxy.plusone.validator.ValidateDto;
 
 /**
@@ -63,7 +63,7 @@ public class AdminLoginService {
         Account account = (switch (command.getPrincipalType()) {
             case EMAIL -> accountRepository.findByEmail(Email.of(principal));
             case MOBILE_PHONE -> accountRepository.findByMobilePhone(MobilePhone.of(principal));
-            default -> throw InvalidInputException.unsupportedPrincipalTypeException("输入邮箱地址或手机号");
+            default -> throw new UnsupportedPrincipalTypeException("输入邮箱地址或手机号");
         }).orElseThrow(AccountLoginException::accountNotExistException);
 
         mailAndSmsVerifyService.checkOtp(principal, command.getOtp());

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/MailAndSmsVerifyService.java

@@ -9,8 +9,8 @@ import org.springframework.util.Assert;
 import cn.hutool.core.util.RandomUtil;
 import xyz.zhouxy.plusone.mail.MailService;
 import xyz.zhouxy.plusone.sms.SmsService;
-import xyz.zhouxy.plusone.system.application.exception.AccountLoginException;
+import xyz.zhouxy.plusone.system.application.common.exception.AccountLoginException;
-import xyz.zhouxy.plusone.system.application.exception.AccountRegisterException;
+import xyz.zhouxy.plusone.system.application.common.exception.AccountRegisterException;
 import xyz.zhouxy.plusone.system.domain.model.account.AccountRepository;
 import xyz.zhouxy.plusone.system.domain.model.account.Email;
 import xyz.zhouxy.plusone.system.domain.model.account.MobilePhone;

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/MenuManagementService.java

@@ -1,7 +1,6 @@
 package xyz.zhouxy.plusone.system.application.service;
 
-import java.util.Comparator;
+import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -13,9 +12,10 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
-import xyz.zhouxy.plusone.domain.IWithOrderNumber;
+import xyz.zhouxy.plusone.commons.util.MoreCollections;
+import xyz.zhouxy.plusone.constant.EntityStatus;
 import xyz.zhouxy.plusone.exception.DataNotExistException;
-import xyz.zhouxy.plusone.system.application.exception.UnsupportedMenuTypeException;
+import xyz.zhouxy.plusone.system.application.common.exception.UnsupportedMenuTypeException;
 import xyz.zhouxy.plusone.system.application.query.result.MenuViewObject;
 import xyz.zhouxy.plusone.system.application.service.command.CreateMenuCommand;
 import xyz.zhouxy.plusone.system.application.service.command.UpdateMenuCommand;
@@ -66,7 +66,7 @@ public class MenuManagementService {
                 command.getIcon(),
                 command.getHidden(),
                 command.getOrderNumber(),
-                command.getStatus(),
+                EntityStatus.of(command.getStatus()),
                 command.getRemarks());
     }
 
@@ -79,7 +79,7 @@ public class MenuManagementService {
                 command.getIcon(),
                 command.getHidden(),
                 command.getOrderNumber(),
-                command.getStatus(),
+                EntityStatus.of(command.getStatus()),
                 command.getComponent(),
                 command.getResource(),
                 command.getCache(),
@@ -107,7 +107,7 @@ public class MenuManagementService {
                 command.getIcon(),
                 command.getHidden(),
                 command.getOrderNumber(),
-                command.getStatus(),
+                EntityStatus.of(command.getStatus()),
                 command.getComponent(),
                 command.getResource(),
                 command.getCache(),
@@ -138,38 +138,33 @@ public class MenuManagementService {
 
     @Transactional(propagation = Propagation.SUPPORTS)
     public List<MenuViewObject> buildMenuTree(List<MenuViewObject> menus) {
-        List<MenuViewObject> rootMenus = menus
+        // 创建并填充 Map
-                .stream()
+        final Map<Long, MenuViewObject> menuMap = MoreCollections.toHashMap(menus, MenuViewObject::getId);
-                .filter(menu -> Objects.equals(menu.getParentId(), 0L))
-                .toList();
-
-        Map<Long, MenuViewObject> allMenus = new HashMap<>();
-        for (var item : menus) {
-            allMenus.put(item.getId(), item);
-        }
-
         for (MenuViewObject menu : menus) {
             long parentId = menu.getParentId();
-            while (parentId != 0 && !allMenus.containsKey(parentId)) {
+            if (parentId != 0L) {
+                while (!menuMap.containsKey(parentId)) {
                     MenuViewObject parent = findById(parentId);
                     if (parent == null) {
                         break;
                     }
-                allMenus.put(parent.getId(), parent);
+                    menuMap.put(parent.getId(), parent);
                     parentId = parent.getParentId();
                 }
             }
+        }
 
-        for (var menu : allMenus.values()) {
+        Collection<MenuViewObject> allMenus = menuMap.values();
-            var parent = allMenus.getOrDefault(menu.getParentId(), null);
+        for (var menu : allMenus) {
+            var parent = menuMap.get(menu.getParentId());
             if (parent != null) {
                 parent.addChild(menu);
             }
         }
 
-        return rootMenus
+        return allMenus.stream()
-                .stream()
+                .filter(menu -> (menu != null) && Objects.equals(menu.getParentId(), 0L))
-                .sorted(Comparator.comparing(IWithOrderNumber::getOrderNumber))
+                .sorted()
                 .toList();
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/RegisterAccountService.java

@@ -5,9 +5,10 @@ import java.util.Set;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import xyz.zhouxy.plusone.system.application.common.exception.AccountRegisterException;
+import xyz.zhouxy.plusone.system.application.common.exception.UnsupportedPrincipalTypeException;
 import xyz.zhouxy.plusone.system.application.common.util.PrincipalType;
 import xyz.zhouxy.plusone.system.application.common.util.PrincipalUtil;
-import xyz.zhouxy.plusone.system.application.exception.AccountRegisterException;
 import xyz.zhouxy.plusone.system.application.service.command.RegisterAccountCommand;
 import xyz.zhouxy.plusone.system.domain.model.account.Account;
 import xyz.zhouxy.plusone.system.domain.model.account.AccountInfo;
@@ -16,9 +17,7 @@ import xyz.zhouxy.plusone.system.domain.model.account.AccountStatus;
 import xyz.zhouxy.plusone.system.domain.model.account.Email;
 import xyz.zhouxy.plusone.system.domain.model.account.MobilePhone;
 import xyz.zhouxy.plusone.system.domain.model.account.Password;
-import xyz.zhouxy.plusone.system.domain.model.account.Sex;
 import xyz.zhouxy.plusone.system.domain.model.account.Username;
-import xyz.zhouxy.plusone.validator.InvalidInputException;
 
 /**
  * 注册账号服务
@@ -70,7 +69,7 @@ public class RegisterAccountService {
                 throw AccountRegisterException.emailAlreadyExists(mobilePhone.value());
             }
         } else {
-            throw InvalidInputException.unsupportedPrincipalTypeException();
+            throw new UnsupportedPrincipalTypeException();
         }
 
         verifyService.checkCode(emailOrMobilePhone, command.getCode());
@@ -82,7 +81,9 @@ public class RegisterAccountService {
                 Password.newPassword(command.getPassword(), command.getReenteredPassword()),
                 AccountStatus.AVAILABLE,
                 Set.of(DEFAULT_ROLE_ID),
-                AccountInfo.of(command.getNickname(), null, Sex.UNSET));
+                AccountInfo.builder()
+                        .nickname(command.getNickname())
+                        .build());
         accountRepository.save(accountToSave);
     }
 
@@ -93,7 +94,7 @@ public class RegisterAccountService {
         } else if (principalType == PrincipalType.MOBILE_PHONE) {
             verifyService.sendCodeToMobilePhone(MobilePhone.of(principal));
         } else {
-            throw InvalidInputException.unsupportedPrincipalTypeException();
+            throw new UnsupportedPrincipalTypeException();
         }
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/RoleManagementService.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import xyz.zhouxy.plusone.constant.EntityStatus;
 import xyz.zhouxy.plusone.exception.DataNotExistException;
 import xyz.zhouxy.plusone.system.application.query.RoleQueries;
 import xyz.zhouxy.plusone.system.application.query.params.RoleQueryParams;
@@ -54,7 +55,7 @@ public class RoleManagementService {
         Role roleToCreate = Role.newInstance(
                 command.getName(),
                 command.getIdentifier(),
-                command.getStatus(),
+                EntityStatus.of(command.getStatus()),
                 command.getRemarks(),
                 menuRefs,
                 permissionRefs);
@@ -67,7 +68,7 @@ public class RoleManagementService {
         roleToUpdate.update(
                 command.getName(),
                 command.getIdentifier(),
-                command.getStatus(),
+                EntityStatus.of(command.getStatus()),
                 command.getRemarks(),
                 Set.copyOf(_menuRepository.findByIdIn(command.getMenus())),
                 Set.copyOf(_menuRepository.findPermissionsByIdIn(command.getPermissions())));

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/CreateAccountCommand.java

@@ -10,10 +10,8 @@ import javax.validation.constraints.Pattern;
 import org.hibernate.validator.constraints.URL;
 
 import lombok.Data;
-import xyz.zhouxy.plusone.constant.RegexConsts;
+import xyz.zhouxy.plusone.commons.constant.RegexConsts;
 import xyz.zhouxy.plusone.domain.ICommand;
-import xyz.zhouxy.plusone.system.domain.model.account.AccountStatus;
-import xyz.zhouxy.plusone.system.domain.model.account.Sex;
 
 /**
  * 创建账号命令
@@ -41,7 +39,7 @@ public class CreateAccountCommand implements ICommand {
     String passwordConfirmation;
 
     @NotNull
-    AccountStatus status;
+    Integer status;
 
     Set<Long> roleRefs;
 
@@ -52,5 +50,5 @@ public class CreateAccountCommand implements ICommand {
     @URL
     String avatar;
 
-    Sex sex;
+    Integer sex;
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/CreateMenuCommand.java

@@ -5,7 +5,6 @@ import javax.validation.constraints.NotNull;
 
 import lombok.Getter;
 import lombok.Setter;
-import xyz.zhouxy.plusone.constant.EntityStatus;
 import xyz.zhouxy.plusone.domain.ICommand;
 import xyz.zhouxy.plusone.system.domain.model.menu.Menu.MenuType;
 
@@ -42,7 +41,7 @@ public class CreateMenuCommand implements ICommand {
     private Integer orderNumber;
 
     @NotNull
-    private EntityStatus status;
+    private Integer status;
 
     private String component;
 

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/CreateRoleCommand.java

@@ -6,7 +6,6 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 import lombok.Data;
-import xyz.zhouxy.plusone.constant.EntityStatus;
 import xyz.zhouxy.plusone.domain.ICommand;
 
 /**
@@ -23,7 +22,7 @@ public class CreateRoleCommand implements ICommand {
     String identifier;
 
     @NotNull
-    EntityStatus status;
+    Integer status;
     String remarks;
 
     Set<Long> menus;

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/RegisterAccountCommand.java

@@ -4,7 +4,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 
 import lombok.Data;
-import xyz.zhouxy.plusone.constant.RegexConsts;
+import xyz.zhouxy.plusone.commons.constant.RegexConsts;
 import xyz.zhouxy.plusone.domain.ICommand;
 
 /**

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/UpdateAccountCommand.java

@@ -6,9 +6,8 @@ import javax.validation.constraints.Pattern;
 import org.hibernate.validator.constraints.URL;
 
 import lombok.Data;
-import xyz.zhouxy.plusone.constant.RegexConsts;
+import xyz.zhouxy.plusone.commons.constant.RegexConsts;
 import xyz.zhouxy.plusone.domain.ICommand;
-import xyz.zhouxy.plusone.system.domain.model.account.Sex;
 
 /**
  * 更新账号信息命令
@@ -27,5 +26,5 @@ public class UpdateAccountCommand implements ICommand {
     @URL
     String avatar;
 
-    Sex sex;
+    Integer sex;
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/UpdateMenuCommand.java

@@ -5,7 +5,6 @@ import javax.validation.constraints.NotNull;
 
 import lombok.Getter;
 import lombok.Setter;
-import xyz.zhouxy.plusone.constant.EntityStatus;
 import xyz.zhouxy.plusone.domain.ICommand;
 import xyz.zhouxy.plusone.system.domain.model.menu.Menu.MenuType;
 
@@ -46,7 +45,7 @@ public class UpdateMenuCommand implements ICommand {
     private Integer orderNumber;
 
     @NotNull
-    private EntityStatus status;
+    private Integer status;
 
     private String component;
 

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/UpdateRoleCommand.java

@@ -6,7 +6,6 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 import lombok.Data;
-import xyz.zhouxy.plusone.constant.EntityStatus;
 import xyz.zhouxy.plusone.domain.ICommand;
 
 /**
@@ -27,7 +26,7 @@ public class UpdateRoleCommand implements ICommand {
     String identifier;
 
     @NotNull
-    EntityStatus status;
+    Integer status;
 
     @NotBlank
     String remarks;

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/validator/LoginByOtpCommandValidator.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.stereotype.Component;
 
-import xyz.zhouxy.plusone.constant.RegexConsts;
+import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 import xyz.zhouxy.plusone.system.application.service.command.LoginByOtpCommand;
 import xyz.zhouxy.plusone.validator.BaseValidator;
 import xyz.zhouxy.plusone.validator.DtoValidator;
@@ -16,10 +16,10 @@ public class LoginByOtpCommandValidator extends BaseValidator<LoginByOtpCommand>
         ruleForString(LoginByOtpCommand::getPrincipal)
                 .notNull("输入邮箱地址或手机号")
                 .notEmpty("输入邮箱地址或手机号")
-                .matchesOr(List.of(RegexConsts.EMAIL, RegexConsts.MOBILE_PHONE), "输入用户名、邮箱地址或手机号");
+                .matchesOne(List.of(PatternConsts.EMAIL, PatternConsts.MOBILE_PHONE), "输入用户名、邮箱地址或手机号");
         ruleForString(LoginByOtpCommand::getOtp)
                 .notNull("验证码不能为空")
                 .notEmpty("验证码不能为空")
-                .matches(RegexConsts.CAPTCHA, "验证码格式不正确");
+                .matches(PatternConsts.CAPTCHA, "验证码格式不正确");
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/command/validator/LoginByPasswordCommandValidator.java

@@ -2,7 +2,8 @@ package xyz.zhouxy.plusone.system.application.service.command.validator;
 
 import java.util.List;
 import org.springframework.stereotype.Component;
-import xyz.zhouxy.plusone.constant.RegexConsts;
+
+import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 import xyz.zhouxy.plusone.system.application.service.command.LoginByPasswordCommand;
 import xyz.zhouxy.plusone.validator.BaseValidator;
 import xyz.zhouxy.plusone.validator.DtoValidator;
@@ -14,11 +15,11 @@ public class LoginByPasswordCommandValidator extends BaseValidator<LoginByPasswo
         ruleForString(LoginByPasswordCommand::getPrincipal)
                 .notNull("输入用户名、邮箱地址或手机号")
                 .notEmpty("输入用户名、邮箱地址或手机号")
-                .matchesOr(List.of(RegexConsts.USERNAME, RegexConsts.EMAIL, RegexConsts.MOBILE_PHONE),
+                .matchesOne(List.of(PatternConsts.USERNAME, PatternConsts.EMAIL, PatternConsts.MOBILE_PHONE),
                         "输入用户名、邮箱地址或手机号");
         ruleForString(LoginByPasswordCommand::getPassword)
                 .notNull("密码不能为空")
                 .notEmpty("密码不能为空")
-                .matches(RegexConsts.PASSWORD, "密码格式不正确");
+                .matches(PatternConsts.PASSWORD, "密码格式不正确");
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/config/InterceptorConfig.java

@@ -0,0 +1,20 @@
+package xyz.zhouxy.plusone.system.application.web.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class InterceptorConfig implements WebMvcConfigurer {
+    @Autowired
+    HandlerInterceptor[] interceptors;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        for (var interceptor : interceptors) {
+            registry.addInterceptor(interceptor);
+        }
+    }
+}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/controller/AccountContextController.java

@@ -1,4 +1,4 @@
-package xyz.zhouxy.plusone.system.application.controller;
+package xyz.zhouxy.plusone.system.application.web.controller;
 
 import static xyz.zhouxy.plusone.system.constant.AuthLogic.adminAuthLogic;
 
@@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 import xyz.zhouxy.plusone.system.application.service.AccountContextService;
 import xyz.zhouxy.plusone.system.application.service.command.ChangePasswordCommand;
 import xyz.zhouxy.plusone.system.application.service.command.ChangePasswordWithoutLoginCommand;
-import xyz.zhouxy.plusone.util.RestfulResult;
 
 /**
  * 账号查询本身相关信息
@@ -28,34 +28,34 @@ public class AccountContextController {
     }
 
     @GetMapping("info")
-    public RestfulResult getAccountInfo() {
+    public UnifiedResponse getAccountInfo() {
         adminAuthLogic.checkLogin();
         var result = service.getAccountInfo();
-        return RestfulResult.success("查询成功", result);
+        return UnifiedResponse.success("查询成功", result);
     }
 
     @GetMapping("logout")
-    public RestfulResult logout() {
+    public UnifiedResponse logout() {
         service.logout();
-        return RestfulResult.success("注销成功");
+        return UnifiedResponse.success("注销成功");
     }
 
     @GetMapping("menus")
-    public RestfulResult getMenuTree() {
+    public UnifiedResponse getMenuTree() {
         adminAuthLogic.checkLogin();
         var result = service.getMenuTree();
-        return RestfulResult.success("查询成功", result);
+        return UnifiedResponse.success("查询成功", result);
     }
 
     @PostMapping("changePassword")
-    public RestfulResult changePassword(ChangePasswordCommand command) {
+    public UnifiedResponse changePassword(ChangePasswordCommand command) {
         service.changePassword(command);
-        return RestfulResult.success("修改成功，请重新登录。");
+        return UnifiedResponse.success("修改成功，请重新登录。");
     }
 
     @PostMapping("changePasswordWithoutLogin")
-    public RestfulResult changePasswordWithoutLogin(ChangePasswordWithoutLoginCommand command) {
+    public UnifiedResponse changePasswordWithoutLogin(ChangePasswordWithoutLoginCommand command) {
         service.changePasswordWithoutLogin(command);
-        return RestfulResult.success("修改成功，请重新登录。");
+        return UnifiedResponse.success("修改成功，请重新登录。");
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/controller/AccountManagementController.java

@@ -1,7 +1,7 @@
-package xyz.zhouxy.plusone.system.application.controller;
+package xyz.zhouxy.plusone.system.application.web.controller;
 
 import static xyz.zhouxy.plusone.system.constant.AuthLogic.adminAuthLogic;
-import static xyz.zhouxy.plusone.util.RestfulResult.success;
+import static xyz.zhouxy.plusone.commons.util.UnifiedResponse.success;
 
 import java.util.List;
 
@@ -16,11 +16,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 import xyz.zhouxy.plusone.system.application.query.params.AccountQueryParams;
 import xyz.zhouxy.plusone.system.application.service.AccountManagementService;
 import xyz.zhouxy.plusone.system.application.service.command.CreateAccountCommand;
 import xyz.zhouxy.plusone.system.application.service.command.UpdateAccountCommand;
-import xyz.zhouxy.plusone.util.RestfulResult;
 
 /**
  * 账号管理
@@ -38,7 +38,7 @@ public class AccountManagementController {
     }
 
     @PostMapping
-    public RestfulResult createAccount(@RequestBody @Valid CreateAccountCommand command) {
+    public UnifiedResponse createAccount(@RequestBody @Valid CreateAccountCommand command) {
         adminAuthLogic.checkLogin();
         adminAuthLogic.checkPermission("sys-account-create");
         service.createAccount(command);
@@ -46,7 +46,7 @@ public class AccountManagementController {
     }
 
     @DeleteMapping
-    public RestfulResult deleteAccounts(@RequestBody List<Long> ids) {
+    public UnifiedResponse deleteAccounts(@RequestBody List<Long> ids) {
         adminAuthLogic.checkLogin();
         adminAuthLogic.checkPermission("sys-account-delete");
         service.deleteAccounts(ids);
@@ -54,7 +54,7 @@ public class AccountManagementController {
     }
 
     @PatchMapping("{id}")
-    public RestfulResult updateAccountInfo(
+    public UnifiedResponse updateAccountInfo(
             @PathVariable("id") Long id,
             @RequestBody @Valid UpdateAccountCommand command) {
         adminAuthLogic.checkLogin();
@@ -64,7 +64,7 @@ public class AccountManagementController {
     }
 
     @GetMapping("query")
-    public RestfulResult queryAccountOverviewList(AccountQueryParams queryParams) {
+    public UnifiedResponse queryAccountOverviewList(AccountQueryParams queryParams) {
         adminAuthLogic.checkLogin();
         adminAuthLogic.checkPermission("sys-account-list");
         var accountOverviewList = service.queryAccountOverviewList(queryParams);
@@ -72,7 +72,7 @@ public class AccountManagementController {
     }
 
     @GetMapping("{accountId}")
-    public RestfulResult queryAccountDetails(@PathVariable("accountId") Long accountId) {
+    public UnifiedResponse queryAccountDetails(@PathVariable("accountId") Long accountId) {
         adminAuthLogic.checkLogin();
         adminAuthLogic.checkPermission("sys-account-details");
         var accountDetails = service.queryAccountDetails(accountId);

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/controller/AdminLoginController.java

@@ -1,6 +1,6 @@
-package xyz.zhouxy.plusone.system.application.controller;
+package xyz.zhouxy.plusone.system.application.web.controller;
 
-import static xyz.zhouxy.plusone.util.RestfulResult.success;
+import static xyz.zhouxy.plusone.commons.util.UnifiedResponse.success;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import xyz.zhouxy.plusone.system.application.service.AdminLoginService;
 import xyz.zhouxy.plusone.system.application.service.command.LoginByOtpCommand;
 import xyz.zhouxy.plusone.system.application.service.command.LoginByPasswordCommand;
-import xyz.zhouxy.plusone.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 
 /**
  * Admin 账号登录
@@ -30,19 +30,19 @@ public class AdminLoginController {
     }
 
     @PostMapping("byPassword")
-    public RestfulResult loginByPassword(@RequestBody LoginByPasswordCommand command) {
+    public UnifiedResponse loginByPassword(@RequestBody LoginByPasswordCommand command) {
         var loginInfo = service.loginByPassword(command);
         return success("登录成功", loginInfo);
     }
 
     @PostMapping("byOtp")
-    public RestfulResult loginByOtp(@RequestBody LoginByOtpCommand command) {
+    public UnifiedResponse loginByOtp(@RequestBody LoginByOtpCommand command) {
         var loginInfo = service.loginByOtp(command);
         return success("登录成功", loginInfo);
     }
 
     @GetMapping("sendOtp")
-    public RestfulResult sendOtp(@RequestParam String principal) {
+    public UnifiedResponse sendOtp(@RequestParam String principal) {
         service.sendOtp(principal);
         return success("发送成功");
     }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/controller/DictManagementController.java

@@ -1,7 +1,7 @@
-package xyz.zhouxy.plusone.system.application.controller;
+package xyz.zhouxy.plusone.system.application.web.controller;
 
 import static xyz.zhouxy.plusone.system.constant.AuthLogic.adminAuthLogic;
-import static xyz.zhouxy.plusone.util.RestfulResult.success;
+import static xyz.zhouxy.plusone.commons.util.UnifiedResponse.success;
 
 import java.util.List;
 
@@ -20,7 +20,7 @@ import xyz.zhouxy.plusone.system.application.query.params.DictQueryParams;
 import xyz.zhouxy.plusone.system.application.service.DictManagementService;
 import xyz.zhouxy.plusone.system.application.service.command.CreateDictCommand;
 import xyz.zhouxy.plusone.system.application.service.command.UpdateDictCommand;
-import xyz.zhouxy.plusone.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 
 /**
  * 数据字典管理
@@ -38,21 +38,21 @@ public class DictManagementController {
     }
 
     @PostMapping
-    public RestfulResult createDict(@RequestBody @Valid CreateDictCommand command) {
+    public UnifiedResponse createDict(@RequestBody @Valid CreateDictCommand command) {
         adminAuthLogic.checkPermission("sys-dict-create");
         service.createDict(command);
         return success();
     }
 
     @DeleteMapping
-    public RestfulResult deleteDicts(@RequestBody List<Long> ids) {
+    public UnifiedResponse deleteDicts(@RequestBody List<Long> ids) {
         adminAuthLogic.checkPermission("sys-dict-delete");
         service.deleteDicts(ids);
         return success();
     }
 
     @PatchMapping("{id}")
-    public RestfulResult updateDict(
+    public UnifiedResponse updateDict(
             @PathVariable("id") Long id,
             @RequestBody @Valid UpdateDictCommand command) {
         adminAuthLogic.checkPermission("sys-dict-update");
@@ -61,21 +61,21 @@ public class DictManagementController {
     }
 
     @GetMapping("{dictId}")
-    public RestfulResult findDictDetails(@PathVariable("dictId") Long dictId) {
+    public UnifiedResponse findDictDetails(@PathVariable("dictId") Long dictId) {
         adminAuthLogic.checkPermission("sys-dict-details");
         var dictDetails = service.findDictDetails(dictId);
         return success("查询成功", dictDetails);
     }
 
     @GetMapping("all")
-    public RestfulResult loadAllDicts() {
+    public UnifiedResponse loadAllDicts() {
         adminAuthLogic.checkPermissionAnd("sys-dict-list", "sys-dict-details");
         var dicts = service.loadAllDicts();
         return success("查询成功", dicts);
     }
 
     @GetMapping("query")
-    public RestfulResult queryDictOverviewList(@Valid DictQueryParams queryParams) {
+    public UnifiedResponse queryDictOverviewList(@Valid DictQueryParams queryParams) {
         adminAuthLogic.checkPermission("sys-dict-list");
         var dicts = service.queryDictOverviewList(queryParams);
         return success("查询成功", dicts);

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/controller/MenuManagementController.java

@@ -1,7 +1,7 @@
-package xyz.zhouxy.plusone.system.application.controller;
+package xyz.zhouxy.plusone.system.application.web.controller;
 
 import static xyz.zhouxy.plusone.system.constant.AuthLogic.adminAuthLogic;
-import static xyz.zhouxy.plusone.util.RestfulResult.success;
+import static xyz.zhouxy.plusone.commons.util.UnifiedResponse.success;
 
 import javax.validation.Valid;
 
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import xyz.zhouxy.plusone.system.application.service.MenuManagementService;
 import xyz.zhouxy.plusone.system.application.service.command.CreateMenuCommand;
 import xyz.zhouxy.plusone.system.application.service.command.UpdateMenuCommand;
-import xyz.zhouxy.plusone.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 
 /**
  * 菜单管理
@@ -37,7 +37,7 @@ public class MenuManagementController {
 
     // ==================== create ====================
     @PostMapping
-    public RestfulResult createMenu(@RequestBody @Valid CreateMenuCommand command) {
+    public UnifiedResponse createMenu(@RequestBody @Valid CreateMenuCommand command) {
         adminAuthLogic.checkPermission("sys-menu-create");
         service.createMenu(command);
         return success();
@@ -45,7 +45,7 @@ public class MenuManagementController {
 
     // ==================== delete ====================
     @DeleteMapping("{id}")
-    public RestfulResult deleteMenu(@PathVariable("id") Long id) {
+    public UnifiedResponse deleteMenu(@PathVariable("id") Long id) {
         adminAuthLogic.checkPermission("sys-menu-delete");
         service.deleteMenu(id);
         return success();
@@ -53,7 +53,7 @@ public class MenuManagementController {
 
     // ==================== update ====================
     @PatchMapping("{id}")
-    public RestfulResult updateMenu(
+    public UnifiedResponse updateMenu(
             @PathVariable("id") Long id,
             @RequestBody @Valid UpdateMenuCommand command) {
         adminAuthLogic.checkPermission("sys-menu-update");
@@ -63,21 +63,21 @@ public class MenuManagementController {
 
     // ==================== query ====================
     @GetMapping("{id}")
-    public RestfulResult findById(@PathVariable("id") Long id) {
+    public UnifiedResponse findById(@PathVariable("id") Long id) {
         adminAuthLogic.checkPermission("sys-menu-details");
         var result = service.findById(id);
-        return RestfulResult.success("查询成功", result);
+        return UnifiedResponse.success("查询成功", result);
     }
 
     @GetMapping("queryByAccountId")
-    public RestfulResult queryByAccountId(@RequestParam Long accountId) {
+    public UnifiedResponse queryByAccountId(@RequestParam Long accountId) {
         adminAuthLogic.checkPermission("sys-menu-details");
         var result = service.queryByAccountId(accountId);
         return success("查询成功", result);
     }
 
     @GetMapping("queryByRoleId")
-    public RestfulResult queryByRoleId(@RequestParam Long roleId) {
+    public UnifiedResponse queryByRoleId(@RequestParam Long roleId) {
         adminAuthLogic.checkPermission("sys-menu-details");
         var result = service.queryByRoleId(roleId);
         return success("查询成功", result);

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/controller/RegisterAccountController.java

@@ -1,6 +1,6 @@
-package xyz.zhouxy.plusone.system.application.controller;
+package xyz.zhouxy.plusone.system.application.web.controller;
 
-import static xyz.zhouxy.plusone.util.RestfulResult.success;
+import static xyz.zhouxy.plusone.commons.util.UnifiedResponse.success;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import xyz.zhouxy.plusone.system.application.service.RegisterAccountService;
 import xyz.zhouxy.plusone.system.application.service.command.RegisterAccountCommand;
-import xyz.zhouxy.plusone.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 
 /**
  * 注册账号服务
@@ -29,13 +29,13 @@ public class RegisterAccountController {
     }
 
     @PostMapping
-    public RestfulResult registerAccount(@RequestBody RegisterAccountCommand command) {
+    public UnifiedResponse registerAccount(@RequestBody RegisterAccountCommand command) {
         service.registerAccount(command);
         return success("注册成功");
     }
 
     @GetMapping("sendCode")
-    public RestfulResult sendCode(@RequestParam String principal) {
+    public UnifiedResponse sendCode(@RequestParam String principal) {
         service.sendCode(principal);
         return success("发送成功");
     }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/controller/RoleManagementController.java

@@ -1,4 +1,4 @@
-package xyz.zhouxy.plusone.system.application.controller;
+package xyz.zhouxy.plusone.system.application.web.controller;
 
 import javax.validation.Valid;
 import static xyz.zhouxy.plusone.system.constant.AuthLogic.adminAuthLogic;
@@ -17,7 +17,7 @@ import xyz.zhouxy.plusone.system.application.query.params.RoleQueryParams;
 import xyz.zhouxy.plusone.system.application.service.RoleManagementService;
 import xyz.zhouxy.plusone.system.application.service.command.CreateRoleCommand;
 import xyz.zhouxy.plusone.system.application.service.command.UpdateRoleCommand;
-import xyz.zhouxy.plusone.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.util.UnifiedResponse;
 
 /**
  * 角色管理服务
@@ -35,44 +35,44 @@ public class RoleManagementController {
     }
 
     @PostMapping
-    public RestfulResult createRole(@RequestBody @Valid CreateRoleCommand command) {
+    public UnifiedResponse createRole(@RequestBody @Valid CreateRoleCommand command) {
         adminAuthLogic.checkPermission("sys-role-create");
         service.createRole(command);
-        return RestfulResult.success();
+        return UnifiedResponse.success();
     }
 
     @PatchMapping
-    public RestfulResult updateRole(@RequestBody @Valid UpdateRoleCommand command) {
+    public UnifiedResponse updateRole(@RequestBody @Valid UpdateRoleCommand command) {
         adminAuthLogic.checkPermission("sys-role-update");
         service.updateRole(command);
-        return RestfulResult.success();
+        return UnifiedResponse.success();
     }
 
     @DeleteMapping("{id}")
-    public RestfulResult delete(@PathVariable("id") Long id) {
+    public UnifiedResponse delete(@PathVariable("id") Long id) {
         adminAuthLogic.checkPermission("sys-role-delete");
         service.delete(id);
-        return RestfulResult.success();
+        return UnifiedResponse.success();
     }
 
     @GetMapping("exists")
-    public RestfulResult exists(@RequestParam("id") Long id) {
+    public UnifiedResponse exists(@RequestParam("id") Long id) {
         adminAuthLogic.checkPermissionOr("sys-role-list", "sys-role-details");
         var isExists = service.exists(id);
-        return RestfulResult.success(isExists ? "存在" : "不存在", isExists);
+        return UnifiedResponse.success(isExists ? "存在" : "不存在", isExists);
     }
 
     @GetMapping("{id}")
-    public RestfulResult findById(@PathVariable("id") Long id) {
+    public UnifiedResponse findById(@PathVariable("id") Long id) {
         adminAuthLogic.checkPermission("sys-role-details");
         var result = service.findById(id);
-        return RestfulResult.success("查询成功", result);
+        return UnifiedResponse.success("查询成功", result);
     }
 
     @GetMapping("query")
-    public RestfulResult query(RoleQueryParams params) {
+    public UnifiedResponse query(RoleQueryParams params) {
         adminAuthLogic.checkPermission("sys-role-list");
         var result = service.query(params);
-        return RestfulResult.success("查询成功", result);
+        return UnifiedResponse.success("查询成功", result);
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/interceptor/HttpContextInterceptor.java

@@ -0,0 +1,32 @@
+package xyz.zhouxy.plusone.system.application.web.interceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import lombok.extern.slf4j.Slf4j;
+import xyz.zhouxy.plusone.system.application.common.model.PlusoneContext;
+import static xyz.zhouxy.plusone.system.constant.AuthLogic.adminAuthLogic;;
+
+@Slf4j
+@Order(1)
+@Component
+public class HttpContextInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+            throws Exception {
+        log.info("" + adminAuthLogic.isLogin());
+        return true;
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+            throws Exception {
+        PlusoneContext.remove();
+        log.info("拦截器清理 ThreadLocal，防止内存泄漏");
+    }
+}

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/web/interceptor/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * 拦截器
+ *
+ * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
+ * @since 1.0
+ */
+package xyz.zhouxy.plusone.system.application.web.interceptor;

plusone-system/plusone-system-application/src/main/resources/xyz/zhouxy/plusone/system/application/query/AccountQueries.xml

@@ -87,10 +87,13 @@
                     AND sar.role_id = #{roleId}
                     AND sr.deleted = 0
                 </if>
-                <if test="orderBy != null">
+                <if test="orderBy != null and !orderBy.isEmpty()">
-                    ORDER BY sa.${orderBy}, sa.id
+                    ORDER BY
+                    <foreach item="col" index="index" collection="orderBy" open="" separator="," close="">
+                        sa.${col}
+                    </foreach>
                 </if>
-                <if test="orderBy == null">
+                <if test="orderBy == null or orderBy.isEmpty()">
                     ORDER BY sa.id
                 </if>
                 LIMIT #{size} OFFSET #{offset}
@@ -99,7 +102,7 @@
     </select>
 
     <!--
-        long count(SysAccountQuery queryParams);
+        long count(AccountQueryParams queryParams);
     -->
     <select id="count" resultType="long">
         SELECT COUNT(*)

plusone-system/plusone-system-common/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>plusone-system</artifactId>
@@ -14,10 +14,6 @@
             <groupId>xyz.zhouxy</groupId>
             <artifactId>plusone-basic-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-crypto</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

plusone-system/plusone-system-common/src/main/java/xyz/zhouxy/plusone/system/util/PasswordUtil.java

@@ -1,11 +1,13 @@
 package xyz.zhouxy.plusone.system.util;
 
-import javax.annotation.Nonnull;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
-import cn.hutool.core.util.RandomUtil;
+import org.springframework.util.Assert;
-import cn.hutool.crypto.digest.DigestUtil;
+
-import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
+import com.google.common.hash.Hashing;
-import xyz.zhouxy.plusone.exception.PlusoneException;
+
+import xyz.zhouxy.plusone.util.RandomUtil;
 
 /**
  * 密码工具类
@@ -13,7 +15,8 @@ import xyz.zhouxy.plusone.exception.PlusoneException;
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  */
 public final class PasswordUtil {
-    private static final String SALT_BASE_STRING = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_-+={}[]|\\:;\"',.<>?/";
+    private static final char[] SALT_BASE_CHAR_ARRAY = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_-+={}[]|\\:;\"',.<>?/"
+            .toCharArray();
 
     /**
      * 将密码和随机盐混合，并进行哈希加密。
@@ -22,18 +25,18 @@ public final class PasswordUtil {
      * @param salt     随机盐
      * @return 哈希加密的结果
      */
-    @Nonnull
+    public static String hashPassword(String password, String salt) {
-    public static String hashPassword(@Nonnull String password, @Nonnull String salt) {
+        Assert.notNull(password, "Password must not be null");
-        int length = salt.length();
+        Assert.notNull(salt, "Salt must not be null");
-        int i = length > 0 ? length / 2 : 0;
+        return Hashing.sha512().newHasher()
-        var passwordWithSalt = salt.substring(0, i)
+                .putInt(Arrays.hashCode(salt.toCharArray()))
-                + password
+                .putString(password, StandardCharsets.UTF_8)
-                + salt.substring(1);
+                .putInt(password.length())
-        String sha512Hex = DigestUtil.sha512Hex(passwordWithSalt);
+                .putBoolean(password.length() % 2 == 0)
-        if (sha512Hex == null) {
+                .putString(salt, StandardCharsets.UTF_8)
-            throw new PlusoneException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：哈希加密失败！");
+                .putInt(Arrays.hashCode(password.toCharArray()))
-        }
+                .hash()
-        return sha512Hex;
+                .toString();
     }
 
     /**
@@ -42,7 +45,7 @@ public final class PasswordUtil {
      * @return 生成的随机盐
      */
     public static String generateRandomSalt() {
-        return RandomUtil.randomString(SALT_BASE_STRING, 24);
+        return RandomUtil.randomStr(SALT_BASE_CHAR_ARRAY, 24);
     }
 
     private PasswordUtil() {

plusone-system/plusone-system-domain/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>xyz.zhouxy</groupId>

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/event/AccountCreated.java

@@ -27,7 +27,7 @@ public class AccountCreated extends DomainEvent {
 
     public AccountCreated(Account account) {
         this.username = account.getUsername();
-        this.email = account.getEmail();
+        this.email = account.getEmail().orElse(null);
-        this.mobilePhone = account.getMobilePhone();
+        this.mobilePhone = account.getMobilePhone().orElse(null);
     }
 }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/event/AccountLocked.java

@@ -27,7 +27,7 @@ public class AccountLocked extends DomainEvent {
 
     public AccountLocked(Account account) {
         this.username = account.getUsername();
-        this.email = account.getEmail();
+        this.email = account.getEmail().orElse(null);
-        this.mobilePhone = account.getMobilePhone();
+        this.mobilePhone = account.getMobilePhone().orElse(null);
     }
 }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/event/AccountPasswordChanged.java

@@ -27,8 +27,8 @@ public class AccountPasswordChanged extends DomainEvent {
 
     public AccountPasswordChanged(Account account) {
         this.username = account.getUsername();
-        this.email = account.getEmail();
+        this.email = account.getEmail().orElse(null);
-        this.mobilePhone = account.getMobilePhone();
+        this.mobilePhone = account.getMobilePhone().orElse(null);
     }
 
 }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/event/EmailChanged.java

@@ -25,6 +25,6 @@ public class EmailChanged extends DomainEvent {
 
     public EmailChanged(Account account) {
         this.username = account.getUsername();
-        this.email = account.getEmail();
+        this.email = account.getEmail().orElse(null);
     }
 }