Skip to content

Commit 35f70db

Browse files
author
smallchill
committed
🎉 4.2.0.RELEASE 重构包名，分类core模块与starter模块
1 parent c3165e2 commit 35f70db

File tree

53 files changed

+134
-487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+134
-487
lines changed

‎README.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img src="https://img.shields.io/badge/Release-V4.1.0-green.svg" alt="Downloads">
2+
<img src="https://img.shields.io/badge/Release-V4.2.0-green.svg" alt="Downloads">
33
<img src="https://img.shields.io/badge/JDK-17+-green.svg" alt="Build Status">
44
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
55
<img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
@@ -33,9 +33,9 @@
3333
|----------------------|------------|
3434
| Java | 17+ |
3535
| NodeJS | 18+ |
36-
| Spring | 6.1.10 |
37-
| Spring Boot | 3.2.7 |
38-
| Spring Cloud | 2023.0.2 |
36+
| Spring | 6.1.12 |
37+
| Spring Boot | 3.2.9 |
38+
| Spring Cloud | 2023.0.3 |
3939
| Spring Cloud Alibaba | 2023.0.1.0 |
4040
| Nacos Alibaba | 2.3.2 |
4141
| Mybatis Plus | 3.5.7 |
@@ -56,8 +56,7 @@ SpringBlade
5656
├── blade-service -- 业务模块
5757
├ ├── blade-desk -- 工作台模块
5858
├ ├── blade-log -- 日志模块
59-
├ ├── blade-system -- 系统模块
60-
├ └── blade-user -- 用户模块
59+
├ └── blade-system -- 系统模块
6160
├── blade-service-api -- 业务模块api封装
6261
├ ├── blade-desk-api -- 工作台api
6362
├ ├── blade-dict-api -- 字典api

‎blade-auth/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>SpringBlade</artifactId>
1010
<groupId>org.springblade</groupId>
11-
<version>4.1.0</version>
11+
<version>4.2.0</version>
1212
</parent>
1313

1414
<artifactId>blade-auth</artifactId>
@@ -35,12 +35,12 @@
3535
</dependency>
3636
<dependency>
3737
<groupId>org.springblade</groupId>
38-
<artifactId>blade-core-log</artifactId>
38+
<artifactId>blade-starter-log</artifactId>
3939
<version>${blade.tool.version}</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.springblade</groupId>
43-
<artifactId>blade-core-social</artifactId>
43+
<artifactId>blade-starter-social</artifactId>
4444
<version>${blade.tool.version}</version>
4545
</dependency>
4646
<dependency>
@@ -50,7 +50,7 @@
5050
</dependency>
5151
<dependency>
5252
<groupId>org.springblade</groupId>
53-
<artifactId>blade-core-swagger</artifactId>
53+
<artifactId>blade-starter-swagger</artifactId>
5454
<version>${blade.tool.version}</version>
5555
</dependency>
5656
<!-- Captcha -->

‎blade-common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -22,7 +22,7 @@
2222
</dependency>
2323
<dependency>
2424
<groupId>org.springblade</groupId>
25-
<artifactId>blade-core-loadbalancer</artifactId>
25+
<artifactId>blade-starter-loadbalancer</artifactId>
2626
<version>${blade.tool.version}</version>
2727
</dependency>
2828
<dependency>

‎blade-gateway/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-ops/blade-admin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-ops/blade-develop/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springblade</groupId>
88
<artifactId>blade-ops</artifactId>
9-
<version>4.1.0</version>
9+
<version>4.2.0</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +30,7 @@
3030
</dependency>
3131
<dependency>
3232
<groupId>org.springblade</groupId>
33-
<artifactId>blade-core-develop</artifactId>
33+
<artifactId>blade-starter-develop</artifactId>
3434
<version>${blade.tool.version}</version>
3535
</dependency>
3636
<dependency>

‎blade-ops/blade-report/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springblade</groupId>
77
<artifactId>blade-ops</artifactId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
@@ -24,7 +24,7 @@
2424
</dependency>
2525
<dependency>
2626
<groupId>org.springblade</groupId>
27-
<artifactId>blade-core-report</artifactId>
27+
<artifactId>blade-starter-report</artifactId>
2828
<version>${blade.tool.version}</version>
2929
</dependency>
3030
<dependency>

‎blade-ops/blade-resource/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -38,7 +38,7 @@
3838
</dependency>
3939
<dependency>
4040
<groupId>org.springblade</groupId>
41-
<artifactId>blade-core-oss</artifactId>
41+
<artifactId>blade-starter-oss</artifactId>
4242
<version>${blade.tool.version}</version>
4343
</dependency>
4444
</dependencies>

‎blade-ops/blade-seata-order/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -27,7 +27,7 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>org.springblade</groupId>
30-
<artifactId>blade-core-transaction</artifactId>
30+
<artifactId>blade-starter-transaction</artifactId>
3131
<version>${blade.tool.version}</version>
3232
</dependency>
3333
</dependencies>

‎blade-ops/blade-seata-storage/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-ops</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -27,7 +27,7 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>org.springblade</groupId>
30-
<artifactId>blade-core-transaction</artifactId>
30+
<artifactId>blade-starter-transaction</artifactId>
3131
<version>${blade.tool.version}</version>
3232
</dependency>
3333
</dependencies>

‎blade-ops/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>blade-ops</artifactId>
1313
<name>${project.artifactId}</name>
14-
<version>4.1.0</version>
14+
<version>4.2.0</version>
1515
<packaging>pom</packaging>
1616
<modules>
1717
<module>blade-admin</module>

‎blade-service-api/blade-demo-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-desk-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-dict-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-scope-api/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -22,7 +22,7 @@
2222
</dependency>
2323
<dependency>
2424
<groupId>org.springblade</groupId>
25-
<artifactId>blade-core-datascope</artifactId>
25+
<artifactId>blade-starter-datascope</artifactId>
2626
<version>${blade.tool.version}</version>
2727
</dependency>
2828
</dependencies>

‎blade-service-api/blade-system-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-user-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service-api</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Chill
3434
*/
3535
@FeignClient(
36-
value = AppConstant.APPLICATION_USER_NAME,
36+
value = AppConstant.APPLICATION_SYSTEM_NAME,
3737
fallback = IUserClientFallback.class
3838
)
3939
public interface IUserClient {

‎blade-service-api/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>blade-service-api</artifactId>
1313
<name>${project.artifactId}</name>
14-
<version>4.1.0</version>
14+
<version>4.2.0</version>
1515
<packaging>pom</packaging>
1616
<description>SpringBlade 微服务API集合</description>
1717

@@ -27,7 +27,7 @@
2727
<dependencies>
2828
<dependency>
2929
<groupId>org.springblade</groupId>
30-
<artifactId>blade-core-mybatis</artifactId>
30+
<artifactId>blade-starter-mybatis</artifactId>
3131
<version>${blade.tool.version}</version>
3232
</dependency>
3333
<dependency>

‎blade-service/blade-demo/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -22,7 +22,7 @@
2222
</dependency>
2323
<dependency>
2424
<groupId>org.springblade</groupId>
25-
<artifactId>blade-core-swagger</artifactId>
25+
<artifactId>blade-starter-swagger</artifactId>
2626
<version>${blade.tool.version}</version>
2727
</dependency>
2828
<dependency>
@@ -32,8 +32,8 @@
3232
</dependency>
3333
<dependency>
3434
<groupId>com.baomidou</groupId>
35-
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
36-
<version>2.5.6</version>
35+
<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
36+
<version>4.3.0</version>
3737
</dependency>
3838
</dependencies>
3939

‎blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public void launcher(SpringApplicationBuilder builder, String appName, String pr
3535
PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].data-id", NacosConstant.dataId("blade-demo", profile));
3636
PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].group", NacosConstant.NACOS_CONFIG_GROUP);
3737
PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH);
38+
// 开启多数据源
39+
PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true");
3840
// 自定义命名空间
3941
// PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE);
4042
// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE);

‎blade-service/blade-desk/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springblade</groupId>
88
<artifactId>blade-service</artifactId>
9-
<version>4.1.0</version>
9+
<version>4.2.0</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
@@ -24,7 +24,7 @@
2424
</dependency>
2525
<dependency>
2626
<groupId>org.springblade</groupId>
27-
<artifactId>blade-core-swagger</artifactId>
27+
<artifactId>blade-starter-swagger</artifactId>
2828
<version>${blade.tool.version}</version>
2929
</dependency>
3030
<dependency>

‎blade-service/blade-log/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>blade-service</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.1.0</version>
8+
<version>4.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)