Merge branch 'dev'

matevip · May 21, 2021 · 4220654 · 4220654
2 parents 20f10fa + 74b6bf6
commit 4220654
Show file tree

Hide file tree

Showing 118 changed files with 388 additions and 7,666 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 *.ear
 target/
 
+# 防提交docker本地生成文件 #
 doc/deploy/docker-standalone/mysql
 doc/deploy/docker-standalone/nacos
 

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ admin | matecloud| mate-system模块不能执行增删改请求
 admin | matecloud123 | 不能执行增删改请求，如需全部权限加微信 matecloud 联系
 
 ### 📌 版本演进
-核心中间件 | 2.5.8及以下 | 3.1.8
+核心中间件 | 2.5.8及以下 | 3.0.8+
 ---|---|---
 Spring Boot | 2.3.*.RELEASE | <img src="https://img.shields.io/badge/Spring%20Boot-2.4.5-blue" alt="SpringBoot"/>
 Spring Cloud | Hoxton SR* | <img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.2-blue" alt="SpringCloud"/>
@@ -151,7 +151,7 @@ matecloud -- 父项目,各模块分离，方便集成和微服务
  <dependency>
  <groupId>vip.mate</groupId>
  <artifactId>mate-starter-dependencies</artifactId>
- <version>3.0.8</version>
+ <version>3.1.8</version>
  <type>pom</type>
  <scope>import</scope>
  </dependency>

diff --git a/doc/sql/gen_table.sql b/doc/sql/gen_table.sql
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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

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>3.1.8</version>
+ <version>3.2.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 = "3.1.8";
+ public static final String MATE_APP_VERSION = "3.2.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>3.1.8</version>
+ <version>3.2.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
@@ -12,7 +12,7 @@
 
  <groupId>vip.mate</groupId>
  <artifactId>mate-starter-dependencies</artifactId>
- <version>3.1.8</version>
+ <version>3.2.8</version>
  <packaging>pom</packaging>
  <name>mate-starter-dependencies</name>
  <description>based on Spring Cloud Alibaba dependencies</description>
@@ -39,7 +39,7 @@
  </scm>
 
  <properties>
- <matecloud.core.version>3.1.8</matecloud.core.version>
+ <matecloud.core.version>3.2.8</matecloud.core.version>
  <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
  <spring.boot.version>2.4.5</spring.boot.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.5</druid.version>
+ <druid.version>1.2.6</druid.version>
  <mybatis.plus.version>3.4.2</mybatis.plus.version>
  <mybaits.generator.version>3.4.1</mybaits.generator.version>
  <dynamic-datasource.version>3.3.2</dynamic-datasource.version>
@@ -77,7 +77,7 @@
 
  <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
  <poi.version>4.1.2</poi.version>
- <nacos.client.version>2.0.0</nacos.client.version>
+ <nacos.client.version>2.0.1</nacos.client.version>
  <easypoi.version>4.3.0</easypoi.version>
  <ip2region.version>1.7.2</ip2region.version>
  <justauth.version>1.15.8</justauth.version>

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

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>3.1.8</version>
+ <version>3.2.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-elasticsearch/pom.xml b/mate-core/mate-starter-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-idempotent/src/main/java/vip/mate/core/ide/aspect/IdeAspect.java b/mate-core/mate-starter-idempotent/src/main/java/vip/mate/core/ide/aspect/IdeAspect.java
@@ -1,8 +1,8 @@
 package vip.mate.core.ide.aspect;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import io.micrometer.core.instrument.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -90,7 +90,7 @@ public void doBefore(JoinPoint joinPoint) {
  //2.1.通过rid模式判断是否属于重复提交
  String rid = request.getHeader(HEADER_RID_KEY);
 
- if (StringUtils.isNotBlank(rid)) {
+ if (StrUtil.isNotBlank(rid)) {
  Boolean result = redisService.tryLock(REDIS_KEY_PREFIX + rid, LOCK_WAIT_TIME);
  if (!result) {
  throw new IdeException("命中RID重复请求");
@@ -105,7 +105,7 @@ public void doBefore(JoinPoint joinPoint) {
  || ide.ideTypeEnum() == IdeTypeEnum.KEY) {
  //2.2.通过自定义key模式判断是否属于重复提交
  String key = ide.key();
- if (StringUtils.isNotBlank(key)) {
+ if (StrUtil.isNotBlank(key)) {
  String val = "";
  Object[] paramValues = joinPoint.getArgs();
  String[] paramNames = ((CodeSignature) joinPoint.getSignature()).getParameterNames();
@@ -128,7 +128,7 @@ public void doBefore(JoinPoint joinPoint) {
 
  //判断重复提交的条件
  String perFix = ide.perFix();
- if (StringUtils.isNotBlank(val)) {
+ if (StrUtil.isNotBlank(val)) {
  perFix = perFix + ":" + val;
 
  try {
@@ -165,7 +165,7 @@ public void doAfter(JoinPoint joinPoint) throws Throwable {
  ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
  HttpServletRequest request = attributes.getRequest();
  String rid = request.getHeader(HEADER_RID_KEY);
- if (StringUtils.isNotBlank(rid)) {
+ if (StrUtil.isNotBlank(rid)) {
  try {
 // redisService.unLock(REDIS_KEY_PREFIX + rid);
  log.info("msg1=当前请求已成功处理,,rid={}", rid);
@@ -180,7 +180,7 @@ public void doAfter(JoinPoint joinPoint) throws Throwable {
  || ide.ideTypeEnum() == IdeTypeEnum.KEY) {
  // 自定义key
  String key = ide.key();
- if (StringUtils.isNotBlank(key) && StringUtils.isNotBlank(PER_FIX_KEY.get())) {
+ if (StrUtil.isNotBlank(key) && StrUtil.isNotBlank(PER_FIX_KEY.get())) {
  try {
 // redisService.unLock(PER_FIX_KEY.get());
  log.info("msg1=当前请求已成功释放,,key={}", PER_FIX_KEY.get());

diff --git a/mate-core/mate-starter-j2cache/pom.xml b/mate-core/mate-starter-j2cache/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-retrofit/pom.xml b/mate-core/mate-starter-retrofit/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>mate-core</artifactId>
  <groupId>vip.mate</groupId>
- <version>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.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>3.1.8</version>
+ <version>3.2.8</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

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

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