Merge branch 'master' of git@60.205.210.36:proudkids-pub/config-center.git

proudkids-gateway-dev.yml

@@ -67,6 +67,11 @@ zuul:
       serviceId: proudkids-mms
       stripPrefix: true
       sensitiveHeaders:
+    proudkids-apps:
+      path: /apps/**
+      serviceId: proudkids-apps
+      stripPrefix: true
+      sensitiveHeaders:
 
   ratelimit:
     key-prefix: proudkids-ratelimite 
@@ -80,6 +85,21 @@ zuul:
         refresh-interval: 3
 
 
+hystrix:
+  command:
+    default:
+     execution:
+      timeout: #配置命令的执行，是否会超时
+        enabled: true
+      isolation: #命令的执行超时时间  超时将执行回退
+        thread:
+          timeoutInMilliseconds: 60000
+
+ribbon:
+  ReadTimeout: 30000  #读取超时时间
+  ConnectTimeout: 30000
+
+
 security:
   validate:
     code: true
@@ -135,6 +155,7 @@ urls:
     - /ruser/v1/ruser/isHaveInstallWinter*
     - /mms/email/v1/send/**
     - /mms/sms/v1/send
+    - /apps/mp/**
 
 logging:
   config: classpath:logback.xml

proudkids-upms-service-dev.yml

@@ -75,5 +75,5 @@ cms:
       location: /opt/devops/cms/
       templete: templates/
     - domain: http://192.168.1.81/cms002
-      location: /opt/devops/cms/cms002
+      location: /opt/devops/cms002/
       templete: templates002/
\ No newline at end of file