update spring boot version to latest

flystar32 · EndlessSeeker · commit a97fc4cc8c23 · 2024-12-18T11:34:11.000+08:00
diff --git a/mse-simple-demo/A/src/main/resources/application.properties b/mse-simple-demo/A/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-nacos.host=mse-5d174c00-p.nacos-ans.mse.aliyuncs.com
+nacos.host=nacos-server
 nacos.namespace=public
 
 
diff --git a/mse-simple-demo/B/Dockerfile b/mse-simple-demo/B/Dockerfile
@@ -1,9 +1,7 @@
-# syntax=docker/dockerfile:1.4
-
-FROM maven:3-eclipse-temurin-8 as build
+FROM maven:3.9.9-eclipse-temurin-17 as build
 
 COPY <<EOF /root/.m2/settings.xml
-<?xml version=\"1.0\"?>
+<?xml version="1.0"?>
 <settings>
     <mirrors>
         <mirror>
@@ -23,7 +21,7 @@ COPY ./ ./
 RUN --mount=type=cache,target=/root/.m2/repository/ \
     mvn clean package --batch-mode
 
-FROM eclipse-temurin:8-jdk
+FROM eclipse-temurin:17-jdk
 
 RUN apt-get update && apt-get install -y \
     vim unzip netcat-openbsd telnet tcpdump iproute2 lsof \
diff --git a/mse-simple-demo/B/build.sh b/mse-simple-demo/B/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-b
-export VERSION="${VERSION:-3.0.8}"
+export VERSION="${VERSION:-3.1.0}"
 
 set -e
 
diff --git a/mse-simple-demo/B/pom.xml b/mse-simple-demo/B/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>B</artifactId>
-    <version>3.0.8</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <name>B</name>
@@ -14,11 +14,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>8</java.version>
-        <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
-        <spring-cloud.version>Hoxton.SR1</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.1.1.RELEASE</spring-cloud-alibaba.version>
-        <dubbo.version>2.7.23</dubbo.version>
+        <java.version>17</java.version>
+        <spring-boot.version>3.2.4</spring-boot.version>
+        <spring-cloud.version>2023.0.1</spring-cloud.version>
+        <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
+        <dubbo.version>3.3.0</dubbo.version>
     </properties>
 
     <dependencies>
@@ -34,14 +34,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>1.3.0</version>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
         </dependency>
 
         <!--  Dubbo -->
@@ -77,14 +73,14 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.3</version>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <version>3.5.9</version>
         </dependency>
 
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.2.15</version>
+            <artifactId>druid-spring-boot-3-starter</artifactId>
+            <version>1.2.24</version>
         </dependency>
 
         <dependency>
@@ -102,13 +98,12 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>2.2.5.RELEASE</version>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>2.2.5.RELEASE</version>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.19</version>
         </dependency>
 
     </dependencies>
@@ -145,9 +140,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring-boot.version}</version>
-                <configuration>
-                    <mainClass>com.alibabacloud.mse.demo.b.BApplication</mainClass>
-                </configuration>
                 <executions>
                     <execution>
                         <id>repackage</id>
diff --git a/mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/b/BController.java b/mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/b/BController.java
@@ -1,6 +1,6 @@
 package com.alibabacloud.mse.demo.b;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.alibabacloud.mse.demo.c.service.HelloServiceC;
 import com.alibabacloud.mse.demo.common.TrafficAttribute;
 import com.alibabacloud.mse.demo.entity.User;
diff --git a/mse-simple-demo/B/src/main/resources/application.properties b/mse-simple-demo/B/src/main/resources/application.properties
@@ -18,7 +18,4 @@ dubbo.scan.base-packages=com.alibabacloud.mse.demo
 dubbo.protocol.port=12080
 dubbo.registry.check=false
 
-spring.profiles.active=druid
-
-management.endpoints.web.exposure.include=info,health,prometheus
-management.metrics.tags.application=spring-cloud-b
+spring.profiles.active=druid
diff --git a/mse-simple-demo/C/Dockerfile b/mse-simple-demo/C/Dockerfile
@@ -1,9 +1,7 @@
-# syntax=docker/dockerfile:1.4
-
-FROM maven:3-eclipse-temurin-8 as build
+FROM maven:3.9.9-eclipse-temurin-17 as build
 
 COPY <<EOF /root/.m2/settings.xml
-<?xml version=\"1.0\"?>
+<?xml version="1.0"?>
 <settings>
     <mirrors>
         <mirror>
@@ -23,7 +21,7 @@ COPY ./ ./
 RUN --mount=type=cache,target=/root/.m2/repository/ \
     mvn clean package --batch-mode
 
-FROM eclipse-temurin:8-jdk
+FROM eclipse-temurin:17-jdk
 
 RUN apt-get update && apt-get install -y \
     vim unzip netcat-openbsd telnet tcpdump iproute2 lsof \
diff --git a/mse-simple-demo/C/build.sh b/mse-simple-demo/C/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-c
-export VERSION="${VERSION:-3.0.8}"
+export VERSION="${VERSION:-3.1.0}"
 
 set -e
 
diff --git a/mse-simple-demo/C/pom.xml b/mse-simple-demo/C/pom.xml
@@ -14,11 +14,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>8</java.version>
-        <spring-boot.version>1.5.1.RELEASE</spring-boot.version>
-        <spring-cloud.version>Edgware.SR2</spring-cloud.version>
-        <spring-cloud-alibaba.version>1.5.0.RELEASE</spring-cloud-alibaba.version>
-        <dubbo.version>2.7.23</dubbo.version>
+        <java.version>17</java.version>
+        <spring-boot.version>3.2.4</spring-boot.version>
+        <spring-cloud.version>2023.0.1</spring-cloud.version>
+        <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
+        <dubbo.version>3.3.0</dubbo.version>
         <rocketmq.version>4.9.8</rocketmq.version>
     </properties>
 
diff --git a/mse-simple-demo/SpringCloudGateway/pom.xml b/mse-simple-demo/SpringCloudGateway/pom.xml
@@ -25,6 +25,10 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -34,11 +38,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>1.1.0</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -92,14 +91,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
diff --git a/mse-simple-demo/SpringCloudGateway/src/main/java/com/alibabcloud/mse/demo/ModifyPathGatewayFilterFactory.java b/mse-simple-demo/SpringCloudGateway/src/main/java/com/alibabcloud/mse/demo/ModifyPathGatewayFilterFactory.java
diff --git a/mse-simple-demo/SpringCloudGateway/src/main/resources/application.properties b/mse-simple-demo/SpringCloudGateway/src/main/resources/application.properties
@@ -9,22 +9,22 @@ spring.cloud.nacos.discovery.namespace=${nacos.namespace}
 
 
 spring.cloud.gateway.routes[0].id=sc-A
-spring.cloud.gateway.routes[0].uri=lb://sc-A
+spring.cloud.gateway.routes[0].uri=lb://sc-A:20001
 spring.cloud.gateway.routes[0].predicates[0]=Path=/A/**
-spring.cloud.gateway.routes[0].filters[0]=RewritePath=/A/(?<segment>.*), /${segment}
+spring.cloud.gateway.routes[0].filters[0]=RewritePath=/A/, /
 
 
 spring.cloud.gateway.routes[1].id=sc-B
-spring.cloud.gateway.routes[1].uri=lb://sc-B
+spring.cloud.gateway.routes[1].uri=lb://sc-B:20002
 spring.cloud.gateway.routes[1].predicates[0]=Path=/B/**
-spring.cloud.gateway.routes[1].filters[0]=RewritePath=/B/(?<segment>.*), /${segment}
+spring.cloud.gateway.routes[1].filters[0]=RewritePath=/B/, /
 
 
 
 spring.cloud.gateway.routes[2].id=sc-C
-spring.cloud.gateway.routes[2].uri=lb://sc-C
+spring.cloud.gateway.routes[2].uri=lb://sc-C:20003
 spring.cloud.gateway.routes[2].predicates[0]=Path=/C/**
-spring.cloud.gateway.routes[2].filters[0]=RewritePath=/C/(?<segment>.*), /${segment}
+spring.cloud.gateway.routes[2].filters[0]=RewritePath=/C/, /
 
 
 
@@ -33,6 +33,3 @@ spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.servlet.content-type=text/html
 spring.thymeleaf.suffix=.html
 spring.thymeleaf.cache=false
-
-management.endpoints.web.exposure.include=prometheus
-management.metrics.tags.application=spring-cloud-gateway

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-nacos.host=mse-5d174c00-p.nacos-ans.mse.aliyuncs.com`
	`1`	`+nacos.host=nacos-server`
`2`	`2`	`nacos.namespace=public`
`3`	`3`
`4`	`4`