From fffb817cc80e3a20913e1c8073e39daaa8c58f63 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 21 十一月 2025 16:09:56 +0800
Subject: [PATCH] Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms

---
 rsf-server/src/main/resources/application-dev.yml |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 4944870..496df82 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -1,8 +1,7 @@
 server:
-  port: 8080
+  port: 8085
   servlet:
     context-path: /@pom.artifactId@
-
 spring:
   application:
     name: @pom.artifactId@
@@ -11,12 +10,10 @@
     path match:
       matching-strategy: ANT_PATH_MATCHER
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-#    username: rsf
-    password: 1234
+    password: 34821015
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 5
@@ -83,6 +80,11 @@
     api:
       #璐ㄦ涓婃姤鎺ュ彛
       notify-inspect: /report/inspect
+  rcs:
+    #閾炬帴
+    host: http://127.0.0.1
+    #绔彛
+    port: 8081
 
 #浠撳簱鍔熻兘鍙傛暟閰嶇疆
 stock:

--
Gitblit v1.9.1