升级版本号3.3.0

zhangdaiscott
1 parent 5c9ec4d0
Showing 37 changed files with 59 additions and 87 deletions
jeecg-boot/README.md
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/pom.xml
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/pom.xml
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/pom.xml
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml
jeecg-boot/jeecg-boot-base/jeecg-boot-base-tools/pom.xml
jeecg-boot/jeecg-boot-base/pom.xml
jeecg-boot/jeecg-boot-module-demo/pom.xml
jeecg-boot/jeecg-boot-module-system/Dockerfile
jeecg-boot/jeecg-boot-module-system/pom.xml
jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/pom.xml
jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-job/pom.xml
jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/pom.xml
jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/pom.xml
jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-seata/pom.xml
jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/pom.xml
jeecg-boot/jeecg-boot-starter/pom.xml
jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/Dockerfile
jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml
jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/pom.xml
 Jeecg-Boot 低代码开发平台
 ===============
  
-当前最新版本： 3.2.0（发布日期：20220425）
+当前最新版本： 3.3.0（发布日期：20220725）
  
  
 ## 后端技术架构
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-base-api</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-base-api</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-base</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-base</artifactId>
-		<version>3.2.0</version>
+		<version>3.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
  
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jeecgframework.boot</groupId>
         <artifactId>jeecg-boot-base</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>公共模块</description>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-parent</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-parent</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
@@ -11,6 +11,6 @@ WORKDIR /jeecg-boot
 EXPOSE 8080
  
 ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/jeecg-boot-module-system-3.2.0.jar ./
+ADD ./target/jeecg-boot-module-system-3.3.0.jar ./
  
-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-boot-module-system-3.2.0.jar
 \ No newline at end of file
+CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-boot-module-system-3.3.0.jar
 \ No newline at end of file
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.3.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
  
@@ -34,6 +34,11 @@
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>jeecg-system-local-api</artifactId>
 		</dependency>
+		<!-- 企业微信/钉钉 api -->
+		<dependency>
+			<groupId>org.jeecgframework</groupId>
+			<artifactId>jeewx-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
@@ -42,18 +47,12 @@
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>hibernate-re</artifactId>
 		</dependency>
-
-		<!-- 企业微信/钉钉 api -->
-		<dependency>
-			<groupId>org.jeecgframework</groupId>
-			<artifactId>jeewx-api</artifactId>
-		</dependency>
 		<!-- 积木报表 -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot-starter</artifactId>
+			<version>${jimureport-spring-boot-starter.version}</version>
 		</dependency>
-
 		<!-- DEMO 示例模块 -->
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
@@ -69,38 +68,10 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<!--SpringCloud运行环境 ,值改为true跳过SpringBoot启动打包插件 -->
+					<!--微服务模式下修改为true,跳过SpringBoot启动打包插件，否则微服务模块无法引用-->
 					<skip>${skip.springboot.maven}</skip>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
-
-	<profiles>
-		<!-- SpringCloud运行环境 -->
-		<profile>
-			<id>SpringCloud</id>
-			<build>
-				<resources>
-					<resource>
-						<directory>src/main/resources</directory>
-						<filtering>true</filtering>
-						<!-- SpringCloud运行环境的配置，排除system模块jar里的yaml -->
-						<excludes>
-							<exclude>application.yml</exclude>
-							<exclude>application-*.yml</exclude>
-						</excludes>
-					</resource>
-					<resource>
-						<directory>src/main/java</directory>
-						<includes>
-							<include>**/*.xml</include>
-							<include>**/*.json</include>
-							<include>**/*.ftl</include>
-						</includes>
-					</resource>
-				</resources>
-			</build>
-		</profile>
-	</profiles>
 </project>
 \ No newline at end of file
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-starter</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-boot-starter-cloud</artifactId>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-starter</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-boot-starter-job</artifactId>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-starter</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-boot-starter-lock</artifactId>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-starter</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-boot-starter-rabbitmq</artifactId>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-starter</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-boot-starter-seata</artifactId>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-starter</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-boot-starter-shardingsphere</artifactId>
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jeecgframework.boot</groupId>
         <artifactId>jeecg-boot-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-boot-starter</artifactId>
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-gateway
  
 EXPOSE 9999
  
-ADD ./target/jeecg-cloud-gateway-3.2.0.jar ./
+ADD ./target/jeecg-cloud-gateway-3.3.0.jar ./
  
-CMD sleep 50;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.2.0.jar
 \ No newline at end of file
+CMD sleep 50;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.3.0.jar
 \ No newline at end of file
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-gateway</artifactId>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-monitor</artifactId>
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-nacos
  
 EXPOSE 8848
  
-ADD ./target/jeecg-cloud-nacos-3.2.0.jar ./
+ADD ./target/jeecg-cloud-nacos-3.3.0.jar ./
  
-CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.2.0.jar
 \ No newline at end of file
+CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.3.0.jar
 \ No newline at end of file
@@ -5,7 +5,6 @@
     <artifactId>jeecg-cloud-nacos</artifactId>
     <name>jeecg-cloud-nacos</name>
     <description>nacos启动模块</description>
-    <version>3.2.0</version>
  
     <!-- Nacos2不支持springboot2.6.6  -->
     <parent>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <artifactId>jeecg-cloud-sentinel</artifactId>
     <name>jeecg-cloud-sentinel</name>
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-system
  
 EXPOSE 7001
  
-ADD ./target/jeecg-cloud-system-start-3.2.0.jar ./
+ADD ./target/jeecg-cloud-system-start-3.3.0.jar ./
  
-CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-system-start-3.2.0.jar
 \ No newline at end of file
+CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-system-start-3.3.0.jar
 \ No newline at end of file
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-system-start</artifactId>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-test</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>公共测试模块</description>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-test</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>消息队列测试模块</description>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-test-seata</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>分布式事务测试模块</description>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-test-seata</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>分布式事务测试模块</description>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-test-seata</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>分布式事务测试模块</description>
@@ -5,12 +5,11 @@
     <parent>
         <artifactId>jeecg-cloud-test</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-test-seata</artifactId>
     <packaging>pom</packaging>
-
     <modules>
         <module>jeecg-cloud-test-seata-account</module>
         <module>jeecg-cloud-test-seata-product</module>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-test</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
  
     <modelVersion>4.0.0</modelVersion>
@@ -10,7 +10,7 @@ WORKDIR /jeecg-cloud-xxljob
  
 EXPOSE 9080
  
-ADD ./target/jeecg-cloud-xxljob-3.2.0.jar ./
+ADD ./target/jeecg-cloud-xxljob-3.3.0.jar ./
  
-CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.2.0.jar
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.3.0.jar
  
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-parent</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-  <version>3.2.0</version>
+  <version>3.3.0</version>
   <packaging>pom</packaging>
   <name>JEECG BOOT ${project.version}</name>
  
@@ -14,13 +14,13 @@
 	</parent>
  
 	<properties>
-		<jeecgboot.version>3.2.0</jeecgboot.version>
+		<jeecgboot.version>3.3.0</jeecgboot.version>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  
 		<!-- 微服务属性 -->
 		<skip.springboot.maven>false</skip.springboot.maven>
-        <spring-cloud.version>2021.0.3</spring-cloud.version>
+		<spring-cloud.version>2021.0.3</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
 		<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
  
@@ -41,8 +41,11 @@
 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.1</mybatis-plus.version>
 		<dynamic-datasource-spring-boot-starter.version>3.2.0</dynamic-datasource-spring-boot-starter.version>
-		<minidao.version>1.9.0</minidao.version>
 		<druid.version>1.1.22</druid.version>
+		<minidao.version>1.9.0</minidao.version>
+
+		<!-- 积木报表-->
+		<jimureport-spring-boot-starter.version>1.5.2</jimureport-spring-boot-starter.version>
 		<commons.version>2.6</commons.version>
 		<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
 		<aliyun.oss.version>3.11.2</aliyun.oss.version>
@@ -51,7 +54,7 @@
 		<java-jwt.version>3.11.0</java-jwt.version>
 		<shiro-redis.version>3.1.0</shiro-redis.version>
 		<codegenerate.version>1.3.9</codegenerate.version>
-		<autopoi-web.version>1.4.0</autopoi-web.version>
+		<autopoi-web.version>1.4.2</autopoi-web.version>
 		<minio.version>8.0.3</minio.version>
 		<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
 		<dom4j.version>1.6.1</dom4j.version>
@@ -336,15 +339,15 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<!-- 积木报表 -->
+			<!-- 积木报表-->
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>
 				<artifactId>jimureport-spring-boot-starter</artifactId>
-				<version>1.5.0</version>
+				<version>${jimureport-spring-boot-starter.version}</version>
 				<exclusions>
 					<exclusion>
-						<artifactId>fastjson</artifactId>
-						<groupId>com.alibaba</groupId>
+						<artifactId>autopoi-web</artifactId>
+						<groupId>org.jeecgframework</groupId>
 					</exclusion>
 				</exclusions>
 			</dependency>