github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎉 使用flatten插件重构项目依赖结构

Browse Source
This commit is contained in:
smallchill 2024-11-02 23:04:18 +08:00
parent ce5ec476fd
commit 499ca2dee2
24 changed files with 160 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -25,3 +25,7 @@ Thumbs.db
*.war *.war
*.ear *.ear
/target /target
# Flattened pom
.flattened-pom.xml
/**/.flattened-pom.xml

11
blade-auth/pom.xml
View File

@ -8,12 +8,11 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<artifactId>blade-auth</artifactId> <artifactId>blade-auth</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -21,43 +20,35 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-cloud</artifactId> <artifactId>blade-core-cloud</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-secure</artifactId> <artifactId>blade-core-secure</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-log</artifactId> <artifactId>blade-starter-log</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-social</artifactId> <artifactId>blade-starter-social</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-user-api</artifactId> <artifactId>blade-user-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId> <artifactId>blade-starter-swagger</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<!-- Captcha --> <!-- Captcha -->
<dependency> <dependency>
<groupId>com.github.whvcse</groupId> <groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId> <artifactId>easy-captcha</artifactId>
<version>${captcha.version}</version>
</dependency> </dependency>
<!-- MySQL --> <!-- MySQL -->
<dependency> <dependency>

6
blade-common/pom.xml
View File

@ -5,30 +5,26 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId> <artifactId>blade-core-launch</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-loadbalancer</artifactId> <artifactId>blade-starter-loadbalancer</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.dreamlu</groupId> <groupId>net.dreamlu</groupId>
<artifactId>mica-auto</artifactId> <artifactId>mica-auto</artifactId>
<version>${mica.auto.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

7
blade-gateway/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-gateway</artifactId> <artifactId>blade-gateway</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -19,7 +18,6 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId> <artifactId>blade-core-launch</artifactId>
<version>${blade.tool.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -34,7 +32,6 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
@ -78,12 +75,10 @@
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId> <artifactId>jjwt-impl</artifactId>
<version>0.11.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId> <artifactId>jjwt-jackson</artifactId>
<version>0.11.2</version>
</dependency> </dependency>
</dependencies> </dependencies>

7
blade-ops/blade-admin/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-admin</artifactId> <artifactId>blade-admin</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -19,22 +18,18 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId> <artifactId>blade-core-launch</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-tool</artifactId> <artifactId>blade-core-tool</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-cloud</artifactId> <artifactId>blade-core-cloud</artifactId>
<version>${blade.tool.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>

7
blade-ops/blade-develop/pom.xml
View File

@ -6,14 +6,13 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-develop</artifactId> <artifactId>blade-develop</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -21,22 +20,18 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId> <artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-develop</artifactId> <artifactId>blade-starter-develop</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-dict-api</artifactId> <artifactId>blade-dict-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

6
blade-ops/blade-report/pom.xml
View File

@ -5,14 +5,13 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-report</artifactId> <artifactId>blade-report</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -20,17 +19,14 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId> <artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-report</artifactId> <artifactId>blade-starter-report</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

7
blade-ops/blade-resource/pom.xml
View File

@ -5,30 +5,26 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-resource</artifactId> <artifactId>blade-resource</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-tool</artifactId> <artifactId>blade-core-tool</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-cloud</artifactId> <artifactId>blade-core-cloud</artifactId>
<version>${blade.tool.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
@ -39,7 +35,6 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-oss</artifactId> <artifactId>blade-starter-oss</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

6
blade-ops/blade-seata-order/pom.xml
View File

@ -5,30 +5,26 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-seata-order</artifactId> <artifactId>blade-seata-order</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId> <artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-transaction</artifactId> <artifactId>blade-starter-transaction</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

6
blade-ops/blade-seata-storage/pom.xml
View File

@ -5,30 +5,26 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-seata-storage</artifactId> <artifactId>blade-seata-storage</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId> <artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-transaction</artifactId> <artifactId>blade-starter-transaction</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

3
blade-ops/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>4.2.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>blade-admin</module> <module>blade-admin</module>

3
blade-service-api/blade-demo-api/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-demo-api</artifactId> <artifactId>blade-demo-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>

3
blade-service-api/blade-desk-api/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-desk-api</artifactId> <artifactId>blade-desk-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
</project> </project>

3
blade-service-api/blade-dict-api/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-dict-api</artifactId> <artifactId>blade-dict-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>

5
blade-service-api/blade-scope-api/pom.xml
View File

@ -5,25 +5,22 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-scope-api</artifactId> <artifactId>blade-scope-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-secure</artifactId> <artifactId>blade-core-secure</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-datascope</artifactId> <artifactId>blade-starter-datascope</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

3
blade-service-api/blade-system-api/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-system-api</artifactId> <artifactId>blade-system-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>

3
blade-service-api/blade-user-api/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-user-api</artifactId> <artifactId>blade-user-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
</project> </project>

5
blade-service-api/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>4.2.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>SpringBlade 微服务API集合</description> <description>SpringBlade 微服务API集合</description>
@ -28,7 +27,6 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-mybatis</artifactId> <artifactId>blade-starter-mybatis</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
@ -37,7 +35,6 @@
<dependency> <dependency>
<groupId>net.dreamlu</groupId> <groupId>net.dreamlu</groupId>
<artifactId>mica-auto</artifactId> <artifactId>mica-auto</artifactId>
<version>${mica.auto.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

7
blade-service/blade-demo/pom.xml
View File

@ -5,35 +5,30 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-demo</artifactId> <artifactId>blade-demo</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId> <artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId> <artifactId>blade-starter-swagger</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-demo-api</artifactId> <artifactId>blade-demo-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot3-starter</artifactId> <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>4.3.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

8
blade-service/blade-desk/pom.xml
View File

@ -6,41 +6,35 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-desk</artifactId> <artifactId>blade-desk</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId> <artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId> <artifactId>blade-starter-swagger</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-desk-api</artifactId> <artifactId>blade-desk-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-dict-api</artifactId> <artifactId>blade-dict-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-test</artifactId> <artifactId>blade-core-test</artifactId>
<version>${blade.tool.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
blade-service/blade-log/pom.xml
View File

@ -5,13 +5,12 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-log</artifactId> <artifactId>blade-log</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -19,7 +18,6 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId> <artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

13
blade-service/blade-system/pom.xml
View File

@ -5,65 +5,54 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-system</artifactId> <artifactId>blade-system</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId> <artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-dict-api</artifactId> <artifactId>blade-dict-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-system-api</artifactId> <artifactId>blade-system-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-user-api</artifactId> <artifactId>blade-user-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId> <artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>${poi.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId> <artifactId>poi-ooxml-schemas</artifactId>
<version>${poi.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId> <artifactId>poi-scratchpad</artifactId>
<version>${poi.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>ooxml-schemas</artifactId> <artifactId>ooxml-schemas</artifactId>
<version>1.4</version>
</dependency> </dependency>
</dependencies> </dependencies>

5
blade-service/pom.xml
View File

@ -7,12 +7,11 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<version>4.2.0</version> <version>${revision}</version>
</parent> </parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>4.2.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>SpringBlade 微服务集合</description> <description>SpringBlade 微服务集合</description>
@ -27,12 +26,10 @@
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId> <artifactId>blade-common</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-scope-api</artifactId> <artifactId>blade-scope-api</artifactId>
<version>${blade.project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

164
pom.xml
View File

@ -5,15 +5,15 @@
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<version>4.2.0</version> <version>${revision}</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<blade.tool.version>4.2.0</blade.tool.version> <revision>4.2.0</revision>
<blade.project.version>4.2.0</blade.project.version>
<java.version>17</java.version> <java.version>17</java.version>
<maven.plugin.version>3.11.0</maven.plugin.version> <maven.plugin.version>3.11.0</maven.plugin.version>
<maven.flatten.version>1.3.0</maven.flatten.version>
<knife4j.version>4.5.0</knife4j.version> <knife4j.version>4.5.0</knife4j.version>
<protostuff.version>1.6.0</protostuff.version> <protostuff.version>1.6.0</protostuff.version>
@ -22,13 +22,13 @@
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<mica.auto.version>3.1.3</mica.auto.version> <mica.auto.version>3.1.3</mica.auto.version>
<spring.version>6.1.12</spring.version> <spring.version>6.1.14</spring.version>
<spring.boot.version>3.2.9</spring.boot.version> <spring.boot.version>3.2.10</spring.boot.version>
<spring.boot.admin.version>3.2.3</spring.boot.admin.version> <spring.boot.admin.version>3.2.3</spring.boot.admin.version>
<spring.cloud.version>2023.0.3</spring.cloud.version> <spring.cloud.version>2023.0.3</spring.cloud.version>
<alibaba.cloud.version>2023.0.1.0</alibaba.cloud.version> <alibaba.cloud.version>2023.0.1.2</alibaba.cloud.version>
<alibaba.nacos.version>2.3.2</alibaba.nacos.version> <alibaba.nacos.version>2.4.3</alibaba.nacos.version>
<!-- 推荐使用Harbor --> <!-- 推荐使用Harbor -->
<docker.registry.url>10.211.55.5</docker.registry.url> <docker.registry.url>10.211.55.5</docker.registry.url>
@ -47,40 +47,110 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- blade bom -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springblade</groupId>
<artifactId>spring-framework-bom</artifactId> <artifactId>blade-core-bom</artifactId>
<version>${spring.version}</version> <version>${revision}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<!-- blade api -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springblade</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>blade-common</artifactId>
<version>${spring.boot.version}</version> <version>${revision}</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springblade</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>blade-dict-api</artifactId>
<version>${spring.cloud.version}</version> <version>${revision}</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>org.springblade</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId> <artifactId>blade-scope-api</artifactId>
<version>${alibaba.cloud.version}</version> <version>${revision}</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>org.springblade</groupId>
<artifactId>knife4j-dependencies</artifactId> <artifactId>blade-desk-api</artifactId>
<version>${knife4j.version}</version> <version>${revision}</version>
<type>pom</type> </dependency>
<scope>import</scope> <dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-user-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-demo-api</artifactId>
<version>${revision}</version>
</dependency>
<!-- Captcha -->
<dependency>
<groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId>
<version>${captcha.version}</version>
</dependency>
<!-- Easyexcel -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>ooxml-schemas</artifactId>
<version>1.4</version>
</dependency>
<!-- dynamic-datasource -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>4.3.0</version>
</dependency>
<!-- JWT -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<version>0.11.2</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>0.11.2</version>
</dependency>
<!-- Mica -->
<dependency>
<groupId>net.dreamlu</groupId>
<artifactId>mica-auto</artifactId>
<version>${mica.auto.version}</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -123,6 +193,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
@ -147,6 +218,39 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${maven.flatten.version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>oss</flattenMode>
<pomElements>
<url>remove</url>
<scm>remove</scm>
<developers>remove</developers>
<properties>remove</properties>
<repositories>remove</repositories>
<distributionManagement>remove</distributionManagement>
</pomElements>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>