From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决

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

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6c8d683..42ecf7e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -62,9 +62,9 @@
     druid:
       # 涓诲簱鏁版嵁婧�
       master:
-        url: jdbc:mysql://localhost:3306/product-inventory-management-dhdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://114.132.189.42:9099/product-inventory-management-dhdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: xd@123456..
       # 浠庡簱鏁版嵁婧�
       slave:
         # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -142,7 +142,7 @@
     database: 0
     # 瀵嗙爜
 #    password: root2022!
-    password:
+    password: 123456
 
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 10s
@@ -190,7 +190,7 @@
   secret: abcdefghijklmnopqrstuvwxyz
   # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
   expireTime: 450
-  
+
 # MyBatis Plus閰嶇疆
 mybatis-plus:
   # 鎼滅储鎸囧畾鍖呭埆鍚�   鏍规嵁鑷繁鐨勯」鐩潵
@@ -203,7 +203,7 @@
     enable-sql-runner: true
     db-config:
       id-type: auto
-  
+
 # PageHelper鍒嗛〉鎻掍欢
 pagehelper:
   helperDialect: mysql
@@ -225,7 +225,7 @@
   excludes: /system/notice
   # 鍖归厤閾炬帴
   urlPatterns: /system/*,/monitor/*,/tool/*
-  
+
 # 浠ｇ爜鐢熸垚
 gen:
   # 浣滆��
@@ -241,4 +241,4 @@
 
 file:
   temp-dir: D:/ruoyi/temp/uploads   # 涓存椂鐩綍
-  upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
\ No newline at end of file
+  upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍

--
Gitblit v1.9.3