Merge pull request #45 from matevip/dev

merge from dev
matevip · Sep 8, 2021 · 987d021 · 987d021
2 parents c02cac1 + f834cf7
commit 987d021
Show file tree

Hide file tree

Showing 74 changed files with 431 additions and 403 deletions.
diff --git a/README.md b/README.md
@@ -32,31 +32,17 @@ admin | matecloud123 | 不能执行增删改请求，如需全部权限加微信
 Spring Boot | 2.3.*.RELEASE | <img src="https://img.shields.io/badge/Spring%20Boot-2.5.4-blue" alt="SpringBoot"/>
 Spring Cloud | Hoxton SR* | <img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.3-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.2-blue" alt="nacos"/>
-Sentinel | 1.8.1 | <img src="https://img.shields.io/badge/Sentinel-1.8.1-blue" alt="sentinel"/>
+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"/>
 
 ## 📖 官方文档
 ### 👉 文档地址：[http://www.mate.vip/docs](http://www.mate.vip/docs)
 ### 👉 商业版文档：[http://doc.mate.vip](http://doc.mate.vip)
 ### 👉 快速安装：[http://www.mate.vip/archives/107](http://www.mate.vip/archives/107)
 
-## 🔥 前端重大更新
-前端采用`Vue3.2`、`Vite 2.5.*`、 `Ant-Design-Vue 2.*`、`TypeScript` 的大型中后台解决方案。
-### 👉 技术栈
-- Vue 3.2.2
-- Pinia 2.0.0-rc.4
-- vue-i18n 9.1.7
-- typescript 4.29.1
-- ant-design-vue 2.2.6
-- axios 0.21.1
-- vue-router 4.0.11
-- vite 2.5.0-beta.2
-### 👉 版本发布
-`4.0.8-M1`版本已经发布，实现了系统管理的基础功能，主要包括菜单管理、用户管理、角色管理、部门管理、日志管理、客户端管理等功能。欢迎体验。
-
 ## 👷 技术交流
 <p align="center"> 
- <img src="https://cdn.mate.vip/matecloud_social2.jpg" />
+ <img src="https://gitee.com/matevip/matecloud/raw/dev/doc/images/qr_group.jpg" />
 </p>
 👉 QQ群：2003638
 
@@ -167,7 +153,7 @@ matecloud -- 父项目,各模块分离，方便集成和微服务
  <dependency>
  <groupId>vip.mate</groupId>
  <artifactId>mate-starter-dependencies</artifactId>
- <version>3.8.8</version>
+ <version>4.0.8</version>
  <type>pom</type>
  <scope>import</scope>
  </dependency>
@@ -176,6 +162,21 @@ matecloud -- 父项目,各模块分离，方便集成和微服务
 ```
 然后在 dependencies 中添加自己所需使用的依赖即可使用。
 
+## 🔥 前端重大更新
+前端采用`Vue3.2.4`、`Vite 2.5.1`、 `Ant-Design-Vue 2.2.6`、`TypeScript` 的大型中后台解决方案。
+### 👉 技术栈
+- Vue 3.2.4
+- Pinia 2.0.0-rc.6
+- vue-i18n 9.1.7
+- typescript 4.29.1
+- ant-design-vue 2.2.6
+- axios 0.21.1
+- vue-router 4.0.11
+- vite 2.5.1
+### 👉 版本发布
+`4.0.8-M2`版本已经发布，完善了系统管理的基础功能，主要包括菜单管理、用户管理、角色管理、部门管理、日志管理、客户端管理等功能。后续功能正在加紧开发中，欢迎体验。
+
+
 ## 🌭 项目源码
 | 项目 | GITHUB | 码云 |
 |--- |--- | --- |

diff --git a/doc/images/qr_group.jpg b/doc/images/qr_group.jpg
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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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>4.0.9</version>
+ <version>4.0.10</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.9";
+ public static final String MATE_APP_VERSION = "4.0.10";
 
  /**
  * 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.9</version>
+ <version>4.0.10</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>4.0.9</version>
+ <version>4.0.10</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>4.0.9</matecloud.core.version>
+ <matecloud.core.version>4.0.10</matecloud.core.version>
  <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
  <spring.boot.version>2.5.4</spring.boot.version>
@@ -58,7 +58,7 @@
  <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>
- <mybatis.plus.version>3.4.3.1</mybatis.plus.version>
+ <mybatis.plus.version>3.4.3.3</mybatis.plus.version>
  <mybaits.generator.version>3.4.1</mybaits.generator.version>
  <dynamic-datasource.version>3.3.2</dynamic-datasource.version>
  <velocity.version>1.7</velocity.version>
@@ -72,13 +72,13 @@
  <jetcache.version>2.6.0</jetcache.version>
 
  <!-- Apache Dubbo -->
- <dubbo.version>2.7.12</dubbo.version>
- <fastjson.version>1.2.76</fastjson.version>
+ <dubbo.version>[2.7.13,)</dubbo.version>
+ <fastjson.version>1.2.78</fastjson.version>
 
  <spring-boot-admin.version>2.5.0</spring-boot-admin.version>
  <poi.version>4.1.2</poi.version>
  <nacos.client.version>2.0.3</nacos.client.version>
- <easypoi.version>4.3.0</easypoi.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>
@@ -99,15 +99,15 @@
  <seata.version>1.4.2</seata.version>
  <prometheus.version>1.6.2</prometheus.version>
 
- <jasypt.version>3.0.3</jasypt.version>
+ <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.6</gson.version>
+ <gson.version>2.8.8</gson.version>
  <guava.version>30.1.1-jre</guava.version>
- <aws-java-sdk-s3.version>1.11.996</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.63</aws-java-sdk-s3.version>
  <lombok.version>1.18.20</lombok.version>
- <hutool.version>5.6.3</hutool.version>
+ <hutool.version>5.7.11</hutool.version>
  </properties>
 
  <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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-lock/src/main/java/vip/mate/core/lock/RedissonLock.java b/mate-core/mate-starter-lock/src/main/java/vip/mate/core/lock/RedissonLock.java
@@ -31,7 +31,7 @@ public class RedissonLock {
  */
  public boolean lock(String lockName, long expireSeconds) {
  RLock rLock = redissonManager.getRedisson().getLock(lockName);
- boolean getLock = false;
+ boolean getLock;
  try {
  getLock = rLock.tryLock(0, expireSeconds, TimeUnit.SECONDS);
  if (getLock) {

diff --git a/mate-core/mate-starter-lock/src/main/java/vip/mate/core/lock/RedissonManager.java b/mate-core/mate-starter-lock/src/main/java/vip/mate/core/lock/RedissonManager.java
@@ -3,8 +3,13 @@
 import com.google.common.base.Preconditions;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
-import vip.mate.core.lock.config.strategy.*;
+import vip.mate.core.lock.config.strategy.ClusterRedissonConfigStrategyImpl;
+import vip.mate.core.lock.config.strategy.MasterslaveRedissonConfigStrategyImpl;
+import vip.mate.core.lock.config.strategy.RedissonConfigContext;
+import vip.mate.core.lock.config.strategy.SentinelRedissonConfigStrategyImpl;
+import vip.mate.core.lock.config.strategy.StandaloneRedissonConfigStrategyImpl;
 import vip.mate.core.lock.constant.RedisConnectionType;
 import vip.mate.core.lock.props.RedissonProperties;
 
@@ -19,23 +24,23 @@ public class RedissonManager {
 
  private Config config = new Config();
 
- private Redisson redisson = null;
+ private RedissonClient redisson = null;
 
  public RedissonManager() {
  }
 
  public RedissonManager(RedissonProperties redissonProperties) {
  try {
  config = RedissonConfigFactory.getInstance().createConfig(redissonProperties);
- redisson = (Redisson) Redisson.create(config);
+ redisson = Redisson.create(config);
  } catch (Exception e) {
  log.error("Redisson init error", e);
  throw new IllegalArgumentException("please input correct configurations," +
  "connectionType must in standalone/sentinel/cluster/masterslave");
  }
  }
 
- public Redisson getRedisson() {
+ public RedissonClient getRedisson() {
  return redisson;
  }
 
@@ -72,11 +77,10 @@ public static RedissonConfigFactory getInstance() {
  Config createConfig(RedissonProperties redissonProperties) {
  Preconditions.checkNotNull(redissonProperties);
  Preconditions.checkNotNull(redissonProperties.getAddress(), "redisson.lock.server.address cannot be NULL!");
- Preconditions.checkNotNull(redissonProperties.getType(), "redisson.lock.server.password cannot be NULL");
- Preconditions.checkNotNull(redissonProperties.getDatabase(), "redisson.lock.server.database cannot be NULL");
+ // Preconditions.checkNotNull(redissonProperties.getType(), "redisson.lock.server.password cannot be NULL");
  String connectionType = redissonProperties.getType();
  // 声明配置上下文
- RedissonConfigContext redissonConfigContext = null;
+ RedissonConfigContext redissonConfigContext;
  if (connectionType.equals(RedisConnectionType.STANDALONE.getConnection_type())) {
  redissonConfigContext = new RedissonConfigContext(new StandaloneRedissonConfigStrategyImpl());
  } else if (connectionType.equals(RedisConnectionType.SENTINEL.getConnection_type())) {

diff --git a/...k/src/main/java/vip/mate/core/lock/config/strategy/ClusterRedissonConfigStrategyImpl.java b/...k/src/main/java/vip/mate/core/lock/config/strategy/ClusterRedissonConfigStrategyImpl.java
@@ -23,9 +23,9 @@ public Config createRedissonConfig(RedissonProperties redissonProperties) {
  String password = redissonProperties.getPassword();
  String[] addrTokens = address.split(",");
  // 设置cluster节点的服务IP和端口
- for (int i = 0; i < addrTokens.length; i++) {
+ for (String addrToken : addrTokens) {
  config.useClusterServers()
- .addNodeAddress(GlobalConstant.REDIS_CONNECTION_PREFIX.getConstant_value() + addrTokens[i]);
+ .addNodeAddress(GlobalConstant.REDIS_CONNECTION_PREFIX.getConstant_value() + addrToken);
  if (StringUtils.isNotBlank(password)) {
  config.useClusterServers().setPassword(password);
  }

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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</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.9</version>
+ <version>4.0.10</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>