【同步】对齐 boot 和 cloud 的逻辑

yudaocode · May 1, 2024 · 1297676 · 1297676
1 parent 74bc3b3
commit 1297676
Show file tree

Hide file tree

Showing 2,549 changed files with 8 additions and 174,973 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,14 +14,14 @@
         <!--  各种 module 拓展 -->
         <module>yudao-module-system</module>
         <module>yudao-module-infra</module>
-        <module>yudao-module-member</module>
-        <module>yudao-module-bpm</module>
-        <module>yudao-module-pay</module>
-        <module>yudao-module-report</module>
-        <module>yudao-module-mp</module>
-        <module>yudao-module-mall</module>
-        <module>yudao-module-erp</module>
-        <module>yudao-module-crm</module>
+<!--        <module>yudao-module-member</module>-->
+<!--        <module>yudao-module-bpm</module>-->
+<!--        <module>yudao-module-pay</module>-->
+<!--        <module>yudao-module-report</module>-->
+<!--        <module>yudao-module-mp</module>-->
+<!--        <module>yudao-module-mall</module>-->
+<!--        <module>yudao-module-erp</module>-->
+<!--        <module>yudao-module-crm</module>-->
     </modules>
 
     <name>${project.artifactId}</name>

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
@@ -383,14 +383,6 @@
                 <version>${spring-boot-admin.version}</version>
             </dependency>
 
-            <!-- Test 测试相关 -->
-            <dependency>
-                <groupId>cn.iocoder.cloud</groupId>
-                <artifactId>yudao-spring-boot-starter-test</artifactId>
-                <version>${revision}</version>
-                <scope>test</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-inline</artifactId>

diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
@@ -26,7 +26,6 @@
         <module>yudao-spring-boot-starter-rpc</module>
 
         <module>yudao-spring-boot-starter-excel</module>
-        <module>yudao-spring-boot-starter-test</module>
 
         <module>yudao-spring-boot-starter-biz-tenant</module>
         <module>yudao-spring-boot-starter-biz-data-permission</module>

diff --git a/.../src/test/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtilsTest.java b/.../src/test/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtilsTest.java
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml
@@ -40,13 +40,6 @@
             <artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行数据权限的获取 -->
             <version>${revision}</version>
         </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/...oder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java b/...oder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java
diff --git a/...a/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java b/...a/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java