Merge remote-tracking branch 'origin/main' into main

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

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

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

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

@@ -15,7 +15,6 @@ 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;
@@ -67,14 +66,7 @@ public class MenuManagementController {
     public RestfulResult findById(@PathVariable("id") Long id) {
         adminAuthLogic.checkPermission("sys-menu-details");
         var result = service.findById(id);
-        return success("查询成功", result);
+        return RestfulResult.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

@@ -1,23 +0,0 @@
-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

@@ -0,0 +1,10 @@
+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

@@ -1,18 +0,0 @@
-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,28 +25,60 @@ import xyz.zhouxy.plusone.system.domain.model.menu.Menu.MenuType;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class MenuViewObject implements IWithOrderNumber {
 
-    private @Getter @Setter Integer type;
+    @Getter
+    @Setter
+    Integer type;
 
-    private @Getter @Setter String typeName;
+    @Getter
+    @Setter
+    String typeName;
 
-    private @Getter @Setter Long id;
+    @Getter
-    private @Getter @Setter Long parentId;
+    @Setter
+    Long id;
+    @Getter
+    @Setter
+    Long parentId;
 
-    private @Getter @Setter String name;
+    @Getter
+    @Setter
+    String name;
     // 若 type 为 MENU_ITEM 且 path 以 http:// 或 https:// 开头则被识别为外链
-    private @Getter @Setter String path;
+    @Getter
-    private @Getter @Setter String title;
+    @Setter
-    private @Getter @Setter String icon;
+    String path;
-    private @Getter @Setter boolean hidden;
+    @Getter
-    private @Getter @Setter int orderNumber;
+    @Setter
-    private @Getter @Setter Integer status;
+    String title;
-    private @Getter @Setter String remarks;
+    @Getter
+    @Setter
+    String icon;
+    @Getter
+    @Setter
+    boolean hidden;
+    @Getter
+    @Setter
+    int orderNumber;
+    @Getter
+    @Setter
+    Integer status;
+    @Getter
+    @Setter
+    String remarks;
 
     // MENU_ITEM
-    private @Getter @Setter String component;
+    @Getter
-    private @Getter @Setter Boolean cache;
+    @Setter
-    private @Getter @Setter String resource;
+    String component;
-    private @Getter @Setter List<Action> actions;
+    @Getter
+    @Setter
+    Boolean cache;
+    @Getter
+    @Setter
+    String resource;
+    @Getter
+    @Setter
+    List<Action> actions;
 
     // MENU_LIST
     List<MenuViewObject> children;

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

@@ -17,8 +17,6 @@ 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;
@@ -38,12 +36,10 @@ public class MenuManagementService {
 
     private final MenuService menuService;
     private final MenuRepository menuRepository;
-    private final MenuQueries menuQueries;
 
-    MenuManagementService(MenuService menuService, MenuRepository menuRepository, MenuQueries menuQueries) {
+    MenuManagementService(MenuService roleRepository, MenuRepository menuRepository) {
-        this.menuService = menuService;
+        this.menuService = roleRepository;
         this.menuRepository = menuRepository;
-        this.menuQueries = menuQueries;
     }
 
     // ==================== create ====================
@@ -127,11 +123,6 @@ 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,7 +7,9 @@ import java.security.NoSuchAlgorithmException;
 
 import javax.annotation.Nonnull;
 
-import xyz.zhouxy.plusone.exception.SysException;
+import lombok.extern.slf4j.Slf4j;
+import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
+import xyz.zhouxy.plusone.exception.BizException;
 import xyz.zhouxy.plusone.util.RandomUtil;
 
 /**
@@ -15,6 +17,7 @@ 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();
@@ -32,12 +35,12 @@ public final class PasswordUtil {
         int i = length > 0 ? length / 2 : 0;
         var passwordWithSalt = salt.substring(0, i)
                 + password
-                + salt.substring(i);
+                + salt.substring(1);
-        try {
+        String sha512Hex = sha512Hex(passwordWithSalt);
-            return sha512Hex(passwordWithSalt);
+        if (sha512Hex == null) {
-        } catch (NoSuchAlgorithmException e) {
+            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：哈希加密失败！");
-            throw new SysException(e);
         }
+        return sha512Hex;
     }
 
     /**
@@ -54,12 +57,15 @@ public final class PasswordUtil {
         throw new IllegalStateException("Utility class");
     }
 
-    @Nonnull
+    private static String sha512Hex(String data) {
-    @SuppressWarnings("null")
+        try {
-    private static String sha512Hex(String data) throws NoSuchAlgorithmException {
+            MessageDigest messageDigest = MessageDigest.getInstance("SHA-512");
-        MessageDigest messageDigest = MessageDigest.getInstance("SHA-512");
+            messageDigest.update(data.getBytes(StandardCharsets.UTF_8));
-        messageDigest.update(data.getBytes(StandardCharsets.UTF_8));
+            byte[] result = messageDigest.digest();
-        byte[] result = messageDigest.digest();
+            return new BigInteger(1, result).toString(16);
-        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/Password.java

@@ -8,8 +8,9 @@ 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.SysException;
+import xyz.zhouxy.plusone.exception.BizException;
 import xyz.zhouxy.plusone.system.util.PasswordUtil;
 
 /**
@@ -36,7 +37,7 @@ public class Password implements IValueObject {
         }
         var salt = PasswordUtil.generateRandomSalt();
         if (salt == null) {
-            throw new SysException("未知错误：生成随机盐失败");
+            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：生成随机盐失败");
         }
         this.saltVal = salt;
         this.passwordVal = PasswordUtil.hashPassword(password, salt);