修改配置

ali-service-prod.yml

@@ -25,13 +25,3 @@ oauth:
   clinet:
     id: client-ali
     secret: '{cipher}afc4310cda3e677ba06fcebfacdd21de619712640c0c2d351fcad4f24f33774e'
-ribbon:
-  ReadTimeout: 6000
-  ConnectTimeout: 6000
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 6000

ali-service-test.yml

@@ -25,13 +25,3 @@ oauth:
   clinet:
     id: client-ali
     secret: '{cipher}c920c9354f78e8e214b0e9f85aa05f3d32ae00b67c61ead402e7cc1979e83cfc'
-ribbon: 
-  ReadTimeout: 6000
-  ConnectTimeout: 6000
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 6000

application.yml

@@ -11,6 +11,19 @@ datasource:
   testOnReturn: false
 es:
   elasticIps: http://193.112.16.187:12900
+ribbon:
+  ReadTimeout: 5000
+  ConnectTimeout: 5000
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 5000
+feign:
+  hystrix:
+    enabled: true
 ---
 datasource:
   comtika:

equip-service-prod.yml

@@ -1,6 +1,3 @@
-feign:
-  hystrix:
-    enabled: true
 ribbon: 
   ReadTimeout: 36500
   ConnectTimeout: 36500

equip-service-test.yml

@@ -1,6 +1,3 @@
-feign:
-  hystrix:
-    enabled: true
 ribbon: 
   ReadTimeout: 36500
   ConnectTimeout: 36500

instructions-service-prod.yml

@@ -1,6 +1,3 @@
-feign:
-  hystrix:
-    enabled: true
 ribbon: 
   ReadTimeout: 36000
   ConnectTimeout: 36000

instructions-service-test.yml

@@ -1,6 +1,3 @@
-feign:
-  hystrix:
-    enabled: true
 ribbon: 
   ReadTimeout: 36000
   ConnectTimeout: 36000

logs-service-prod.yml

@@ -1,6 +0,0 @@
-spring:
-  rabbitmq:
-    host: '{cipher}17a5c5d44eca2e0aecbac7e993115606e1a99ef20cf4f551330ce0b1eac6243e'
-    port: '{cipher}e0d9dbb4d77f5a84bee245b4c74c4585ff67e747f045252de4edbd170f4d0016'
-    username: admin
-    password: '{cipher}63e855a24e7dc281a4e946cb4c990f5701cae599d2a21bee8780325e6c8c04f9'

merchant-service-prod.yml

@@ -1,17 +1,3 @@
-feign:
-  hystrix:
-    enabled: true
-ribbon: 
-  ReadTimeout: 5000
-  ConnectTimeout: 5000
-  ServerListRefreshInterval: 5000
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 5000
 oauth:
   clinet:
     id: client-merchant

merchant-service-test.yml

@@ -1,17 +1,3 @@
-feign:
-  hystrix:
-    enabled: true
-ribbon: 
-  ReadTimeout: 5000
-  ConnectTimeout: 5000
-  ServerListRefreshInterval: 5000
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 5000
 oauth:
   clinet:
     id: client-merchant

message-service-prod.yml

@@ -1 +0,0 @@
-

message-service-test.yml

@@ -1,15 +0,0 @@
-eureka:
-  instance:
-    lease-renewal-interval-in-seconds: 5
-    lease-expiration-duration-in-seconds: 15
-  client:
-    registryFetchIntervalSeconds: 5
-spring:
-  jpa:
-    show-sql: true
-    hibernate.ddl-auto: update
-  rabbitmq:
-    host: '{cipher}f9da24726dfcb00a35fe0dde5ee4bebc3ff4d992984bbc4e9907795d9a7e120d'
-    port: '{cipher}e0d9dbb4d77f5a84bee245b4c74c4585ff67e747f045252de4edbd170f4d0016'
-    username: admin
-    password: '{cipher}63e855a24e7dc281a4e946cb4c990f5701cae599d2a21bee8780325e6c8c04f9'

order-service-prod.yml

@@ -1,14 +0,0 @@
-feign:
-  hystrix:
-    enabled: true
-ribbon: 
-  ReadTimeout: 6000
-  ConnectTimeout: 6000
-  ServerListRefreshInterval: 6000
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 6000

order-service-test.yml

@@ -1,14 +0,0 @@
-feign:
-  hystrix:
-    enabled: true
-ribbon: 
-  ReadTimeout: 6000
-  ConnectTimeout: 6000
-  ServerListRefreshInterval: 6000
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 6000

server-service-prod.yml

@@ -1,6 +1,3 @@
-feign:
-  hystrix:
-    enabled: true
 ribbon: 
   ReadTimeout: 36500
   ConnectTimeout: 36500

sites-service-prod.yml

@@ -1,14 +0,0 @@
-feign:
-  hystrix:
-    enabled: true
-ribbon: 
-  ReadTimeout: 6000
-  ConnectTimeout: 6000
-  ServerListRefreshInterval: 6000
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 6000

sites-service-test.yml

@@ -1,14 +0,0 @@
-feign:
-  hystrix:
-    enabled: true
-ribbon: 
-  ReadTimeout: 6000
-  ConnectTimeout: 6000
-  ServerListRefreshInterval: 6000
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 6000

wxpay-service-prod.yml

@@ -2,13 +2,6 @@ oauth:
   clinet:
     id: client-ali
     secret: '{cipher}afc4310cda3e677ba06fcebfacdd21de619712640c0c2d351fcad4f24f33774e'
-#eureka客户端ribbon刷新时间,默认30s
-ribbon:
-  ServerListRefreshInterval: 5000
-#开启熔断器
-feign:
-  hystrix:
-    enabled: true
 #微信授权配置
 wechat:
   jscode2session: https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code

wxpay-service-test.yml

@@ -2,13 +2,6 @@ oauth:
   clinet:
     id: '{cipher}532f658f6e5d523b3a10d03359d597ef83d3b43e47ff206856233e10c9393535'
     secret: '{cipher}b39cee78f15b16daa32da3ac0390e616115fadf50fd5b8b6cf9458618e10f11e'
-#eureka客户端ribbon刷新时间,默认30s
-ribbon:
-  ServerListRefreshInterval: 5000
-#开启熔断器
-feign:
-  hystrix:
-    enabled: true
 #微信授权配置
 wechat:
   jscode2session: https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code

zipkin-service-prod.yml

@@ -1,9 +1,3 @@
-spring:
-  rabbitmq:
-    host: '{cipher}17a5c5d44eca2e0aecbac7e993115606e1a99ef20cf4f551330ce0b1eac6243e'
-    port: '{cipher}e0d9dbb4d77f5a84bee245b4c74c4585ff67e747f045252de4edbd170f4d0016'
-    username: admin
-    password: '{cipher}63e855a24e7dc281a4e946cb4c990f5701cae599d2a21bee8780325e6c8c04f9'
 zipkin:
   storage:
     type: elasticsearch

zipkin-service-test.yml

@@ -1,9 +1,3 @@
-spring:
-  rabbitmq:
-    host: '{cipher}f9da24726dfcb00a35fe0dde5ee4bebc3ff4d992984bbc4e9907795d9a7e120d'
-    port: '{cipher}e0d9dbb4d77f5a84bee245b4c74c4585ff67e747f045252de4edbd170f4d0016'
-    username: admin
-    password: '{cipher}63e855a24e7dc281a4e946cb4c990f5701cae599d2a21bee8780325e6c8c04f9'
 zipkin:
   storage:
     type: elasticsearch