Update application-predev.yml

application-predev.yml

@@ -5,22 +5,34 @@ jasypt:
 spring:
 spring:
   redis:
   redis:
     remote: false        #cachecloud 获取
     remote: false        #cachecloud 获取
-    host: 192.168.0.158
-    hostName: 192.168.0.158 #183.95.190.112
+    host: 119.96.87.17
+    hostName: 119.96.87.17 #183.95.190.112
     port: 6379
     port: 6379
-    password: 123456
+    password: fcd258Kf
     timeout: 0
     timeout: 0
     pool:
     pool:
       max-active: 8
       max-active: 8
       max-wait: -1
       max-wait: -1
       max-idle: 8
       max-idle: 8
       min-idle: 0
       min-idle: 0
+  redisMac:
+    remote: false        #cachecloud 获取
+    host: 81.70.218.156
+    hostName: 81.70.218.156 #183.95.190.112
+    port: 6379
+    timeout: 0
+    pool:
+      max-active: 8
+      max-wait: -1
+      max-idle: 8
+      min-idle: 0
+
   rabbitmq:
   rabbitmq:
     host: 119.96.87.17
     host: 119.96.87.17
     port: 5672
     port: 5672
     username: rabbit
     username: rabbit
     password: rabbit-techhero
     password: rabbit-techhero
-    virtual-host: /test
+    virtual-host: /local
     listener:
     listener:
       simple:
       simple:
         acknowledge-mode: auto
         acknowledge-mode: auto
@@ -32,12 +44,6 @@ spring:
     publisher-confirms: true
     publisher-confirms: true
     #确认消息已发送到队列(Queue)
     #确认消息已发送到队列(Queue)
     publisher-returns: true
     publisher-returns: true
-  zipkin:
-    enabled: true
-    sender:
-      type: rabbit
-    rabbitmq:
-      queue: zipkin
   sleuth:
   sleuth:
     sampler:
     sampler:
       percentage: 1.0    
       percentage: 1.0    
@@ -51,10 +57,12 @@ spring:
     admin:
     admin:
       auto-registration: true
       auto-registration: true
       #url: http://119.96.87.17:10422
       #url: http://119.96.87.17:10422
-    #   url: http://127.0.0.1:10422
-      url: http://192.168.0.19
+      #url: http://127.0.0.1:10422
+      client:
+        service-base-url: 127.0.0.1:10422
       api-path: instances
       api-path: instances
 
 
+
 cache:
 cache:
   redis:
   redis:
     expires:
     expires:
@@ -65,13 +73,13 @@ ribbon:
     enabled: true
     enabled: true
   eager-load:
   eager-load:
     enabled: true
     enabled: true
-    clients: techhero-auth,techhero-base-system,techhero-base-exam,techhero-base-transdata,techhero-project-theme,techhero-project-emergencycommand,techhero-project-track,techhero-project-visualization,techhero-preventioncheat,techhero-component-task,techhero-component-oss,techhero-component-websocket,techhero-component-message,techhero-component-workflow,techhero-project-inspection,techhero-base-datagovern
+    clients: techhero-auth,techhero-base-system,techhero-base-exam,techhero-base-transdata,techhero-project-theme,techhero-project-emergencycommand,techhero-project-track,techhero-project-visualization,techhero-preventioncheat,techhero-component-task,techhero-component-oss,techhero-component-websocket,techhero-component-message,techhero-component-workflow
   Httpclient:
   Httpclient:
     enabled: false
     enabled: false
   OkHttp:
   OkHttp:
     enabled: true
     enabled: true
-  ReadTimeout: 10000
-  ConnectTimeout: 10000
+  ReadTimeout: 100000
+  ConnectTimeout: 100000
 
 
 feign:
 feign:
   hystrix:
   hystrix:
@@ -83,8 +91,8 @@ feign:
   client:
   client:
     config:
     config:
       feignName:
       feignName:
-        connectTimeout: 10000
-        readTimeout: 10000
+        connectTimeout: 100000
+        readTimeout: 100000
   compression:
   compression:
     request:
     request:
       enabled: true
       enabled: true
@@ -104,7 +112,7 @@ hystrix:
       execution:
       execution:
         isolation:
         isolation:
           thread:
           thread:
-            timeoutInMilliseconds: 40000
+            timeoutInMilliseconds: 400000
     fallback:
     fallback:
       isolation:
       isolation:
         semaphore:
         semaphore:
@@ -115,27 +123,18 @@ tomcat:
   min-spare-threads: 3
   min-spare-threads: 3
   accept-count: 10
   accept-count: 10
 
 
-# 关闭安全管理
-management:
-  security:
-    enabled: false
-#   endpoints:
-#     web:
-#       exposure:
-#         include: '*'
-#   endpoint:
-#     health:
-#       show-details: ALWAYS
+
 
 
 rabbitmq:
 rabbitmq:
   czlsLog:
   czlsLog:
-    exchange: topicCzlsLogExchangeTest
-    queue: topic.czlsLog.test
+    exchange: topicCzlsLogExchangeLocal
+    queue: topic.czlsLog.local
   incidentReporting:
   incidentReporting:
-    exchange: topic-test-incident-reporting-exchange
-    queue: topic.test.incidentReporting.queue
+    exchange: topic-local-incident-reporting-exchange
+    queue: topic.local.incidentReporting.queue
   alarmMessage:
   alarmMessage:
-    exchange: alarm-message-test
-    queue: Alarm-Event-Msg-test
-
+    exchange: alarm-message-local
+    queue: Alarm-Event-Msg-local
 
 
+  
+ 
\ No newline at end of file