【3.2.0 版本发布】升级springboot2.6.6、spring-cloud-alibaba 2021.1

zhangdaiscott
1 parent 2fc5143b
Showing 2 changed files with 52 additions and 21 deletions
jeecg-boot/README.md
jeecg-boot/pom.xml
 Jeecg-Boot 低代码开发平台
 ===============
  
-当前最新版本： 3.1.0（发布日期：20220301）
+当前最新版本： 3.2.0（发布日期：20220425）
  
  
 ## 后端技术架构
-- 基础框架：Spring Boot 2.3.5.RELEASE
+- 基础框架：Spring Boot 2.6.6
  
-- 持久层框架：Mybatis-plus 3.4.3.1
+- 持久层框架：Mybatis-plus 3.5.1
  
-- 安全框架：Apache Shiro 1.7.0，Jwt 3.11.0
+- 安全框架：Apache Shiro 1.8.0，Jwt 3.11.0
  
 - 数据库连接池：阿里巴巴Druid 1.1.22
  
@@ -2,50 +2,56 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <packaging>pom</packaging>
   <name>JEECG BOOT ${project.version}</name>
-  
+
   	<parent>
 	    <groupId>org.springframework.boot</groupId>
 	    <artifactId>spring-boot-starter-parent</artifactId>
-	    <version>2.3.5.RELEASE</version>
+	    <version>2.6.6</version>
 	    <relativePath/>
 	</parent>
  
 	<properties>
-		<jeecgboot.version>3.1.0</jeecgboot.version>
-		<!-- 微服务专用属性 -->
-		<skip.springboot.maven>false</skip.springboot.maven>
+		<jeecgboot.version>3.2.0</jeecgboot.version>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
+
+		<!-- 微服务属性 -->
+		<skip.springboot.maven>false</skip.springboot.maven>
+        <spring-cloud.version>2021.0.0</spring-cloud.version>
+        <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+		<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
+
 		<xxl-job-core.version>2.2.0</xxl-job-core.version>
         <fastjson.version>1.2.78</fastjson.version>
-		<knife4j-spring-boot-starter.version>2.0.9</knife4j-spring-boot-starter.version>
+		<knife4j-spring-boot-starter.version>3.0.3</knife4j-spring-boot-starter.version>
 		<knife4j-spring-ui.version>2.0.9</knife4j-spring-ui.version>
 		<!-- 数据库驱动 -->
 		<postgresql.version>42.2.6</postgresql.version>
 		<ojdbc6.version>11.2.0.3</ojdbc6.version>
 		<sqljdbc4.version>4.0</sqljdbc4.version>
 		<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
-		<!-- 动态数据源-->
-		<dynamic-datasource-spring-boot-starter.version>3.2.0</dynamic-datasource-spring-boot-starter.version>
 		<hutool.version>5.3.8</hutool.version>
 		<redisson.version>3.16.1</redisson.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<guava.version>29.0-jre</guava.version>
-		<mybatis-plus.version>3.4.3.1</mybatis-plus.version>
+
+		<!-- 持久层 -->
+		<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>
 		<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>
+		<!-- shiro -->
 		<shiro.version>1.8.0</shiro.version>
 		<java-jwt.version>3.11.0</java-jwt.version>
 		<shiro-redis.version>3.1.0</shiro-redis.version>
 		<codegenerate.version>1.3.8</codegenerate.version>
-		<autopoi-web.version>1.3.9</autopoi-web.version>
+		<autopoi-web.version>1.4.0</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>
@@ -98,6 +104,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- Lombok -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -162,33 +173,36 @@
 				<version>${jeecgboot.version}</version>
 			</dependency>
  
-            <!--微服务模块-->
+            <!--微服务启动依赖-->
             <dependency>
                 <groupId>org.jeecgframework.boot</groupId>
                 <artifactId>jeecg-boot-starter-cloud</artifactId>
                 <version>${jeecgboot.version}</version>
             </dependency>
-
 			<!--xxl-job定时任务-->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
 				<artifactId>jeecg-boot-starter-job</artifactId>
 				<version>${jeecgboot.version}</version>
 			</dependency>
-
 			<!--redis分布式锁-->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
 				<artifactId>jeecg-boot-starter-lock</artifactId>
 				<version>${jeecgboot.version}</version>
 			</dependency>
-
 			<!--rabbitmq消息队列-->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
 				<artifactId>jeecg-boot-starter-rabbitmq</artifactId>
 				<version>${jeecgboot.version}</version>
 			</dependency>
+			<!--分库分表shardingsphere-->
+			<dependency>
+				<groupId>org.jeecgframework.boot</groupId>
+				<artifactId>jeecg-boot-starter-shardingsphere</artifactId>
+				<version>${jeecgboot.version}</version>
+			</dependency>
  
  
 			<!-- 七牛云SDK -->
@@ -291,6 +305,22 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<!-- 企业微信和钉钉 api -->
+			<dependency>
+				<groupId>org.jeecgframework</groupId>
+				<artifactId>jeewx-api</artifactId>
+				<version>1.4.7</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>commons-beanutils</artifactId>
+						<groupId>commons-beanutils</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>commons-lang</artifactId>
+						<groupId>commons-lang</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
  
@@ -318,6 +348,7 @@
 	         <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
+				 <version>3.1.0</version>
                 <configuration>
                     <nonFilteredFileExtensions>
                         <nonFilteredFileExtension>woff</nonFilteredFileExtension>