Merge pull request #47 from matevip/dev

merge dev
matevip · Sep 29, 2021 · 8626121 · 8626121
2 parents 987d021 + 07289d5
commit 8626121
Show file tree

Hide file tree

Showing 68 changed files with 206 additions and 314 deletions.
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.4-green" alt="SpringBoot"/>
-  <img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.3-blue" alt="SpringCloud"/>
+  <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%20Cloud%20Alibaba-2021.1-brightgreen" alt="Spring Cloud Alibaba"/>
 </p>
 
@@ -14,23 +14,25 @@
 MateCloud是一款基于Spring Cloud Alibaba的微服务架构。旨在为大家提供技术框架的基础能力的封装，减少开发工作，让您只关注业务。
 
 ## 🎨 系统演示
-### 👉 演示地址：http://cloud.mate.vip
+### 👉 演示地址：https://cloud.mate.vip
 
 账号 | 密码| 操作权限
 ---|---|---
 admin | matecloud| mate-system模块不能执行增删改请求
 
 如果需要验证手机号码登录，手机号码采用页面默认号码，点击获取验证码，输入1188，即可登录。
-### 🍯 企业版：http://plus.mate.vip
+### 🍯 商业版：https://plus.mate.vip
 账号 | 密码| 操作权限
 ---|---|---
 admin | matecloud123 | 不能执行增删改请求，如需全部权限加微信 matecloud 联系
 
+[商业版与开源版对比](https://doc.mate.vip/vip/product/business/)
+
 ## 📌 版本演进
 核心中间件 | 2.5.8及以下 | 3.0.8+
 ---|---|---
-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 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 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"/>
@@ -71,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.3`, `Spring Boot 2.5.4`, `Spring Cloud Alibaba 2021.1`版本进行系统设计；
+- 主体框架：采用最新的`Spring Cloud 2020.0.4`, `Spring Boot 2.5.5`, `Spring Cloud Alibaba 2021.1`版本进行系统设计；
 
 - 统一注册：支持`Nacos`作为注册中心，实现多配置、分群组、分命名空间、多业务模块的注册和发现功能；
 
@@ -153,7 +155,7 @@ matecloud -- 父项目,各模块分离，方便集成和微服务
         <dependency>
             <groupId>vip.mate</groupId>
             <artifactId>mate-starter-dependencies</artifactId>
-            <version>4.0.8</version>
+            <version>4.0.10</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -163,18 +165,18 @@ matecloud -- 父项目,各模块分离，方便集成和微服务
 然后在 dependencies 中添加自己所需使用的依赖即可使用。
 
 ## 🔥 前端重大更新
-前端采用`Vue3.2.4`、`Vite 2.5.1`、 `Ant-Design-Vue 2.2.6`、`TypeScript` 的大型中后台解决方案。
+前端采用`Vue 3.2.12`、`Vite 2.5.8`、 `Ant-Design-Vue 2.2.8`、`TypeScript` 的大型中后台解决方案。
 ### 👉 技术栈
-- Vue 3.2.4
-- Pinia 2.0.0-rc.6
+- Vue 3.2.12
+- Pinia 2.0.0-rc.8
 - vue-i18n 9.1.7
-- typescript 4.29.1
+- typescript 4.4.2
 - ant-design-vue 2.2.6
-- axios 0.21.1
+- axios 0.21.3
 - vue-router 4.0.11
-- vite 2.5.1
+- vite 2.5.8
 ### 👉 版本发布
-`4.0.8-M2`版本已经发布，完善了系统管理的基础功能，主要包括菜单管理、用户管理、角色管理、部门管理、日志管理、客户端管理等功能。后续功能正在加紧开发中，欢迎体验。
+`4.0.8-M3`版本已经发布，完善了系统管理的基础功能，主要包括菜单管理、用户管理、角色管理、部门管理、日志管理、客户端管理等功能。后续功能正在加紧开发中，欢迎体验。
 
 
 ## 🌭 项目源码

diff --git a/doc/sql/matex.sql b/doc/sql/matex.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>4.0.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-common/src/main/java/vip/mate/core/common/api/ResultCode.java b/mate-core/mate-starter-common/src/main/java/vip/mate/core/common/api/ResultCode.java
@@ -33,6 +33,11 @@ public enum ResultCode implements IResultCode {
 	 * Too Many Requests
 	 */
 	TOO_MANY_REQUESTS(429, "Too Many Requests"),
+
+	/**
+	 * 服务不可用
+	 */
+	SERVICE_UNAVAILABLE(503, "服务不可用"),
 	/**
 	 * 参数错误
 	 */

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.10";
+	public static final String MATE_APP_VERSION = "4.0.11";
 
 	/**
 	 * 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.10</version>
+        <version>4.0.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mate-core/mate-starter-database/src/main/java/vip/mate/core/database/enums/PageTypeEnum.java b/mate-core/mate-starter-database/src/main/java/vip/mate/core/database/enums/PageTypeEnum.java
diff --git a/mate-core/mate-starter-database/src/main/java/vip/mate/core/database/package-info.java b/mate-core/mate-starter-database/src/main/java/vip/mate/core/database/package-info.java
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.4</version>
+        <version>2.5.5</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>vip.mate</groupId>
     <artifactId>mate-starter-dependencies</artifactId>
-    <version>4.0.10</version>
+    <version>4.0.11</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.10</matecloud.core.version>
+        <matecloud.core.version>4.0.11</matecloud.core.version>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <spring.boot.version>2.5.4</spring.boot.version>
-        <spring.cloud.version>2020.0.3</spring.cloud.version>
+        <spring.boot.version>2.5.5</spring.boot.version>
+        <spring.cloud.version>2020.0.4</spring.cloud.version>
         <alibaba.cloud.version>2021.1</alibaba.cloud.version>
 
         <maven-compiler-plugin.version>3.6.2</maven-compiler-plugin.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.3</mybatis.plus.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>
         <velocity.version>1.7</velocity.version>
@@ -75,7 +75,7 @@
         <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>
+        <spring-boot-admin.version>2.5.1</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>
@@ -86,7 +86,7 @@
 
         <sharding-jdbc.version>4.1.1</sharding-jdbc.version>
 
-        <elastic.version>7.13.3</elastic.version>
+        <elastic.version>[7.14.0,)</elastic.version>
         <commons-collections.version>3.2.2</commons-collections.version>
 
         <dozer.version>6.5.0</dozer.version>
@@ -97,7 +97,7 @@
         <commons-io.version>2.8.0</commons-io.version>
         <rocketmq.version>4.9.0</rocketmq.version>
         <seata.version>1.4.2</seata.version>
-        <prometheus.version>1.6.2</prometheus.version>
+        <prometheus.version>1.7.4</prometheus.version>
 
         <jasypt.version>3.0.4</jasypt.version>
 

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.10</version>
+        <version>4.0.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/.../main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboFeignBuilder.java b/.../main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboFeignBuilder.java
@@ -4,15 +4,13 @@
 import feign.Target;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.config.spring.reference.ReferenceBeanBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.ReflectionUtils;
 
 import java.util.Objects;
 
-import static com.alibaba.spring.util.AnnotationUtils.getAttributes;
-import static org.springframework.core.annotation.AnnotationAttributes.fromMap;
-
 /**
  * Dubbo、Feign整合类
  *
@@ -39,10 +37,10 @@ public DubboFeignBuilder() {
 
     @Override
     public <T> T target(Target<T> target) {
-        ReferenceBeanBuilder beanBuilder = ReferenceBeanBuilder.create(fromMap(getAttributes(defaultReference,
-                applicationContext.getEnvironment(), true)), applicationContext).interfaceClass(target.type());
+        ReferenceBeanBuilder referenceBeanBuilder = new ReferenceBeanBuilder();
+        referenceBeanBuilder.setInterface(target.type());
         try {
-            T object = (T) beanBuilder.build().getObject();
+            T object = (T) referenceBeanBuilder.build().getObject();
             return object;
         } catch (Exception e) {
             throw new RuntimeException(e);

diff --git a/...che/dubbo/config/spring/beans/factory/annotation/DubboFeignProviderBeanPostProcessor.java b/...che/dubbo/config/spring/beans/factory/annotation/DubboFeignProviderBeanPostProcessor.java
@@ -240,15 +240,16 @@ private void registerServiceBean(BeanDefinitionHolder beanDefinitionHolder, Bean
         // ServiceBean Bean name
         String beanName = generateServiceBeanName(serviceAnnotationAttributes, interfaceClass);
 
-        if (scanner.checkCandidate(beanName, serviceBeanDefinition)) { // check duplicated candidate bean
-            registry.registerBeanDefinition(beanName, serviceBeanDefinition);
-            log.warn("The BeanDefinition[" + serviceBeanDefinition +
-                    "] of ServiceBean has been registered with name : " + beanName);
-        } else {
-            log.warn("The Duplicated BeanDefinition[" + serviceBeanDefinition +
-                    "] of ServiceBean[ bean name : " + beanName +
-                    "] was be found , Did @DubboComponentScan scan to same package in many times?");
-        }
+        registry.registerBeanDefinition(beanName, serviceBeanDefinition);
+//        if (scanner.checkCandidate(beanName, serviceBeanDefinition)) { // check duplicated candidate bean
+//            registry.registerBeanDefinition(beanName, serviceBeanDefinition);
+//            log.warn("The BeanDefinition[" + serviceBeanDefinition +
+//                    "] of ServiceBean has been registered with name : " + beanName);
+//        } else {
+//            log.warn("The Duplicated BeanDefinition[" + serviceBeanDefinition +
+//                    "] of ServiceBean[ bean name : " + beanName +
+//                    "] was be found , Did @DubboComponentScan scan to same package in many times?");
+//        }
     }
 
     /**

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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</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.10</version>
+        <version>4.0.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>