WMS/wms-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: WMS:master_lz
Branches Tags
WMS:master WMS:online WMS:master_lz WMS:hk_dev
...
compare: WMS:bf1af526608ab3ca92ad798ab22f76c46ae22f27
Branches Tags
WMS:online WMS:master WMS:master_lz WMS:hk_dev

2 Commits
master_lz ... bf1af52660

Author SHA1 Message Date
zc
bf1af52660 Merge remote-tracking branch 'refs/remotes/origin/master_lz' 
# Conflicts:
#	wms-webapi/src/main/java/top/wms/admin/controller/tcp/service/CommandService.java
#	wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
 2026-03-13 10:33:03 +08:00
zc
d60966dd3f 优化 2026-03-13 09:47:51 +08:00
2 changed files with 2 additions and 2 deletions
Expand all files Collapse all files

2
wms-webapi/src/main/resources/config/application-dev.yml
View File

@@ -14,7 +14,7 @@ spring.datasource:
# 请务必提前创建好名为 wms_admin 的数据库，如果使用其他数据库名请注意同步修改 DB_NAME 配置 # 请务必提前创建好名为 wms_admin 的数据库，如果使用其他数据库名请注意同步修改 DB_NAME 配置
url: jdbc:p6spy:mysql://127.0.0.1:3306/wms?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true url: jdbc:p6spy:mysql://127.0.0.1:3306/wms?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root username: root
password: test123$ password: root
# PostgreSQL 配置 # PostgreSQL 配置
# url: jdbc:p6spy:mysql://192.168.2.30:${DB_PORT:3306}/continew?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # url: jdbc:p6spy:mysql://192.168.2.30:${DB_PORT:3306}/continew?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# username: ${DB_USER:root} # username: ${DB_USER:root}