Commit 9d97c0ccb413f5a4ec2fa48f5e206f3955fa9836

Authored by YunaiV
1 parent 62ca36de

yudao-spring-boot-starter-data-permission 和 yudao-spring-boot-starter-tenant 调整为 biz 组件

Showing 50 changed files with 31 additions and 31 deletions
yudao-admin-server/pom.xml
@@ -35,6 +35,14 @@ @@ -35,6 +35,14 @@
35 <groupId>cn.iocoder.boot</groupId> 35 <groupId>cn.iocoder.boot</groupId>
36 <artifactId>yudao-spring-boot-starter-biz-sms</artifactId> 36 <artifactId>yudao-spring-boot-starter-biz-sms</artifactId>
37 </dependency> 37 </dependency>
  38 + <dependency>
  39 + <groupId>cn.iocoder.boot</groupId>
  40 + <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
  41 + </dependency>
  42 + <dependency>
  43 + <groupId>cn.iocoder.boot</groupId>
  44 + <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
  45 + </dependency>
38 46
39 <dependency> 47 <dependency>
40 <groupId>cn.iocoder.boot</groupId> 48 <groupId>cn.iocoder.boot</groupId>
@@ -118,16 +126,6 @@ @@ -118,16 +126,6 @@
118 </dependency> 126 </dependency>
119 127
120 <dependency> 128 <dependency>
121 - <groupId>cn.iocoder.boot</groupId>  
122 - <artifactId>yudao-spring-boot-starter-tenant</artifactId>  
123 - </dependency>  
124 -  
125 - <dependency>  
126 - <groupId>cn.iocoder.boot</groupId>  
127 - <artifactId>yudao-spring-boot-starter-data-permission</artifactId>  
128 - </dependency>  
129 -  
130 - <dependency>  
131 <groupId>org.apache.velocity</groupId> 129 <groupId>org.apache.velocity</groupId>
132 <artifactId>velocity-engine-core</artifactId> 130 <artifactId>velocity-engine-core</artifactId>
133 </dependency> 131 </dependency>
yudao-core-service/pom.xml
@@ -36,6 +36,10 @@ @@ -36,6 +36,10 @@
36 <groupId>cn.iocoder.boot</groupId> 36 <groupId>cn.iocoder.boot</groupId>
37 <artifactId>yudao-spring-boot-starter-biz-pay</artifactId> 37 <artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
38 </dependency> 38 </dependency>
  39 + <dependency>
  40 + <groupId>cn.iocoder.boot</groupId>
  41 + <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
  42 + </dependency>
39 43
40 <!-- Web 相关 --> 44 <!-- Web 相关 -->
41 <dependency> 45 <dependency>
@@ -91,10 +95,6 @@ @@ -91,10 +95,6 @@
91 </dependency> 95 </dependency>
92 96
93 <!-- 工具类相关 --> 97 <!-- 工具类相关 -->
94 - <dependency>  
95 - <groupId>cn.iocoder.boot</groupId>  
96 - <artifactId>yudao-spring-boot-starter-tenant</artifactId>  
97 - </dependency>  
98 98
99 <dependency> 99 <dependency>
100 <groupId>com.google.guava</groupId> 100 <groupId>com.google.guava</groupId>
yudao-dependencies/pom.xml
@@ -105,6 +105,16 @@ @@ -105,6 +105,16 @@
105 <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId> 105 <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
106 <version>${revision}</version> 106 <version>${revision}</version>
107 </dependency> 107 </dependency>
  108 + <dependency>
  109 + <groupId>cn.iocoder.boot</groupId>
  110 + <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
  111 + <version>${revision}</version>
  112 + </dependency>
  113 + <dependency>
  114 + <groupId>cn.iocoder.boot</groupId>
  115 + <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
  116 + <version>${revision}</version>
  117 + </dependency>
108 118
109 <!-- Spring 核心 --> 119 <!-- Spring 核心 -->
110 <dependency> 120 <dependency>
@@ -364,18 +374,6 @@ @@ -364,18 +374,6 @@
364 </dependency> 374 </dependency>
365 375
366 <dependency> 376 <dependency>
367 - <groupId>cn.iocoder.boot</groupId>  
368 - <artifactId>yudao-spring-boot-starter-tenant</artifactId>  
369 - <version>${revision}</version>  
370 - </dependency>  
371 -  
372 - <dependency>  
373 - <groupId>cn.iocoder.boot</groupId>  
374 - <artifactId>yudao-spring-boot-starter-data-permission</artifactId>  
375 - <version>${revision}</version>  
376 - </dependency>  
377 -  
378 - <dependency>  
379 <groupId>org.projectlombok</groupId> 377 <groupId>org.projectlombok</groupId>
380 <artifactId>lombok</artifactId> 378 <artifactId>lombok</artifactId>
381 <version>${lombok.version}</version> 379 <version>${lombok.version}</version>
yudao-framework/pom.xml
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
24 24
25 <module>yudao-spring-boot-starter-excel</module> 25 <module>yudao-spring-boot-starter-excel</module>
26 <module>yudao-spring-boot-starter-test</module> 26 <module>yudao-spring-boot-starter-test</module>
  27 + <module>yudao-spring-boot-starter-extension</module>
27 28
28 <module>yudao-spring-boot-starter-biz-operatelog</module> 29 <module>yudao-spring-boot-starter-biz-operatelog</module>
29 <module>yudao-spring-boot-starter-biz-dict</module> 30 <module>yudao-spring-boot-starter-biz-dict</module>
@@ -31,9 +32,9 @@ @@ -31,9 +32,9 @@
31 <module>yudao-spring-boot-starter-activiti</module> 32 <module>yudao-spring-boot-starter-activiti</module>
32 <module>yudao-spring-boot-starter-biz-pay</module> 33 <module>yudao-spring-boot-starter-biz-pay</module>
33 <module>yudao-spring-boot-starter-biz-weixin</module> 34 <module>yudao-spring-boot-starter-biz-weixin</module>
34 - <module>yudao-spring-boot-starter-extension</module>  
35 - <module>yudao-spring-boot-starter-tenant</module>  
36 - <module>yudao-spring-boot-starter-data-permission</module> 35 + <module>yudao-spring-boot-starter-biz-social</module>
  36 + <module>yudao-spring-boot-starter-biz-tenant</module>
  37 + <module>yudao-spring-boot-starter-biz-data-permission</module>
37 </modules> 38 </modules>
38 39
39 <artifactId>yudao-framework</artifactId> 40 <artifactId>yudao-framework</artifactId>
yudao-framework/yudao-spring-boot-starter-data-permission/pom.xml renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <version>${revision}</version> 8 <version>${revision}</version>
9 </parent> 9 </parent>
10 <modelVersion>4.0.0</modelVersion> 10 <modelVersion>4.0.0</modelVersion>
11 - <artifactId>yudao-spring-boot-starter-data-permission</artifactId> 11 + <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
12 <packaging>jar</packaging> 12 <packaging>jar</packaging>
13 13
14 <name>${artifactId}</name> 14 <name>${artifactId}</name>
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDataPermissionAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDataPermissionAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDeptDataPermissionAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDeptDataPermissionAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/annotation/DataPermission.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/annotation/DataPermission.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptor.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptor.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolder.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolder.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/package-info.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/rule/DeptDataPermissionRule.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/rule/DeptDataPermissionRule.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/rule/DeptDataPermissionRuleCustomizer.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/rule/DeptDataPermissionRuleCustomizer.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/service/DeptDataPermissionFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/service/DeptDataPermissionFrameworkService.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/service/dto/DeptDataPermissionRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/dept/service/dto/DeptDataPermissionRespDTO.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRule.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRule.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactory.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactory.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImpl.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImpl.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/package-info.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/main/resources/META-INF/spring.factories renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring.factories
yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/dept/rule/DeptDataPermissionRuleTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/dept/rule/DeptDataPermissionRuleTest.java
yudao-framework/yudao-spring-boot-starter-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java
yudao-framework/yudao-spring-boot-starter-tenant/pom.xml renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <version>${revision}</version> 8 <version>${revision}</version>
9 </parent> 9 </parent>
10 <modelVersion>4.0.0</modelVersion> 10 <modelVersion>4.0.0</modelVersion>
11 - <artifactId>yudao-spring-boot-starter-tenant</artifactId> 11 + <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
12 <packaging>jar</packaging> 12 <packaging>jar</packaging>
13 13
14 <name>${artifactId}</name> 14 <name>${artifactId}</name>
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/TenantProperties.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/TenantProperties.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantDatabaseAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantDatabaseAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantJobAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantJobAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantMQAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantMQAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantSecurityAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantSecurityAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantWebAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantWebAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantBaseDO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantBaseDO.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantDatabaseInterceptor.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantDatabaseInterceptor.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJob.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJob.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobHandlerDecorator.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobHandlerDecorator.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobHandlerInvoker.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobHandlerInvoker.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantRedisMessageInterceptor.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantRedisMessageInterceptor.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefine.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefine.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkService.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/web/TenantContextWebFilter.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/web/TenantContextWebFilter.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/package-info.java
yudao-framework/yudao-spring-boot-starter-tenant/src/main/resources/META-INF/spring.factories renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring.factories
yudao-framework/yudao-spring-boot-starter-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefineTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefineTest.java
更新日志.md
@@ -29,6 +29,9 @@ @@ -29,6 +29,9 @@
29 * 【新增】多租户,支持 Web、Security、Job、MQ、Async、DB、Redis 组件 29 * 【新增】多租户,支持 Web、Security、Job、MQ、Async、DB、Redis 组件
30 * 【新增】数据权限,内置基于部门过滤的规则 30 * 【新增】数据权限,内置基于部门过滤的规则
31 * 【新增】用户前台的昵称、头像的修改 31 * 【新增】用户前台的昵称、头像的修改
  32 +* 【新增】用户前台的微信公众号、微信小程序的社交登陆的 API 接口
  33 + > 完整功能,需要等基于 Uniapp 实现的用户前台一起~ 努力 coding 中,胖友可以 star 持续关注一波!
  34 +
32 * 【优化】管理后台的登陆成功后,LoginUser 使用统一方法补全信息 35 * 【优化】管理后台的登陆成功后,LoginUser 使用统一方法补全信息
33 36
34 ### 🐞 Bug Fixes 37 ### 🐞 Bug Fixes