添加 TODO

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

@@ -1,13 +1,10 @@
 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.commons.exception.handler.AllExceptionHandler;
+import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
-import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
 
 /**
  * AllExceptionHandlerConfig
@@ -17,7 +14,7 @@ import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler.Excepti
 public class AllExceptionHandlerConfig {
 
     @Bean
-    AllExceptionHandler getAllExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
+    AllExceptionHandler getAllExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
         return new AllExceptionHandler(exceptionInfoHolder);
     }
 }

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

@@ -1,7 +1,5 @@
 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;
@@ -13,8 +11,7 @@ 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.RestfulResult;
-import xyz.zhouxy.plusone.commons.exception.handler.RestfulResult;
 
 /**
  * 默认异常的处理器
@@ -43,7 +40,7 @@ import xyz.zhouxy.plusone.commons.exception.handler.RestfulResult;
 @Order(Ordered.LOWEST_PRECEDENCE - 1)
 @Slf4j
 public class DefaultExceptionHandler extends BaseExceptionHandler {
-    public DefaultExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
+    public DefaultExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
         set(IllegalArgumentException.class, 4010000, "格式错误", HttpStatus.FORBIDDEN);
         set(DataAccessException.class, 6030000, "数据库错误", HttpStatus.INTERNAL_SERVER_ERROR, true);

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

@@ -8,7 +8,6 @@ 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.RestfulResult;
 import xyz.zhouxy.plusone.exception.SysException;
 
@@ -16,7 +15,7 @@ import xyz.zhouxy.plusone.exception.SysException;
 @Slf4j
 public class SysExceptionHandler extends BaseExceptionHandler {
 
-    public SysExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
+    public SysExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
     }
 

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

@@ -49,7 +49,7 @@
         <dependency>
             <groupId>xyz.zhouxy.plusone</groupId>
             <artifactId>plusone-exception-handler</artifactId>
-            <version>0.0.9-SNAPSHOT</version>
+            <version>0.0.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

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

@@ -1,9 +1,5 @@
 package xyz.zhouxy.plusone.constant;
 
-import java.util.Collection;
-
-import javax.annotation.Nonnull;
-
 import xyz.zhouxy.plusone.commons.util.Enumeration;
 
 /**
@@ -13,22 +9,24 @@ import xyz.zhouxy.plusone.commons.util.Enumeration;
  */
 public final class EntityStatus extends Enumeration<EntityStatus> {
 
-    private EntityStatus(int id, @Nonnull String name) {
+    private EntityStatus(int value, String name) {
-        super(id, name);
+        super(value, name);
     }
 
     // 常量
     public static final EntityStatus AVAILABLE = new EntityStatus(0, "正常");
     public static final EntityStatus DISABLED = new EntityStatus(1, "禁用");
 
-    private static final ValueSet<EntityStatus> VALUE_SET = new ValueSet<>(
+    private static final EnumerationValuesHolder<EntityStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
-            AVAILABLE, DISABLED);
+            AVAILABLE,
+            DISABLED);
 
-    public static EntityStatus of(int id) {
+    public static EntityStatus of(int value) {
-        return VALUE_SET.get(id);
+        return ENUMERATION_VALUES.get(value);
     }
 
-    public static Collection<EntityStatus> constants() {
+    @Override
-        return VALUE_SET.getValues();
+    public String toString() {
+        return "EntityStatus" + super.toString();
     }
 }

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.commons.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
+import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
 
 @Configuration
 public class PlusoneExceptionHandlerConfig {

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.BizException;
 import xyz.zhouxy.plusone.sms.SmsProperties.SmsCredentialProperties;
 import xyz.zhouxy.plusone.sms.SmsProperties.SmsHttpProperties;
 import xyz.zhouxy.plusone.sms.SmsProperties.SmsProxyProperties;
@@ -62,14 +61,13 @@ public class TencentSmsServiceImpl implements SmsService {
             var res = client.SendSms(req);
 
             // 输出json格式的字符串回包
-            System.out.println(SendSmsResponse.toJsonString(res));
+            log.info(SendSmsResponse.toJsonString(res));
 
             // 也可以取出单个值，你可以通过官网接口文档或跳转到response对象的定义处查看返回字段的定义
             // System.out.println(res.getRequestId());
 
         } catch (TencentCloudSDKException e) {
-            log.error(e.getMessage(), e);
+            throw new SysException(e);
-            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, e);
         }
     }
 

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

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

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import xyz.zhouxy.plusone.system.application.query.params.MenuQueryParams;
 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;
@@ -66,7 +67,14 @@ public class MenuManagementController {
     public RestfulResult findById(@PathVariable("id") Long id) {
         adminAuthLogic.checkPermission("sys-menu-details");
         var result = service.findById(id);
-        return RestfulResult.success("查询成功", result);
+        return success("查询成功", result);
+    }
+
+    @GetMapping
+    public RestfulResult queryMenuTree(MenuQueryParams queryParams) {
+        adminAuthLogic.checkPermission("sys-menu-query");
+        var result = service.queryMenuTree(queryParams);
+        return success("查询成功", result);
     }
 
     @GetMapping("queryByAccountId")

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

@@ -6,14 +6,14 @@ 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.commons.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.util.RestfulResult;
-import xyz.zhouxy.plusone.commons.exception.handler.RestfulResult;
 
 @RestControllerAdvice
 public class AccountLoginExceptionHandler extends BaseExceptionHandler {
 
-    public AccountLoginExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
+    public AccountLoginExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
     }
 

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

@@ -1,7 +1,5 @@
 package xyz.zhouxy.plusone.system.application.exception.handler;
 
-import javax.annotation.Nonnull;
-
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -16,8 +14,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.commons.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler;
-import xyz.zhouxy.plusone.commons.exception.handler.RestfulResult;
+import xyz.zhouxy.plusone.commons.util.RestfulResult;
 
 /**
  * Sa-Token 异常处理器
@@ -29,7 +27,7 @@ import xyz.zhouxy.plusone.commons.exception.handler.RestfulResult;
 public class SaTokenExceptionHandler extends BaseExceptionHandler {
 
 
-    public SaTokenExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
+    public SaTokenExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
         set(NotPermissionException.class, 4030103, "会话未能通过权限认证", HttpStatus.FORBIDDEN);
         set(NotRoleException.class, 4030103, "会话未能通过角色认证", HttpStatus.FORBIDDEN);

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

@@ -2,8 +2,6 @@ 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;
@@ -25,7 +23,6 @@ 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/MenuQueries.java

@@ -0,0 +1,23 @@
+package xyz.zhouxy.plusone.system.application.query;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import xyz.zhouxy.plusone.system.application.query.params.MenuQueryParams;
+import xyz.zhouxy.plusone.system.application.query.result.MenuViewObject;
+
+/**
+ *
+ *
+ * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
+ */
+@Component
+public class MenuQueries {
+
+    public List<MenuViewObject> queryMenuTree(MenuQueryParams queryParams) {
+        // TODO【添加】 实现该查询
+        return null;
+    }
+
+}

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

@@ -1,10 +0,0 @@
-package xyz.zhouxy.plusone.system.application.query;
-
-/**
- *
- *
- * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
- */
-public interface PermissionQueries {
-    // TODO【添加】 权限信息查询器
-}

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

@@ -0,0 +1,18 @@
+package xyz.zhouxy.plusone.system.application.query.params;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import xyz.zhouxy.plusone.constant.EntityStatus;
+
+@ToString
+public class MenuQueryParams {
+    private @Getter @Setter String name;
+    private @Getter @Setter String path;
+    private @Getter @Setter String title;
+    private @Getter @Setter Boolean hidden;
+    private @Getter @Setter EntityStatus status;
+    private @Getter @Setter String component;
+    private @Getter @Setter Boolean cache;
+    private @Getter @Setter String resource;
+}

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

@@ -25,60 +25,28 @@ import xyz.zhouxy.plusone.system.domain.model.menu.Menu.MenuType;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class MenuViewObject implements IWithOrderNumber {
 
-    @Getter
+    private @Getter @Setter Integer type;
-    @Setter
-    Integer type;
 
-    @Getter
+    private @Getter @Setter String typeName;
-    @Setter
-    String typeName;
 
-    @Getter
+    private @Getter @Setter Long id;
-    @Setter
+    private @Getter @Setter Long parentId;
-    Long id;
-    @Getter
-    @Setter
-    Long parentId;
 
-    @Getter
+    private @Getter @Setter String name;
-    @Setter
-    String name;
     // 若 type 为 MENU_ITEM 且 path 以 http:// 或 https:// 开头则被识别为外链
-    @Getter
+    private @Getter @Setter String path;
-    @Setter
+    private @Getter @Setter String title;
-    String path;
+    private @Getter @Setter String icon;
-    @Getter
+    private @Getter @Setter boolean hidden;
-    @Setter
+    private @Getter @Setter int orderNumber;
-    String title;
+    private @Getter @Setter Integer status;
-    @Getter
+    private @Getter @Setter String remarks;
-    @Setter
-    String icon;
-    @Getter
-    @Setter
-    boolean hidden;
-    @Getter
-    @Setter
-    int orderNumber;
-    @Getter
-    @Setter
-    Integer status;
-    @Getter
-    @Setter
-    String remarks;
 
     // MENU_ITEM
-    @Getter
+    private @Getter @Setter String component;
-    @Setter
+    private @Getter @Setter Boolean cache;
-    String component;
+    private @Getter @Setter String resource;
-    @Getter
+    private @Getter @Setter List<Action> actions;
-    @Setter
-    Boolean cache;
-    @Getter
-    @Setter
-    String resource;
-    @Getter
-    @Setter
-    List<Action> actions;
 
     // MENU_LIST
     List<MenuViewObject> children;
@@ -109,7 +77,7 @@ public class MenuViewObject implements IWithOrderNumber {
         viewObject.icon = menu.getIcon();
         viewObject.hidden = menu.isHidden();
         viewObject.orderNumber = menu.getOrderNumber();
-        viewObject.status = menu.getStatus().getId();
+        viewObject.status = menu.getStatus().getValue();
         viewObject.remarks = menu.getRemarks();
         if (viewObject.type == MenuType.MENU_ITEM.ordinal()) {
             viewObject.component = menu.getComponent();

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

@@ -17,6 +17,8 @@ import xyz.zhouxy.plusone.constant.EntityStatus;
 import xyz.zhouxy.plusone.domain.IWithOrderNumber;
 import xyz.zhouxy.plusone.exception.DataNotExistException;
 import xyz.zhouxy.plusone.system.application.exception.UnsupportedMenuTypeException;
+import xyz.zhouxy.plusone.system.application.query.MenuQueries;
+import xyz.zhouxy.plusone.system.application.query.params.MenuQueryParams;
 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;
@@ -36,10 +38,12 @@ public class MenuManagementService {
 
     private final MenuService menuService;
     private final MenuRepository menuRepository;
+    private final MenuQueries menuQueries;
 
-    MenuManagementService(MenuService roleRepository, MenuRepository menuRepository) {
+    MenuManagementService(MenuService menuService, MenuRepository menuRepository, MenuQueries menuQueries) {
-        this.menuService = roleRepository;
+        this.menuService = menuService;
         this.menuRepository = menuRepository;
+        this.menuQueries = menuQueries;
     }
 
     // ==================== create ====================
@@ -123,6 +127,11 @@ public class MenuManagementService {
         return MenuViewObject.of(menu.orElseThrow(DataNotExistException::new));
     }
 
+    @Transactional(propagation = Propagation.SUPPORTS)
+    public List<MenuViewObject> queryMenuTree(MenuQueryParams queryParams) {
+        return menuQueries.queryMenuTree(queryParams);
+    }
+
     @Transactional(propagation = Propagation.SUPPORTS)
     public List<MenuViewObject> queryByAccountId(Long accountId) {
         var menus = menuService.queryAllMenuListByAccountId(accountId);

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

@@ -7,9 +7,7 @@ import java.security.NoSuchAlgorithmException;
 
 import javax.annotation.Nonnull;
 
-import lombok.extern.slf4j.Slf4j;
+import xyz.zhouxy.plusone.exception.SysException;
-import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
-import xyz.zhouxy.plusone.exception.BizException;
 import xyz.zhouxy.plusone.util.RandomUtil;
 
 /**
@@ -17,7 +15,6 @@ import xyz.zhouxy.plusone.util.RandomUtil;
  *
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  */
-@Slf4j
 public final class PasswordUtil {
     private static final char[] SALT_BASE_CHAR_ARRAY = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_-+={}[]|\\:;\"',.<>?/"
             .toCharArray();
@@ -35,12 +32,12 @@ public final class PasswordUtil {
         int i = length > 0 ? length / 2 : 0;
         var passwordWithSalt = salt.substring(0, i)
                 + password
-                + salt.substring(1);
+                + salt.substring(i);
-        String sha512Hex = sha512Hex(passwordWithSalt);
+        try {
-        if (sha512Hex == null) {
+            return sha512Hex(passwordWithSalt);
-            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：哈希加密失败！");
+        } catch (NoSuchAlgorithmException e) {
+            throw new SysException(e);
         }
-        return sha512Hex;
     }
 
     /**
@@ -57,15 +54,12 @@ public final class PasswordUtil {
         throw new IllegalStateException("Utility class");
     }
 
-    private static String sha512Hex(String data) {
+    @Nonnull
-        try {
+    @SuppressWarnings("null")
+    private static String sha512Hex(String data) throws NoSuchAlgorithmException {
         MessageDigest messageDigest = MessageDigest.getInstance("SHA-512");
         messageDigest.update(data.getBytes(StandardCharsets.UTF_8));
         byte[] result = messageDigest.digest();
         return new BigInteger(1, result).toString(16);
-        } catch (NoSuchAlgorithmException e) {
-            log.error("{}", e);
-        }
-        return null;
     }
 }

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

@@ -1,9 +1,5 @@
 package xyz.zhouxy.plusone.system.domain.model.account;
 
-import java.util.Collection;
-
-import javax.annotation.Nonnull;
-
 import lombok.Getter;
 import xyz.zhouxy.plusone.commons.util.Enumeration;
 import xyz.zhouxy.plusone.domain.IValueObject;
@@ -16,22 +12,18 @@ import xyz.zhouxy.plusone.domain.IValueObject;
 @Getter
 public final class AccountStatus extends Enumeration<AccountStatus> implements IValueObject {
 
-    private AccountStatus(int id, @Nonnull String name) {
+    private AccountStatus(int value, String name) {
-        super(id, name);
+        super(value, name);
     }
 
     public static final AccountStatus AVAILABLE = new AccountStatus(0, "账号正常");
     public static final AccountStatus LOCKED = new AccountStatus(1, "账号被锁定");
 
-    private static final ValueSet<AccountStatus> VALUE_SET = new ValueSet<>(
+    private static final EnumerationValuesHolder<AccountStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
             AVAILABLE,
             LOCKED);
 
-    public static AccountStatus of(int id) {
+    public static AccountStatus of(int value) {
-        return VALUE_SET.get(id);
+        return ENUMERATION_VALUES.get(value);
-    }
-
-    public static Collection<AccountStatus> constants() {
-        return VALUE_SET.getValues();
     }
 }

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

@@ -8,9 +8,8 @@ import javax.annotation.Nonnull;
 import org.springframework.util.Assert;
 
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
-import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
 import xyz.zhouxy.plusone.domain.IValueObject;
-import xyz.zhouxy.plusone.exception.BizException;
+import xyz.zhouxy.plusone.exception.SysException;
 import xyz.zhouxy.plusone.system.util.PasswordUtil;
 
 /**
@@ -37,7 +36,7 @@ public class Password implements IValueObject {
         }
         var salt = PasswordUtil.generateRandomSalt();
         if (salt == null) {
-            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：生成随机盐失败");
+            throw new SysException("未知错误：生成随机盐失败");
         }
         this.saltVal = salt;
         this.passwordVal = PasswordUtil.hashPassword(password, salt);

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

@@ -1,7 +1,5 @@
 package xyz.zhouxy.plusone.system.domain.model.account;
 
-import java.util.Collection;
-
 import javax.annotation.Nonnull;
 
 import xyz.zhouxy.plusone.commons.util.Enumeration;
@@ -20,17 +18,16 @@ public final class Sex extends Enumeration<Sex> implements IValueObject {
     @Nonnull
     public static final Sex FEMALE = new Sex(2, "女性");
 
-    private Sex(int id, @Nonnull String name) {
+    private Sex(int value, String name) {
-        super(id, name);
+        super(value, name);
     }
 
-    private static final ValueSet<Sex> VALUE_SET = new ValueSet<>(UNSET, MALE, FEMALE);
+    private static EnumerationValuesHolder<Sex> values = new EnumerationValuesHolder<>(
+            UNSET,
+            MALE,
+            FEMALE);
 
     public static Sex of(int value) {
-        return VALUE_SET.get(value);
+        return values.get(value);
-    }
-
-    public static Collection<Sex> constants() {
-        return VALUE_SET.getValues();
     }
 }

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

@@ -206,9 +206,9 @@ public class AccountRepositoryImpl extends JdbcRepositorySupport<Account, Long>
                 .addValue("password", entity.getPassword().value())
                 .addValue("salt", entity.getPassword().getSalt())
                 .addValue("avatar", accountInfo.getAvatar().toString())
-                .addValue("sex", accountInfo.getSex().getId())
+                .addValue("sex", accountInfo.getSex().getValue())
                 .addValue("nickname", getValueOrNull(accountInfo.getNickname()))
-                .addValue("status", entity.getStatus().getId())
+                .addValue("status", entity.getStatus().getValue())
                 .addValue("createdBy", entity.getCreatedBy())
                 .addValue("createTime", now)
                 .addValue("updatedBy", entity.getUpdatedBy())

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/menu/MenuRepositoryImpl.java

@@ -188,7 +188,7 @@ public class MenuRepositoryImpl extends JdbcRepositorySupport<Menu, Long> implem
                 .addValue("icon", entity.getIcon())
                 .addValue("hidden", entity.isHidden())
                 .addValue("orderNumber", entity.getOrderNumber())
-                .addValue("status", entity.getStatus().getId())
+                .addValue("status", entity.getStatus().getValue())
                 .addValue("remarks", entity.getRemarks())
                 .addValue("component", entity.getComponent())
                 .addValue("cache", entity.getCache())

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/role/RoleRepositoryImpl.java

@@ -135,7 +135,7 @@ public class RoleRepositoryImpl extends JdbcRepositorySupport<Role, Long> implem
                 .addValue("id", id)
                 .addValue("name", entity.getName())
                 .addValue("identifier", entity.getIdentifier())
-                .addValue("status", entity.getStatus().getId())
+                .addValue("status", entity.getStatus().getValue())
                 .addValue("remarks", entity.getRemarks())
                 .addValue("createTime", now)
                 .addValue("createdBy", loginId)