Skip to content

Commit 725c445

Browse files
committed
《Spring Cloud实战》更新
1 parent 7ffbd49 commit 725c445

File tree

19 files changed

+144
-29
lines changed

19 files changed

+144
-29
lines changed

spring_cloud_in_action/api-gateway-consul/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<artifactId>spring-cloud-starter-consul-all</artifactId>
3636
</dependency>
3737

38+
<dependency>
39+
<groupId>org.codehaus.groovy</groupId>
40+
<artifactId>groovy-all</artifactId>
41+
</dependency>
3842
</dependencies>
3943

4044
<dependencyManagement>
Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
package com.didispace;
22

3-
import com.didispace.filter.AccessFilter;
3+
import com.netflix.zuul.FilterFileManager;
4+
import com.netflix.zuul.FilterLoader;
5+
import com.netflix.zuul.groovy.GroovyCompiler;
6+
import com.netflix.zuul.groovy.GroovyFileFilter;
47
import org.springframework.boot.builder.SpringApplicationBuilder;
58
import org.springframework.cloud.client.SpringCloudApplication;
69
import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
7-
import org.springframework.context.annotation.Bean;
810

911
@EnableZuulProxy
1012
@SpringCloudApplication
1113
public class Application {
1214

1315
public static void main(String[] args) {
1416
new SpringApplicationBuilder(Application.class).web(true).run(args);
17+
String zuulFilterRoot = "api-gateway-consul/filter";
18+
FilterLoader.getInstance().setCompiler(new GroovyCompiler());
19+
try {
20+
FilterFileManager.setFilenameFilter(new GroovyFileFilter());
21+
FilterFileManager.init(5,
22+
zuulFilterRoot + "/pre",
23+
zuulFilterRoot + "/post");
24+
} catch (Exception e) {
25+
throw new RuntimeException(e);
26+
}
1527
}
1628

17-
// @Bean
18-
// public AccessFilter accessFilter() {
19-
// return new AccessFilter();
20-
// }
21-
2229
}

spring_cloud_in_action/config-client/src/main/resources/bootstrap.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
spring.application.name=didispace
2+
23
spring.cloud.config.profile=dev
34
spring.cloud.config.uri=http://localhost:7001/
5+
#spring.cloud.config.username=user
6+
#spring.cloud.config.password=37cc5635-559b-4e6f-b633-7e932b813f73
47

58
server.port=7002
69

spring_cloud_in_action/config-server/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
<groupId>org.springframework.cloud</groupId>
2929
<artifactId>spring-cloud-config-server</artifactId>
3030
</dependency>
31+
32+
33+
<!--<dependency>-->
34+
<!--<groupId>org.springframework.boot</groupId>-->
35+
<!--<artifactId>spring-boot-starter-security</artifactId>-->
36+
<!--</dependency>-->
3137
</dependencies>
3238

3339
<dependencyManagement>

spring_cloud_in_action/config-server/src/main/resources/application.properties

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,33 @@ spring.application.name=config-server
22
server.port=7001
33

44
# git管理配置
5-
spring.cloud.config.server.git.uri=http://git.oschina.net/didispace/SpringCloud-Learning/
6-
spring.cloud.config.server.git.searchPaths=spring_cloud_in_action/config-repo
7-
spring.cloud.config.server.git.username=username
8-
spring.cloud.config.server.git.password=password
5+
#spring.cloud.config.server.git.uri=http://git.oschina.net/didispace/SpringCloud-Learning/
6+
#spring.cloud.config.server.git.searchPaths=spring_cloud_in_action/config-repo
7+
#spring.cloud.config.server.git.username=username
8+
#spring.cloud.config.server.git.password=password
9+
10+
# 健康检查配置
11+
#spring.cloud.config.server.health.repositories.check.name=check-repo
12+
#spring.cloud.config.server.health.repositories.check.label=master
13+
#spring.cloud.config.server.health.repositories.check.profiles=default
14+
15+
# 关闭健康检查
16+
#spring.cloud.config.server.health.enabled=false
917

1018
# 全局参数
11-
spring.cloud.config.server.overrides.name=didi
12-
spring.cloud.config.server.overrides.from=shanghai
19+
#spring.cloud.config.server.overrides.name=didi
20+
#spring.cloud.config.server.overrides.from=shanghai
1321

1422
# 开启本地配置
15-
#spring.profiles.active=native
16-
23+
spring.profiles.active=native
1724

25+
# 安全保护,需要引入spring-boot-starter-security
26+
#security.user.name=user
27+
#security.user.password=37cc5635-559b-4e6f-b633-7e932b813f73
1828

29+
encrypt.key=didispace
30+
#encrypt.key-store.location=config-server.keystore
31+
#encrypt.key-store.alias=config-server
32+
#encrypt.key-store.password=111111
33+
#encrypt.key-store.secret=222222
1934

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
from=local
1+
from=local
2+
#from={cipher}AQBL4zN73nFahuirqUyWjgMD3o7FJJstbVKWfrSqh9k4V/GiS9osQRl0U17xsBX5nciFvm1XcfnB1tD13Hg3OCZds9tNS7NSixED4Kx7Bgq5vIuTzZpZkVb5YYvJyjFUhHnvdeTfgblsSS2a1NTABZ19n6quYnaupLdONKsa6goqagbg9FFwdvjLx0dWKfDsAF74lO9qYuCNsR2oJiDwvWnry3r3x8ewvXb6u0LxZ9DXGWPRsLITTY7BRkuwt3bra93gj4Elp4r1JFMwgAt6EbdF+7mXxVO51MPn9xvRKZPgpkk+e40t8Y/YjJ2P4SwzdbzMLuKbOwq2+MbWa37eyUt+f9BZ2GCFDHQPKDNIP3dWo4vuO0mja19osiWYUkOufcs=

spring_cloud_in_action/eureka-server/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<groupId>org.springframework.cloud</groupId>
2929
<artifactId>spring-cloud-starter-eureka-server</artifactId>
3030
</dependency>
31+
32+
<!--<dependency>-->
33+
<!--<groupId>org.springframework.boot</groupId>-->
34+
<!--<artifactId>spring-boot-starter-actuator</artifactId>-->
35+
<!--</dependency>-->
3136
</dependencies>
3237

3338
<dependencyManagement>
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
spring.application.name=eureka-server
22
server.port=1111
3+
34
eureka.instance.hostname=localhost
45

6+
# ¹Ø±Õ±£»¤»úÖÆ
7+
#eureka.server.enable-self-preservation=false
8+
59
eureka.client.register-with-eureka=false
610
eureka.client.fetch-registry=false
711
eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/
812

9-
logging.file=${spring.application.name}.log
13+
logging.file=${spring.application.name}.log
14+

spring_cloud_in_action/feign-consumer/src/main/java/com/didispace/ConsumerApplication.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
package com.didispace;
22

3+
import feign.Logger;
34
import org.springframework.boot.SpringApplication;
45
import org.springframework.boot.autoconfigure.SpringBootApplication;
5-
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
66
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
7-
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
87
import org.springframework.cloud.netflix.feign.EnableFeignClients;
98
import org.springframework.context.annotation.Bean;
10-
import org.springframework.web.client.RestTemplate;
119

1210
@EnableFeignClients
1311
@EnableDiscoveryClient
1412
@SpringBootApplication
1513
public class ConsumerApplication {
1614

15+
// @Bean
16+
// Logger.Level feignLoggerLevel() {
17+
// return Logger.Level.FULL;
18+
// }
19+
1720
public static void main(String[] args) {
1821
SpringApplication.run(ConsumerApplication.class, args);
1922
}

spring_cloud_in_action/feign-consumer/src/main/resources/application.properties

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,26 @@ spring.application.name=feign-consumer
22
server.port=9001
33

44
eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
5+
6+
# 全局关闭hystrix支持
7+
#feign.hystrix.enabled=false
8+
9+
# hystrix的默认配置
10+
#hystrix.command.default.execution.timeout.enabled=true
11+
#hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=1000
12+
13+
# hystrix指定Commandkey的配置
14+
#hystrix.command.hello.execution.isolation.thread.timeoutInMilliseconds=5000
15+
16+
# ribbon指定服务的配置
17+
#HELLO-SERVICE.ribbon.ReadTimeout=2000
18+
19+
# ribbon默认配置
20+
#ribbon.ConnectTimeout=250
21+
#ribbon.ReadTimeout=1000
22+
#ribbon.OkToRetryOnAllOperations=true
23+
#ribbon.MaxAutoRetriesNextServer=2
24+
#ribbon.MaxAutoRetries=0
25+
26+
# feign日志配置
27+
#logging.level.com.didispace.web.HelloService=DEBUG

spring_cloud_in_action/hello-service/src/main/resources/application.properties

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,27 @@ spring.application.name=hello-service
22

33
eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
44

5-
endpoints.shutdown.enabled=true
6-
endpoints.restart.enabled=true
5+
# 健康检查
6+
#eureka.client.healthcheck.enabled=true
77

8-
server.port=8081
8+
# 随机端口配置
9+
#eureka.instance.instance-id=${spring.application.name}:${random.int}
10+
#server.port=0
11+
#server.port=${random.int[10000,19999]}
12+
server.port=8081
13+
14+
# 端点配置
15+
#management.context-path=/hello
16+
#eureka.instance.statusPageUrlPath=${management.context-path}/info
17+
#eureka.instance.healthCheckUrlPath=${management.context-path}/health
18+
19+
# 开启控制端点
20+
#endpoints.shutdown.enabled=true
21+
#endpoints.restart.enabled=true
22+
23+
# 实例名配置
24+
#eureka.instance.hostname=didi
25+
#eureka.instance.non-secure-port=8001
26+
#eureka.instance.secure-port-enabled=true
27+
28+
#debug=false

spring_cloud_in_action/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<module>hello-service-api</module>
2121

2222
<module>api-gateway</module>
23+
<module>api-gateway-exception</module>
24+
<module>api-gateway-dynamic-route</module>
25+
<module>api-gateway-dynamic-filter</module>
2326

2427
<module>config-server</module>
2528
<module>config-client</module>
@@ -49,6 +52,7 @@
4952
<module>trace-stream-1</module>
5053
<module>trace-stream-2</module>
5154
<module>zipkin-server-stream</module>
55+
<module>zipkin-server-stream-mysql</module>
5256

5357
<module>consul-client-1</module>
5458
<module>api-gateway-consul</module>

spring_cloud_in_action/spring-boot-hello/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<groupId>org.springframework.boot</groupId>
3030
<artifactId>spring-boot-starter-web</artifactId>
3131
</dependency>
32+
<dependency>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-starter-actuator</artifactId>
35+
</dependency>
3236

3337
<dependency>
3438
<groupId>org.springframework.boot</groupId>
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
spring.application.name=hello
22
server.port=8885
3-
spring.profiles.active=dev
3+
spring.profiles.active=dev
4+
5+
# /info¶ËµãÐÅÏ¢ÅäÖÃ
6+
info.app.name=spring-boot-hello
7+
info.app.version=v1.0.0
8+
9+
#endpoints.info.enabled=false

spring_cloud_in_action/trace-1/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
5151
</dependency>
5252

53+
<dependency>
54+
<groupId>net.logstash.logback</groupId>
55+
<artifactId>logstash-logback-encoder</artifactId>
56+
<version>4.6</version>
57+
</dependency>
58+
5359
</dependencies>
5460

5561
<dependencyManagement>

spring_cloud_in_action/trace-2/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
<artifactId>spring-cloud-starter-sleuth</artifactId>
4646
</dependency>
4747

48+
<dependency>
49+
<groupId>net.logstash.logback</groupId>
50+
<artifactId>logstash-logback-encoder</artifactId>
51+
<version>4.6</version>
52+
</dependency>
53+
4854
<dependency>
4955
<groupId>org.springframework.cloud</groupId>
5056
<artifactId>spring-cloud-sleuth-zipkin</artifactId>

spring_cloud_in_action/trace-2/src/main/resources/application.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
spring.application.name=trace-2
2-
server.port=9102
3-
41
eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
52

63
spring.zipkin.base-url=http://localhost:9411

spring_cloud_in_action/trace-stream-1/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
spring.application.name=trace-stream-1
1+
spring.application.name=trace-1
22
server.port=9101
33

44
eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/

spring_cloud_in_action/trace-stream-2/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
spring.application.name=trace-stream-2
1+
spring.application.name=trace-2
22
server.port=9102
33

44
eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/

0 commit comments

Comments
 (0)