pom.xml

@@ -11,11 +11,11 @@
 
     <properties>
         <revision>1.0.0</revision>
-        <hosea-cloud.version>1.0.0</hosea-cloud.version>
+        <hosea-cloud.version>1.0.1</hosea-cloud.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
+        <flatten-maven-plugin.version>1.7.2</flatten-maven-plugin.version>
         <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
-        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-boot.version>3.2.12</spring-boot.version>
         <mysql.version>8.0.32</mysql.version>
     </properties>
 

service-user-app/src/main/java/com/hosea/service/app/tenant/TenantService.java

@@ -1,7 +1,7 @@
 package com.hosea.service.app.tenant;
 
 import com.alibaba.cola.dto.PageResponse;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Assert;
 import com.hosea.service.app.tenant.executor.TenantCmdExecute;
 import com.hosea.service.app.tenant.executor.TenantQueryExecute;
 import com.hosea.service.user.client.dto.constant.TenantErrorCode;

service-user-app/src/main/java/com/hosea/service/app/user/UserService.java

@@ -2,7 +2,7 @@ package com.hosea.service.app.user;
 
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Assert;
 import com.hosea.cloud.web.login.JwtToken;
 import com.hosea.service.app.user.executor.UserCmdExecute;
 import com.hosea.service.app.user.executor.UserQueryExecute;

service-user-client/src/main/java/com/hosea/service/user/client/dto/constant/TenantErrorCode.java

@@ -1,6 +1,6 @@
 package com.hosea.service.user.client.dto.constant;
 
-import com.hosea.cloud.web.exception.ErrorCode;
+import com.hosea.common.dto.ErrorCode;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

service-user-client/src/main/java/com/hosea/service/user/client/dto/constant/UserErrorCode.java

@@ -1,6 +1,6 @@
 package com.hosea.service.user.client.dto.constant;
 
-import com.hosea.cloud.web.exception.ErrorCode;
+import com.hosea.common.dto.ErrorCode;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

service-user-client/src/main/java/com/hosea/service/user/client/dto/data/TenantUniqueDTO.java

@@ -1,8 +1,8 @@
 package com.hosea.service.user.client.dto.data;
 
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.dto.Validation;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Assert;
+import com.hosea.common.dto.Validation;
 import com.hosea.common.utils.StrUtil;
 import com.hosea.service.user.client.dto.constant.TenantErrorCode;
 import lombok.AllArgsConstructor;

service-user-client/src/main/java/com/hosea/service/user/client/dto/data/UserUniqueDTO.java

@@ -1,8 +1,8 @@
 package com.hosea.service.user.client.dto.data;
 
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.dto.Validation;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Assert;
+import com.hosea.common.dto.Validation;
 import com.hosea.common.utils.StrUtil;
 import com.hosea.service.user.client.dto.constant.UserErrorCode;
 import lombok.AllArgsConstructor;

service-user-client/src/main/java/com/hosea/service/user/client/dto/request/TenantAddCmd.java

@@ -2,8 +2,8 @@ package com.hosea.service.user.client.dto.request;
 
 import com.alibaba.cola.dto.Command;
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.dto.Validation;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Assert;
+import com.hosea.common.dto.Validation;
 import com.hosea.service.user.client.dto.constant.TenantErrorCode;
 import com.hosea.service.user.client.dto.data.TenantDTO;
 import lombok.*;

service-user-client/src/main/java/com/hosea/service/user/client/dto/request/TenantListPageQuery.java

@@ -2,7 +2,7 @@ package com.hosea.service.user.client.dto.request;
 
 import com.alibaba.cola.dto.PageQuery;
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.dto.Validation;
+import com.hosea.common.dto.Validation;
 import lombok.*;
 
 /**

service-user-client/src/main/java/com/hosea/service/user/client/dto/request/TenantUpdateCmd.java

@@ -2,8 +2,8 @@ package com.hosea.service.user.client.dto.request;
 
 import com.alibaba.cola.dto.Command;
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.dto.Validation;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Assert;
+import com.hosea.common.dto.Validation;
 import com.hosea.service.user.client.dto.constant.TenantErrorCode;
 import com.hosea.service.user.client.dto.data.TenantDTO;
 import lombok.*;

service-user-client/src/main/java/com/hosea/service/user/client/dto/request/UserAddCmd.java

@@ -2,8 +2,8 @@ package com.hosea.service.user.client.dto.request;
 
 import com.alibaba.cola.dto.Command;
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.dto.Validation;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Validation;
+import com.hosea.common.dto.Assert;
 import com.hosea.service.user.client.dto.constant.UserErrorCode;
 import com.hosea.service.user.client.dto.data.UserDTO;
 import lombok.*;

service-user-client/src/main/java/com/hosea/service/user/client/dto/request/UserJoinTenantCmd.java

@@ -2,8 +2,8 @@ package com.hosea.service.user.client.dto.request;
 
 import com.alibaba.cola.dto.Command;
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.dto.Validation;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Validation;
+import com.hosea.common.dto.Assert;
 import com.hosea.service.user.client.dto.constant.TenantErrorCode;
 import com.hosea.service.user.client.dto.constant.UserErrorCode;
 import com.hosea.service.user.client.dto.data.TenantUniqueDTO;

service-user-client/src/main/java/com/hosea/service/user/client/dto/request/UserListByTenantPageQuery.java

@@ -2,8 +2,8 @@ package com.hosea.service.user.client.dto.request;
 
 import com.alibaba.cola.dto.PageQuery;
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.dto.Validation;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Validation;
+import com.hosea.common.dto.Assert;
 import com.hosea.common.utils.StrUtil;
 import com.hosea.service.user.client.dto.constant.TenantErrorCode;
 import com.hosea.service.user.client.dto.data.TenantUniqueDTO;

service-user-client/src/main/java/com/hosea/service/user/client/dto/request/UserUpdateCmd.java

@@ -1,8 +1,8 @@
 package com.hosea.service.user.client.dto.request;
 
 import com.alibaba.cola.dto.Command;
-import com.hosea.cloud.web.dto.Validation;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Validation;
+import com.hosea.common.dto.Assert;
 import com.hosea.common.utils.StrUtil;
 import com.hosea.service.user.client.dto.constant.UserErrorCode;
 import com.hosea.service.user.client.dto.data.UserDTO;

service-user-domain/src/main/java/com/hosea/service/domain/tenant/TenantDomainService.java

@@ -1,7 +1,7 @@
 package com.hosea.service.domain.tenant;
 
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Assert;
 import com.hosea.common.utils.StrUtil;
 import com.hosea.service.user.client.dto.constant.TenantErrorCode;
 import com.hosea.service.user.client.dto.event.TenantCreateEvent;

service-user-domain/src/main/java/com/hosea/service/domain/user/UserDomainService.java

@@ -3,7 +3,7 @@ package com.hosea.service.domain.user;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.cola.exception.BizException;
-import com.hosea.cloud.web.exception.Assert;
+import com.hosea.common.dto.Assert;
 import com.hosea.service.domain.tenant.Tenant;
 import com.hosea.service.domain.tenant.TenantDomainService;
 import com.hosea.service.domain.tenant.TenantUnique;

start/src/test/java/com/hosea/service/user/test/AllTest.java

@@ -1,6 +1,6 @@
 package com.hosea.service.user.test;
 
-import com.hosea.cloud.test.JunitSequentialExecutionTest;
+import com.hosea.common.test.JunitSequentialExecutionTest;
 import org.junit.jupiter.api.Test;
 
 /**

start/src/test/java/com/hosea/service/user/test/client/TenantApiTest.java

@@ -1,8 +1,8 @@
 package com.hosea.service.user.test.client;
 
+import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.RandomUtil;
-import com.hosea.cloud.test.Assertions;
-import com.hosea.cloud.test.Tuple;
+import com.hosea.common.test.Assertions;
 import com.hosea.service.user.client.api.TenantApi;
 import com.hosea.service.user.client.dto.constant.TenantErrorCode;
 import com.hosea.service.user.client.dto.data.TenantDTO;
@@ -28,10 +28,10 @@ public class TenantApiTest {
         TenantAddCmd cmd = new TenantAddCmd(createTenant("code" + info.getCurrentRepetition(), RandomUtil.randomString(5)));
         Assertions.success(api::add, cmd);
         Assertions.error(api::add
-                , Tuple.of(null, TenantErrorCode.NOT_NULL)
-                , Tuple.of(cmd, TenantErrorCode.ALREADY_EXISTS)
-                , Tuple.of(new TenantAddCmd(), TenantErrorCode.NOT_NULL)
-                , Tuple.of(new TenantAddCmd(createTenant("")), TenantErrorCode.NOT_NULL_CODE)
+                , Pair.of(null, TenantErrorCode.NOT_NULL)
+                , Pair.of(cmd, TenantErrorCode.ALREADY_EXISTS)
+                , Pair.of(new TenantAddCmd(), TenantErrorCode.NOT_NULL)
+                , Pair.of(new TenantAddCmd(createTenant("")), TenantErrorCode.NOT_NULL_CODE)
         );
     }
 
@@ -40,9 +40,9 @@ public class TenantApiTest {
     public void get() {
         Assertions.assertNotNull(api.get(createTenant("code5")).getData().getName());
         Assertions.error(api::get
-                , Tuple.of(null, TenantErrorCode.NOT_NULL)
-                , Tuple.of(new TenantUniqueDTO(), TenantErrorCode.NOT_NULL_ID_OR_CODE)
-                , Tuple.of(createTenant("xxx"), TenantErrorCode.NOT_EXIST)
+                , Pair.of(null, TenantErrorCode.NOT_NULL)
+                , Pair.of(new TenantUniqueDTO(), TenantErrorCode.NOT_NULL_ID_OR_CODE)
+                , Pair.of(createTenant("xxx"), TenantErrorCode.NOT_EXIST)
         );
     }
 
@@ -53,10 +53,10 @@ public class TenantApiTest {
         TenantUpdateCmd cmd = new TenantUpdateCmd(createTenant("code" + index, "name" + index));
         Assertions.success(api::update, cmd);
         Assertions.error(api::update
-                , Tuple.of(null, TenantErrorCode.NOT_NULL)
-                , Tuple.of(new TenantUpdateCmd(), TenantErrorCode.NOT_NULL)
-                , Tuple.of(new TenantUpdateCmd(createTenant("")), TenantErrorCode.NOT_NULL_ID_OR_CODE)
-                , Tuple.of(new TenantUpdateCmd(createTenant("xxxx")), TenantErrorCode.NOT_EXIST)
+                , Pair.of(null, TenantErrorCode.NOT_NULL)
+                , Pair.of(new TenantUpdateCmd(), TenantErrorCode.NOT_NULL)
+                , Pair.of(new TenantUpdateCmd(createTenant("")), TenantErrorCode.NOT_NULL_ID_OR_CODE)
+                , Pair.of(new TenantUpdateCmd(createTenant("xxxx")), TenantErrorCode.NOT_EXIST)
         );
     }
 

start/src/test/java/com/hosea/service/user/test/client/UserApiTest.java

@@ -1,8 +1,8 @@
 package com.hosea.service.user.test.client;
 
+import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.RandomUtil;
-import com.hosea.cloud.test.Assertions;
-import com.hosea.cloud.test.Tuple;
+import com.hosea.common.test.Assertions;
 import com.hosea.cloud.web.login.JwtToken;
 import com.hosea.cloud.webmvc.JwtTokenUtil;
 import com.hosea.cloud.webmvc.constant.LoginErrorCode;
@@ -38,10 +38,10 @@ public class UserApiTest {
         UserAddCmd cmd = new UserAddCmd(createUser("user" + info.getCurrentRepetition(), RandomUtil.randomString(5)));
         Assertions.success(api::add, cmd);
         Assertions.error(api::add
-                , Tuple.of(null, UserErrorCode.NOT_NULL)
-                , Tuple.of(new UserAddCmd(), UserErrorCode.NOT_NULL)
-                , Tuple.of(new UserAddCmd(createUser("")), UserErrorCode.NOT_NULL_NAME)
-                , Tuple.of(cmd, UserErrorCode.ALREADY_EXISTS)
+                , Pair.of(null, UserErrorCode.NOT_NULL)
+                , Pair.of(new UserAddCmd(), UserErrorCode.NOT_NULL)
+                , Pair.of(new UserAddCmd(createUser("")), UserErrorCode.NOT_NULL_NAME)
+                , Pair.of(cmd, UserErrorCode.ALREADY_EXISTS)
         );
     }
 
@@ -52,10 +52,10 @@ public class UserApiTest {
         UserUpdateCmd cmd = new UserUpdateCmd(createUser("user" + index, "name" + index));
         Assertions.success(api::update, cmd);
         Assertions.error(api::update
-                , Tuple.of(null, UserErrorCode.NOT_NULL)
-                , Tuple.of(new UserUpdateCmd(), UserErrorCode.NOT_NULL)
-                , Tuple.of(new UserUpdateCmd(createUser("")), UserErrorCode.NOT_NULL_ID_OR_NAME)
-                , Tuple.of(new UserUpdateCmd(createUser("xxx")), UserErrorCode.NOT_EXIST)
+                , Pair.of(null, UserErrorCode.NOT_NULL)
+                , Pair.of(new UserUpdateCmd(), UserErrorCode.NOT_NULL)
+                , Pair.of(new UserUpdateCmd(createUser("")), UserErrorCode.NOT_NULL_ID_OR_NAME)
+                , Pair.of(new UserUpdateCmd(createUser("xxx")), UserErrorCode.NOT_EXIST)
         );
     }
 
@@ -68,13 +68,13 @@ public class UserApiTest {
         // 加入不存在的租户不会报错，但是加不进去
         Assertions.success(api::join, new UserJoinTenantCmd(user, List.of(new TenantUniqueDTO(null, "xxxx"))));
         Assertions.error(api::join
-                , Tuple.of(null, UserErrorCode.NOT_NULL)
-                , Tuple.of(new UserJoinTenantCmd(), UserErrorCode.NOT_NULL)
-                , Tuple.of(new UserJoinTenantCmd(user, null), TenantErrorCode.NOT_NULL)
-                , Tuple.of(new UserJoinTenantCmd(null, tenant), UserErrorCode.NOT_NULL)
-                , Tuple.of(new UserJoinTenantCmd(new UserUniqueDTO(null, ""), tenant), UserErrorCode.NOT_NULL_ID_OR_NAME)
-                , Tuple.of(new UserJoinTenantCmd(new UserUniqueDTO(null, "xxxx"), tenant), UserErrorCode.NOT_EXIST)
-                , Tuple.of(new UserJoinTenantCmd(user, List.of(new TenantUniqueDTO(null, ""))), TenantErrorCode.NOT_NULL_ID_OR_CODE)
+                , Pair.of(null, UserErrorCode.NOT_NULL)
+                , Pair.of(new UserJoinTenantCmd(), UserErrorCode.NOT_NULL)
+                , Pair.of(new UserJoinTenantCmd(user, null), TenantErrorCode.NOT_NULL)
+                , Pair.of(new UserJoinTenantCmd(null, tenant), UserErrorCode.NOT_NULL)
+                , Pair.of(new UserJoinTenantCmd(new UserUniqueDTO(null, ""), tenant), UserErrorCode.NOT_NULL_ID_OR_NAME)
+                , Pair.of(new UserJoinTenantCmd(new UserUniqueDTO(null, "xxxx"), tenant), UserErrorCode.NOT_EXIST)
+                , Pair.of(new UserJoinTenantCmd(user, List.of(new TenantUniqueDTO(null, ""))), TenantErrorCode.NOT_NULL_ID_OR_CODE)
         );
     }
 
@@ -113,9 +113,9 @@ public class UserApiTest {
         query.setOrderBy("GROUPCODE");
         Assertions.assertEquals(api.list(query).getData().size(), size);
         Assertions.error(api::list
-                , Tuple.of(null, TenantErrorCode.NOT_NULL)
-                , Tuple.of(new UserListByTenantPageQuery(), TenantErrorCode.NOT_NULL)
-                , Tuple.of(new UserListByTenantPageQuery(new TenantUniqueDTO(null, "")), TenantErrorCode.NOT_NULL_ID_OR_CODE)
+                , Pair.of(null, TenantErrorCode.NOT_NULL)
+                , Pair.of(new UserListByTenantPageQuery(), TenantErrorCode.NOT_NULL)
+                , Pair.of(new UserListByTenantPageQuery(new TenantUniqueDTO(null, "")), TenantErrorCode.NOT_NULL_ID_OR_CODE)
         );
         Assertions.assertEquals(api.list(new UserListByTenantPageQuery(new TenantUniqueDTO(null, "code1"))).getTotalCount(), TenantApiTest.TEST_NUM);
         Assertions.assertEquals(api.list(new UserListByTenantPageQuery(new TenantUniqueDTO(null, "xxx"))).getTotalCount(), 0);