From 2db2c1328008ae399d8d7af56c9c6dc67a47bce8 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-open-api/src/main/resources/application-dev.yml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index b79a379..f7df34c 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -14,10 +14,10 @@
# url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# username: rsf
username: root
-# url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# password: 34821015
- url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- password: xltys1995
+ url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ password: 34821015
+# url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# password: xltys1995
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 5
@@ -58,11 +58,16 @@
#RCS閾炬帴
rcs:
#閾炬帴
- host: http://10.10.10.200
+ host: http://127.0.0.1
#绔彛
port: 8088
wms:
#閾炬帴
- host: http://10.10.10.157
+ host: http://127.0.0.1
#绔彛
- port: 8080
\ No newline at end of file
+ port: 8085
+ erp:
+ #閾炬帴
+ host: http://www.itsdg.cn
+ #绔彛
+ port: 3741
--
Gitblit v1.9.1