From a76bfe866c705285b737d593e8629a8be819b8f7 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 18 八月 2026 14:49:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-server/src/main/resources/application-dev.yaml | 105 ++++++----------------------------------------------
1 files changed, 13 insertions(+), 92 deletions(-)
diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml
index 84855ce..af8ba92 100644
--- a/yudao-server/src/main/resources/application-dev.yaml
+++ b/yudao-server/src/main/resources/application-dev.yaml
@@ -11,17 +11,8 @@
- org.springframework.ai.vectorstore.redis.autoconfigure.RedisVectorStoreAutoConfiguration # 绂佺敤 AI 妯″潡鐨� Redis锛屾墜鍔ㄥ垱寤�
- org.springframework.ai.vectorstore.milvus.autoconfigure.MilvusVectorStoreAutoConfiguration # 绂佺敤 AI 妯″潡鐨� Milvus锛屾墜鍔ㄥ垱寤�
- org.dromara.trans.config.TransServiceConfig # TODO 鑺嬭壙锛歟asy-trans 鍏煎 Spring Boot 4 鍚庣Щ闄わ紙TransServiceConfig 寮曠敤浜嗗凡绉婚櫎鐨� RestTemplateBuilder锛�
- # TODO 鑺嬭壙锛歴pring-ai-alibaba 2.0.0-M1.1 鐨� DashScope 鑷姩閰嶇疆鏆備笉鍏煎 Spring AI 2.0.0
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeChatAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeAgentAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeImageAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeVideoAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeAudioSpeechAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeAudioTranscriptionAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeRerankAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeEmbeddingAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeMultimodalEmbeddingAutoConfiguration
- - com.alibaba.cloud.ai.autoconfigure.dashscope.DashScopeAsyncToolCallingManagerAutoConfiguration
+ # 绂佺敤鏈厤缃� API Key 鐨勬ā鍨嬭嚜鍔ㄩ厤缃�
+ - org.springframework.ai.model.deepseek.autoconfigure.DeepSeekChatAutoConfiguration
# 鏁版嵁婧愰厤缃」
datasource:
druid: # Druid 銆愮洃鎺с�戠浉鍏崇殑鍏ㄥ眬閰嶇疆
@@ -60,11 +51,6 @@
primary: master
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
- username: root
- password: 123456
- slave: # 妯℃嫙浠庡簱锛屽彲鏍规嵁鑷繁闇�瑕佷慨鏀� # 妯℃嫙浠庡簱锛屽彲鏍规嵁鑷繁闇�瑕佷慨鏀�
- lazy: true # 寮�鍚噿鍔犺浇锛屼繚璇佸惎鍔ㄩ�熷害
url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
username: root
password: 123456
@@ -108,23 +94,6 @@
jdbc: # 浣跨敤 JDBC 鐨� JobStore 鐨勬椂鍊欙紝JDBC 鐨勯厤缃�
initialize-schema: NEVER # 鏄惁鑷姩浣跨敤 SQL 鍒濆鍖� Quartz 琛ㄧ粨鏋勩�傝繖閲岃缃垚 never 锛屾垜浠墜鍔ㄥ垱寤鸿〃缁撴瀯銆�
---- #################### 娑堟伅闃熷垪鐩稿叧 ####################
-
-# rocketmq 閰嶇疆椤癸紝瀵瑰簲 RocketMQProperties 閰嶇疆绫�
-rocketmq:
- name-server: 127.0.0.1:9876 # RocketMQ Namesrv
-
-spring:
- # RabbitMQ 閰嶇疆椤癸紝瀵瑰簲 RabbitProperties 閰嶇疆绫�
- rabbitmq:
- host: 127.0.0.1 # RabbitMQ 鏈嶅姟鐨勫湴鍧�
- port: 5672 # RabbitMQ 鏈嶅姟鐨勭鍙�
- username: guest # RabbitMQ 鏈嶅姟鐨勮处鍙�
- password: guest # RabbitMQ 鏈嶅姟鐨勫瘑鐮�
- # Kafka 閰嶇疆椤癸紝瀵瑰簲 KafkaProperties 閰嶇疆绫�
- kafka:
- bootstrap-servers: 127.0.0.1:9092 # 鎸囧畾 Kafka Broker 鍦板潃锛屽彲浠ヨ缃涓紝浠ラ�楀彿鍒嗛殧
-
--- #################### 鏈嶅姟淇濋殰鐩稿叧閰嶇疆 ####################
# Lock4j 閰嶇疆椤�
@@ -161,35 +130,20 @@
file:
name: ${user.home}/logs/${spring.application.name}.log # 鏃ュ織鏂囦欢鍚嶏紝鍏ㄨ矾寰�
---- #################### 寰俊鍏紬鍙风浉鍏抽厤缃� ####################
-wx: # 鍙傝 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 鏂囨。
- mp:
- # 鍏紬鍙烽厤缃�(蹇呭～)
- app-id: wx041349c6f39b268b
- secret: 5abee519483bc9f8cb37ce280e814bd0
- # 瀛樺偍閰嶇疆锛岃В鍐� AccessToken 鐨勮法鑺傜偣鐨勫叡浜�
- config-storage:
- type: RedisTemplate # 閲囩敤 RedisTemplate 鎿嶄綔 Redis锛屼細鑷姩浠� Spring 涓幏鍙�
- key-prefix: wx # Redis Key 鐨勫墠缂�
- http-client-type: HttpComponents # 閲囩敤 HttpComponents锛圚ttpClient 5锛夎姹傚井淇″叕浼楀彿骞冲彴
- miniapp: # 灏忕▼搴忛厤缃紙蹇呭～锛夛紝鍙傝 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 鏂囨。
- appid: wx63c280fe3248a3e7
- secret: 6f270509224a7ae1296bbf1c8cb97aed
- config-storage:
- type: RedisTemplate # 閲囩敤 RedisTemplate 鎿嶄綔 Redis锛屼細鑷姩浠� Spring 涓幏鍙�
- key-prefix: wa # Redis Key 鐨勫墠缂�
- http-client-type: HttpComponents # 閲囩敤 HttpComponents锛圚ttpClient 5锛夎姹傚井淇″皬绋嬪簭骞冲彴
+--- #################### 瓒呯骇绠＄悊鍛樼浉鍏抽厤缃� ####################
---- #################### 鑺嬮亾鐩稿叧閰嶇疆 ####################
-
-# 鑺嬮亾閰嶇疆椤癸紝璁剧疆褰撳墠椤圭洰鎵�鏈夎嚜瀹氫箟鐨勯厤缃�
+# 瓒呯骇绠＄悊鍛橀厤缃」锛岃缃綋鍓嶉」鐩墍鏈夎嚜瀹氫箟鐨勯厤缃�
yudao:
- pay:
- order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 鏀粯娓犻亾鐨勩�愭敮浠樸�戝洖璋冨湴鍧�
- refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 鏀粯娓犻亾鐨勩�愰��娆俱�戝洖璋冨湴鍧�
- transfer-notify-url: https://yunai.natapp1.cc/admin-api/pay/notify/transfer # 鏀粯娓犻亾鐨勩�愯浆璐︺�戝洖璋冨湴鍧�
+ ai:
+ vector-store:
+ type: milvus # 鍚戦噺搴撶被鍨嬶細milvus
+ milvus:
+ initialize-schema: true
+ database-name: default
+ collection-name: knowledge_segment
+ host: 127.0.0.1
+ port: 19530
demo: false # 寮�鍚紨绀烘ā寮�
- tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 鍦板浘鐨勫瘑閽� https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
storage: # 鏂囦欢涓婁紶閰嶇疆
path: /data/uploads # 鏂囦欢瀛樺偍鏍圭洰褰�
url-prefix: /admin-api/system/storage-blob # URL璺緞鍓嶇紑
@@ -200,36 +154,3 @@
compress: true # 鏄惁鍘嬬缉鍥剧墖
need-compress-size: 10MB # 瑙﹀彂鍘嬬缉鐨勬枃浠跺ぇ灏忛槇鍊�
compress-quality: 0.5 # 鍘嬬缉璐ㄩ噺(0.0-1.0)
-
-justauth:
- enabled: true
- type:
- DINGTALK: # 閽夐拤
- client-id: dingvrnreaje3yqvzhxg
- client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI
- ignore-check-redirect-uri: true
- WECHAT_ENTERPRISE: # 浼佷笟寰俊
- client-id: wwd411c69a39ad2e54
- client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw
- agent-id: 1000004
- ignore-check-redirect-uri: true
- # noinspection SpringBootApplicationYaml
- WECHAT_MINI_PROGRAM: # 寰俊灏忕▼搴�
- client-id: ${wx.miniapp.appid}
- client-secret: ${wx.miniapp.secret}
- ignore-check-redirect-uri: true
- ignore-check-state: true # 寰俊灏忕▼搴忥紝涓嶄細浣跨敤鍒� state锛屾墍浠ヤ笉杩涜鏍￠獙
- WECHAT_MP: # 寰俊鍏紬鍙�
- client-id: ${wx.mp.app-id}
- client-secret: ${wx.mp.secret}
- ignore-check-redirect-uri: true
- ALIPAY: # 鏀粯瀹濆皬绋嬪簭
- client-id: xx
- client-secret: xx
- alipay-public-key: xx
- ignore-check-redirect-uri: true
- ignore-check-state: true
- cache:
- type: REDIS
- prefix: 'social_auth_state:' # 缂撳瓨鍓嶇紑锛岀洰鍓嶅彧瀵� Redis 缂撳瓨鐢熸晥锛岄粯璁� JUSTAUTH::STATE::
- timeout: 24h # 瓒呮椂鏃堕暱锛岀洰鍓嶅彧瀵� Redis 缂撳瓨鐢熸晥锛岄粯璁� 3 鍒嗛挓
--
Gitblit v1.9.3