From 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18 Mon Sep 17 00:00:00 2001
From: 青城 <1662047068@qq.com>
Date: 星期三, 09 七月 2025 09:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim-qiao

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

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 611744d..a987879 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,7 +16,7 @@
 
 # 寮�鍙戠幆澧冮厤缃�
 server:
-  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负80807
+  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
   port: 7003
   servlet:
     # 搴旂敤鐨勮闂矾寰�
@@ -38,6 +38,14 @@
     com.ruoyi: warn
     org.springframework: warn
 
+minio:
+  endpoint: http://114.132.189.42/
+  port: 7019
+  secure: false
+  accessKey: admin
+  secretKey: 12345678
+  preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
+  default-bucket: uploadPath
 # 鐢ㄦ埛閰嶇疆
 user:
   password:
@@ -73,9 +81,9 @@
     # 绔彛锛岄粯璁や负6379
     port: 6379
     # 鏁版嵁搴撶储寮�
-    database: 1
+    database: 0
     # 瀵嗙爜
-#    password: root2022!
+    password:
 #    password: 123456
 
     # 杩炴帴瓒呮椂鏃堕棿

--
Gitblit v1.9.3