update README.md.

README.md

@@ -1,24 +1,26 @@
-# Cloud-Platform
+### Cloud-Platform
+
 Cloud-Platform是国内首个基于`Spring 
 Cloud`微`服务`化`开发平台`，具有统一授权、认证后台管理系统，其中包含具备用户管理、资源权限管理、网关API
 管理等多个模块，支持多业务系统并行开发，可以作为后端服务的开发脚手架。代码简洁，架构清晰，适合学习和直接项目中使用。
 核心技术采用`Spring Boot 
-2.1.2`以及`Spring Cloud (Greenwich.RELEASE)
-`相关核心组件，采用`Nacos`注册和配置中心，集成流量卫兵`Sentinel`，前端采用`vue-element-admin`组件，`Elastic Search`自行集成。
+2.4.1`、`Spring Cloud (2020.0.0)`以及`Spring Cloud Alibaba 2.2.4`
+相关核心组件，采用`Nacos`注册和配置中心，集成流量卫兵`Sentinel`，前端采用`vue-element-admin`组件，`Elastic Search`自行集成。
+
+### QQ群号：169824183(1)、592462556(2)、661605461(3)
 
-### QQ群号：169824183(1)、661605461(2)、592462556(3)
+### 公众号
+![输入图片说明](https://images.gitee.com/uploads/images/2020/1020/173334_53541846_547642.png "[email protected]")
 
-### 开源用户登记，宣传用：[点击打开](https://gitee.com/geek_qi/cloud-platform/issues/II9SP)
+#### 开源用户登记，宣传用：[点击打开](https://gitee.com/geek_qi/cloud-platform/issues/II9SP)
 
-### 最新更新日志，[点击查看](https://gitee.com/geek_qi/cloud-platform/wikis/Cloud-Platform更新日志?sort_id=320050)
+#### 最新更新日志，[点击查看](https://gitee.com/geek_qi/cloud-platform/wikis/Cloud-Platform更新日志?sort_id=320050)
 
-### 基础文档，[点击查看](https://gitee.com/geek_qi/cloud-platform/wikis/Home)
+#### 基础文档，[点击查看](https://gitee.com/geek_qi/cloud-platform/blob/master/dev-doc.md)
 
 # 模块说明
 ![架构图](https://images.gitee.com/uploads/images/2019/0528/205306_9a8b8d83_1899222.png "1.png")
 
-## 公众号
-![输入图片说明](https://images.gitee.com/uploads/images/2019/0712/091503_c2618a08_547642.jpeg "qrcode_for_gh_e5a084d37c0d_258 (2).jpg")
 
 ### 架构摘要
 #### 中台化前端

ace-dev-base/ace-auth-sdk/pom.xml

@@ -24,13 +24,13 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
-            <version>2.0.0.M1</version>
+            <version>3.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.0.4.RELEASE</version>
+            <version>5.3.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

ace-dev-base/ace-common/pom.xml

@@ -47,6 +47,7 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <version>5.0.4.RELEASE</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -57,7 +58,8 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>5.2.6.RELEASE</version>
+            <version>5.3.2</version>
+            <scope>compile</scope>
         </dependency>
 
 
@@ -85,6 +87,11 @@
             <artifactId>fastjson</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
 
 
     </dependencies>

ace-dev-base/ace-common/src/main/java/com/github/wxiaoqi/security/common/context/BaseContextHandler.java

@@ -2,17 +2,10 @@
 
 import com.github.wxiaoqi.security.common.constant.CommonConstants;
 import com.github.wxiaoqi.security.common.util.StringHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * Created by ace on 2017/9/8.
  */
@@ -77,41 +70,41 @@ public static void remove(){
         threadLocal.remove();
     }
 
-    @RunWith(MockitoJUnitRunner.class)
-    public static class UnitTest {
-        private Logger logger = LoggerFactory.getLogger(UnitTest.class);
-
-        @Test
-        public void testSetContextVariable() throws InterruptedException {
-            BaseContextHandler.set("test", "main");
-            new Thread(()->{
-                BaseContextHandler.set("test", "moo");
-
-                try {
-                    Thread.sleep(3000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                assertEquals(BaseContextHandler.get("test"), "moo");
-                logger.info("thread one done!");
-            }).start();
-            new Thread(()->{
-                BaseContextHandler.set("test", "moo2");
-                assertEquals(BaseContextHandler.get("test"), "moo2");
-                logger.info("thread two done!");
-            }).start();
-
-            Thread.sleep(5000);
-            assertEquals(BaseContextHandler.get("test"), "main");
-            logger.info("main one done!");
-        }
-
-        @Test
-        public void testSetUserInfo(){
-            BaseContextHandler.setUserID("test");
-            assertEquals(BaseContextHandler.getUserID(), "test");
-            BaseContextHandler.setUsername("test2");
-            assertEquals(BaseContextHandler.getUsername(), "test2");
-        }
-    }
+//    @RunWith(MockitoJUnitRunner.class)
+//    public static class UnitTest {
+//        private Logger logger = LoggerFactory.getLogger(UnitTest.class);
+//
+//        @Test
+//        public void testSetContextVariable() throws InterruptedException {
+//            BaseContextHandler.set("test", "main");
+//            new Thread(()->{
+//                BaseContextHandler.set("test", "moo");
+//
+//                try {
+//                    Thread.sleep(3000);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//                assertEquals(BaseContextHandler.get("test"), "moo");
+//                logger.info("thread one done!");
+//            }).start();
+//            new Thread(()->{
+//                BaseContextHandler.set("test", "moo2");
+//                assertEquals(BaseContextHandler.get("test"), "moo2");
+//                logger.info("thread two done!");
+//            }).start();
+//
+//            Thread.sleep(5000);
+//            assertEquals(BaseContextHandler.get("test"), "main");
+//            logger.info("main one done!");
+//        }
+//
+//        @Test
+//        public void testSetUserInfo(){
+//            BaseContextHandler.setUserID("test");
+//            assertEquals(BaseContextHandler.getUserID(), "test");
+//            BaseContextHandler.setUsername("test2");
+//            assertEquals(BaseContextHandler.getUsername(), "test2");
+//        }
+//    }
 }

ace-gate/pom.xml

@@ -16,7 +16,7 @@
         <project.reporting.outputEncoding>UTF-8
         </project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <kotlin.version>1.1.51</kotlin.version>
+        <kotlin.version>1.4.20</kotlin.version>
     </properties>
 
     <dependencies>
@@ -69,14 +69,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <!-- LB 扩展 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
         <!--<dependency>-->
             <!--<groupId>org.springframework.amqp</groupId>-->
@@ -118,6 +114,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -163,6 +165,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/GatewayServerBootstrap.java

@@ -3,16 +3,14 @@
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import com.github.wxiaoqi.security.gate.utils.DBLog;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * @author ace
  * @create 2018/3/12.
  */
-@SpringBootApplication
-@EnableDiscoveryClient
+@SpringCloudApplication
 @EnableAceAuthClient
 //TODO 切换为webclient
 @EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign"})

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/config/GatewayConfig.java

@@ -11,6 +11,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.reactive.function.client.WebClient;
 
 import java.util.ArrayList;
@@ -23,6 +24,12 @@
 @Configuration
 public class GatewayConfig {
 
+    @LoadBalanced
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+
     @Bean
     public Decoder feignDecoder() {
         return new ResponseEntityDecoder(new SpringDecoder(feignHttpMessageConverter()));

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/handler/RequestBodyRoutePredicateFactory.java

@@ -24,7 +24,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.cloud.gateway.handler.AsyncPredicate;
 import org.springframework.cloud.gateway.handler.predicate.AbstractRoutePredicateFactory;
-import org.springframework.cloud.gateway.handler.predicate.ReadBodyPredicateFactory;
 import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.codec.HttpMessageReader;
@@ -47,7 +46,7 @@
 @Order(1)
 public class RequestBodyRoutePredicateFactory
         extends AbstractRoutePredicateFactory<RequestBodyRoutePredicateFactory.Config> {
-    protected static final Log LOGGER = LogFactory.getLog(ReadBodyPredicateFactory.class);
+    protected static final Log LOGGER = LogFactory.getLog(RequestBodyRoutePredicateFactory.class);
     private final List<HttpMessageReader<?>> messageReaders;
 
     public RequestBodyRoutePredicateFactory() {

ace-gate/src/main/resources/application.yml

@@ -35,22 +35,22 @@ spring:
       legacy:
         enabled: true
   cloud:
-     gateway:
-       default-filters:
+    gateway:
+      default-filters:
          - DedupeResponseHeader=Access-Control-Allow-Origin
-       globalcors:
+      globalcors:
          add-to-simple-url-handler-mapping: true
          corsConfigurations:
            '[/**]':
-             allowed-origins: "*"
+             allowed-origins: "http://localhost:9572"
              allowed-methods: "*"
              allowed-headers: "*"
              allow-credentials: true
-       discovery:
-         locator:
-           lowerCaseServiceId: true
-           enabled: true
-       routes:
+      discovery:
+        locator:
+          lowerCaseServiceId: true
+          enabled: true
+      routes:
         # =====================================
         - id: ace-auth
           uri: lb://ace-admin
@@ -83,12 +83,10 @@ spring:
             - Path=/api/sample/**
           filters:
             - StripPrefix=2
-     nacos:
-        discovery:
-          server-addr: 127.0.0.1:8848
-  sentinel:
-    transport:
-      dashboard: localhost:8080
+    sentinel:
+      transport:
+        dashboard: localhost:8080
+
 logging:
   level:
     com.github.wxiaoqi.security.gate.v2: info

ace-gate/src/main/resources/bootstrap.yml

@@ -6,6 +6,12 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         file-extension: yaml
+      discovery:
+        server-addr: 127.0.0.1:8848
+    loadbalancer:
+      ribbon:
+        enabled: false
+
   profiles:
     active: dev
   main:

ace-infrastructure/ace-monitor/pom.xml

@@ -13,7 +13,7 @@
     <artifactId>ace-monitor</artifactId>
 
     <properties>
-        <boot.admin.version>2.1.2</boot.admin.version>
+        <boot.admin.version>2.4.0</boot.admin.version>
     </properties>
 
     <dependencies>
@@ -26,19 +26,34 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.cloud</groupId>-->
-            <!--<artifactId>spring-cloud-starter-consul-all</artifactId>-->
-        <!--</dependency>-->
+        <!-- LB 扩展 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
             <version>${boot.admin.version}</version>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-webflux</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
         </dependency>
 
         <dependency>