Merge pull request #49 from matevip/dev

发布正式版
matevip · Dec 3, 2021 · 9a6b89c · 9a6b89c
2 parents 8626121 + 1f987ec
commit 9a6b89c
Show file tree

Hide file tree

Showing 66 changed files with 244 additions and 403 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,7 +39,6 @@ temp/
 nbproject/private/
 build/
 nbbuild/
-dist/
 nbdist/
 .nb-gradle/
 

diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@
 <p align="center">
  <img src='https://img.shields.io/github/license/matevip/matecloud' alt='License'/>
  <img src="https://img.shields.io/github/stars/matevip/matecloud" alt="Stars"/>
- <img src="https://img.shields.io/badge/Spring%20Boot-2.5.5-green" alt="SpringBoot"/>
- <img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.4-blue" alt="SpringCloud"/>
+ <img src="https://img.shields.io/badge/Spring%20Boot-2.6.1-green" alt="SpringBoot"/>
+ <img src="https://img.shields.io/badge/Spring%20Cloud-2021.0.0-blue" alt="SpringCloud"/>
  <img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2021.1-brightgreen" alt="Spring Cloud Alibaba"/>
 </p>
 
@@ -31,8 +31,8 @@ admin | matecloud123 | 不能执行增删改请求，如需全部权限加微信
 ## 📌 版本演进
 核心中间件 | 2.5.8及以下 | 3.0.8+
 ---|---|---
-Spring Boot | 2.3.*.RELEASE | <img src="https://img.shields.io/badge/Spring%20Boot-2.5.5-blue" alt="SpringBoot"/>
-Spring Cloud | Hoxton SR* | <img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.4-blue" alt="SpringCloud"/>
+Spring Boot | 2.3.*.RELEASE | <img src="https://img.shields.io/badge/Spring%20Boot-2.6.1-blue" alt="SpringBoot"/>
+Spring Cloud | Hoxton SR* | <img src="https://img.shields.io/badge/Spring%20Cloud-2021.0.0-blue" alt="SpringCloud"/>
 Spring Cloud Alibaba | 2.2.*.RELEASE | <img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2021.1-blue" alt="SpringCloudAlibaba"/>
 Nacos | 1.4.*及以下 | <img src="https://img.shields.io/badge/Nacos-2.0.3-blue" alt="nacos"/>
 Sentinel | 1.8.1 | <img src="https://img.shields.io/badge/Sentinel-1.8.2-blue" alt="sentinel"/>
@@ -73,7 +73,7 @@ Sentinel | 1.8.1 | <img src="https://img.shields.io/badge/Sentinel-1.8.2-blue" a
 </table>
 
 ## 🔧 功能特点
-- 主体框架：采用最新的`Spring Cloud 2020.0.4`, `Spring Boot 2.5.5`, `Spring Cloud Alibaba 2021.1`版本进行系统设计；
+- 主体框架：采用最新的`Spring Cloud 2021.0.0`, `Spring Boot 2.6.1`, `Spring Cloud Alibaba 2021.1`版本进行系统设计；
 
 - 统一注册：支持`Nacos`作为注册中心，实现多配置、分群组、分命名空间、多业务模块的注册和发现功能；
 
@@ -155,7 +155,7 @@ matecloud -- 父项目,各模块分离，方便集成和微服务
  <dependency>
  <groupId>vip.mate</groupId>
  <artifactId>mate-starter-dependencies</artifactId>
- <version>4.0.10</version>
+ <version>4.0.11</version>
  <type>pom</type>
  <scope>import</scope>
  </dependency>
@@ -173,7 +173,7 @@ matecloud -- 父项目,各模块分离，方便集成和微服务
 - typescript 4.4.2
 - ant-design-vue 2.2.6
 - axios 0.21.3
-- vue-router 4.0.11
+- vue-router 4.1.8
 - vite 2.5.8
 ### 👉 版本发布
 `4.0.8-M3`版本已经发布，完善了系统管理的基础功能，主要包括菜单管理、用户管理、角色管理、部门管理、日志管理、客户端管理等功能。后续功能正在加紧开发中，欢迎体验。

diff --git a/mate-core/mate-starter-auth/pom.xml b/mate-core/mate-starter-auth/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-cloud/pom.xml b/mate-core/mate-starter-cloud/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-cloud/src/main/resources/bootstrap.yml b/mate-core/mate-starter-cloud/src/main/resources/bootstrap.yml
@@ -3,6 +3,7 @@ spring:
  active: @spring.active@
  main:
  allow-bean-definition-overriding: true
+ allow-circular-references: true
  cloud:
  nacos:
  config:

diff --git a/mate-core/mate-starter-common/pom.xml b/mate-core/mate-starter-common/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-common/src/main/java/vip/mate/core/common/constant/MateConstant.java b/mate-core/mate-starter-common/src/main/java/vip/mate/core/common/constant/MateConstant.java
@@ -13,7 +13,7 @@ public class MateConstant {
  /**
  * 应用版本号
  */
- public static final String MATE_APP_VERSION = "4.0.11";
+ public static final String MATE_APP_VERSION = "4.1.8";
 
  /**
  * Spring 应用名 prop key

diff --git a/mate-core/mate-starter-database/pom.xml b/mate-core/mate-starter-database/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-dependencies/pom.xml b/mate-core/mate-starter-dependencies/pom.xml
@@ -5,14 +5,14 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.5.5</version>
+ <version>2.6.1</version>
  <relativePath/>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>vip.mate</groupId>
  <artifactId>mate-starter-dependencies</artifactId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  <packaging>pom</packaging>
  <name>mate-starter-dependencies</name>
  <description>based on Spring Cloud Alibaba dependencies</description>
@@ -39,11 +39,11 @@
  </scm>
 
  <properties>
- <matecloud.core.version>4.0.11</matecloud.core.version>
+ <matecloud.core.version>4.1.8</matecloud.core.version>
  <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
- <spring.boot.version>2.5.5</spring.boot.version>
- <spring.cloud.version>2020.0.4</spring.cloud.version>
+ <spring.boot.version>2.6.1</spring.boot.version>
+ <spring.cloud.version>2021.0.0</spring.cloud.version>
  <alibaba.cloud.version>2021.1</alibaba.cloud.version>
 
  <maven-compiler-plugin.version>3.6.2</maven-compiler-plugin.version>
@@ -57,7 +57,7 @@
  <mysql.connector.version>8.0.22</mysql.connector.version>
  <oracle.connector.version>12.2.0.1</oracle.connector.version>
  <postgresql.connector.version>42.2.6</postgresql.connector.version>
- <druid.version>1.2.6</druid.version>
+ <druid.version>1.2.8</druid.version>
  <mybatis.plus.version>3.4.3.4</mybatis.plus.version>
  <mybaits.generator.version>3.4.1</mybaits.generator.version>
  <dynamic-datasource.version>3.3.2</dynamic-datasource.version>
@@ -75,14 +75,14 @@
  <dubbo.version>[2.7.13,)</dubbo.version>
  <fastjson.version>1.2.78</fastjson.version>
 
- <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
+ <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
  <poi.version>4.1.2</poi.version>
  <nacos.client.version>2.0.3</nacos.client.version>
  <easypoi.version>4.4.0</easypoi.version>
  <ip2region.version>1.7.2</ip2region.version>
  <justauth.version>1.15.8</justauth.version>
  <justauth.springboot.version>1.3.3</justauth.springboot.version>
- <okhttp.version>4.9.1</okhttp.version>
+ <okhttp.version>4.9.2</okhttp.version>
 
  <sharding-jdbc.version>4.1.1</sharding-jdbc.version>
 
@@ -91,9 +91,9 @@
 
  <dozer.version>6.5.0</dozer.version>
  <redisson.version>3.15.0</redisson.version>
- <lettuce.version>5.3.7.RELEASE</lettuce.version>
+ <lettuce.version>6.1.5.RELEASE</lettuce.version>
  <sentinel.version>1.8.2</sentinel.version>
- <transmittable.version>2.12.0</transmittable.version>
+ <transmittable.version>2.12.2</transmittable.version>
  <commons-io.version>2.8.0</commons-io.version>
  <rocketmq.version>4.9.0</rocketmq.version>
  <seata.version>1.4.2</seata.version>
@@ -102,12 +102,12 @@
  <jasypt.version>3.0.4</jasypt.version>
 
  <retrofit.version>2.2.3</retrofit.version>
- <j2cache.version>2.8.2-release</j2cache.version>
  <gson.version>2.8.8</gson.version>
  <guava.version>30.1.1-jre</guava.version>
- <aws-java-sdk-s3.version>1.12.63</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.86</aws-java-sdk-s3.version>
  <lombok.version>1.18.20</lombok.version>
- <hutool.version>5.7.11</hutool.version>
+ <hutool.version>5.7.14</hutool.version>
+ <spring.security.version>2.5.5</spring.security.version>
  </properties>
 
  <dependencyManagement>
@@ -542,11 +542,6 @@
  <artifactId>retrofit-spring-boot-starter</artifactId>
  <version>${retrofit.version}</version>
  </dependency>
- <dependency>
- <groupId>net.oschina.j2cache</groupId>
- <artifactId>j2cache-core</artifactId>
- <version>${j2cache.version}</version>
- </dependency>
  <dependency>
  <groupId>io.seata</groupId>
  <artifactId>seata-spring-boot-starter</artifactId>
@@ -590,6 +585,11 @@
  <artifactId>bcpkix-jdk15on</artifactId>
  <version>1.68</version>
  </dependency>
+ <dependency>
+ <groupId>org.springframework.security.oauth.boot</groupId>
+ <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
  </dependencies>
  </dependencyManagement>
 

diff --git a/mate-core/mate-starter-dubbo/pom.xml b/mate-core/mate-starter-dubbo/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-encrypt/pom.xml b/mate-core/mate-starter-encrypt/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-feign/pom.xml b/mate-core/mate-starter-feign/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-file/pom.xml b/mate-core/mate-starter-file/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-gray/pom.xml b/mate-core/mate-starter-gray/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-idempotent/pom.xml b/mate-core/mate-starter-idempotent/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-jetcache/pom.xml b/mate-core/mate-starter-jetcache/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-job/pom.xml b/mate-core/mate-starter-job/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <packaging>jar</packaging>

diff --git a/mate-core/mate-starter-kafka/pom.xml b/mate-core/mate-starter-kafka/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-lock/pom.xml b/mate-core/mate-starter-lock/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-log/pom.xml b/mate-core/mate-starter-log/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-mail/pom.xml b/mate-core/mate-starter-mail/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-mongodb/pom.xml b/mate-core/mate-starter-mongodb/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-mybatis/pom.xml b/mate-core/mate-starter-mybatis/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-oss/pom.xml b/mate-core/mate-starter-oss/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-prometheus/pom.xml b/mate-core/mate-starter-prometheus/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-rabbit/pom.xml b/mate-core/mate-starter-rabbit/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-redis/pom.xml b/mate-core/mate-starter-redis/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-rocketmq/pom.xml b/mate-core/mate-starter-rocketmq/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-rule/pom.xml b/mate-core/mate-starter-rule/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>4.0.11</version>
+ <version>4.1.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>