diff --git a/README.md b/README.md index 791a2fdd..7d20c406 100644 --- a/README.md +++ b/README.md @@ -63,18 +63,19 @@ 用户名: admin 密码：admin123 ### 源码地址 -[1]github -- 前端服务-用户端: https://github.com/ageerle/ruoyi-web -- 前端服务-管理端: https://github.com/ageerle/ruoyi-admin -- 前端服务-小程序端: https://github.com/ageerle/ruoyi-uniapp -- 后端服务：https://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 - 后端服务：https://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 +- 后端服务：https://github.com/ageerle/ruoyi-ai + [3]gitcode - 前端服务-用户端：https://gitcode.com/ageerle/ruoyi-web - 前端服务-管理端: https://gitcode.com/ageerle/ruoyi-admin @@ -83,7 +84,7 @@ ### 配套文档 - 配套文档: https://doc.pandarobot.chat - - 项目部署文档：https://doc.pandarobot.chat/guide/introduction/ +- 项目部署文档：https://doc.pandarobot.chat/guide/introduction/ ### 核心功能 1. 全套开源系统：提供完整的前端应用、后台管理以及小程序应用，基于MIT协议，开箱即用。 @@ -96,7 +97,16 @@ ### 项目演示 -#### mcp支持(需要切换dev分支 下周发布正式版) +#### mcp支持 + +### 如何使用 +1. ruoyi-admin\src\main\resources\application.yml中mcp.client.enabled改为true +2. application.yml中配置openai api-key(用于推理使用那个工具,并构建工具所需参数) +3. 启动[ruoyi-mcp-server] +4. [mcp-server.json]中配置fileSystem.command(npx本地安装路径) +5. 指定fileSystem操作目录(本地必须存在指定的目录) +6. 配置search1api.env.SEARCH1API_KEY 申请地址：https://www.search1api.com/ +7. 详情教程：https://blog.csdn.net/weixin_42416319/article/details/147385808
drawing drawing @@ -215,9 +225,12 @@ ### 开发计划 -- 流程编排 +| 主题 | 方向 | 时间节点 | +| --- |-----------------------------------|--------| +| 前端简化版 | 与element-plus-x框架合作，推出基于该框架的前端简化版 | 2025.5 | +| agent2agent | Agent2Agent协议支持 | 2025.6 | +| 流程编排 | 通过可视化界面和灵活的配置方式，快速构建AI应用 | 2025.7 | -通过流程编排功能，用户可以将不同的模型按照业务逻辑进行有序连接。这将解决单一模型能力不足的问题，充分发挥多个模型的协同作用，从而更好地满足企业的复杂业务需求。 - 感谢 diff --git a/image/mcp-01.png b/image/mcp-01.png index 08f30833..46b43858 100644 Binary files a/image/mcp-01.png and b/image/mcp-01.png differ diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 66a63e71..f9fe7545 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -25,7 +25,7 @@ spring: 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 c3c9f79c..e54fe3c8 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -323,11 +323,11 @@ wechat: 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 bf3569b3..05e6fc65 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 @@ public class ChatConfigController extends BaseController { /** * 新增配置信息 */ - @SaCheckPermission("system:config:add") - @Log(title = "配置信息", businessType = BusinessType.INSERT) + @SaCheckPermission("system:config:edit") + @Log(title = "新增或者修改配置信息", businessType = BusinessType.UPDATE) @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ChatConfigBo bo) { - return toAjax(chatConfigService.insertByBo(bo)); + @PostMapping("/saveOrUpdate") + public R saveOrUpdate(@RequestBody List 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 5b78b8ca..c8fb392f 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 @@ -45,6 +45,14 @@ public class ChatPackagePlanController extends BaseController { return chatPackagePlanService.queryPageList(bo, pageQuery); } + /** + * 查询套餐列表-不分页 + */ + @GetMapping("/listPlan") + public R> listPlan() { + return R.ok(chatPackagePlanService.queryList(new ChatPackagePlanBo())); + } + /** * 导出套餐管理列表 */ diff --git a/script/sql/update/updatdata20250402.sql b/script/sql/update/updatdata20250402.sql deleted file mode 100644 index 940ace59..00000000 --- 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);