Skip to content

Commit 6a4efa8

Browse files
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")

0 commit comments

Comments
 (0)