Commit 693f6ff48241316ebb371e0d2421476f4931cb56

Authored by zhangdaiscott
1 parent c66f5410

- 升级Spring Cloud Alibaba 2021.0.1.0,使用 spring.config.import 方式引入nacos配置

- 拆分jeecg-boot-starter出来,使用独立项目维护 [jeecg-boot-starter项目地址](https://gitee.com/jeecg/jeecg-boot-starter)
Showing 33 changed files with 41 additions and 41 deletions
jeecg-boot/README.md
1 1 Jeecg-Boot 低代码开发平台
2 2 ===============
3 3  
4   -当前最新版本: 3.3.0(发布日期:20220725
  4 +当前最新版本: 3.4.0(发布日期:20220808
5 5  
6 6  
7 7 ## 后端技术架构
... ...
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-boot-base-api</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-boot-base-api</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-boot-base</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml
... ... @@ -4,7 +4,7 @@
4 4 <parent>
5 5 <groupId>org.jeecgframework.boot</groupId>
6 6 <artifactId>jeecg-boot-base</artifactId>
7   - <version>3.3.0</version>
  7 + <version>3.4.0</version>
8 8 </parent>
9 9 <modelVersion>4.0.0</modelVersion>
10 10  
... ...
jeecg-boot/jeecg-boot-base/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-boot-parent</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/jeecg-boot-module-demo/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-boot-parent</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/jeecg-boot-module-system/Dockerfile
... ... @@ -11,6 +11,6 @@ WORKDIR /jeecg-boot
11 11 EXPOSE 8080
12 12  
13 13 ADD ./src/main/resources/jeecg ./config/jeecg
14   -ADD ./target/jeecg-boot-module-system-3.3.0.jar ./
  14 +ADD ./target/jeecg-boot-module-system-3.4.0.jar ./
15 15  
16   -CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-boot-module-system-3.3.0.jar
17 16 \ No newline at end of file
  17 +CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-boot-module-system-3.4.0.jar
18 18 \ No newline at end of file
... ...
jeecg-boot/jeecg-boot-module-system/pom.xml
... ... @@ -4,7 +4,7 @@
4 4 <parent>
5 5 <groupId>org.jeecgframework.boot</groupId>
6 6 <artifactId>jeecg-boot-parent</artifactId>
7   - <version>3.3.0</version>
  7 + <version>3.4.0</version>
8 8 </parent>
9 9 <modelVersion>4.0.0</modelVersion>
10 10  
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/banner.txt
... ... @@ -9,6 +9,6 @@ ${AnsiColor.BRIGHT_BLUE}
9 9  
10 10  
11 11 ${AnsiColor.BRIGHT_GREEN}
12   -Jeecg Boot Version: 3.3.0
  12 +Jeecg Boot Version: 3.4.0
13 13 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
14 14 ${AnsiColor.BLACK}
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/Dockerfile
... ... @@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-gateway
10 10  
11 11 EXPOSE 9999
12 12  
13   -ADD ./target/jeecg-cloud-gateway-3.3.0.jar ./
  13 +ADD ./target/jeecg-cloud-gateway-3.4.0.jar ./
14 14  
15   -CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.3.0.jar
16 15 \ No newline at end of file
  16 +CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.4.0.jar
17 17 \ No newline at end of file
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-module</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <artifactId>jeecg-cloud-gateway</artifactId>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-module</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <artifactId>jeecg-cloud-monitor</artifactId>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/Dockerfile
... ... @@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-nacos
10 10  
11 11 EXPOSE 8848
12 12  
13   -ADD ./target/jeecg-cloud-nacos-3.3.0.jar ./
  13 +ADD ./target/jeecg-cloud-nacos-3.4.0.jar ./
14 14  
15   -CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.3.0.jar
16 15 \ No newline at end of file
  16 +CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.4.0.jar
17 17 \ No newline at end of file
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <artifactId>jeecg-cloud-nacos</artifactId>
6 6 <name>jeecg-cloud-nacos</name>
7 7 <description>nacos启动模块</description>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9  
10 10 <!-- Nacos2不支持springboot2.6.6 -->
11 11 <parent>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/Dockerfile
... ... @@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-sentinel
10 10  
11 11 EXPOSE 8848
12 12  
13   -ADD ./target/jeecg-cloud-sentinel-3.3.0.jar ./
  13 +ADD ./target/jeecg-cloud-sentinel-3.4.0.jar ./
14 14  
15   -CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.3.0.jar
  15 +CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.4.0.jar
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-module</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <artifactId>jeecg-cloud-sentinel</artifactId>
11 11 <name>jeecg-cloud-sentinel</name>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-test</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <description>公共测试模块</description>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-test</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <description>消息队列测试模块</description>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-test-seata</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <description>分布式事务测试模块</description>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-test-seata</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <description>分布式事务测试模块</description>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-test-seata</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <description>分布式事务测试模块</description>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-test</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <artifactId>jeecg-cloud-test-seata</artifactId>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-test</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-module</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10  
11 11 <modelVersion>4.0.0</modelVersion>
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/Dockerfile
... ... @@ -10,7 +10,7 @@ WORKDIR /jeecg-cloud-xxljob
10 10  
11 11 EXPOSE 9080
12 12  
13   -ADD ./target/jeecg-cloud-xxljob-3.3.0.jar ./
  13 +ADD ./target/jeecg-cloud-xxljob-3.4.0.jar ./
14 14  
15   -CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.3.0.jar
  15 +CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.4.0.jar
16 16  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-module</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/Dockerfile
... ... @@ -10,6 +10,6 @@ WORKDIR /jeecg-demo-cloud
10 10  
11 11 EXPOSE 7002
12 12  
13   -ADD ./target/jeecg-demo-cloud-start-3.3.0.jar ./
  13 +ADD ./target/jeecg-demo-cloud-start-3.4.0.jar ./
14 14  
15   -CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.3.0.jar
  15 +CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.4.0.jar
... ...
jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-module</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/Dockerfile
... ... @@ -10,6 +10,6 @@ WORKDIR /jeecg-system-cloud
10 10  
11 11 EXPOSE 7001
12 12  
13   -ADD ./target/jeecg-system-cloud-start-3.3.0.jar ./
  13 +ADD ./target/jeecg-system-cloud-start-3.4.0.jar ./
14 14  
15   -CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.3.0.jar
  15 +CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.4.0.jar
... ...
jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-cloud-module</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11 <artifactId>jeecg-system-cloud-start</artifactId>
... ...
jeecg-boot/jeecg-cloud-module/pom.xml
... ... @@ -5,7 +5,7 @@
5 5 <parent>
6 6 <artifactId>jeecg-boot-parent</artifactId>
7 7 <groupId>org.jeecgframework.boot</groupId>
8   - <version>3.3.0</version>
  8 + <version>3.4.0</version>
9 9 </parent>
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
... ...
jeecg-boot/pom.xml
... ... @@ -2,7 +2,7 @@
2 2 <modelVersion>4.0.0</modelVersion>
3 3 <groupId>org.jeecgframework.boot</groupId>
4 4 <artifactId>jeecg-boot-parent</artifactId>
5   - <version>3.3.0</version>
  5 + <version>3.4.0</version>
6 6 <packaging>pom</packaging>
7 7 <name>JEECG BOOT ${project.version}</name>
8 8  
... ... @@ -14,7 +14,7 @@
14 14 </parent>
15 15  
16 16 <properties>
17   - <jeecgboot.version>3.3.0</jeecgboot.version>
  17 + <jeecgboot.version>3.4.0</jeecgboot.version>
18 18 <java.version>1.8</java.version>
19 19 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20 20  
... ...