Merge branch '2021' into 21/config-empty-protection

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Change Log
 ---
 
+- [fix: add gateway context config example.](https://github.com/Tencent/spring-cloud-tencent/pull/1562)
 - [feat:support config empty protection.](https://github.com/Tencent/spring-cloud-tencent/pull/1581)

spring-cloud-starter-tencent-polaris-config/pom.xml

@@ -18,12 +18,6 @@
 		<dependency>
 			<groupId>com.tencent.cloud</groupId>
 			<artifactId>spring-cloud-tencent-polaris-context</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>spring-security-crypto</artifactId>
-					<groupId>org.springframework.security</groupId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<!-- Spring Cloud Tencent dependencies end -->
 

spring-cloud-starter-tencent-polaris-discovery/pom.xml

@@ -18,12 +18,6 @@
 		<dependency>
 			<groupId>com.tencent.cloud</groupId>
 			<artifactId>spring-cloud-tencent-rpc-enhancement</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>spring-security-crypto</artifactId>
-					<groupId>org.springframework.security</groupId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>

spring-cloud-tencent-commons/pom.xml

@@ -45,6 +45,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-commons</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-security-crypto</artifactId>
+					<groupId>org.springframework.security</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/application-context.yml

@@ -3,10 +3,10 @@ spring:
     tencent:
       gateway:
         groups:
-          group-scg2p:
+          group-callee:
             predicate:
               apiType: ms
-              context: /group1
+              context: /group-callee
               namespace:
                 key: null
                 position: PATH
@@ -15,17 +15,42 @@ spring:
                 position: PATH
             routes:
               - host: null
-                metadata: {}
+                metadata: { }
                 method: GET
                 namespace: default
-                path: /echo/{param}
+                path: /quickstart/callee/info
-                service: provider-demo
+                service: QuickstartCalleeService
+          group-caller:
+            predicate:
+              apiType: ms
+              context: /group-caller
+              namespace:
+                key: null
+                position: PATH
+              service:
+                key: null
+                position: PATH
+            routes:
+              - host: null
+                metadata: { }
+                method: GET
+                namespace: default
+                path: /quickstart/**
+                service: QuickstartCallerService
         routes:
-          group1:
+          group-callee:
+            filters:
+              - Context=group-callee
+            order: -1
+            predicates:
+              - Context=group-callee
+              - Path=/group-callee/**
+            uri: lb://group-callee # do not use "_".
+          group-caller:
             filters:
-              - Context=group1
+              - Context=group-caller
             order: -1
             predicates:
-              - Context=group1
+              - Context=group-caller
-              - Path=/group1/**
+              - Path=/group-caller/**
-            uri: lb://group1
+            uri: lb://group-caller # do not use "_".

spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/application.yml

@@ -1,6 +1,8 @@
 server:
   port: 48081
 spring:
+#  profiles:
+#    active: context
   application:
     name: QuickStartGatewayService
   config:

spring-cloud-tencent-rpc-enhancement/pom.xml

@@ -39,6 +39,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-loadbalancer</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-security-crypto</artifactId>
+					<groupId>org.springframework.security</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>