From 094a8032e067756156cc73c3288e039f2ea1d25d Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 30 八月 2025 08:04:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-open-api/src/main/resources/application-dev.yml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index bc1bd20..f4fe06a 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -14,8 +14,8 @@
# 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
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 5
@@ -56,6 +56,11 @@
#RCS閾炬帴
rcs:
#閾炬帴
- host: http://192.168.4.84
+ host: http://10.10.10.247
#绔彛
- port: 8088
\ No newline at end of file
+ port: 8088
+ wms:
+ #閾炬帴
+ host: http://127.0.0.1
+ #绔彛
+ port: 8080
\ No newline at end of file
--
Gitblit v1.9.1