Skip to content
GitLab
Commit 77f1c6be authored by matevip's avatar matevip Committed by Gitee
Browse files

!18 3.2.8正式版本合并 

Merge pull request !18 from matevip/dev
parents 3df8d755 74b6bf6b
master 4.2.8 4.0.10 4.0.9 4.0.8 3.7.8 3.3.8 3.2.8
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 28 additions and 306 deletions
+28 -306
.gitignore
+ 1
- 0
View file @ 77f1c6be
......@@ -6,6 +6,7 @@
*.ear
target/
# 防提交docker本地生成文件 #
doc/deploy/docker-standalone/mysql
doc/deploy/docker-standalone/nacos
......
README.md
+ 2
- 2
View file @ 77f1c6be
......@@ -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>
......
doc/sql/gen_table.sql deleted 100644 → 0
+ 0
- 279
View file @ 3df8d755
This diff is collapsed.
mate-core/mate-starter-auth/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-cloud/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-common/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-common/src/main/java/vip/mate/core/common/constant/MateConstant.java
+ 1
- 1
View file @ 77f1c6be
......@@ -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
......
mate-core/mate-starter-database/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-dependencies/pom.xml
+ 4
- 4
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-dozer/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-dubbo/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-elasticsearch/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-encrypt/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-feign/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-file/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-gray/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-idempotent/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-idempotent/src/main/java/vip/mate/core/ide/aspect/IdeAspect.java
+ 6
- 6
View file @ 77f1c6be
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 class IdeAspect extends BaseAspect {
//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 class IdeAspect extends BaseAspect {
|| 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 class IdeAspect extends BaseAspect {
//判断重复提交的条件
String perFix = ide.perFix();
if (StringUtils.isNotBlank(val)) {
if (StrUtil.isNotBlank(val)) {
perFix = perFix + ":" + val;
try {
......@@ -165,7 +165,7 @@ public class IdeAspect extends BaseAspect {
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 class IdeAspect extends BaseAspect {
|| 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());
......
mate-core/mate-starter-j2cache/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
mate-core/mate-starter-jetcache/pom.xml
+ 1
- 1
View file @ 77f1c6be
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全