|
|
@@ -59,11 +59,7 @@ 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
|
|
|
# 连接池的配置信息
|
|
|
@@ -116,11 +112,7 @@ spring:
|
|
|
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:
|
|
|
@@ -188,16 +180,9 @@ mrqc:
|
|
|
|
|
|
#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
|
|
|
+
|
Gaozk