From cd91b69f808deb6af8b3613835f3c56e84ba87ff Mon Sep 17 00:00:00 2001
From: chuntaojun <liaochuntao@live.com>
Date: Thu, 18 Nov 2021 22:06:31 +0800
Subject: [PATCH] feat: save code

---
 .../polaris-discovery-example/pom.xml           |  5 +++++
 .../ratelimit-callee-service/pom.xml            | 17 +++++++++++++++++
 .../service/callee/BusinessController.java      |  8 ++++++++
 .../service/callee/RateLimitCalleeService.java  |  3 ++-
 .../{bootstrap.yml => application.yml}          |  7 ++++---
 .../PolarisFeignBlockingLoadBalancerClient.java |  1 -
 .../pom.xml                                     |  6 ++++++
 .../pom.xml                                     |  1 +
 8 files changed, 43 insertions(+), 5 deletions(-)
 rename spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/{bootstrap.yml => application.yml} (50%)

diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/pom.xml b/spring-cloud-tencent-examples/polaris-discovery-example/pom.xml
index 866fcd456..f6c4cbc3b 100644
--- a/spring-cloud-tencent-examples/polaris-discovery-example/pom.xml
+++ b/spring-cloud-tencent-examples/polaris-discovery-example/pom.xml
@@ -44,6 +44,11 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
         <!-- 熔断超时后，重试机制依赖-->
         <dependency>
             <groupId>org.springframework.retry</groupId>
diff --git a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/pom.xml b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/pom.xml
index b37077e3d..47336b35b 100644
--- a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/pom.xml
+++ b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/pom.xml
@@ -13,11 +13,24 @@
     <artifactId>ratelimit-callee-service</artifactId>
 
     <dependencies>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.2.6</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
         <dependency>
             <artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId>
             <groupId>com.tencent.cloud</groupId>
@@ -30,5 +43,9 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator-autoconfigure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/BusinessController.java b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/BusinessController.java
index 767907446..b9b8f04f3 100644
--- a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/BusinessController.java
+++ b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/BusinessController.java
@@ -20,6 +20,8 @@ package com.tencent.cloud.ratelimit.example.service.callee;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,6 +45,12 @@ public class BusinessController {
     @Value("${spring.application.name}")
     private String appName;
 
+    @Configuration
+    @LoadBalancerClient(value = "service-provider")
+    class RateLimitCalleeConfiguration {
+
+    }
+
 
     /**
      * 获取当前服务的信息
diff --git a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/RateLimitCalleeService.java b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/RateLimitCalleeService.java
index 342d12804..362f1d7e3 100644
--- a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/RateLimitCalleeService.java
+++ b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/RateLimitCalleeService.java
@@ -20,6 +20,7 @@ package com.tencent.cloud.ratelimit.example.service.callee;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
@@ -28,7 +29,7 @@ import org.springframework.web.client.RestTemplate;
  * @author Haotian Zhang
  */
 @SpringBootApplication
-@EnableAutoConfiguration
+@EnableDiscoveryClient
 public class RateLimitCalleeService {
 
     @Bean
diff --git a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/application.yml
similarity index 50%
rename from spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/bootstrap.yml
rename to spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/application.yml
index 9974b810f..b6b548eaf 100644
--- a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/bootstrap.yml
+++ b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/application.yml
@@ -1,11 +1,12 @@
 server:
-  session-timeout: 1800
   port: 48081
 spring:
   application:
     name: RateLimitCalleeService
   cloud:
+    loadbalancer:
+      configurations: default
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://9.135.224.139:8091
       discovery:
-        namespace: Test
\ No newline at end of file
+        namespace: default
\ No newline at end of file
diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java
index 113302d12..31c0d6f70 100644
--- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java
+++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignBlockingLoadBalancerClient.java
@@ -20,7 +20,6 @@ package com.tencent.cloud.polaris.circuitbreaker.feign;
 import feign.Client;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
 
diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml
index d0c8e8f26..523a41b03 100644
--- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml
+++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml
@@ -31,6 +31,12 @@
         </dependency>
         <!-- Spring Cloud Tencent dependencies end -->
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Polaris dependencies start -->
         <dependency>
             <groupId>com.tencent.polaris</groupId>
diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml
index 91968ea7a..cbfd8ad68 100644
--- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml
+++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml
@@ -34,6 +34,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-loadbalancer</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- Polaris dependencies start -->