From 7a48e6173335559b181b2097867f1166233b8117 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 13 五月 2026 20:18:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro
---
src/main/resources/application-qxy.yml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application-qxy.yml b/src/main/resources/application-qxy.yml
index d52a8ee..4945685 100644
--- a/src/main/resources/application-qxy.yml
+++ b/src/main/resources/application-qxy.yml
@@ -53,6 +53,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:
@@ -63,8 +71,6 @@
# Spring閰嶇疆
spring:
- main:
- allow-circular-references: true # 鍏佽寰幆渚濊禆
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
@@ -140,7 +146,6 @@
restart:
# 鐑儴缃插紑鍏�
enabled: false
- # redis 閰嶇疆
data:
mongodb:
uri: mongodb://114.132.189.42:9028/chat_memory_db
@@ -154,7 +159,7 @@
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
- # password: JHY20260510.
+ # password: root2022!
password:
# 杩炴帴瓒呮椂鏃堕棿
@@ -199,7 +204,7 @@
token:
# 浠ょ墝鑷畾涔夋爣璇�
header: Authorization
- # 浠ょ墝瀵嗛挜 鏂扮増jwt瀵嗛挜闀垮害蹇呴』64浣嶄互涓�
+ # 浠ょ墝瀵嗛挜
secret: xpAVjhCjQDaDB7mjPAzMDSbQWXNu2zYkTdDNUsPMS5Xx8QMmQVYN7n74eZrYJxDJ
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 450
@@ -264,3 +269,6 @@
compress: true # 鏄惁鍘嬬缉
needCompressSize: 10MB # 鍘嬬缉闃堝��
compressQuality: 0.5 # 鍘嬬缉璐ㄩ噺(0.0-1.0)
+knowledge:
+ one: D:\鏂扮枂澶х綏绱犱紒涓氫骇鍝佷綋绯昏鏄庢枃妗�.md
+
--
Gitblit v1.9.3