Merge branch 'spring-boot'

close #116

Author: robberphex

mse-simple-demo/A/Dockerfile

@@ -36,4 +36,4 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
 
 EXPOSE 20001
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar /app/target/A-1.0.0.jar"]
+CMD ["java -jar /app/target/A.jar"]

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.0.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

mse-simple-demo/A/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>A</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>A</name>
@@ -107,8 +107,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
+        <finalName>${project.artifactId}</finalName>
     </build>
 
-
 </project>
-

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;
@@ -24,12 +25,20 @@ public static void main(String[] args) {
         SpringApplication.run(AApplication.class, args);
     }
 
-    @Bean
+    @Bean(name = "loadBalancedRestTemplate")
     @LoadBalanced
-    RestTemplate restTemplate() {
+    RestTemplate loadBalancedRestTemplate() {
         return new RestTemplate();
     }
 
+    @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();
+    }
+
     @Bean(name = "serviceTag")
     String serviceTag() {
         String tag = parseServiceTag("/etc/podinfo/labels");

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AController.java

@@ -12,6 +12,7 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -30,12 +31,17 @@
 class AController {
 
     @Autowired
-    RestTemplate restTemplate;
+    @Qualifier("loadBalancedRestTemplate")
+    private RestTemplate loadBalancedRestTemplate;
+
+    @Autowired
+    @Qualifier("restTemplate")
+    private RestTemplate restTemplate;
 
     @Autowired
     InetUtils inetUtils;
 
-    @Reference(application = "${dubbo.application.id}", version = "1.0.0")
+    @Reference(application = "${dubbo.application.id}", version = "1.1.0")
     private HelloServiceB helloServiceB;
 
     @Autowired
@@ -81,13 +87,21 @@ public String a(HttpServletRequest request) throws ExecutionException, Interrupt
             }
         }
 
-        String result=restTemplate.getForObject("http://sc-B/b", String.class);
+        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;
+        return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
+                "[config=" + configValue + "]" + " -> " + result;
+    }
+
+    @GetMapping("/spring_boot")
+    public String spring_boot(HttpServletRequest request) {
+        String result = restTemplate.getForObject("http://sc-b:20002/spring_boot", String.class);
+
+        return "A" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" +
+                " -> " + result;
     }
 
     @ApiOperation(value = "HTTP 全链路灰度入口", tags = {"入口应用"})
@@ -104,7 +118,7 @@ public String aZone(HttpServletRequest request) {
             }
         }
         return "A" + serviceTag + "[" + currentZone + "]" + " -> " +
-                restTemplate.getForObject("http://sc-B/b-zone", String.class);
+                loadBalancedRestTemplate.getForObject("http://sc-B/b-zone", String.class);
     }
 
     @ApiOperation(value = "Dubbo 全链路灰度入口", tags = {"入口应用"})

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceAImpl.java

@@ -6,13 +6,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.commons.util.InetUtils;
 
-@Service(version = "1.0.0")
+@Service(version = "1.1.0")
 public class HelloServiceAImpl implements HelloServiceA {
 
     @Autowired
     InetUtils inetUtils;
 
-    @Reference(application = "${dubbo.application.id}", version = "1.0.0")
+    @Reference(application = "${dubbo.application.id}", version = "1.1.0")
     private HelloServiceB helloServiceB;
 
     @Autowired

mse-simple-demo/B/Dockerfile

@@ -36,4 +36,4 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
 
 EXPOSE 20002
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar /app/target/B-1.0.0.jar"]
+CMD ["java -jar /app/target/B.jar"]

mse-simple-demo/B/build.sh

@@ -2,5 +2,8 @@
 
 cd "$(dirname "$0")"
 
-mvn clean package
-docker build . -t spring-cloud-b:1.0.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

mse-simple-demo/B/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>B</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>B</name>
@@ -88,6 +88,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
+        <finalName>${project.artifactId}</finalName>
     </build>
 
 

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
@@ -20,13 +26,20 @@ public static void main(String[] args) {
         SpringApplication.run(BApplication.class, args);
     }
 
-
-    @Bean
+    @Bean(name = "loadBalancedRestTemplate")
     @LoadBalanced
-    RestTemplate restTemplate() {
+    RestTemplate loadBalancedRestTemplate() {
         return new RestTemplate();
     }
 
+    @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();
+    }
+
     @Bean(name = "serviceTag")
     String serviceTag() {
         String tag = parseServiceTag("/etc/podinfo/labels");