From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-open-api/src/main/resources/application-dev.yml | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 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 f4fe06a..5fc0f28 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -14,8 +14,13 @@
# 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://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- password: xltys1995
+# url: jdbc:mysql://192.168.4.15:3306/rsf_20250106?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# password: 1234
+# 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&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://192.168.4.199:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ password: root
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 5
@@ -56,11 +61,34 @@
#RCS閾炬帴
rcs:
#閾炬帴
- host: http://10.10.10.247
+ host: http://127.0.0.1
#绔彛
port: 8088
+ #WCS閾炬帴
+ wcs:
+ #閾炬帴
+ host: http://127.0.0.1
+ #绔彛
+ port: 9090
+ #WCS閾炬帴
+ hk:
+ #閾炬帴
+ host: http://192.168.4.197
+ #绔彛
+ port: 9189
wms:
#閾炬帴
host: http://127.0.0.1
#绔彛
- port: 8080
\ No newline at end of file
+ port: 8085
+ erp:
+ #閾炬帴
+ host: http://www.itsdg.cn
+ #绔彛
+ port: 3741
+
+springdoc:
+ api-docs:
+ enabled: true
+ swagger-ui:
+ enabled: true
--
Gitblit v1.9.1