Skip to content

Commit 6a4efa8

Browse files
robberphexrobberphex
authored
Merge pull request #185 from aliyun/3.0.6
3.0.6
2 parents 6fc1f3a + 24d9c17 commit 6a4efa8

File tree

22 files changed

+38
-118
lines changed

22 files changed

+38
-118
lines changed

‎mse-simple-demo/A/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
# syntax=docker/dockerfile:1.4
22

3-
FROM maven:3-eclipse-temurin-8-alpine as build
3+
FROM maven:3-eclipse-temurin-8 as build
44

55
# copy arthas
66
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
77

8-
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
9-
RUN apk add wget unzip tcpdump ngrep iproute2-ss bind-tools
10-
118
COPY <<EOF /root/.m2/settings.xml
129
<?xml version=\"1.0\"?>
1310
<settings>
@@ -30,7 +27,7 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
3027
mvn clean package --batch-mode
3128

3229

33-
FROM eclipse-temurin:8-jdk-alpine
30+
FROM eclipse-temurin:8-jdk
3431

3532
# copy arthas
3633
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas

‎mse-simple-demo/A/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-a
6-
export VERSION="${VERSION:-3.0.5}"
6+
export VERSION="${VERSION:-3.0.6}"
77

88
set -e
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>A</artifactId>
8-
<version>3.0.5</version>
8+
<version>3.0.6</version>
99
<packaging>jar</packaging>
1010

1111
<name>A</name>

‎mse-simple-demo/B/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# syntax=docker/dockerfile:1.4
22

3-
FROM maven:3-eclipse-temurin-8-alpine as build
4-
5-
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
6-
RUN apk add wget unzip tcpdump ngrep iproute2-ss bind-tools
3+
FROM maven:3-eclipse-temurin-8 as build
74

85
COPY <<EOF /root/.m2/settings.xml
96
<?xml version=\"1.0\"?>
@@ -26,7 +23,7 @@ COPY ./ ./
2623
RUN --mount=type=cache,target=/root/.m2/repository/ \
2724
mvn clean package --batch-mode
2825

29-
FROM eclipse-temurin:8-jdk-alpine
26+
FROM eclipse-temurin:8-jdk
3027

3128
# copy arthas
3229
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas

‎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.5}"
6+
export VERSION="${VERSION:-3.0.6}"
77

88
set -e
99

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

Lines changed: 1 addition & 1 deletion
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.5</version>
8+
<version>3.0.6</version>
99
<packaging>jar</packaging>
1010

1111
<name>B</name>

‎mse-simple-demo/C/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# syntax=docker/dockerfile:1.4
22

3-
FROM maven:3-eclipse-temurin-8-alpine as build
4-
5-
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
3+
FROM maven:3-eclipse-temurin-8 as build
64

75
COPY <<EOF /root/.m2/settings.xml
86
<?xml version=\"1.0\"?>
@@ -25,7 +23,7 @@ COPY ./ ./
2523
RUN --mount=type=cache,target=/root/.m2/repository/ \
2624
mvn clean package --batch-mode
2725

28-
FROM eclipse-temurin:8-jdk-alpine
26+
FROM eclipse-temurin:8-jdk
2927

3028
# copy arthas
3129
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas

‎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.5}"
6+
export VERSION="${VERSION:-3.0.6}"
77

88
set -e
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>C</artifactId>
8-
<version>3.0.5</version>
8+
<version>3.0.6</version>
99
<packaging>jar</packaging>
1010

1111
<name>C</name>

‎mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/CController.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,17 @@ public String c(HttpServletRequest request) {
6161
if (throwException) {
6262
throw new RuntimeException();
6363
}
64-
return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
64+
try (Entry entry1 = SphU.entry("HelloWorld-c-1", EntryType.IN)) {
65+
log.debug("Hello Sentinel!1");
66+
try (Entry entry2 = SphU.entry("H\"elloWorld-c-2", EntryType.IN)) {
67+
log.debug("Hello Sentinel!2");
68+
return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
69+
} catch (BlockException e) {
70+
throw new RuntimeException(e);
71+
}
72+
} catch (BlockException e) {
73+
throw new RuntimeException(e);
74+
}
6575
}
6676

6777
@GetMapping("/c-zone")

‎mse-simple-demo/SpringCloudGateway/Dockerfile

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

44
# copy arthas
55
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
66

7-
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
8-
RUN apk add wget unzip tcpdump ngrep iproute2-ss bind-tools
9-
107
COPY <<EOF /root/.m2/settings.xml
118
<?xml version=\"1.0\"?>
129
<settings>
@@ -29,7 +26,7 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
2926
mvn clean package --batch-mode
3027

3128

32-
FROM eclipse-temurin:8-jdk-alpine
29+
FROM eclipse-temurin:8-jdk
3330

3431

3532
# copy arthas

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

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

44
export appName=spring-cloud-gateway
5-
export VERSION="${VERSION:-3.0.5}"
5+
export VERSION="${VERSION:-3.0.6}"
66

77
set -e
88

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

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.alibabacloud.mse.demo</groupId>
66
<artifactId>SpringCloudGateway</artifactId>
7-
<version>3.0.5</version>
7+
<version>3.0.6</version>
88
<packaging>jar</packaging>
99

1010
<parent>
@@ -22,23 +22,6 @@
2222
</properties>
2323

2424
<dependencies>
25-
<dependency>
26-
<groupId>io.opentelemetry</groupId>
27-
<artifactId>opentelemetry-api</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>io.opentelemetry</groupId>
31-
<artifactId>opentelemetry-sdk-trace</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>io.opentelemetry</groupId>
35-
<artifactId>opentelemetry-sdk</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>io.opentelemetry</groupId>
39-
<artifactId>opentelemetry-exporter-logging</artifactId>
40-
</dependency>
41-
4225
<dependency>
4326
<groupId>com.alibaba.cloud</groupId>
4427
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
@@ -71,13 +54,6 @@
7154

7255
<dependencyManagement>
7356
<dependencies>
74-
<dependency>
75-
<groupId>io.opentelemetry</groupId>
76-
<artifactId>opentelemetry-bom</artifactId>
77-
<version>1.23.0</version>
78-
<type>pom</type>
79-
<scope>import</scope>
80-
</dependency>
8157
<dependency>
8258
<groupId>org.springframework.cloud</groupId>
8359
<artifactId>spring-cloud-dependencies</artifactId>

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

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

‎mse-simple-demo/ZuulGateway/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# syntax=docker/dockerfile:1.4
22

3-
FROM maven:3-eclipse-temurin-8-alpine as build
4-
5-
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
3+
FROM maven:3-eclipse-temurin-8 as build
64

75
COPY <<EOF /root/.m2/settings.xml
86
<?xml version=\"1.0\"?>
@@ -25,7 +23,7 @@ COPY ./ ./
2523
RUN --mount=type=cache,target=/root/.m2/repository/ \
2624
mvn clean package --batch-mode
2725

28-
FROM eclipse-temurin:8-jdk-alpine
26+
FROM eclipse-temurin:8-jdk
2927

3028
# copy arthas
3129
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas

‎mse-simple-demo/ZuulGateway/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-zuul
6-
export VERSION="${VERSION:-3.0.5}"
6+
export VERSION="${VERSION:-3.0.6}"
77

88
set -e
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>ZuulGateway</artifactId>
8-
<version>3.0.5</version>
8+
<version>3.0.6</version>
99
<packaging>jar</packaging>
1010

1111
<parent>

‎mse-simple-demo/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# Select the correct warehouse prefix
33
export REGISTRY=${REGISTRY}
4-
export VERSION="${VERSION:-3.0.5}"
4+
export VERSION="${VERSION:-3.0.6}"
55

66
set -e
77

‎mse-simple-demo/helm/mse-simple-demo/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: mse-simple-demo
3-
version: "3.0.5"
4-
appVersion: "3.0.5"
3+
version: "3.0.6"
4+
appVersion: "3.0.6"
55
home: https://mse.console.aliyun.com/
66
keywords:
77
- mse

‎mse-simple-demo/helm/mse-simple-demo/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
registry: registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/
33

44
images:
5-
version: 3.0.5
5+
version: 3.0.6
66

77
mse:
88
namespace: mse-demo

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

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

44
export appName=demo-mysql
5-
export VERSION="${VERSION:-3.0.5}"
5+
export VERSION="${VERSION:-3.0.6}"
66

77
set -e
88

‎mse-simple-demo/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<properties>
8-
<all.project.version>3.0.5</all.project.version>
8+
<all.project.version>3.0.6</all.project.version>
99
</properties>
1010

1111

1212
<groupId>com.alibabacloud.mse.demo</groupId>
1313
<artifactId>mse-simple-demo</artifactId>
14-
<version>3.0.5</version>
14+
<version>3.0.6</version>
1515
<modules>
1616
<module>A</module>
1717
<module>B</module>

0 commit comments

Comments
 (0)