aliyun · panxiaojun233 · Feb 23, 2023 · Jan 7, 2023 · Feb 23, 2023 · Feb 23, 2023
diff --git a/mse-simple-demo/A/build.sh b/mse-simple-demo/A/build.sh
@@ -3,7 +3,7 @@ set -e
 
 cd "$(dirname "$0")"
 
-docker build . -t ${REGISTRY}spring-cloud-a:1.2.0
+docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-a:1.2.0
 
 if [ -n "${REGISTRY}" ]; then
     docker push ${REGISTRY}spring-cloud-a:1.2.0

diff --git a/mse-simple-demo/A/pom.xml b/mse-simple-demo/A/pom.xml
@@ -14,28 +14,39 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.6.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Greenwich.SR3</spring-cloud.version>
+        <spring-cloud.version>2021.0.4</spring-cloud.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <version>2.1.1.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -91,6 +102,12 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>2.2.5.RELEASE</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

diff --git a/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/AApplication.java b/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/AApplication.java
@@ -2,10 +2,12 @@
 package com.alibabacloud.mse.demo.a;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.web.client.RestTemplate;
@@ -21,6 +23,7 @@
  */
 @SpringBootApplication
 @EnableSwagger2
+@EnableFeignClients
 public class AApplication {
 
     public static void main(String[] args) {

diff --git a/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/AController.java b/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/AController.java
@@ -1,6 +1,8 @@
 package com.alibabacloud.mse.demo.a;
 
+import com.alibabacloud.mse.demo.a.service.FeignClient;
 import com.alibabacloud.mse.demo.b.service.HelloServiceB;
+import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -37,6 +39,9 @@ class AController {
     @Qualifier("loadBalancedRestTemplate")
     private RestTemplate loadBalancedRestTemplate;
 
+    @Autowired
+    private FeignClient feignClient;
+
     @Autowired
     @Qualifier("restTemplate")
     private RestTemplate restTemplate;
@@ -50,15 +55,11 @@ class AController {
     @Autowired
     String serviceTag;
 
-    @Autowired
-    ThreadPoolTaskExecutor taskExecutor;
-
     @Value("${custom.config.value}")
     private String configValue;
 
     private String currentZone;
 
-
     @PostConstruct
     private void init() {
         try {
@@ -92,9 +93,48 @@ public String a(HttpServletRequest request) throws ExecutionException, Interrupt
         }
 
         String result = loadBalancedRestTemplate.getForObject("http://sc-B/b", String.class);
-//        String result = taskExecutor.submit(() ->
-//                restTemplate.getForObject("http://sc-B/b", String.class)
-//        ).get();
+
+        return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
+                "[config=" + configValue + "]" + " -> " + result;
+    }
+
+    @ApiOperation(value = "HTTP 全链路灰度入口 a调用b和c", tags = {"入口应用"})
+    @GetMapping("/a2bc")
+    public String a2bc(HttpServletRequest request) throws ExecutionException, InterruptedException {
+        StringBuilder headerSb = new StringBuilder();
+        Enumeration<String> enumeration = request.getHeaderNames();
+        while (enumeration.hasMoreElements()) {
+            String headerName = enumeration.nextElement();
+            Enumeration<String> val = request.getHeaders(headerName);
+            while (val.hasMoreElements()) {
+                String headerVal = val.nextElement();
+                headerSb.append(headerName + ":" + headerVal + ",");
+            }
+        }
+
+        String resultB = "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
+                "[config=" + configValue + "]" + " -> " + loadBalancedRestTemplate.getForObject("http://sc-B/b", String.class);
+        String resultA = "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
+                "[config=" + configValue + "]" + " -> " + loadBalancedRestTemplate.getForObject("http://sc-C/c", String.class);
+
+        return resultA + "\n" + resultB;
+    }
+
+    @ApiOperation(value = "HTTP 全链路灰度入口 feign", tags = {"入口应用"})
+    @GetMapping("/aByFeign")
+    public String aByFeign(HttpServletRequest request) throws ExecutionException, InterruptedException {
+        StringBuilder headerSb = new StringBuilder();
+        Enumeration<String> enumeration = request.getHeaderNames();
+        while (enumeration.hasMoreElements()) {
+            String headerName = enumeration.nextElement();
+            Enumeration<String> val = request.getHeaders(headerName);
+            while (val.hasMoreElements()) {
+                String headerVal = val.nextElement();
+                headerSb.append(headerName + ":" + headerVal + ",");
+            }
+        }
+
+        String result = feignClient.bByFeign("test");
 
         return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
                 "[config=" + configValue + "]" + " -> " + result;
@@ -106,7 +146,7 @@ public String flow(HttpServletRequest request) throws ExecutionException, Interr
 
         ResponseEntity<String> responseEntity = loadBalancedRestTemplate.getForEntity("http://sc-B/flow", String.class);
         HttpStatus status = responseEntity.getStatusCode();
-        String result = responseEntity.getBody() + status.value();
+        String result = responseEntity.getBody() + " code:" + status.value();
 
         return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
                 "[config=" + configValue + "]" + " -> " + result;
@@ -116,13 +156,13 @@ public String flow(HttpServletRequest request) throws ExecutionException, Interr
     @ApiOperation(value = "测试热点规则", tags = {"流量防护"})
     @GetMapping("/params/{hot}")
     public String params(HttpServletRequest request,@PathVariable("hot") String hot) throws ExecutionException, InterruptedException {
-        ResponseEntity<String> responseEntity = loadBalancedRestTemplate.getForEntity("http://sc-B/params/"+hot, String.class);
+        ResponseEntity<String> responseEntity = loadBalancedRestTemplate.getForEntity("http://sc-B/params/" + hot, String.class);
 
         HttpStatus status = responseEntity.getStatusCode();
-        String result = responseEntity.getBody() + status.value();
+        String result = responseEntity.getBody() + " code:" + status.value();
 
         return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
-                "[config=" + configValue + "]" + " -> " + result;
+                "[config=" + configValue + "]" + " params:" + hot + " -> " + result;
     }
 
     @ApiOperation(value = "测试隔离规则", tags = { "流量防护"})
@@ -131,7 +171,7 @@ public String isolate(HttpServletRequest request) throws ExecutionException, Int
         ResponseEntity<String> responseEntity = loadBalancedRestTemplate.getForEntity("http://sc-B/isolate", String.class);
 
         HttpStatus status = responseEntity.getStatusCode();
-        String result = responseEntity.getBody() + status.value();
+        String result = responseEntity.getBody() + " code:" + status.value();
 
         return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
                 "[config=" + configValue + "]" + " -> " + result;
@@ -146,6 +186,15 @@ public String spring_boot(HttpServletRequest request) {
                 " -> " + result;
     }
 
+    @GetMapping("/sql")
+    public String sql(HttpServletRequest request) {
+
+        String url = "http://sc-B/sql?" + request.getQueryString();
+        String result = loadBalancedRestTemplate.getForObject(url, String.class);
+        return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
+                "[config=" + configValue + "]" + " -> " + result;
+    }
+
     @ApiOperation(value = "HTTP 全链路灰度入口", tags = {"入口应用"})
     @GetMapping("/a-zone")
     public String aZone(HttpServletRequest request) {
@@ -177,10 +226,10 @@ public String dubbo(HttpServletRequest request) {
             }
         }
         return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
-                helloServiceB.hello("A");
+                helloServiceB.hello(JSON.toJSONString(request.getParameterMap()));
     }
 
-    @ApiOperation(value = "Dubbo 全链路灰度入口", tags = {"入口应用"})
+    @ApiOperation(value = "Dubbo 限流测试", tags = {"入口应用"})
     @GetMapping("/dubbo-flow")
     public String dubbo_flow(HttpServletRequest request) {
         StringBuilder headerSb = new StringBuilder();
@@ -197,7 +246,7 @@ public String dubbo_flow(HttpServletRequest request) {
                 helloServiceB.hello("A");
     }
 
-    @ApiOperation(value = "Dubbo 全链路灰度入口", tags = {"入口应用"})
+    @ApiOperation(value = "Dubbo 热点测试", tags = {"入口应用"})
     @GetMapping("/dubbo-params/{hot}")
     public String dubbo_params(HttpServletRequest request, @PathVariable("hot") String hot) {
         StringBuilder headerSb = new StringBuilder();
@@ -210,11 +259,11 @@ public String dubbo_params(HttpServletRequest request, @PathVariable("hot") Stri
                 headerSb.append(headerName + ":" + headerVal + ",");
             }
         }
-        return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
+        return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " params:" + hot + " -> " +
                 helloServiceB.hello(hot);
     }
 
-    @ApiOperation(value = "Dubbo 全链路灰度入口", tags = {"入口应用"})
+    @ApiOperation(value = "Dubbo 隔离测试", tags = {"入口应用"})
     @GetMapping("/dubbo-isolate")
     public String dubbo_isolate(HttpServletRequest request) {
         StringBuilder headerSb = new StringBuilder();
@@ -239,6 +288,4 @@ public String swagger(@ApiParam(name = "name", value = "我是姓名", required
                           @ApiParam(name = "aliware-products", value = "我是购买阿里云原生产品列表", required = true) List<String> aliwareProducts) {
         return "hello swagger";
     }
-
-
 }
diff --git a/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/Swagger2Config.java b/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/Swagger2Config.java
@@ -2,6 +2,8 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.spi.DocumentationType;
@@ -11,7 +13,7 @@
  * Swagger2API文档的配置
  */
 @Configuration
-public class Swagger2Config {
+public class Swagger2Config extends WebMvcConfigurationSupport {
 
     @Bean
     public Docket api() {
@@ -21,4 +23,12 @@ public Docket api() {
             .paths(PathSelectors.any())
             .build();
     }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.
+                addResourceHandler("/swagger-ui/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
+                .resourceChain(false);
+    }
 }
diff --git a/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/SwaggerBeanPostProcessor.java b/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/SwaggerBeanPostProcessor.java
@@ -0,0 +1,46 @@
+package com.alibabacloud.mse.demo.a;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
+import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
+import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+public class SwaggerBeanPostProcessor implements BeanPostProcessor {
+    @Override
+    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+        if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider)
+        {
+            List<RequestMappingInfoHandlerMapping> handlerMappings = getHandlerMappings(bean);
+            customizeSpringfoxHandlerMappings(handlerMappings);
+        }
+        return bean;
+    }
+
+    private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
+        List<T> copy = mappings.stream()
+                .filter(mapping -> mapping.getPatternParser() == null)
+                .collect(Collectors.toList());
+        mappings.clear();
+        mappings.addAll(copy);
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
+        try {
+            Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
+            field.setAccessible(true);
+            return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
+        }
+        catch (IllegalArgumentException | IllegalAccessException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+}
diff --git a/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/service/FeignClient.java b/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/service/FeignClient.java
@@ -0,0 +1,17 @@
+package com.alibabacloud.mse.demo.a.service;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author yushan
+ * @date 2023年02月21日
+ */
+@org.springframework.cloud.openfeign.FeignClient("sc-B")
+public interface FeignClient {
+
+    @GetMapping("/bByFeign")
+    String bByFeign(@RequestParam("s") String s);
+}
diff --git a/mse-simple-demo/A/src/main/resources/application.properties b/mse-simple-demo/A/src/main/resources/application.properties
@@ -7,7 +7,6 @@ server.port=20001
 spring.cloud.nacos.discovery.server-addr=${nacos.host}:8848
 spring.cloud.nacos.discovery.namespace=${nacos.namespace}
 
-
 dubbo.application.id=dubbo-provider-A
 dubbo.application.name=dubbo-provider-A
 dubbo.protocol.id=dubbo

diff --git a/mse-simple-demo/B/build.sh b/mse-simple-demo/B/build.sh
@@ -2,7 +2,7 @@
 
 cd "$(dirname "$0")"
 
-docker build . -t ${REGISTRY}spring-cloud-b:1.2.0
+docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-b:1.2.0
 
 if [ -n "${REGISTRY}" ]; then
     docker push ${REGISTRY}spring-cloud-b:1.2.0