fix restTemplate

robberphex · robberphex · commit a1acf8f809b5 · 2022-12-15T14:45:33.000+08:00
diff --git a/mse-simple-demo/A/build.sh b/mse-simple-demo/A/build.sh
@@ -3,5 +3,8 @@ set -e
 
 cd "$(dirname "$0")"
 
-mvn clean package
-docker build . -t spring-cloud-a:1.1.0
+docker build . -t ${REGISTRY}spring-cloud-a:1.1.0
+
+if [ -n "${REGISTRY}" ]; then
+    docker push ${REGISTRY}spring-cloud-a:1.1.0
+fi
diff --git a/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AApplication.java b/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AApplication.java
@@ -4,6 +4,7 @@
 import org.apache.commons.lang3.StringUtils;
 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.context.annotation.Bean;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -31,9 +32,11 @@ RestTemplate loadBalancedRestTemplate() {
     }
 
     @Bean(name = "restTemplate")
-    @LoadBalanced
     RestTemplate restTemplate() {
-        return new RestTemplate();
+        return new RestTemplateBuilder(rt -> rt.getInterceptors().add((request, body, execution) -> {
+            request.getHeaders().add("Connection", "close");
+            return execution.execute(request, body);
+        })).build();
     }
 
     @Bean(name = "serviceTag")
diff --git a/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AController.java b/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AController.java
@@ -98,7 +98,7 @@ public String a(HttpServletRequest request) throws ExecutionException, Interrupt
 
     @GetMapping("/spring_boot")
     public String spring_boot(HttpServletRequest request) {
-        String result = restTemplate.getForObject("http://sc-b/spring_boot", String.class);
+        String result = restTemplate.getForObject("http://sc-b:20002/spring_boot", String.class);
 
         return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
                 " -> " + result;
diff --git a/mse-simple-demo/B/build.sh b/mse-simple-demo/B/build.sh
@@ -2,5 +2,8 @@
 
 cd "$(dirname "$0")"
 
-mvn clean package
-docker build . -t spring-cloud-b:1.1.0
+docker build . -t ${REGISTRY}spring-cloud-b:1.1.0
+
+if [ -n "${REGISTRY}" ]; then
+    docker push ${REGISTRY}spring-cloud-b:1.1.0
+fi
diff --git a/mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/BApplication.java b/mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/BApplication.java
@@ -4,13 +4,19 @@
 import org.apache.commons.lang3.StringUtils;
 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.context.annotation.Bean;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.client.ClientHttpRequest;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.net.URI;
 import java.util.Properties;
 
 @SpringBootApplication
@@ -27,9 +33,11 @@ RestTemplate loadBalancedRestTemplate() {
     }
 
     @Bean(name = "restTemplate")
-    @LoadBalanced
     RestTemplate restTemplate() {
-        return new RestTemplate();
+        return new RestTemplateBuilder(rt -> rt.getInterceptors().add((request, body, execution) -> {
+            request.getHeaders().add("Connection", "close");
+            return execution.execute(request, body);
+        })).build();
     }
 
     @Bean(name = "serviceTag")
diff --git a/mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/BController.java b/mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/BController.java
@@ -65,9 +65,9 @@ public String bZone(HttpServletRequest request) {
                 loadBalancedRestTemplate.getForObject("http://sc-C/c-zone", String.class);
     }
 
-    @GetMapping("/spring-boot")
+    @GetMapping("/spring_boot")
     public String spring_boot(HttpServletRequest request) {
         return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
-                restTemplate.getForObject("http://sc-c/spring-boot", String.class);
+                restTemplate.getForObject("http://sc-c:20003/spring_boot", String.class);
     }
 }
diff --git a/mse-simple-demo/C/Dockerfile b/mse-simple-demo/C/Dockerfile
@@ -2,9 +2,6 @@
 
 FROM maven:3-eclipse-temurin-8-alpine as build
 
-# copy arthas
-COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
-
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
 COPY <<EOF /root/.m2/settings.xml
@@ -35,6 +32,9 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
 
 FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
 
+# copy arthas
+COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
+
 COPY --from=build /app/target/C.jar /app/target/C.jar
 
 EXPOSE 20003
diff --git a/mse-simple-demo/C/build.sh b/mse-simple-demo/C/build.sh
@@ -3,5 +3,8 @@ set -e
 
 cd "$(dirname "$0")"
 
-mvn clean package
-docker build . -t spring-cloud-c:1.1.0
+docker build . -t ${REGISTRY}spring-cloud-c:1.1.0
+
+if [ -n "${REGISTRY}" ]; then
+    docker push ${REGISTRY}spring-cloud-c:1.1.0
+fi
diff --git a/mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/CApplication.java b/mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/CApplication.java
@@ -3,6 +3,7 @@
 import org.apache.commons.lang3.StringUtils;
 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.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
@@ -26,9 +27,11 @@ RestTemplate loadBalancedRestTemplate() {
     }
 
     @Bean(name = "restTemplate")
-    @LoadBalanced
     RestTemplate restTemplate() {
-        return new RestTemplate();
+        return new RestTemplateBuilder(rt -> rt.getInterceptors().add((request, body, execution) -> {
+            request.getHeaders().add("Connection", "close");
+            return execution.execute(request, body);
+        })).build();
     }
 
     @Bean(name = "serviceTag")
diff --git a/mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/CController.java b/mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/CController.java
@@ -65,7 +65,7 @@ public String cZone(HttpServletRequest request) {
         return "C" + serviceTag + "[" + currentZone + "]";
     }
 
-    @GetMapping("/spring-boot")
+    @GetMapping("/spring_boot")
     public String spring_boot(HttpServletRequest request) {
         return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
     }
diff --git a/mse-simple-demo/gateway/Dockerfile b/mse-simple-demo/gateway/Dockerfile
@@ -1,11 +1,42 @@
+# syntax=docker/dockerfile:1.3-labs
+
+FROM maven:3-eclipse-temurin-8-alpine as build
+
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
+COPY <<EOF /root/.m2/settings.xml
+<?xml version=\"1.0\"?>
+<settings>
+    <mirrors>
+        <mirror>
+            <id>alimaven</id>
+            <name>aliyun maven</name>
+            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
+            <mirrorOf>central</mirrorOf>
+        </mirror>
+        <mirror>
+            <id>maven-default-http-blocker</id>
+            <mirrorOf>!*</mirrorOf>
+            <url>http://0.0.0.0/</url>
+        </mirror>
+    </mirrors>
+</settings>
+EOF
+
+WORKDIR /app
+
+COPY ./ ./
+
+RUN --mount=type=cache,target=/root/.m2/repository/ \
+  mvn clean package --batch-mode
+
 FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
 
-WORKDIR /app
-COPY /target/gateway.jar /app
+COPY --from=build /app/target/gateway.jar /app/target/gateway.jar
 
 EXPOSE 20000
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar /app/gateway.jar"]
+CMD ["java -jar /app/target/gateway.jar"]
diff --git a/mse-simple-demo/gateway/build.sh b/mse-simple-demo/gateway/build.sh
@@ -3,5 +3,8 @@ set -e
 
 cd "$(dirname "$0")"
 
-mvn clean package
-docker build . -t spring-cloud-zuul:1.1.0
+docker build . -t ${REGISTRY}spring-cloud-zuul:1.1.0
+
+if [ -n "${REGISTRY}" ]; then
+    docker push ${REGISTRY}spring-cloud-zuul:1.1.0
+fi
diff --git a/mse-simple-demo/gateway/src/main/java/com/alibabacloud/mse/demo/DemoController.java b/mse-simple-demo/gateway/src/main/java/com/alibabacloud/mse/demo/DemoController.java
@@ -4,12 +4,17 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
@@ -18,14 +23,16 @@
 @Controller
 public class DemoController {
 
+    @Autowired
+    @Qualifier("restTemplate")
+    private RestTemplate restTemplate;
 
     @Value("${demo.qps:100}")
     private int qps;
 
     @Value("${enable.mq.invoke:false}")
     private boolean enableMqInvoke;
 
-
     @Value("${background.color:white}")
     private String backgroundColor;
 
@@ -47,6 +54,13 @@ public String index(Model model) {
         return "index";
     }
 
+    @GetMapping("/spring_boot")
+    @ResponseBody
+    public String spring_boot(HttpServletRequest request) {
+        String result = restTemplate.getForObject("http://sc-a:20001/spring_boot", String.class);
+        return result;
+    }
+
     @PostConstruct
     private void flow() {
         if (qps > 0) {
diff --git a/mse-simple-demo/gateway/src/main/java/com/alibabacloud/mse/demo/ZuulApplication.java b/mse-simple-demo/gateway/src/main/java/com/alibabacloud/mse/demo/ZuulApplication.java
@@ -18,7 +18,11 @@
 
 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.netflix.zuul.EnableZuulProxy;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 @EnableZuulProxy
@@ -28,4 +32,11 @@ public static void main(String[] args) {
         SpringApplication.run(ZuulApplication.class, args);
     }
 
+    @Bean(name = "restTemplate")
+    RestTemplate restTemplate() {
+        return new RestTemplateBuilder(rt -> rt.getInterceptors().add((request, body, execution) -> {
+            request.getHeaders().add("Connection", "close");
+            return execution.execute(request, body);
+        })).build();
+    }
 }
diff --git a/mse-simple-demo/helm/mse-simple-demo/templates/sc-a-svc.yaml b/mse-simple-demo/helm/mse-simple-demo/templates/sc-a-svc.yaml
@@ -5,8 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
-    - name: port-1
-      port: 20001
+    - port: 20001
       protocol: TCP
       targetPort: 20001
   selector:
diff --git a/mse-simple-demo/helm/mse-simple-demo/templates/sc-b-svc.yaml b/mse-simple-demo/helm/mse-simple-demo/templates/sc-b-svc.yaml
@@ -5,8 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
-    - name: port-1
-      port: 20002
+    - port: 20002
       protocol: TCP
       targetPort: 20002
   selector:
diff --git a/mse-simple-demo/helm/mse-simple-demo/templates/sc-c-svc.yaml b/mse-simple-demo/helm/mse-simple-demo/templates/sc-c-svc.yaml
@@ -5,8 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
-    - name: port-1
-      port: 20003
+    - port: 20003
       protocol: TCP
       targetPort: 20003
   selector:

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,9 @@ public String bZone(HttpServletRequest request) {`
`65`	`65`	`loadBalancedRestTemplate.getForObject("http://sc-C/c-zone", String.class);`
`66`	`66`	`}`
`67`	`67`
`68`		`- @GetMapping("/spring-boot")`
	`68`	`+ @GetMapping("/spring_boot")`
`69`	`69`	`public String spring_boot(HttpServletRequest request) {`
`70`	`70`	`return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +`
`71`		`- restTemplate.getForObject("http://sc-c/spring-boot", String.class);`
	`71`	`+ restTemplate.getForObject("http://sc-c:20003/spring_boot", String.class);`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public String cZone(HttpServletRequest request) {`
`65`	`65`	`return "C" + serviceTag + "[" + currentZone + "]";`
`66`	`66`	`}`
`67`	`67`
`68`		`- @GetMapping("/spring-boot")`
	`68`	`+ @GetMapping("/spring_boot")`
`69`	`69`	`public String spring_boot(HttpServletRequest request) {`
`70`	`70`	`return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";`
`71`	`71`	`}`