Merge remote-tracking branch 'origin/feature/menu-mng' into feature/menu-mng

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

@@ -44,12 +44,12 @@
         <dependency>
             <groupId>xyz.zhouxy.plusone</groupId>
             <artifactId>plusone-validator</artifactId>
-            <version>0.1.2-SNAPSHOT</version>
+            <version>0.1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>xyz.zhouxy.plusone</groupId>
             <artifactId>plusone-exception-handler</artifactId>
-            <version>0.0.7-SNAPSHOT</version>
+            <version>0.0.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

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

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

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

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

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.BizException;
+import xyz.zhouxy.plusone.exception.SysException;
 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 BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, e);
+            throw new SysException(e);
         }
     }
 

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/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/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
-    @Setter
-    Integer type;
+    private @Getter @Setter Integer type;
 
-    @Getter
-    @Setter
-    String typeName;
+    private @Getter @Setter String typeName;
 
-    @Getter
-    @Setter
-    Long id;
-    @Getter
-    @Setter
-    Long parentId;
+    private @Getter @Setter Long id;
+    private @Getter @Setter Long parentId;
 
-    @Getter
-    @Setter
-    String name;
+    private @Getter @Setter String name;
     // 若 type 为 MENU_ITEM 且 path 以 http:// 或 https:// 开头则被识别为外链
-    @Getter
-    @Setter
-    String path;
-    @Getter
-    @Setter
-    String title;
-    @Getter
-    @Setter
-    String icon;
-    @Getter
-    @Setter
-    boolean hidden;
-    @Getter
-    @Setter
-    int orderNumber;
-    @Getter
-    @Setter
-    Integer status;
-    @Getter
-    @Setter
-    String remarks;
+    private @Getter @Setter String path;
+    private @Getter @Setter String title;
+    private @Getter @Setter String icon;
+    private @Getter @Setter boolean hidden;
+    private @Getter @Setter int orderNumber;
+    private @Getter @Setter Integer status;
+    private @Getter @Setter String remarks;
 
     // MENU_ITEM
-    @Getter
-    @Setter
-    String component;
-    @Getter
-    @Setter
-    Boolean cache;
-    @Getter
-    @Setter
-    String resource;
-    @Getter
-    @Setter
-    List<Action> actions;
+    private @Getter @Setter String component;
+    private @Getter @Setter Boolean cache;
+    private @Getter @Setter String resource;
+    private @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().getValue();
+        viewObject.status = menu.getStatus().getId();
         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) {
-        this.menuService = roleRepository;
+    MenuManagementService(MenuService menuService, MenuRepository menuRepository, MenuQueries menuQueries) {
+        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.constant.ErrorCodeConsts;
-import xyz.zhouxy.plusone.exception.BizException;
+import xyz.zhouxy.plusone.exception.SysException;
 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);
-        String sha512Hex = sha512Hex(passwordWithSalt);
-        if (sha512Hex == null) {
-            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：哈希加密失败！");
+                + salt.substring(i);
+        try {
+            return sha512Hex(passwordWithSalt);
+        } 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) {
-        try {
-            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;
+    @Nonnull
+    @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);
     }
 }

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

@@ -1,5 +1,9 @@
 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;
@@ -12,18 +16,23 @@ import xyz.zhouxy.plusone.domain.IValueObject;
 @Getter
 public final class AccountStatus extends Enumeration<AccountStatus> implements IValueObject {
 
-    private AccountStatus(int value, String name) {
-        super(value, name);
+    private AccountStatus(int id, @Nonnull String name) {
+        super(id, name);
     }
 
     public static final AccountStatus AVAILABLE = new AccountStatus(0, "账号正常");
     public static final AccountStatus LOCKED = new AccountStatus(1, "账号被锁定");
 
-    private static final EnumerationValuesHolder<AccountStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
+    private static final ValueSet<AccountStatus> VALUE_SET = new ValueSet<>(
             AVAILABLE,
             LOCKED);
 
-    public static AccountStatus of(int value) {
-        return ENUMERATION_VALUES.get(value);
+    public static AccountStatus of(int id) {
+        return VALUE_SET.get(id);
+    }
+
+    @Nonnull
+    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,5 +1,7 @@
 package xyz.zhouxy.plusone.system.domain.model.account;
 
+import java.util.Collection;
+
 import javax.annotation.Nonnull;
 
 import xyz.zhouxy.plusone.commons.util.Enumeration;
@@ -18,16 +20,19 @@ public final class Sex extends Enumeration<Sex> implements IValueObject {
     @Nonnull
     public static final Sex FEMALE = new Sex(2, "女性");
 
-    private Sex(int value, String name) {
-        super(value, name);
+    private Sex(int id, @Nonnull String name) {
+        super(id, name);
     }
 
-    private static EnumerationValuesHolder<Sex> values = new EnumerationValuesHolder<>(
-            UNSET,
-            MALE,
-            FEMALE);
+    private static final ValueSet<Sex> VALUE_SET = new ValueSet<>(UNSET, MALE, FEMALE);
 
+    @Nonnull
     public static Sex of(int value) {
-        return values.get(value);
+        return VALUE_SET.get(value);
+    }
+
+    @Nonnull
+    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().getValue())
+                .addValue("sex", accountInfo.getSex().getId())
                 .addValue("nickname", getValueOrNull(accountInfo.getNickname()))
-                .addValue("status", entity.getStatus().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .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().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .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().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .addValue("remarks", entity.getRemarks())
                 .addValue("createTime", now)
                 .addValue("createdBy", loginId)

pom.xml

@@ -25,9 +25,9 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
 
-        <spring-boot.version>2.7.9</spring-boot.version>
+        <spring-boot.version>2.7.10</spring-boot.version>
         <sa-token.version>1.34.0</sa-token.version>
-        <hutool.version>5.8.15</hutool.version>
+        <hutool.version>5.8.16</hutool.version>
         <mybatis-starter.version>3.0.1</mybatis-starter.version>
         <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
         <commons-io.version>2.11.0</commons-io.version>