From a1160706d2940bcbd38233731691a999be1d4024 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期六, 11 十月 2025 11:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/application-bdsm.yml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application-bdsm.yml b/src/main/resources/application-bdsm.yml
index afb5f58..01b577d 100644
--- a/src/main/resources/application-bdsm.yml
+++ b/src/main/resources/application-bdsm.yml
@@ -17,7 +17,7 @@
 # 寮�鍙戠幆澧冮厤缃�
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 9036
+  port: 9096
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /
@@ -62,7 +62,7 @@
     druid:
       # 涓诲簱鏁版嵁婧�
       master:
-        url: jdbc:mysql://192.168.1.185:3306/product-inventory-management-demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.1.185:3306/product-inventory-management-bdsm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: xd@123456..
       # 浠庡簱鏁版嵁婧�
@@ -139,7 +139,7 @@
     # 绔彛锛岄粯璁や负6379
     port: 6379
     # 鏁版嵁搴撶储寮�
-    database: 0
+    database: 15
     # 瀵嗙爜
 #    password: root2022!
     password:

--
Gitblit v1.9.3