sand
|
2747b4c469
Merge branch 'dev' of lyr/ehr.config into dev
|
8 rokov pred |
sand
|
2c5fa71845
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
lyr
|
c78455bd8f
档案安全模块配置添加
|
8 rokov pred |
lyr
|
a6d3470b48
档案安全模块配置添加
|
8 rokov pred |
lyr
|
f4454413b2
档案安全模块配置添加
|
8 rokov pred |
lyr
|
1e07030ab1
档案安全模块配置添加
|
8 rokov pred |
laz
|
564665bfea
开放网关dev分支去掉key-store: tomcat.keystore
|
8 rokov pred |
sand
|
2834931778
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
7edcf8689f
data-source改为datasource
|
8 rokov pred |
sand
|
3223fe82be
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
6903a4875f
恢复开发平台网关ssl认证
|
8 rokov pred |
sand
|
e36f927695
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
5d6783ea47
恢复开发平台网关ssl认证
|
8 rokov pred |
sand
|
522cc4c0c1
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
34a724b5a2
恢复开发平台网关ssl认证
|
8 rokov pred |
sand
|
06efd9295b
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
5333e151fd
修改hystrix和ribbon超时时间为半小时
|
8 rokov pred |
sand
|
9c8eb50aee
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
ce599a9a7d
修改生产环境正确的hadoop配置
|
8 rokov pred |
sand
|
75ef09f7ff
Merge branch 'dev' of lyr/ehr.config into dev
|
8 rokov pred |
lyr
|
9ab274c547
FASTDFS服务器地址修改
|
8 rokov pred |
lyr
|
3cb44351e2
FASTDFS服务器地址修改
|
8 rokov pred |
lyr
|
03e5a7f827
FASTDFS服务器地址修改
|
8 rokov pred |
lyr
|
9c292ecc08
Merge branch 'dev' of http://192.168.1.220:10080/EHR/ehr.config into dev
|
8 rokov pred |
lyr
|
5ccdfb58c6
eureka服务器地址修改
|
8 rokov pred |
sand
|
9e33ffc8e5
Merge branch 'dev' of lyr/ehr.config into dev
|
8 rokov pred |
lyr
|
e14986d035
fastdsf图片获取地址修改
|
8 rokov pred |
sand
|
90b4ba53fd
Merge branch 'dev' of lincl/ehr.config into dev
|
8 rokov pred |
hh
|
ba4e35c5ed
适配微服务调整到标准微服务中, 对应的配置修改
|
8 rokov pred |
sand
|
8b647a05e9
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
1c4f5afd64
svr-health-profile开发库zk-host节点配置修改撤销
|
8 rokov pred |
laz
|
c716cf99b6
修改solr正式库zk-host节点配置和
|
8 rokov pred |
sand
|
9c7681c44e
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
ebd69830a8
测试福州的jar包暂时写的配置
|
8 rokov pred |
sand
|
6d15a2190f
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
dde67dcdc6
测试福州的jar包暂时写的配置
|
8 rokov pred |
sand
|
6dc72cc3e5
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
4782d95380
取消开放平台网关ssl配置,把eureka连接超时时间和访问超时时间迁移到application.yml
|
8 rokov pred |
sand
|
6d223202cd
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
fe93b50d77
修改alpha环境key-store地址
|
8 rokov pred |
sand
|
2be2966207
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
sand
|
1faf1bd3f8
Merge branch 'dev' of lyr/ehr.config into dev
|
8 rokov pred |
lyr
|
781c68d7ac
缓存配置修改
|
8 rokov pred |
laz
|
8ff30b6063
添加mysql配置
|
8 rokov pred |
sand
|
6d7dd8e546
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
d2f58ba0ab
去除mysql配置
|
8 rokov pred |
sand
|
1f251c8ff4
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
353826e896
修改dotasource配置方式,让springboot托管
|
8 rokov pred |
laz
|
95068fb6ab
修改dotasource配置方式,让springboot托管
|
8 rokov pred |
sand
|
0a951b20ae
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
e51ed69289
修改dotasource配置方式,让springboot托管
|
8 rokov pred |
sand
|
428ee7e78c
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
fa9c5d9b98
修改dotasource配置方式,让springboot托管
|
8 rokov pred |
sand
|
8feea3ea62
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
d8e8b4dcda
修改dotasource配置方式,让springboot托管
|
8 rokov pred |
sand
|
f5e6926ae7
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
Sand Wen
|
3bcfe2b8cc
jdbc配置由spring处理
|
8 rokov pred |
Sand Wen
|
0ef34120e1
turn web security off
|
8 rokov pred |
Sand Wen
|
0ab029e0b7
turn web security off
|
8 rokov pred |
Sand Wen
|
143cbe8c74
关闭basic认证
|
8 rokov pred |
Sand Wen
|
1919616a23
修改spring data jdbc配置
|
8 rokov pred |
Sand Wen
|
73f5e360a2
retore ssl配置
|
8 rokov pred |
Sand Wen
|
eab22e37b8
取消ssl配置
|
8 rokov pred |
Sand Wen
|
428f385026
增加ehr.cloud.port配置
|
8 rokov pred |
Sand Wen
|
71f1bbcd4d
修改网关配置名称
|
8 rokov pred |
Sand Wen
|
0529de2fef
merge code
|
8 rokov pred |
Sand Wen
|
536201c9a3
增加alpha版本配置
|
8 rokov pred |
Sand Wen
|
ca86e4e507
Merge branch 'dev' of http://192.168.1.220:10080/EHR/ehr.config into dev
|
8 rokov pred |
Sand Wen
|
3dc53302d0
禁用spring.jmx选项
|
8 rokov pred |
sand
|
11977d7ac9
Merge branch 'dev' of linaz/ehr.config into dev
|
8 rokov pred |
laz
|
7da756396c
合并svr-dict和svr-special-dict svr-dict添加redis配置
|
8 rokov pred |