Merge branch 'develop' into innerDevelop

src/main/resources/application-dev.yml

@@ -10,6 +10,7 @@ hystrix:
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -40,6 +41,11 @@ feign:
     enabled: true
     max-connections: 1000 # 默认值
     max-connections-per-route: 250 # 默认值
+  client:
+    config:
+      default:
+        connectTimeout: 10000  # 连接超时时间
+        readTimeout: 3600000     # 读超时时间设置
 
 management:
   endpoints:

src/main/resources/application-local.yml

@@ -10,6 +10,7 @@ hystrix:
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -40,6 +41,11 @@ feign:
     enabled: true
     max-connections: 1000 # 默认值
     max-connections-per-route: 250 # 默认值
+  client:
+    config:
+      default:
+        connectTimeout: 10000  # 连接超时时间
+        readTimeout: 3600000     # 读超时时间设置
 
 management:
   endpoints:

src/main/resources/application-pre.yml

@@ -10,6 +10,7 @@ hystrix:
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -40,6 +41,11 @@ feign:
     enabled: true
     max-connections: 1000 # 默认值
     max-connections-per-route: 250 # 默认值
+  client:
+    config:
+      default:
+        connectTimeout: 10000  # 连接超时时间
+        readTimeout: 3600000     # 读超时时间设置
 
 management:
   endpoints:

src/main/resources/application-pro.yml

@@ -10,6 +10,7 @@ hystrix:
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -40,6 +41,11 @@ feign:
     enabled: true
     max-connections: 1000 # 默认值
     max-connections-per-route: 250 # 默认值
+  client:
+    config:
+      default:
+        connectTimeout: 10000  # 连接超时时间
+        readTimeout: 3600000     # 读超时时间设置
 
 management:
   endpoints:

src/main/resources/application-test.yml

@@ -10,6 +10,7 @@ hystrix:
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -40,6 +41,11 @@ feign:
     enabled: true
     max-connections: 1000 # 默认值
     max-connections-per-route: 250 # 默认值
+  client:
+    config:
+      default:
+        connectTimeout: 10000  # 连接超时时间
+        readTimeout: 3600000     # 读超时时间设置
 
 management:
   endpoints: