From 85b8e7ba6c4d0d780a7f90360150f2bd955eb874 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 08:07:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/resources/application-dev.yml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 20d38b4..3f84f94 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -14,6 +14,8 @@
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
+# url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# username: rsf
password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -76,7 +78,7 @@
#绔彛鍙�
port: 8080
#鎺ュ搧閾炬帴鍓嶇紑
- prePath: rsf-server
+ pre-path: rsf-server
#鎺ュ彛鏄庣粏
api:
#璐ㄦ涓婃姤鎺ュ彛
--
Gitblit v1.9.1