Skip to content

P
pica-cloud-yunqueyilian
提交 b5318612 编写于 作者: yongbo.wang's avatar yongbo.wang
浏览文件
操作

去除hystrix

上级 3ced2b4a
隐藏空白字符变更
内嵌 并排
正在显示 包含 11 行增加 和 12 行删除
server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/App.java
浏览文件 @ b5318612
...@@ -4,12 +4,11 @@ import com.pica.cloud.wechat.yunqueyilian.server.configuration.MyTypeExcludeFilt ...@@ -4,12 +4,11 @@ import com.pica.cloud.wechat.yunqueyilian.server.configuration.MyTypeExcludeFilt
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; 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
......
server/src/main/resources/bootstrap-dev.properties
浏览文件 @ b5318612
...@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0 ...@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0
AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
#\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000 #hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
ribbon.ConnectTimeout=6000 ribbon.ConnectTimeout=6000
#\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4
......
server/src/main/resources/bootstrap-prod.properties
浏览文件 @ b5318612
...@@ -29,9 +29,9 @@ AppID=wxcf79dbdc24cb684b ...@@ -29,9 +29,9 @@ AppID=wxcf79dbdc24cb684b
AppSecret=febe33eec4d0c05d62a2393be35c35c4 AppSecret=febe33eec4d0c05d62a2393be35c35c4
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
#\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000 #hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
ribbon.ConnectTimeout=6000 ribbon.ConnectTimeout=6000
#\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4
......
server/src/main/resources/bootstrap-test1.properties
浏览文件 @ b5318612
...@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0 ...@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0
AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
#\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000 #hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
ribbon.ConnectTimeout=6000 ribbon.ConnectTimeout=6000
#\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4
......
server/src/main/resources/bootstrap-test2.properties
浏览文件 @ b5318612
...@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0 ...@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0
AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
#\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000 #hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
ribbon.ConnectTimeout=6000 ribbon.ConnectTimeout=6000
#\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4
......
server/src/main/resources/bootstrap-uat.properties
浏览文件 @ b5318612
...@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0 ...@@ -29,9 +29,9 @@ AppID=wx1ee39338694703b0
AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b AppSecret=69e2c741d0cf8fd7eb8877ab9f3a236b
#local settings #local settings
feign.hystrix.enabled=true #feign.hystrix.enabled=true
#\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236 #\u5F00\u542Fhystrix\u8BF7\u6C42\u8D85\u65F6\u673A\u5236
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000 #hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4
ribbon.ConnectTimeout=6000 ribbon.ConnectTimeout=6000
#\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4 #\u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或