From bde2e8ff8eaf9c93507ef5acb781108f45b8f601 Mon Sep 17 00:00:00 2001
From: ageer <ageerle@163.com>
Date: 星期三, 23 四月 2025 23:09:22 +0800
Subject: [PATCH] fix: 1.合并知识库对话接口 2.修复web无法查询套餐信息
---
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatConfigController.java | 17 ++++++--
/dev/null | 1
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatPackagePlanController.java | 8 ++++
image/mcp-01.png | 0
ruoyi-admin/src/main/resources/application.yml | 4 +-
README.md | 33 +++++++++++-----
ruoyi-admin/src/main/resources/application-dev.yml | 2
7 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 791a2fd..7d20c40 100644
--- a/README.md
+++ b/README.md
@@ -63,17 +63,18 @@
鐢ㄦ埛鍚�: admin 瀵嗙爜锛歛dmin123
### 婧愮爜鍦板潃
-[1]github
-- 鍓嶇鏈嶅姟-鐢ㄦ埛绔�: https://github.com/ageerle/ruoyi-web
-- 鍓嶇鏈嶅姟-绠＄悊绔�: https://github.com/ageerle/ruoyi-admin
-- 鍓嶇鏈嶅姟-灏忕▼搴忕: https://github.com/ageerle/ruoyi-uniapp
-- 鍚庣鏈嶅姟锛歨ttps://github.com/ageerle/ruoyi-ai
-[2]gitee
+[1]gitee
- 鍓嶇鏈嶅姟-鐢ㄦ埛绔�: https://gitee.com/ageerle/ruoyi-web
- 鍓嶇鏈嶅姟-绠＄悊绔�: https://gitee.com/ageerle/ruoyi-admin
- 鍓嶇鏈嶅姟-灏忕▼搴忕: https://gitee.com/ageerle/ruoyi-uniapp
- 鍚庣鏈嶅姟锛歨ttps://gitee.com/ageerle/ruoyi-ai
+
+[2]github
+- 鍓嶇鏈嶅姟-鐢ㄦ埛绔�: https://github.com/ageerle/ruoyi-web
+- 鍓嶇鏈嶅姟-绠＄悊绔�: https://github.com/ageerle/ruoyi-admin
+- 鍓嶇鏈嶅姟-灏忕▼搴忕: https://github.com/ageerle/ruoyi-uniapp
+- 鍚庣鏈嶅姟锛歨ttps://github.com/ageerle/ruoyi-ai
[3]gitcode
- 鍓嶇鏈嶅姟-鐢ㄦ埛绔細https://gitcode.com/ageerle/ruoyi-web
@@ -83,7 +84,7 @@
### 閰嶅鏂囨。
- 閰嶅鏂囨。: https://doc.pandarobot.chat
- - 椤圭洰閮ㄧ讲鏂囨。锛歨ttps://doc.pandarobot.chat/guide/introduction/
+- 椤圭洰閮ㄧ讲鏂囨。锛歨ttps://doc.pandarobot.chat/guide/introduction/
### 鏍稿績鍔熻兘
1. 鍏ㄥ寮�婧愮郴缁燂細鎻愪緵瀹屾暣鐨勫墠绔簲鐢ㄣ�佸悗鍙扮鐞嗕互鍙婂皬绋嬪簭搴旂敤锛屽熀浜嶮IT鍗忚锛屽紑绠卞嵆鐢ㄣ��
@@ -96,7 +97,16 @@
### 椤圭洰婕旂ず
-#### mcp鏀寔(闇�瑕佸垏鎹ev鍒嗘敮 涓嬪懆鍙戝竷姝ｅ紡鐗�)
+#### mcp鏀寔
+
+### 濡備綍浣跨敤
+1. ruoyi-admin\src\main\resources\application.yml涓璵cp.client.enabled鏀逛负true
+2. application.yml涓厤缃畂penai api-key(鐢ㄤ簬鎺ㄧ悊浣跨敤閭ｄ釜宸ュ叿,骞舵瀯寤哄伐鍏锋墍闇�鍙傛暟)
+3. 鍚姩[ruoyi-mcp-server]
+4. [mcp-server.json]涓厤缃甪ileSystem.command(npx鏈湴瀹夎璺緞)
+5. 鎸囧畾fileSystem鎿嶄綔鐩綍(鏈湴蹇呴』瀛樺湪鎸囧畾鐨勭洰褰�)
+6. 閰嶇疆search1api.env.SEARCH1API_KEY 鐢宠鍦板潃锛歨ttps://www.search1api.com/
+7. 璇︽儏鏁欑▼锛歨ttps://blog.csdn.net/weixin_42416319/article/details/147385808
<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
<img src="image/mcp-01.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
<img src="image/mcp-02.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
@@ -215,9 +225,12 @@
### 寮�鍙戣鍒�
-- 娴佺▼缂栨帓
+| 涓婚 | 鏂瑰悜 | 鏃堕棿鑺傜偣 |
+| --- |-----------------------------------|--------|
+| 鍓嶇绠�鍖栫増 | 涓巈lement-plus-x妗嗘灦鍚堜綔锛屾帹鍑哄熀浜庤妗嗘灦鐨勫墠绔畝鍖栫増 | 2025.5 |
+| agent2agent | Agent2Agent鍗忚鏀寔 | 2025.6 |
+| 娴佺▼缂栨帓 | 閫氳繃鍙鍖栫晫闈㈠拰鐏垫椿鐨勯厤缃柟寮忥紝蹇�熸瀯寤篈I搴旂敤 | 2025.7 |
-閫氳繃娴佺▼缂栨帓鍔熻兘锛岀敤鎴峰彲浠ュ皢涓嶅悓鐨勬ā鍨嬫寜鐓т笟鍔￠�昏緫杩涜鏈夊簭杩炴帴銆傝繖灏嗚В鍐冲崟涓�妯″瀷鑳藉姏涓嶈冻鐨勯棶棰橈紝鍏呭垎鍙戞尌澶氫釜妯″瀷鐨勫崗鍚屼綔鐢紝浠庤�屾洿濂藉湴婊¤冻浼佷笟鐨勫鏉備笟鍔￠渶姹傘��
- 鎰熻阿
diff --git a/image/mcp-01.png b/image/mcp-01.png
index 08f3083..46b4385 100644
--- a/image/mcp-01.png
+++ b/image/mcp-01.png
Binary files differ
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 66a63e7..f9fe754 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -25,7 +25,7 @@
master:
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://43.139.70.230:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+ url: jdbc:mysql://120.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: ry-vue
password: xx
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index c3c9f79..e54fe3c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -323,11 +323,11 @@
spring:
ai:
openai:
- api-key: sk-xxx
+ api-key: sk-xx
base-url: https://api.pandarobot.chat/
mcp:
client:
- enabled: false
+ enabled: true
name: ruoyi-ai-mcp
sse:
connections:
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatConfigController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatConfigController.java
index bf3569b..05e6fc6 100644
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatConfigController.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatConfigController.java
@@ -75,12 +75,19 @@
/**
* 鏂板閰嶇疆淇℃伅
*/
- @SaCheckPermission("system:config:add")
- @Log(title = "閰嶇疆淇℃伅", businessType = BusinessType.INSERT)
+ @SaCheckPermission("system:config:edit")
+ @Log(title = "鏂板鎴栬�呬慨鏀归厤缃俊鎭�", businessType = BusinessType.UPDATE)
@RepeatSubmit()
- @PostMapping()
- public R<Void> add(@Validated(AddGroup.class) @RequestBody ChatConfigBo bo) {
- return toAjax(chatConfigService.insertByBo(bo));
+ @PostMapping("/saveOrUpdate")
+ public R<Void> saveOrUpdate(@RequestBody List<ChatConfigBo> boList) {
+ for (ChatConfigBo chatConfigBo : boList) {
+ if(chatConfigBo.getId() == null){
+ chatConfigService.insertByBo(chatConfigBo);
+ }else {
+ chatConfigService.updateByBo(chatConfigBo);
+ }
+ }
+ return toAjax(true);
}
/**
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatPackagePlanController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatPackagePlanController.java
index 5b78b8c..c8fb392 100644
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatPackagePlanController.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatPackagePlanController.java
@@ -46,6 +46,14 @@
}
/**
+ * 鏌ヨ濂楅鍒楄〃-涓嶅垎椤�
+ */
+ @GetMapping("/listPlan")
+ public R<List<ChatPackagePlanVo>> listPlan() {
+ return R.ok(chatPackagePlanService.queryList(new ChatPackagePlanBo()));
+ }
+
+ /**
* 瀵煎嚭濂楅绠＄悊鍒楄〃
*/
@SaCheckPermission("system:packagePlan:export")
diff --git a/script/sql/update/updatdata20250402.sql b/script/sql/update/updatdata20250402.sql
deleted file mode 100644
index 940ace5..0000000
--- a/script/sql/update/updatdata20250402.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO `chat_app_store` (`id`, `name`, `description`, `avatar`, `app_url`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (7, '寰俊鏈哄櫒浜�', '寰俊鏈哄櫒浜�', 'https://panda-1253683406.cos.ap-guangzhou.myqcloud.com/panda/2025/04/02/0557a7d68fa842bba952ce0d6ef38a2e.png', '/wxbot', NULL, NULL, NULL, NULL, NULL, NULL);
--
Gitblit v1.9.3