提交 fcda4dad 编写于 作者: minghao.wu's avatar minghao.wu

fix: remove hystrix

上级 b3ceb58c
流水线 #8250 已通过 于阶段
in 10 second
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-feign</artifactId> <artifactId>spring-cloud-starter-feign</artifactId>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>org.springframework.cloud</groupId> <!--<groupId>org.springframework.cloud</groupId>-->
<artifactId>spring-cloud-starter-hystrix</artifactId> <!--<artifactId>spring-cloud-starter-hystrix</artifactId>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -8,7 +8,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; ...@@ -8,7 +8,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.cloud.netflix.feign.EnableFeignClients;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableCircuitBreaker //@EnableCircuitBreaker
@SpringBootApplication(scanBasePackages = "com.pica.cloud") @SpringBootApplication(scanBasePackages = "com.pica.cloud")
@EnableDiscoveryClient @EnableDiscoveryClient
@EnableSwagger2 @EnableSwagger2
......
...@@ -25,9 +25,14 @@ spring.rabbitmq.username=appuser ...@@ -25,9 +25,14 @@ spring.rabbitmq.username=appuser
spring.rabbitmq.password=AqLfvyWOvLQEUzdI spring.rabbitmq.password=AqLfvyWOvLQEUzdI
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
management.security.enabled=false management.security.enabled=false
ribbon.ReadTimeout=300000
ribbon.SocketTimeout=300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout=30000
#spring.zipkin.base-url=http://192.168.110.124:7895 #spring.zipkin.base-url=http://192.168.110.124:7895
#spring.sleuth.sampler.percentage=1.0 #spring.sleuth.sampler.percentage=1.0
......
...@@ -24,11 +24,16 @@ spring.rabbitmq.port=5672 ...@@ -24,11 +24,16 @@ spring.rabbitmq.port=5672
spring.rabbitmq.username=appuser spring.rabbitmq.username=appuser
spring.rabbitmq.password=AqLfvyWOvLQEUzdI spring.rabbitmq.password=AqLfvyWOvLQEUzdI
#local setting #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
management.security.enabled=true management.security.enabled=true
spring.zipkin.base-url=http://172.19.137.19:7895 ribbon.ReadTimeout=300000
spring.sleuth.sampler.percentage=1.0 ribbon.SocketTimeout=300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout=30000
#spring.zipkin.base-url=http://172.19.137.19:7895
#spring.sleuth.sampler.percentage=1.0
logging.config=classpath:log4j2-prod.xml logging.config=classpath:log4j2-prod.xml
\ No newline at end of file
...@@ -25,10 +25,15 @@ spring.rabbitmq.username=appuser ...@@ -25,10 +25,15 @@ spring.rabbitmq.username=appuser
spring.rabbitmq.password=AqLfvyWOvLQEUzdI spring.rabbitmq.password=AqLfvyWOvLQEUzdI
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
management.security.enabled=false management.security.enabled=false
spring.zipkin.base-url=http://192.168.110.133:7895 ribbon.ReadTimeout=300000
spring.sleuth.sampler.percentage=1.0 ribbon.SocketTimeout=300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout=30000
#spring.zipkin.base-url=http://192.168.110.133:7895
#spring.sleuth.sampler.percentage=1.0
logging.config=classpath:log4j2-test1.xml logging.config=classpath:log4j2-test1.xml
\ No newline at end of file
...@@ -25,10 +25,15 @@ spring.rabbitmq.username=appuser ...@@ -25,10 +25,15 @@ spring.rabbitmq.username=appuser
spring.rabbitmq.password=AqLfvyWOvLQEUzdI spring.rabbitmq.password=AqLfvyWOvLQEUzdI
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
management.security.enabled=false management.security.enabled=false
spring.zipkin.base-url=http://192.168.110.133:7895 ribbon.ReadTimeout=300000
spring.sleuth.sampler.percentage=1.0 ribbon.SocketTimeout=300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout=30000
#spring.zipkin.base-url=http://192.168.110.133:7895
#spring.sleuth.sampler.percentage=1.0
logging.config=classpath:log4j2-test1.xml logging.config=classpath:log4j2-test1.xml
\ No newline at end of file
...@@ -25,10 +25,15 @@ spring.rabbitmq.username=picacloud ...@@ -25,10 +25,15 @@ spring.rabbitmq.username=picacloud
spring.rabbitmq.password=123456 spring.rabbitmq.password=123456
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
management.security.enabled=false management.security.enabled=false
spring.zipkin.base-url=http://192.168.110.141:7895 ribbon.ReadTimeout=300000
spring.sleuth.sampler.percentage=1.0 ribbon.SocketTimeout=300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout=30000
#spring.zipkin.base-url=http://192.168.110.141:7895
#spring.sleuth.sampler.percentage=1.0
logging.config=classpath:log4j2-uat.xml logging.config=classpath:log4j2-uat.xml
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册