Merge branch 'feature/add-copyright' of http://zhouxy.xyz:3000/ZhouXY108/plusone-admin into feature/add-copyright

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.6-SNAPSHOT</version>
+            <version>0.0.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

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.util.concurrent.ThreadLocalRandom;
+
+public final class RandomUtil {
+    private RandomUtil() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static String randomStr(char[] sourceCharacters, int length) {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+        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

@@ -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>

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

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

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

@@ -102,18 +102,18 @@ 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);
     }
 
-    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);
     }
 
-    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);

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

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import javax.annotation.Resource;
 
 import org.junit.jupiter.api.Test;
@@ -41,6 +43,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/service/AccountManagementService.java

@@ -42,8 +42,10 @@ 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;
 
@@ -83,12 +85,12 @@ public class AccountManagementService {
                 mobilePhone,
                 command.getPassword(),
                 command.getPasswordConfirmation(),
-                command.getStatus(),
+                AccountStatus.of(command.getStatus()),
                 command.getRoleRefs(),
                 AccountInfo.builder()
                         .nickname(command.getNickname())
                         .avatar(command.getAvatar())
-                        .sex(command.getSex())
+                        .sex(Sex.of(command.getSex()))
                         .build(),
                 adminAuthLogic.getLoginIdAsLong());
         accountRepository.save(account);
@@ -107,7 +109,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/MenuManagementService.java

@@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
+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;
@@ -82,7 +83,7 @@ public class MenuManagementService {
                 command.getIcon(),
                 command.getHidden(),
                 command.getOrderNumber(),
-                command.getStatus(),
+                EntityStatus.of(command.getStatus()),
                 command.getRemarks());
     }
 
@@ -95,7 +96,7 @@ public class MenuManagementService {
                 command.getIcon(),
                 command.getHidden(),
                 command.getOrderNumber(),
-                command.getStatus(),
+                EntityStatus.of(command.getStatus()),
                 command.getComponent(),
                 command.getResource(),
                 command.getCache(),
@@ -123,7 +124,7 @@ public class MenuManagementService {
                 command.getIcon(),
                 command.getHidden(),
                 command.getOrderNumber(),
-                command.getStatus(),
+               EntityStatus.of(command.getStatus()),
                 command.getComponent(),
                 command.getResource(),
                 command.getCache(),

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

@@ -26,6 +26,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;
@@ -70,7 +71,7 @@ public class RoleManagementService {
         Role roleToCreate = Role.newInstance(
                 command.getName(),
                 command.getIdentifier(),
-                command.getStatus(),
+                EntityStatus.of(command.getStatus()),
                 command.getRemarks(),
                 menuRefs,
                 permissionRefs);
@@ -83,7 +84,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

@@ -28,8 +28,6 @@ import org.hibernate.validator.constraints.URL;
 import lombok.Data;
 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;
 
 /**
  * 创建账号命令
@@ -57,7 +55,7 @@ public class CreateAccountCommand implements ICommand {
     String passwordConfirmation;
 
     @NotNull
-    AccountStatus status;
+    Integer status;
 
     Set<Long> roleRefs;
 
@@ -68,5 +66,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

@@ -21,7 +21,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;
 
@@ -58,7 +57,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

@@ -22,7 +22,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;
 
 /**
@@ -39,7 +38,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/UpdateAccountCommand.java

@@ -24,7 +24,6 @@ import org.hibernate.validator.constraints.URL;
 import lombok.Data;
 import xyz.zhouxy.plusone.commons.constant.RegexConsts;
 import xyz.zhouxy.plusone.domain.ICommand;
-import xyz.zhouxy.plusone.system.domain.model.account.Sex;
 
 /**
  * 更新账号信息命令
@@ -43,5 +42,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

@@ -21,7 +21,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;
 
@@ -62,7 +61,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

@@ -22,7 +22,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;
 
 /**
@@ -43,7 +42,7 @@ public class UpdateRoleCommand implements ICommand {
     String identifier;
 
     @NotNull
-    EntityStatus status;
+    Integer status;
 
     @NotBlank
     String remarks;

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

@@ -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

@@ -16,20 +16,27 @@
 
 package xyz.zhouxy.plusone.system.util;
 
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
 import javax.annotation.Nonnull;
 
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.digest.DigestUtil;
+import lombok.extern.slf4j.Slf4j;
 import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
 import xyz.zhouxy.plusone.exception.BizException;
+import xyz.zhouxy.plusone.util.RandomUtil;
 
 /**
  * 密码工具类
  *
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  */
+@Slf4j
 public final class PasswordUtil {
-    private static final String SALT_BASE_STRING = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_-+={}[]|\\:;\"',.<>?/";
+    private static final char[] SALT_BASE_CHAR_ARRAY = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_-+={}[]|\\:;\"',.<>?/"
+            .toCharArray();
 
     /**
      * 将密码和随机盐混合，并进行哈希加密。
@@ -45,7 +52,7 @@ public final class PasswordUtil {
         var passwordWithSalt = salt.substring(0, i)
                 + password
                 + salt.substring(1);
-        String sha512Hex = DigestUtil.sha512Hex(passwordWithSalt);
+        String sha512Hex = sha512Hex(passwordWithSalt);
         if (sha512Hex == null) {
             throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：哈希加密失败！");
         }
@@ -58,11 +65,23 @@ 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() {
         // 不允许实例化
         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;
+    }
 }

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

@@ -47,7 +47,7 @@ class AccountRoleRefDAO extends PlusoneJdbcDaoSupport {
     }
 
     void insertAccountRoleRefs(Long accountId, Set<Long> roleRefs) {
-        int i = batchUpdate(
+        long i = batchUpdate(
                 "INSERT INTO sys_account_role (account_id, role_id) VALUES (:accountId, :roleId)",
                 roleRefs,
                 (Long roleId) -> new MapSqlParameterSource()

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/dict/DictValueDAO.java

@@ -37,11 +37,11 @@ class DictValueDAO extends PlusoneJdbcDaoSupport {
     void updateDictValues(Dict entity) {
         update("DELETE FROM sys_dict_value WHERE dict_type = :dictType",
                 "dictType", entity.getId().orElseThrow());
-        int i = insertDictValues(entity.getId().orElseThrow(), entity);
+        long i = insertDictValues(entity.getId().orElseThrow(), entity);
         assertResultEquals(i, entity.count());
     }
 
-    int insertDictValues(Long dictId, Dict entity) {
+    long insertDictValues(Long dictId, Dict entity) {
         if (Objects.isNull(dictId) || Objects.isNull(entity) || CollectionUtils.isEmpty(entity.getValues())) {
             return 0;
         }

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

@@ -45,7 +45,7 @@ class RoleMenuRefDAO extends PlusoneJdbcDaoSupport {
     }
 
     void saveRoleMenuRefs(Long roleId, Role entity) {
-        int i = batchUpdate(
+        long i = batchUpdate(
                 "INSERT INTO sys_role_menu(role_id, menu_id) VALUES (:roleId, :menuId)",
                 entity.getMenus(),
                 menuRef -> new MapSqlParameterSource()

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

@@ -46,7 +46,7 @@ class RolePermissionRefDAO extends PlusoneJdbcDaoSupport {
     }
 
     void saveRolePermissionRefs(Long roleId, Role entity) {
-        int i = batchUpdate(
+        long i = batchUpdate(
                 "INSERT INTO sys_role_permission(role_id, permission_id) VALUES (:roleId, :permissionId)",
                 entity.getPermissions(),
                 actionRef -> new MapSqlParameterSource()

plusone-system/pom.xml

@@ -67,6 +67,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

pom.xml

@@ -25,15 +25,15 @@
         <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.14</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>
         <mica.version>2.7.5</mica.version>
         <mapstruct.version>1.5.3.Final</mapstruct.version>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>30.1-jre</guava.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <commons-math3.version>3.6.1</commons-math3.version>
@@ -91,16 +91,7 @@
                 <artifactId>hutool-core</artifactId>
                 <version>${hutool.version}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-crypto</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-captcha</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
+
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
@@ -186,11 +177,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>