Skip to content

Commit a97fc4c

Browse files
flystar32EndlessSeeker
flystar32
authored and
EndlessSeeker
committed
update spring boot version to latest
1 parent 36656a5 commit a97fc4c

File tree

12 files changed

+42
-122
lines changed

12 files changed

+42
-122
lines changed

‎mse-simple-demo/A/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
nacos.host=mse-5d174c00-p.nacos-ans.mse.aliyuncs.com
1+
nacos.host=nacos-server
22
nacos.namespace=public
33

44

‎mse-simple-demo/B/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
# syntax=docker/dockerfile:1.4
2-
3-
FROM maven:3-eclipse-temurin-8 as build
1+
FROM maven:3.9.9-eclipse-temurin-17 as build
42

53
COPY <<EOF /root/.m2/settings.xml
6-
<?xml version=\"1.0\"?>
4+
<?xml version="1.0"?>
75
<settings>
86
<mirrors>
97
<mirror>
@@ -23,7 +21,7 @@ COPY ./ ./
2321
RUN --mount=type=cache,target=/root/.m2/repository/ \
2422
mvn clean package --batch-mode
2523

26-
FROM eclipse-temurin:8-jdk
24+
FROM eclipse-temurin:17-jdk
2725

2826
RUN apt-get update && apt-get install -y \
2927
vim unzip netcat-openbsd telnet tcpdump iproute2 lsof \

‎mse-simple-demo/B/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export REGISTRY=${REGISTRY}
44

55
export appName=spring-cloud-b
6-
export VERSION="${VERSION:-3.0.8}"
6+
export VERSION="${VERSION:-3.1.0}"
77

88
set -e
99

‎mse-simple-demo/B/pom.xml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>B</artifactId>
8-
<version>3.0.8</version>
8+
<version>3.1.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>B</name>
@@ -14,11 +14,11 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17-
<java.version>8</java.version>
18-
<spring-boot.version>2.2.0.RELEASE</spring-boot.version>
19-
<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
20-
<spring-cloud-alibaba.version>2.1.1.RELEASE</spring-cloud-alibaba.version>
21-
<dubbo.version>2.7.23</dubbo.version>
17+
<java.version>17</java.version>
18+
<spring-boot.version>3.2.4</spring-boot.version>
19+
<spring-cloud.version>2023.0.1</spring-cloud.version>
20+
<spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
21+
<dubbo.version>3.3.0</dubbo.version>
2222
</properties>
2323

2424
<dependencies>
@@ -34,14 +34,10 @@
3434
<groupId>org.springframework.boot</groupId>
3535
<artifactId>spring-boot-starter-web</artifactId>
3636
</dependency>
37+
3738
<dependency>
38-
<groupId>org.springframework.boot</groupId>
39-
<artifactId>spring-boot-starter-actuator</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>io.micrometer</groupId>
43-
<artifactId>micrometer-registry-prometheus</artifactId>
44-
<version>1.3.0</version>
39+
<groupId>org.springframework.cloud</groupId>
40+
<artifactId>spring-cloud-loadbalancer</artifactId>
4541
</dependency>
4642

4743
<!-- Dubbo -->
@@ -77,14 +73,14 @@
7773

7874
<dependency>
7975
<groupId>com.baomidou</groupId>
80-
<artifactId>mybatis-plus-boot-starter</artifactId>
81-
<version>3.5.3</version>
76+
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
77+
<version>3.5.9</version>
8278
</dependency>
8379

8480
<dependency>
8581
<groupId>com.alibaba</groupId>
86-
<artifactId>druid-spring-boot-starter</artifactId>
87-
<version>1.2.15</version>
82+
<artifactId>druid-spring-boot-3-starter</artifactId>
83+
<version>1.2.24</version>
8884
</dependency>
8985

9086
<dependency>
@@ -102,13 +98,12 @@
10298
<dependency>
10399
<groupId>org.springframework.cloud</groupId>
104100
<artifactId>spring-cloud-starter-openfeign</artifactId>
105-
<version>2.2.5.RELEASE</version>
106101
</dependency>
107102

108103
<dependency>
109-
<groupId>org.springframework.cloud</groupId>
110-
<artifactId>spring-cloud-starter-openfeign</artifactId>
111-
<version>2.2.5.RELEASE</version>
104+
<groupId>com.alibaba.fastjson2</groupId>
105+
<artifactId>fastjson2</artifactId>
106+
<version>2.0.19</version>
112107
</dependency>
113108

114109
</dependencies>
@@ -145,9 +140,6 @@
145140
<groupId>org.springframework.boot</groupId>
146141
<artifactId>spring-boot-maven-plugin</artifactId>
147142
<version>${spring-boot.version}</version>
148-
<configuration>
149-
<mainClass>com.alibabacloud.mse.demo.b.BApplication</mainClass>
150-
</configuration>
151143
<executions>
152144
<execution>
153145
<id>repackage</id>

‎mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/b/BController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.alibabacloud.mse.demo.b;
22

3-
import com.alibaba.fastjson.JSON;
3+
import com.alibaba.fastjson2.JSON;
44
import com.alibabacloud.mse.demo.c.service.HelloServiceC;
55
import com.alibabacloud.mse.demo.common.TrafficAttribute;
66
import com.alibabacloud.mse.demo.entity.User;

‎mse-simple-demo/B/src/main/resources/application.properties

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,4 @@ dubbo.scan.base-packages=com.alibabacloud.mse.demo
1818
dubbo.protocol.port=12080
1919
dubbo.registry.check=false
2020

21-
spring.profiles.active=druid
22-
23-
management.endpoints.web.exposure.include=info,health,prometheus
24-
management.metrics.tags.application=spring-cloud-b
21+
spring.profiles.active=druid

‎mse-simple-demo/C/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
# syntax=docker/dockerfile:1.4
2-
3-
FROM maven:3-eclipse-temurin-8 as build
1+
FROM maven:3.9.9-eclipse-temurin-17 as build
42

53
COPY <<EOF /root/.m2/settings.xml
6-
<?xml version=\"1.0\"?>
4+
<?xml version="1.0"?>
75
<settings>
86
<mirrors>
97
<mirror>
@@ -23,7 +21,7 @@ COPY ./ ./
2321
RUN --mount=type=cache,target=/root/.m2/repository/ \
2422
mvn clean package --batch-mode
2523

26-
FROM eclipse-temurin:8-jdk
24+
FROM eclipse-temurin:17-jdk
2725

2826
RUN apt-get update && apt-get install -y \
2927
vim unzip netcat-openbsd telnet tcpdump iproute2 lsof \

‎mse-simple-demo/C/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export REGISTRY=${REGISTRY}
44

55
export appName=spring-cloud-c
6-
export VERSION="${VERSION:-3.0.8}"
6+
export VERSION="${VERSION:-3.1.0}"
77

88
set -e
99

‎mse-simple-demo/C/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17-
<java.version>8</java.version>
18-
<spring-boot.version>1.5.1.RELEASE</spring-boot.version>
19-
<spring-cloud.version>Edgware.SR2</spring-cloud.version>
20-
<spring-cloud-alibaba.version>1.5.0.RELEASE</spring-cloud-alibaba.version>
21-
<dubbo.version>2.7.23</dubbo.version>
17+
<java.version>17</java.version>
18+
<spring-boot.version>3.2.4</spring-boot.version>
19+
<spring-cloud.version>2023.0.1</spring-cloud.version>
20+
<spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
21+
<dubbo.version>3.3.0</dubbo.version>
2222
<rocketmq.version>4.9.8</rocketmq.version>
2323
</properties>
2424

‎mse-simple-demo/SpringCloudGateway/pom.xml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<groupId>com.alibaba.cloud</groupId>
2626
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
2727
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.cloud</groupId>
30+
<artifactId>spring-cloud-loadbalancer</artifactId>
31+
</dependency>
2832
<dependency>
2933
<groupId>org.springframework.boot</groupId>
3034
<artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -34,11 +38,6 @@
3438
<groupId>org.springframework.boot</groupId>
3539
<artifactId>spring-boot-starter-actuator</artifactId>
3640
</dependency>
37-
<dependency>
38-
<groupId>io.micrometer</groupId>
39-
<artifactId>micrometer-registry-prometheus</artifactId>
40-
<version>1.1.0</version>
41-
</dependency>
4241

4342
<dependency>
4443
<groupId>org.springframework.cloud</groupId>
@@ -92,14 +91,6 @@
9291
</execution>
9392
</executions>
9493
</plugin>
95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-compiler-plugin</artifactId>
98-
<configuration>
99-
<source>8</source>
100-
<target>8</target>
101-
</configuration>
102-
</plugin>
10394
</plugins>
10495
<finalName>${project.artifactId}</finalName>
10596
</build>

‎mse-simple-demo/SpringCloudGateway/src/main/java/com/alibabcloud/mse/demo/ModifyPathGatewayFilterFactory.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎mse-simple-demo/SpringCloudGateway/src/main/resources/application.properties

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ spring.cloud.nacos.discovery.namespace=${nacos.namespace}
99

1010

1111
spring.cloud.gateway.routes[0].id=sc-A
12-
spring.cloud.gateway.routes[0].uri=lb://sc-A
12+
spring.cloud.gateway.routes[0].uri=lb://sc-A:20001
1313
spring.cloud.gateway.routes[0].predicates[0]=Path=/A/**
14-
spring.cloud.gateway.routes[0].filters[0]=RewritePath=/A/(?<segment>.*), /${segment}
14+
spring.cloud.gateway.routes[0].filters[0]=RewritePath=/A/, /
1515

1616

1717
spring.cloud.gateway.routes[1].id=sc-B
18-
spring.cloud.gateway.routes[1].uri=lb://sc-B
18+
spring.cloud.gateway.routes[1].uri=lb://sc-B:20002
1919
spring.cloud.gateway.routes[1].predicates[0]=Path=/B/**
20-
spring.cloud.gateway.routes[1].filters[0]=RewritePath=/B/(?<segment>.*), /${segment}
20+
spring.cloud.gateway.routes[1].filters[0]=RewritePath=/B/, /
2121

2222

2323

2424
spring.cloud.gateway.routes[2].id=sc-C
25-
spring.cloud.gateway.routes[2].uri=lb://sc-C
25+
spring.cloud.gateway.routes[2].uri=lb://sc-C:20003
2626
spring.cloud.gateway.routes[2].predicates[0]=Path=/C/**
27-
spring.cloud.gateway.routes[2].filters[0]=RewritePath=/C/(?<segment>.*), /${segment}
27+
spring.cloud.gateway.routes[2].filters[0]=RewritePath=/C/, /
2828

2929

3030

@@ -33,6 +33,3 @@ spring.thymeleaf.encoding=UTF-8
3333
spring.thymeleaf.servlet.content-type=text/html
3434
spring.thymeleaf.suffix=.html
3535
spring.thymeleaf.cache=false
36-
37-
management.endpoints.web.exposure.include=prometheus
38-
management.metrics.tags.application=spring-cloud-gateway

0 commit comments

Comments
 (0)