From eb8ded2565e746a360985f702c556b26f750d35a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 09:07:51 +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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 34623d8..ce13aca 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -12,8 +12,10 @@
matching-strategy: ANT_PATH_MATCHER
datasource:
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://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,11 +78,11 @@
#绔彛鍙�
port: 8080
#鎺ュ搧閾炬帴鍓嶇紑
- prePath: rsf-server
+ pre-path: rsf-server
#鎺ュ彛鏄庣粏
- apiInfo:
+ api:
#璐ㄦ涓婃姤鎺ュ彛
- notifyInspect: /report/inspect
+ notify-inspect: /report/inspect
#浠撳簱鍔熻兘鍙傛暟閰嶇疆
stock:
--
Gitblit v1.9.1