save

src/main/resources/application-local.yml

@@ -10,8 +10,6 @@ hystrix:
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
-    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -42,11 +40,6 @@ feign:
     enabled: true
     max-connections: 1000 # 默认值
     max-connections-per-route: 250 # 默认值
-  client:
-    config:
-      default:
-        connectTimeout: 10000  # 连接超时时间
-        readTimeout: 3600000     # 读超时时间设置
 
 management:
   endpoints:
@@ -66,7 +59,11 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
+<<<<<<< Updated upstream
       url: jdbc:mysql://192.168.2.122:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+=======
+      url: jdbc:mysql://10.58.4.153:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+>>>>>>> Stashed changes
       username: root
       password: lantone
       # 连接池的配置信息
@@ -113,31 +110,17 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
-  cloud:
-    stream:
-      bindings:
-        outputCdssLog:
-          destination: cdssLog
-        inputCdssLog:
-          destination: cdssLog
-          group: cdssLogReceiveGroup
-
-  #mq
-  rabbitmq:
-    host: localhost
-    port: 5672
-    username: guest
-    password: guest
-    publisher-confirms: true
-    virtual-host: /
-
   #redis
   redis:
     database:
       cache: 15 # cache索引
       token: 15 # Token索引
       mr: 15 # 病历索引
+<<<<<<< Updated upstream
     host: 192.168.2.236  #Redis服务器地址
+=======
+    host: 10.58.4.152  #Redis服务器地址
+>>>>>>> Stashed changes
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
@@ -191,26 +174,30 @@ oath.self.address: http://${myhost}:${server.port}
 swagger:
   enable: true
 
-#日志记录
-cdssLog:
-  enable: true
-
 #Token鉴权
 tokenAuth:
   enable: false
 
 #图片服务器
 imageUrl:
-  prefix: http://192.168.2.236:82
+  prefix: http://10.58.4.152:82
 
 #病历质控地址
 mrqc:
-  url: http://192.168.2.236:5858
+  url: http://10.58.4.152:5858
 
 #CDSS核心地址
 cdss-core:
+<<<<<<< Updated upstream
   url: http://192.168.2.236:7010
 
 #页面推送模式地址配置
 data-page:
   url: http://192.168.2.122:5654
+=======
+  url: http://10.58.4.152:7010
+
+#页面推送模式地址配置
+data-page:
+  url: http://10.58.4.152:5654
+>>>>>>> Stashed changes