Merge remote-tracking branch 'origin/master' into master-alipaymini

# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
This commit is contained in:
yunlongn
2025-11-27 18:01:52 +08:00
164 changed files with 4285 additions and 1611 deletions

View File

@@ -70,8 +70,8 @@ spring:
username: root
password: 123456
# tdengine: # IoT 数据库(需要 IoT 物联网再开启噢!)
# url: jdbc:TAOS-RS://127.0.0.1:6041/ruoyi_vue_pro
# driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
# url: jdbc:TAOS-WS://127.0.0.1:6041/ruoyi_vue_pro
# driver-class-name: com.taosdata.jdbc.ws.WebSocketDriver
# username: root
# password: taosdata
# druid:

View File

@@ -187,7 +187,7 @@ spring:
api-key: sk-47aa124781be4bfb95244cc62f6xxxx
minimax: # Minimaxhttps://www.minimaxi.com/
api-key: xxxx
moonshot: # 月之暗KIMI
moonshot: # 月之暗KIMI
api-key: sk-abc
deepseek: # DeepSeek
api-key: sk-e94db327cc7d457d99a8de8810fc6b12
@@ -211,6 +211,8 @@ spring:
filesystem:
url: http://127.0.0.1:8089
sse-endpoint: /sse
annotation-scanner:
enabled: false # TODO @芋艿:有 bug https://github.com/spring-projects/spring-ai/issues/4917 需要官方修复
yudao:
ai: