From e2729587d4a8b9c2e3e2c4dd50a25adedb337e98 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 15:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-server/src/main/resources/application.yaml |   88 ++-----------------------------------------
 1 files changed, 5 insertions(+), 83 deletions(-)

diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 17509ee..ce9f718 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -97,7 +97,7 @@
     cache-number: 1000 # local 缂撳瓨鐨勯槇鍊�,杈惧埌杩欎釜鍊硷紝娓呴櫎缂撳瓨
     timing-clear: 180 # local瀹氭椂娓呴櫎杩囨湡缂撳瓨(鍗曚綅绉�),璁剧疆涓�0浠h〃涓嶆墽琛�
     type: blockPuzzle # 楠岃瘉鐮佺被鍨� default 涓夌閮藉疄渚嬪寲銆俠lockPuzzle 婊戝潡鎷煎浘銆乧lickWord 鏂囧瓧鐐归�夈�乸ictureWord 鏂囨湰杈撳叆
-    water-mark: 鑺嬮亾婧愮爜 # 鍙充笅瑙掓按鍗版枃瀛�(鎴戠殑姘村嵃)锛屽彲浣跨敤 https://tool.chinaz.com/tools/unicode.aspx 涓枃杞� Unicode锛孡inux 鍙兘闇�瑕佽浆 unicode
+    water-mark: 瓒呯骇绠$悊鍛� # 鍙充笅瑙掓按鍗版枃瀛�(鎴戠殑姘村嵃)锛屽彲浣跨敤 https://tool.chinaz.com/tools/unicode.aspx 涓枃杞� Unicode锛孡inux 鍙兘闇�瑕佽浆 unicode
     interference-options: 0 # 婊戝姩骞叉壈椤�(0/1/2)
     req-frequency-limit-enable: false # 鎺ュ彛璇锋眰娆℃暟涓�鍒嗛挓闄愬埗鏄惁寮�鍚� true|false
     req-get-lock-limit: 5 # 楠岃瘉澶辫触 5 娆★紝get鎺ュ彛閿佸畾
@@ -151,34 +151,10 @@
         database-name: default # Milvus 涓暟鎹簱鐨勫悕绉�
         collection-name: knowledge_segment # Milvus 涓泦鍚堢殑鍚嶇О锛氱敤浜庡瓨鍌ㄥ悜閲忔暟鎹殑闆嗗悎鏍囪瘑绗︼紝鎵�鏈夌浉鍏崇殑鍚戦噺鎿嶄綔閮戒細鍦ㄨ繖涓泦鍚堜腑杩涜
         client:
-          host: 127.0.0.1
+          host: 36.213.180.217
           port: 19530
-    openai: # OpenAI 瀹樻柟
-      base-url: ${OPENAI_BASE_URL}
-      api-key: ${OPENAI_API_KEY}
-    anthropic: # Anthropic Claude
-      base-url: ${ANTHROPIC_BASE_URL}
-      api-key: ${ANTHROPIC_API_KEY}
-    ollama:
-      base-url: http://127.0.0.1:11434
-      chat:
-        model: llama3
-    stabilityai:
-      api-key: sk-e53UqbboF8QJCscYvzJscJxJXoFcFg4iJjl1oqgE7baJETmx
-    dashscope: # 閫氫箟鍗冮棶
-      api-key: ${DASHSCOPE_API_KEY}
-    deepseek: # DeepSeek
-      api-key: ${DEEPSEEK_API_KEY}
-      chat:
-        options:
-          model: deepseek-v4-flash
-    google:
-      genai: # 璋锋瓕 Gemini
-        api-key: ${GEMINI_API_KEY}
-        chat:
-          model: gemini-2.5-flash
     model:
-      rerank: false # 鏄惁寮�鍚�滈�氫箟鍗冮棶鈥濈殑 Rerank 妯″瀷锛屽~鍐� dashscope 寮�鍚�
+      rerank: false # 鏄惁寮�鍚� Rerank 妯″瀷
     mcp:
       server:
         enabled: false
@@ -199,65 +175,11 @@
 
 yudao:
   ai:
-    doubao: # 瀛楄妭璞嗗寘
-      enable: true
-      api-key: ${DOUBAO_API_KEY}
-      model: doubao-seed-2-1-turbo-260628
-    hunyuan: # 鑵捐娣峰厓
-      enable: true
-      api-key: ${HUNYUAN_API_KEY}
-      model: hy3-preview
-    siliconflow: # 纭呭熀娴佸姩
-      enable: true
-      api-key: ${SILICONFLOW_API_KEY}
-      model: deepseek-ai/DeepSeek-V4-Pro
-    xinghuo: # 璁鏄熺伀
-      enable: true
-      api-key: ${XINGHUO_API_KEY}
-      model: x2-flash
-    baichuan: # 鐧惧窛鏅鸿兘
-      enable: true
-      api-key: ${BAICHUAN_API_KEY}
-      model: Baichuan-M3
-    yiyan: # 鏂囧績涓�瑷�
-      enable: false
-      api-key: ${YIYAN_API_KEY}
-      model: ernie-5.1
-    zhipu: # 鏅鸿氨 AI锛圙LM锛�
-      enable: false
-      api-key: ${ZHIPU_API_KEY}
-      model: glm-5.2
-    minimax: # MiniMax
-      enable: false
-      api-key: ${MINIMAX_API_KEY}
-      model: MiniMax-M3
-    moonshot: # 鏈堜箣鏆楅潰锛圞IMI锛�
-      enable: false
-      api-key: ${MOONSHOT_API_KEY}
-      model: kimi-k2.6
-    stepfun: # 闃惰穬鏄熻景
-      enable: false
-      api-key: ${STEPFUN_API_KEY}
-      model: step-3.7-flash
-    grok: # Grok
-      enable: false
-      api-key: ${GROK_API_KEY}
-      model: grok-4.3
-    midjourney:
-      enable: true
-  #    base-url: https://api.holdai.top/mj-relax/mj
-      base-url: https://api.holdai.top/mj
-      api-key: sk-dZEPiVaNcT3FHhef51996bAa0bC74806BeAb620dA5Da10Bf
-      notify-url: http://java.nat300.top/admin-api/ai/image/midjourney/notify
-    suno:
-      enable: true
-  #    base-url: https://suno-55ishh05u-status2xxs-projects.vercel.app
-      base-url: http://127.0.0.1:3001
     web-search:
       enable: true
       api-key: sk-40500e52840f4d24b956d0b1d80d9abe
 
---- #################### 鑺嬮亾鐩稿叧閰嶇疆 ####################
+--- #################### 瓒呯骇绠$悊鍛樼浉鍏抽厤缃� ####################
 
 yudao:
   info:
@@ -295,7 +217,7 @@
       topic: ${spring.application.name}-websocket # 娑堟伅鍙戦�佺殑 Kafka Topic
       consumer-group: ${spring.application.name}-websocket-consumer # 娑堟伅鍙戦�佺殑 Kafka Consumer Group
   swagger:
-    title: 鑺嬮亾蹇�熷紑鍙戝钩鍙�
+    title: 瓒呯骇绠$悊鍛樺揩閫熷紑鍙戝钩鍙�
     description: 鎻愪緵绠$悊鍚庡彴銆佺敤鎴� App 鐨勬墍鏈夊姛鑳�
     version: ${yudao.info.version}
     url: ${yudao.web.admin-ui.url}

--
Gitblit v1.9.3