```
refactor(core): 优化DelFlag枚举值比较逻辑 - 修改DelFlag.getValue()调用为直接访问value字段 - 提升代码性能和可读性 ```
This commit is contained in:
@@ -5,36 +5,14 @@ spring:
|
||||
driverClassName: org.postgresql.Driver
|
||||
druid:
|
||||
# 主库数据源
|
||||
<<<<<<< HEAD
|
||||
master:
|
||||
<<<<<<<< HEAD:openhis-server-new/openhis-application/src/main/resources/application-test.yml
|
||||
url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=histest&characterEncoding=UTF-8&client_encoding=UTF-8
|
||||
username: postgresql
|
||||
password: Jchl1528
|
||||
========
|
||||
url: jdbc:postgresql://192.168.30.199:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
|
||||
username: postgres
|
||||
password: root
|
||||
>>>>>>>> v1.3:openhis-server-new/openhis-application/src/main/resources/application-local.yml
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
enabled:
|
||||
=======
|
||||
# master:
|
||||
# url: jdbc:postgresql://192.168.1.123:5432/openhistest?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
|
||||
# username: postgres
|
||||
# password: root
|
||||
|
||||
master:
|
||||
url: jdbc:postgresql://192.168.31.246:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
|
||||
username: postgres
|
||||
password: root
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
enabled: false
|
||||
>>>>>>> v1.3
|
||||
url:
|
||||
username:
|
||||
password:
|
||||
@@ -84,26 +62,13 @@ spring:
|
||||
# redis 配置
|
||||
redis:
|
||||
# 地址
|
||||
<<<<<<< HEAD
|
||||
<<<<<<<< HEAD:openhis-server-new/openhis-application/src/main/resources/application-test.yml
|
||||
host: 192.168.110.252
|
||||
========
|
||||
host: 192.168.30.199
|
||||
>>>>>>>> v1.3:openhis-server-new/openhis-application/src/main/resources/application-local.yml
|
||||
=======
|
||||
# host: 192.168.1.123
|
||||
host: 127.0.0.1
|
||||
>>>>>>> v1.3
|
||||
# 端口,默认为6379
|
||||
port: 6379
|
||||
# 数据库索引
|
||||
database: 1
|
||||
# 密码
|
||||
<<<<<<< HEAD
|
||||
password: Jchl1528
|
||||
=======
|
||||
password: redis
|
||||
>>>>>>> v1.3
|
||||
# 连接超时时间
|
||||
timeout: 10s
|
||||
lettuce:
|
||||
@@ -119,14 +84,10 @@ spring:
|
||||
# 文言
|
||||
messages:
|
||||
basename: i18n/general_message/messages
|
||||
<<<<<<< HEAD
|
||||
encoding: utf-8
|
||||
server:
|
||||
# 服务器的HTTP端口,默认为18080
|
||||
port: 18081
|
||||
servlet:
|
||||
# 应用的访问路径
|
||||
context-path: /openhis
|
||||
=======
|
||||
encoding: utf-8
|
||||
>>>>>>> v1.3
|
||||
context-path: /openhis
|
||||
Reference in New Issue
Block a user