Skip to content

Commit d1c8ca7

Browse files
salesonsaleson
committed
demo config
1 parent 471b578 commit d1c8ca7

File tree

9 files changed

+83
-78
lines changed

9 files changed

+83
-78
lines changed

‎spring-cloud-gray-samples/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<module>spring-cloud-gray-service-a-sample</module>
1818
<module>spring-cloud-gray-service-b-sample</module>
1919
<module>spring-cloud-gray-server-sample</module>
20+
<module>spring-cloud-gray-server2-sample</module>
2021
<module>spring-cloud-gray-service-a1-sample</module>
2122
<module>spring-cloud-gray-stream-sample</module>
2223
<module>spring-cloud-gray-performance-agent</module>

‎spring-cloud-gray-samples/spring-cloud-gray-server-sample/pom.xml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter-test</artifactId>
2323
</dependency>
24-
<!-- <dependency>-->
25-
<!-- <groupId>org.springframework.cloud</groupId>-->
26-
<!-- <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>-->
27-
<!-- <exclusions>-->
28-
<!-- <exclusion>-->
29-
<!-- <groupId>org.springframework.cloud</groupId>-->
30-
<!-- <artifactId>spring-cloud-netflix-eureka-client</artifactId>-->
31-
<!-- </exclusion>-->
32-
<!-- </exclusions>-->
33-
<!-- </dependency>-->
24+
<dependency>
25+
<groupId>org.springframework.cloud</groupId>
26+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
27+
<!-- <exclusions>-->
28+
<!-- <exclusion>-->
29+
<!-- <groupId>org.springframework.cloud</groupId>-->
30+
<!-- <artifactId>spring-cloud-netflix-eureka-client</artifactId>-->
31+
<!-- </exclusion>-->
32+
<!-- </exclusions>-->
33+
</dependency>
3434
<dependency>
3535
<groupId>org.springframework.boot</groupId>
3636
<artifactId>spring-boot-starter-security</artifactId>
@@ -39,21 +39,21 @@
3939
<groupId>cn.springcloud.gray</groupId>
4040
<artifactId>spring-cloud-starter-gray-server</artifactId>
4141
</dependency>
42-
<!-- <dependency>-->
43-
<!-- <groupId>cn.springcloud.gray</groupId>-->
44-
<!-- <artifactId>spring-cloud-gray-server-plugin-eureka</artifactId>-->
45-
<!-- </dependency>-->
46-
47-
<!-- nacos -->
4842
<dependency>
4943
<groupId>cn.springcloud.gray</groupId>
50-
<artifactId>spring-cloud-gray-server-plugin-nacos-discovery</artifactId>
51-
</dependency>
52-
<dependency>
53-
<groupId>com.alibaba.cloud</groupId>
54-
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
44+
<artifactId>spring-cloud-gray-server-plugin-eureka</artifactId>
5545
</dependency>
5646

47+
<!-- nacos -->
48+
<!-- <dependency>-->
49+
<!-- <groupId>cn.springcloud.gray</groupId>-->
50+
<!-- <artifactId>spring-cloud-gray-server-plugin-nacos-discovery</artifactId>-->
51+
<!-- </dependency>-->
52+
<!-- <dependency>-->
53+
<!-- <groupId>com.alibaba.cloud</groupId>-->
54+
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
55+
<!-- </dependency>-->
56+
5757

5858
<!-- <dependency>-->
5959
<!-- <groupId>cn.springcloud.gray</groupId>-->

‎spring-cloud-gray-samples/spring-cloud-gray-server-sample/src/main/resources/config/application.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
server:
22
port: 20202
33
spring:
4-
# main:
5-
# allow-bean-definition-overriding: true
4+
# main:
5+
# allow-bean-definition-overriding: true
66
application:
77
name: gray-Server
88

@@ -57,8 +57,8 @@ eureka:
5757
gray:
5858
server:
5959
cluster:
60-
synchro:
61-
enable: false
60+
# synchro:
61+
# enable: false
6262
peerNodes:
6363
- host: localhost
6464
port: 20202

‎spring-cloud-gray-samples/spring-cloud-gray-server2-sample/pom.xml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@
2323
</dependency>
2424
<dependency>
2525
<groupId>org.springframework.cloud</groupId>
26-
<artifactId>spring-cloud-starter-eureka</artifactId>
27-
<exclusions>
28-
<exclusion>
29-
<artifactId>bcpkix-jdk15on</artifactId>
30-
<groupId>org.bouncycastle</groupId>
31-
</exclusion>
32-
</exclusions>
26+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
27+
<!-- <exclusions>-->
28+
<!-- <exclusion>-->
29+
<!-- <groupId>org.springframework.cloud</groupId>-->
30+
<!-- <artifactId>spring-cloud-netflix-eureka-client</artifactId>-->
31+
<!-- </exclusion>-->
32+
<!-- </exclusions>-->
33+
</dependency>
34+
<dependency>
35+
<groupId>org.springframework.boot</groupId>
36+
<artifactId>spring-boot-starter-security</artifactId>
3337
</dependency>
3438
<dependency>
3539
<groupId>cn.springcloud.gray</groupId>

‎spring-cloud-gray-samples/spring-cloud-gray-server2-sample/src/main/java/cn/springcloud/gray/server/app2/GrayServer2Application.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class GrayServer2Application {
1919

2020

2121
public static void main(String[] args) throws UnknownHostException {
22-
Environment env = new SpringApplicationBuilder(GrayServer2Application.class).web(true).run(args).getEnvironment();
22+
Environment env = new SpringApplicationBuilder(GrayServer2Application.class).run(args).getEnvironment();
2323
log.info(
2424
"\n----------------------------------------------------------\n\t"
2525
+ "Application '{}' is running! Access URLs:\n\t" + "Local: \t\thttp://127.0.0.1:{}\n\t"

‎spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter-test</artifactId>
2323
</dependency>
24-
<!-- <dependency>-->
25-
<!-- <groupId>org.springframework.cloud</groupId>-->
26-
<!-- <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>-->
27-
<!-- </dependency>-->
2824
<dependency>
29-
<groupId>com.alibaba.cloud</groupId>
30-
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
25+
<groupId>org.springframework.cloud</groupId>
26+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
3127
</dependency>
28+
<!-- <dependency>-->
29+
<!-- <groupId>com.alibaba.cloud</groupId>-->
30+
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
31+
<!-- </dependency>-->
3232
<dependency>
3333
<groupId>org.apache.commons</groupId>
3434
<artifactId>commons-lang3</artifactId>

‎spring-cloud-gray-samples/spring-cloud-gray-service-a1-sample/pom.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<groupId>org.springframework.boot</groupId>
2020
<artifactId>spring-boot-starter-test</artifactId>
2121
</dependency>
22-
<!-- <dependency>-->
23-
<!-- <groupId>org.springframework.cloud</groupId>-->
24-
<!-- <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>-->
25-
<!-- </dependency>-->
22+
<dependency>
23+
<groupId>org.springframework.cloud</groupId>
24+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
25+
</dependency>
2626
<dependency>
2727
<groupId>org.apache.commons</groupId>
2828
<artifactId>commons-lang3</artifactId>
@@ -36,22 +36,22 @@
3636
<artifactId>lombok</artifactId>
3737
</dependency>
3838

39-
<dependency>
40-
<groupId>com.alibaba.cloud</groupId>
41-
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
42-
</dependency>
43-
4439
<!-- <dependency>-->
45-
<!-- <groupId>cn.springcloud.gray</groupId>-->
46-
<!-- <artifactId>spring-cloud-starter-gray-client</artifactId>-->
47-
<!-- <exclusions>-->
48-
<!-- <exclusion>-->
49-
<!-- <groupId>cn.springcloud.gray</groupId>-->
50-
<!-- <artifactId>spring-cloud-gray-plugin-eureka</artifactId>-->
51-
<!-- </exclusion>-->
52-
<!-- </exclusions>-->
40+
<!-- <groupId>com.alibaba.cloud</groupId>-->
41+
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
5342
<!-- </dependency>-->
5443

44+
<!-- <dependency>-->
45+
<!-- <groupId>cn.springcloud.gray</groupId>-->
46+
<!-- <artifactId>spring-cloud-starter-gray-client</artifactId>-->
47+
<!-- <exclusions>-->
48+
<!-- <exclusion>-->
49+
<!-- <groupId>cn.springcloud.gray</groupId>-->
50+
<!-- <artifactId>spring-cloud-gray-plugin-eureka</artifactId>-->
51+
<!-- </exclusion>-->
52+
<!-- </exclusions>-->
53+
<!-- </dependency>-->
54+
5555
</dependencies>
5656

5757
</project>

‎spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/pom.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter-test</artifactId>
2323
</dependency>
24-
<!-- <dependency>-->
25-
<!-- <groupId>org.springframework.cloud</groupId>-->
26-
<!-- <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>-->
27-
<!-- </dependency>-->
2824
<dependency>
29-
<groupId>com.alibaba.cloud</groupId>
30-
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
25+
<groupId>org.springframework.cloud</groupId>
26+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
3127
</dependency>
28+
<!-- <dependency>-->
29+
<!-- <groupId>com.alibaba.cloud</groupId>-->
30+
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
31+
<!-- </dependency>-->
3232
<dependency>
3333
<groupId>org.springframework.cloud</groupId>
3434
<artifactId>spring-cloud-starter-sleuth</artifactId>
@@ -54,27 +54,27 @@
5454
<dependency>
5555
<groupId>cn.springcloud.gray</groupId>
5656
<artifactId>spring-cloud-starter-gray-client</artifactId>
57-
<exclusions>
58-
<exclusion>
59-
<groupId>cn.springcloud.gray</groupId>
60-
<artifactId>spring-cloud-gray-plugin-eureka</artifactId>
61-
</exclusion>
62-
</exclusions>
57+
<!-- <exclusions>-->
58+
<!-- <exclusion>-->
59+
<!-- <groupId>cn.springcloud.gray</groupId>-->
60+
<!-- <artifactId>spring-cloud-gray-plugin-eureka</artifactId>-->
61+
<!-- </exclusion>-->
62+
<!-- </exclusions>-->
6363
</dependency>
6464

65-
<dependency>
66-
<groupId>cn.springcloud.gray</groupId>
67-
<artifactId>spring-cloud-gray-plugin-ribbon-nacos-discovery</artifactId>
68-
</dependency>
65+
<!-- <dependency>-->
66+
<!-- <groupId>cn.springcloud.gray</groupId>-->
67+
<!-- <artifactId>spring-cloud-gray-plugin-ribbon-nacos-discovery</artifactId>-->
68+
<!-- </dependency>-->
6969

7070
<dependency>
7171
<groupId>cn.springcloud.gray</groupId>
7272
<artifactId>spring-cloud-gray-plugin-feign</artifactId>
7373
</dependency>
74-
<dependency>
75-
<groupId>cn.springcloud.gray</groupId>
76-
<artifactId>spring-cloud-gray-plugin-event-stream</artifactId>
77-
</dependency>
74+
<!-- <dependency>-->
75+
<!-- <groupId>cn.springcloud.gray</groupId>-->
76+
<!-- <artifactId>spring-cloud-gray-plugin-event-stream</artifactId>-->
77+
<!-- </dependency>-->
7878

7979
<!-- <dependency>-->
8080
<!-- <groupId>org.springframework.cloud</groupId>-->

‎spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/resources/config/application.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ eureka:
4242
availability-zones:
4343
sh: xuhui,gray
4444
serviceUrl:
45-
# defaultZone: http://localhost:20001/eureka/
45+
defaultZone: http://localhost:20001/eureka/
4646
xuhui: http://localhost:20001/eureka/
4747
gray: http://localhost:20001/eureka/
4848
registry-fetch-interval-seconds: 5
@@ -83,7 +83,7 @@ gray:
8383
grayEnroll: false
8484
grayEnrollDealyTimeInMs: 20000
8585
holdoutServer:
86-
enabled: true
86+
enabled: false
8787
services:
8888
"service-a": starting
8989
request:

0 commit comments

Comments
 (0)