root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-20 21:14:06 +08:00
parent 910adcfd5b
commit 42e40b2f48
14 changed files with 363 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -9,9 +9,9 @@ erp:
password: 123456
sqlserver:
enabled: false
jdbcurl: jdbc:sqlserver://47.97.157.227:1433;DatabaseName=testdb-lx
username: sa
password: Nl@123
jdbcurl: jdbc:sqlserver://124.222.26.218:1433;DatabaseName=wcs-xr
username: mes
password: 123456
#配置数据源
spring:
@@ -19,12 +19,14 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:whxr_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:whxr_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:P@ssw0rd}
# password: ${DB_PWD:P@ssw0rd}
# password: ${DB_PWD:Root.123456}
# username: ${DB_USER:root}
# password: ${DB_PWD:root}
password: ${DB_PWD:root}
# 初始连接数
initial-size: 5
# 最小连接数
@@ -70,8 +72,8 @@ spring:
multi-statement-allow: true
redis:
#数据库索引
database: ${REDIS_DB:14}
host: ${REDIS_HOST:47.111.78.178}
database: ${REDIS_DB:1}
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:}
#连接超时时间