mirror of
https://github.com/Ed1s0nZ/CyberStrikeAI.git
synced 2026-05-17 21:44:43 +02:00
Compare commits
67 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 691793cb38 | |||
| 7270e3c3d1 | |||
| 5e28782b1f | |||
| 3e61b77b9c | |||
| 64f9053061 | |||
| 426b0e282e | |||
| 78c6bd0b6a | |||
| e54815e018 | |||
| 9baa99ea40 | |||
| 83a8c46db1 | |||
| 4b2619e1fe | |||
| 3fffee80f4 | |||
| 41d7afcf99 | |||
| 6431dcb240 | |||
| 665b1d553a | |||
| fd3a52af01 | |||
| 8368ee7712 | |||
| dd883677b8 | |||
| 2edd5ffe95 | |||
| ae588dbfe4 | |||
| 93be113a79 | |||
| d3fb14f72d | |||
| af715e23cb | |||
| 3aecdc275f | |||
| 660d95a787 | |||
| 01271fd8eb | |||
| 8c6e044f84 | |||
| cb2defd0cc | |||
| 88ab73e422 | |||
| 5404d95db7 | |||
| 32d0e98cfb | |||
| e4b1e10a42 | |||
| 870715fc8f | |||
| 772a04b715 | |||
| 2455bde7ab | |||
| dbdfc18d57 | |||
| 82daad3b56 | |||
| 9eee820096 | |||
| fae912b79c | |||
| 9b48daf795 | |||
| bfbb8b31d3 | |||
| 8b2dfea884 | |||
| 7447e82c39 | |||
| 44b8d0b427 | |||
| 3a26d77c94 | |||
| 0be6746794 | |||
| 06bfed508a | |||
| 0d617ebd66 | |||
| 9a52ec25ea | |||
| 594b7676e1 | |||
| fd5d1dff10 | |||
| b8218d9f77 | |||
| 7b7c689efd | |||
| 27b16e0d54 | |||
| 2b6b678439 | |||
| be104d1a05 | |||
| f64bda3678 | |||
| 4b8dbb1bd6 | |||
| 783d80ee37 | |||
| a27c13b734 | |||
| 3cbf398636 | |||
| 84d54b1ea9 | |||
| 91230f273e | |||
| 81fca5b2dd | |||
| 01b6b226eb | |||
| efd7a0aadd | |||
| 895061911c |
@@ -14,6 +14,12 @@ CyberStrikeAI is an **AI-native security testing platform** built in Go. It inte
|
|||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
|
### System Dashboard Overview
|
||||||
|
|
||||||
|
<img src="./images/dashboard.png" alt="System Dashboard" width="100%">
|
||||||
|
|
||||||
|
*The dashboard provides a comprehensive overview of system runtime status, security vulnerabilities, tool usage, and knowledge base, helping users quickly understand the platform's core features and current state.*
|
||||||
|
|
||||||
### Core Features Overview
|
### Core Features Overview
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
@@ -77,6 +83,7 @@ CyberStrikeAI is an **AI-native security testing platform** built in Go. It inte
|
|||||||
- 📋 Batch task management: create task queues, add multiple tasks, and execute them sequentially
|
- 📋 Batch task management: create task queues, add multiple tasks, and execute them sequentially
|
||||||
- 🎭 Role-based testing: predefined security testing roles (Penetration Testing, CTF, Web App Scanning, etc.) with custom prompts and tool restrictions
|
- 🎭 Role-based testing: predefined security testing roles (Penetration Testing, CTF, Web App Scanning, etc.) with custom prompts and tool restrictions
|
||||||
- 🎯 Skills system: 20+ predefined security testing skills (SQL injection, XSS, API security, etc.) that can be attached to roles or called on-demand by AI agents
|
- 🎯 Skills system: 20+ predefined security testing skills (SQL injection, XSS, API security, etc.) that can be attached to roles or called on-demand by AI agents
|
||||||
|
- 📱 **Chatbot**: DingTalk and Lark (Feishu) long-lived connections so you can talk to CyberStrikeAI from mobile (see [Robot / Chatbot guide](docs/robot_en.md) for setup and commands)
|
||||||
|
|
||||||
## Tool Overview
|
## Tool Overview
|
||||||
|
|
||||||
@@ -454,6 +461,10 @@ tools:
|
|||||||
enabled: true
|
enabled: true
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Related documentation
|
||||||
|
|
||||||
|
- [Robot / Chatbot guide (DingTalk & Lark)](docs/robot_en.md): Full setup, commands, and troubleshooting for using CyberStrikeAI from DingTalk or Lark on your phone. **Follow this doc to avoid common pitfalls.**
|
||||||
|
|
||||||
## Project Layout
|
## Project Layout
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -464,6 +475,7 @@ CyberStrikeAI/
|
|||||||
├── tools/ # YAML tool recipes (100+ examples provided)
|
├── tools/ # YAML tool recipes (100+ examples provided)
|
||||||
├── roles/ # Role configurations (12+ predefined security testing roles)
|
├── roles/ # Role configurations (12+ predefined security testing roles)
|
||||||
├── skills/ # Skills directory (20+ predefined security testing skills)
|
├── skills/ # Skills directory (20+ predefined security testing skills)
|
||||||
|
├── docs/ # Documentation (e.g. robot/chbot guide)
|
||||||
├── images/ # Docs screenshots & diagrams
|
├── images/ # Docs screenshots & diagrams
|
||||||
├── config.yaml # Runtime configuration
|
├── config.yaml # Runtime configuration
|
||||||
├── run.sh # Convenience launcher
|
├── run.sh # Convenience launcher
|
||||||
@@ -516,6 +528,8 @@ CyberStrikeAI has joined [404Starlink](https://github.com/knownsec/404StarLink)
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
## Stargazers over time
|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -13,6 +13,12 @@ CyberStrikeAI 是一款 **AI 原生安全测试平台**,基于 Go 构建,集
|
|||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
|
### 系统仪表盘概览
|
||||||
|
|
||||||
|
<img src="./images/dashboard.png" alt="系统仪表盘" width="100%">
|
||||||
|
|
||||||
|
*仪表盘提供系统运行状态、安全漏洞、工具使用情况和知识库的全面概览,帮助用户快速了解平台核心功能和当前状态。*
|
||||||
|
|
||||||
### 核心功能概览
|
### 核心功能概览
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
@@ -76,6 +82,7 @@ CyberStrikeAI 是一款 **AI 原生安全测试平台**,基于 Go 构建,集
|
|||||||
- 📋 批量任务管理:创建任务队列,批量添加任务,依次顺序执行,支持任务编辑与状态跟踪
|
- 📋 批量任务管理:创建任务队列,批量添加任务,依次顺序执行,支持任务编辑与状态跟踪
|
||||||
- 🎭 角色化测试:预设安全测试角色(渗透测试、CTF、Web 应用扫描等),支持自定义提示词和工具限制
|
- 🎭 角色化测试:预设安全测试角色(渗透测试、CTF、Web 应用扫描等),支持自定义提示词和工具限制
|
||||||
- 🎯 Skills 技能系统:20+ 预设安全测试技能(SQL 注入、XSS、API 安全等),可附加到角色或由 AI 按需调用
|
- 🎯 Skills 技能系统:20+ 预设安全测试技能(SQL 注入、XSS、API 安全等),可附加到角色或由 AI 按需调用
|
||||||
|
- 📱 **机器人**:支持钉钉、飞书长连接,在手机端与 CyberStrikeAI 对话(配置与命令详见 [机器人使用说明](docs/robot.md))
|
||||||
|
|
||||||
## 工具概览
|
## 工具概览
|
||||||
|
|
||||||
@@ -453,6 +460,10 @@ tools:
|
|||||||
enabled: true
|
enabled: true
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## 相关文档
|
||||||
|
|
||||||
|
- [机器人使用说明(钉钉 / 飞书)](docs/robot.md):在手机端通过钉钉、飞书与 CyberStrikeAI 对话的完整配置步骤、命令与排查说明,**建议按该文档操作以避免走弯路**。
|
||||||
|
|
||||||
## 项目结构
|
## 项目结构
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -463,6 +474,7 @@ CyberStrikeAI/
|
|||||||
├── tools/ # YAML 工具目录(含 100+ 示例)
|
├── tools/ # YAML 工具目录(含 100+ 示例)
|
||||||
├── roles/ # 角色配置文件目录(含 12+ 预设安全测试角色)
|
├── roles/ # 角色配置文件目录(含 12+ 预设安全测试角色)
|
||||||
├── skills/ # Skills 目录(含 20+ 预设安全测试技能)
|
├── skills/ # Skills 目录(含 20+ 预设安全测试技能)
|
||||||
|
├── docs/ # 说明文档(如机器人使用说明)
|
||||||
├── images/ # 文档配图
|
├── images/ # 文档配图
|
||||||
├── config.yaml # 运行配置
|
├── config.yaml # 运行配置
|
||||||
├── run.sh # 启动脚本
|
├── run.sh # 启动脚本
|
||||||
@@ -513,6 +525,9 @@ CyberStrikeAI 现已加入 [404星链计划](https://github.com/knownsec/404Star
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
## Stargazers over time
|
||||||
|

|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
欢迎提交 Issue/PR 贡献新的工具模版或优化建议!
|
欢迎提交 Issue/PR 贡献新的工具模版或优化建议!
|
||||||
|
|||||||
+40
@@ -9,6 +9,9 @@
|
|||||||
# 系统设置
|
# 系统设置
|
||||||
# ============================================
|
# ============================================
|
||||||
|
|
||||||
|
# 前端显示的版本号(可选,不填则显示默认版本)
|
||||||
|
version: "v1.3.10"
|
||||||
|
|
||||||
# 服务器配置
|
# 服务器配置
|
||||||
server:
|
server:
|
||||||
host: 0.0.0.0 # 监听地址,0.0.0.0 表示监听所有网络接口
|
host: 0.0.0.0 # 监听地址,0.0.0.0 表示监听所有网络接口
|
||||||
@@ -41,6 +44,16 @@ openai:
|
|||||||
model: deepseek-chat # 模型名称(必填)
|
model: deepseek-chat # 模型名称(必填)
|
||||||
max_total_tokens: 120000 # LLM 相关上下文的最大 Token 数限制(内存压缩和攻击链构建会共用此配置)
|
max_total_tokens: 120000 # LLM 相关上下文的最大 Token 数限制(内存压缩和攻击链构建会共用此配置)
|
||||||
|
|
||||||
|
# ============================================
|
||||||
|
# 信息收集(FOFA)配置(可选)
|
||||||
|
# ============================================
|
||||||
|
# 用于「信息收集」页面调用 FOFA API(后端代理,避免前端暴露 key)
|
||||||
|
# 也可通过环境变量配置:FOFA_EMAIL / FOFA_API_KEY(优先级更高)
|
||||||
|
fofa:
|
||||||
|
base_url: "https://fofa.info/api/v1/search/all" # 可选,留空则使用默认
|
||||||
|
email: "" # FOFA 账号邮箱(可选,建议在系统设置中填写)
|
||||||
|
api_key: "" # FOFA API Key(可选,建议在系统设置中填写)
|
||||||
|
|
||||||
# Agent 配置
|
# Agent 配置
|
||||||
# 达到最大迭代次数时,AI 会自动总结测试结果
|
# 达到最大迭代次数时,AI 会自动总结测试结果
|
||||||
agent:
|
agent:
|
||||||
@@ -67,6 +80,10 @@ database:
|
|||||||
# 推荐方式:在 tools/ 目录下为每个工具创建独立的配置文件
|
# 推荐方式:在 tools/ 目录下为每个工具创建独立的配置文件
|
||||||
security:
|
security:
|
||||||
tools_dir: tools # 工具配置文件目录(相对于配置文件所在目录)
|
tools_dir: tools # 工具配置文件目录(相对于配置文件所在目录)
|
||||||
|
# 工具描述模式:加载 tools 下工具时,暴露给 AI/API 使用的描述来源
|
||||||
|
# short - 优先使用 short_description(简短描述,省 token),为空时用 description
|
||||||
|
# full - 使用 description(详细描述)
|
||||||
|
tool_description_mode: full
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# MCP 相关配置
|
# MCP 相关配置
|
||||||
@@ -100,6 +117,29 @@ knowledge:
|
|||||||
similarity_threshold: 0.7 # 相似度阈值(0-1),低于此值的结果将被过滤
|
similarity_threshold: 0.7 # 相似度阈值(0-1),低于此值的结果将被过滤
|
||||||
hybrid_weight: 0.7 # 混合检索权重(0-1),向量检索的权重,1.0表示纯向量检索,0.0表示纯关键词检索
|
hybrid_weight: 0.7 # 混合检索权重(0-1),向量检索的权重,1.0表示纯向量检索,0.0表示纯关键词检索
|
||||||
|
|
||||||
|
# ============================================
|
||||||
|
# 机器人配置(企业微信、钉钉、飞书)
|
||||||
|
# ============================================
|
||||||
|
# 用于在手机端通过企业微信/钉钉/飞书与 CyberStrikeAI 对话,无需部署在服务器上也可使用
|
||||||
|
# 在系统设置 -> 机器人设置 中可配置
|
||||||
|
robots:
|
||||||
|
wecom: # 企业微信
|
||||||
|
enabled: false
|
||||||
|
token: ""
|
||||||
|
encoding_aes_key: ""
|
||||||
|
corp_id: ""
|
||||||
|
secret: ""
|
||||||
|
agent_id: 0
|
||||||
|
dingtalk: # 钉钉
|
||||||
|
enabled: false
|
||||||
|
client_id:
|
||||||
|
client_secret:
|
||||||
|
lark: # 飞书
|
||||||
|
enabled: false
|
||||||
|
app_id: ""
|
||||||
|
app_secret: ""
|
||||||
|
verify_token: ""
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
# Skills 相关配置
|
# Skills 相关配置
|
||||||
# ============================================
|
# ============================================
|
||||||
|
|||||||
+217
@@ -0,0 +1,217 @@
|
|||||||
|
# CyberStrikeAI 机器人使用说明
|
||||||
|
|
||||||
|
[English](robot_en.md)
|
||||||
|
|
||||||
|
本文档说明如何通过**钉钉**、**飞书**与 CyberStrikeAI 对话(长连接模式),在手机端即可使用,无需在服务器上打开网页。按下面步骤操作可避免常见弯路。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 一、在 CyberStrikeAI 里从哪里配置
|
||||||
|
|
||||||
|
1. 登录 CyberStrikeAI Web 端
|
||||||
|
2. 左侧导航进入 **系统设置**
|
||||||
|
3. 在左侧设置分类中点击 **机器人设置**(位于「基本设置」与「安全设置」之间)
|
||||||
|
4. 按平台勾选并填写(钉钉填 Client ID / Client Secret,飞书填 App ID / App Secret)
|
||||||
|
5. 点击 **应用配置** 保存
|
||||||
|
6. **重启 CyberStrikeAI 应用**(只保存不重启,机器人不会连上)
|
||||||
|
|
||||||
|
配置会写入 `config.yaml` 的 `robots` 段,也可在配置文件中直接编辑。**修改钉钉/飞书配置后必须重启,长连接才会生效。**
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 二、支持的平台(长连接)
|
||||||
|
|
||||||
|
| 平台 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| 钉钉 | 使用 Stream 长连接,程序主动连接钉钉接收消息 |
|
||||||
|
| 飞书 | 使用长连接,程序主动连接飞书接收消息 |
|
||||||
|
|
||||||
|
下面第三节会按平台写清:在开放平台要做什么、要复制哪些字段、填到 CyberStrikeAI 的哪一栏。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 三、各平台配置项与详细步骤
|
||||||
|
|
||||||
|
### 3.1 钉钉
|
||||||
|
|
||||||
|
**先搞清楚:两种钉钉机器人不一样**
|
||||||
|
|
||||||
|
| 类型 | 从哪里创建 | 能否做「用户发消息→机器人回复」 | 本程序是否支持 |
|
||||||
|
|------|------------|----------------------------------|----------------|
|
||||||
|
| **自定义机器人** | 钉钉群里:群设置 → 添加机器人 → 自定义(Webhook) | ❌ 不能,只能你往群里发消息 | ❌ 不支持 |
|
||||||
|
| **企业内部应用机器人** | [钉钉开放平台](https://open.dingtalk.com) 创建应用并开通机器人 | ✅ 能 | ✅ 支持 |
|
||||||
|
|
||||||
|
如果你手里是「自定义机器人」的 Webhook 地址(`oapi.dingtalk.com/robot/send?access_token=xxx`)和加签密钥(`SEC...`),**不能直接填到本程序**,必须按下面步骤在开放平台创建「企业内部应用」并拿到 **Client ID**、**Client Secret**。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**钉钉配置完整步骤(按顺序做)**
|
||||||
|
|
||||||
|
1. **打开钉钉开放平台**
|
||||||
|
浏览器访问 [https://open.dingtalk.com](https://open.dingtalk.com),用**企业管理员**账号登录。
|
||||||
|
|
||||||
|
2. **进入应用开发**
|
||||||
|
左侧选 **应用开发** → **企业内部开发** → 点击 **创建应用**(或选择已有应用)。填写应用名称等基本信息后创建。
|
||||||
|
|
||||||
|
3. **拿到 Client ID 和 Client Secret**
|
||||||
|
- 左侧点 **凭证与基础信息**(在「基础信息」下)。
|
||||||
|
- 页面上有 **Client ID(原 AppKey)** 和 **Client Secret(原 AppSecret)**。
|
||||||
|
- 点击复制,**不要手打**,注意:数字 **0** 和字母 **o**、数字 **1** 和字母 **l** 容易抄错(例如 `ding9gf9tiozuc504aer` 中间是数字 **504** 不是 5o4)。
|
||||||
|
|
||||||
|
4. **开通机器人并选 Stream 模式**
|
||||||
|
- 左侧 **应用能力** → **机器人**。
|
||||||
|
- 打开「机器人配置」开关。
|
||||||
|
- 填写机器人名称、简介等(必填项按提示填)。
|
||||||
|
- **关键**:消息接收方式要选 **「Stream 模式」**(流式接入)。若只有「HTTP 回调」或未选 Stream,本程序收不到消息。
|
||||||
|
- 保存。
|
||||||
|
|
||||||
|
5. **权限与发布**
|
||||||
|
- 左侧 **权限管理**:搜索「机器人」「消息」等,勾选**接收消息**、**发送消息**等机器人相关权限,并确认授权。
|
||||||
|
- 左侧 **版本管理与发布**:若有未发布配置,点击 **发布新版本** / **上线**,否则修改不生效。
|
||||||
|
|
||||||
|
6. **填回 CyberStrikeAI**
|
||||||
|
- 回到 CyberStrikeAI → 系统设置 → 机器人设置 → 钉钉。
|
||||||
|
- 勾选「启用钉钉机器人」。
|
||||||
|
- **Client ID (AppKey)** 粘贴第 3 步复制的 Client ID。
|
||||||
|
- **Client Secret** 粘贴第 3 步复制的 Client Secret。
|
||||||
|
- 点击 **应用配置**,然后**重启 CyberStrikeAI**。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**CyberStrikeAI 钉钉栏位对照**
|
||||||
|
|
||||||
|
| CyberStrikeAI 中填写项 | 在钉钉开放平台的来源 |
|
||||||
|
|------------------------|------------------------|
|
||||||
|
| 启用钉钉机器人 | 勾选即启用 |
|
||||||
|
| Client ID (AppKey) | 凭证与基础信息 → **Client ID(原 AppKey)** |
|
||||||
|
| Client Secret | 凭证与基础信息 → **Client Secret(原 AppSecret)** |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 3.2 飞书 (Lark)
|
||||||
|
|
||||||
|
| 配置项 | 说明 |
|
||||||
|
|--------|------|
|
||||||
|
| 启用飞书机器人 | 勾选后启动飞书长连接 |
|
||||||
|
| App ID | 飞书开放平台应用凭证中的 App ID |
|
||||||
|
| App Secret | 飞书开放平台应用凭证中的 App Secret |
|
||||||
|
| Verify Token | 事件订阅用(可选) |
|
||||||
|
|
||||||
|
**飞书配置简要步骤**:登录 [飞书开放平台](https://open.feishu.cn) → 创建企业自建应用 → 在「凭证与基础信息」中获取 **App ID**、**App Secret** → 在「应用能力」中开通**机器人**并启用相应权限 → 发布应用 → 将 App ID、App Secret 填到 CyberStrikeAI 机器人设置 → 保存并**重启应用**。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 四、机器人命令
|
||||||
|
|
||||||
|
在钉钉/飞书中向机器人发送以下**文本命令**(仅支持文本):
|
||||||
|
|
||||||
|
| 命令 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| **帮助** | 显示命令帮助与说明 |
|
||||||
|
| **列表** 或 **对话列表** | 列出所有对话的标题与对话 ID |
|
||||||
|
| **切换 \<对话ID\>** 或 **继续 \<对话ID\>** | 指定对话 ID,后续消息在该对话中继续 |
|
||||||
|
| **新对话** | 开启一个新对话,后续消息在新对话中 |
|
||||||
|
| **清空** | 清空当前对话上下文(效果等同「新对话」) |
|
||||||
|
| **当前** | 显示当前对话 ID 与标题 |
|
||||||
|
|
||||||
|
除以上命令外,**直接输入任意文字**会作为用户消息发给 AI,与 Web 端对话逻辑一致(渗透测试/安全分析等)。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 五、如何使用(要 @ 机器人吗?)
|
||||||
|
|
||||||
|
- **单聊(推荐)**:在钉钉/飞书里**搜索并打开该机器人**,进入与机器人的**私聊**,直接输入「帮助」或任意文字即可,**不需要 @**。
|
||||||
|
- **群聊**:若机器人被添加到群里,在群内只有 **@机器人** 后发送的消息才会被机器人收到并回复;不 @ 的群消息不会触发机器人。
|
||||||
|
|
||||||
|
总结:和机器人**单聊时直接发**;在**群里用时需要 @机器人** 再发内容。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 六、推荐使用流程(避免漏步骤)
|
||||||
|
|
||||||
|
1. **在开放平台**:按第三节完成钉钉或飞书应用创建、凭证复制、机器人开通(钉钉务必选 **Stream 模式**)、权限与发布。
|
||||||
|
2. **在 CyberStrikeAI**:系统设置 → 机器人设置 → 勾选对应平台,粘贴 Client ID/App ID、Client Secret/App Secret → 点击 **应用配置**。
|
||||||
|
3. **重启 CyberStrikeAI 进程**(否则长连接不会建立)。
|
||||||
|
4. **在手机钉钉/飞书**:找到该机器人(单聊直接发,群聊需 @机器人),发「帮助」或任意内容测试。
|
||||||
|
|
||||||
|
若发消息没反应,先看 **第九节排查** 和 **第十节常见弯路**。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 七、配置文件示例
|
||||||
|
|
||||||
|
`config.yaml` 中机器人相关片段示例:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
robots:
|
||||||
|
dingtalk:
|
||||||
|
enabled: true
|
||||||
|
client_id: "your_dingtalk_app_key"
|
||||||
|
client_secret: "your_dingtalk_app_secret"
|
||||||
|
lark:
|
||||||
|
enabled: true
|
||||||
|
app_id: "your_lark_app_id"
|
||||||
|
app_secret: "your_lark_app_secret"
|
||||||
|
verify_token: ""
|
||||||
|
```
|
||||||
|
|
||||||
|
修改后需**重启应用**,长连接在应用启动时建立。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 八、如何验证是否可用(无需钉钉/飞书客户端)
|
||||||
|
|
||||||
|
在未安装钉钉或飞书时,可用**测试接口**验证机器人逻辑是否正常:
|
||||||
|
|
||||||
|
1. 先登录 CyberStrikeAI Web 端(保证有登录态)。
|
||||||
|
2. 使用 curl 调用测试接口(需携带登录后的 Cookie):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 将 YOUR_COOKIE 替换为登录后获得的 Cookie(浏览器 F12 → 网络 → 任意请求 → 请求头中的 Cookie)
|
||||||
|
curl -X POST "http://localhost:8080/api/robot/test" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "Cookie: YOUR_COOKIE" \
|
||||||
|
-d '{"platform":"dingtalk","user_id":"test_user","text":"帮助"}'
|
||||||
|
```
|
||||||
|
|
||||||
|
若返回 JSON 中含有 `"reply":"【CyberStrikeAI 机器人命令】..."`,说明命令处理正常。可再试 `"text":"列表"`、`"text":"当前"` 等。
|
||||||
|
|
||||||
|
接口说明:`POST /api/robot/test`(需登录),请求体 `{"platform":"可选","user_id":"可选","text":"必填"}`,响应 `{"reply":"回复内容"}`。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 九、钉钉发消息没反应时排查
|
||||||
|
|
||||||
|
按顺序检查:
|
||||||
|
|
||||||
|
1. **Client ID / Client Secret 是否与开放平台完全一致**
|
||||||
|
从「凭证与基础信息」里**复制粘贴**,不要手打。注意数字 **0** 与字母 **o**、数字 **1** 与字母 **l**(例如 `ding9gf9tiozuc504aer` 中间是 **504** 不是 5o4)。
|
||||||
|
|
||||||
|
2. **是否在保存配置后重启了应用**
|
||||||
|
机器人长连接在**应用启动时**建立。在 Web 端点击「应用配置」只写入配置文件,**必须重启 CyberStrikeAI 进程**后钉钉连接才会生效。
|
||||||
|
|
||||||
|
3. **看程序日志**
|
||||||
|
- 启动后应看到:`钉钉 Stream 正在连接…`、`钉钉 Stream 已启动(无需公网),等待收消息`。
|
||||||
|
- 若出现 `钉钉 Stream 长连接退出` 且带错误信息,多为 **Client ID / Client Secret 错误**或**开放平台未开通流式接入**。
|
||||||
|
- 在钉钉里发一条消息后,若有收到,应有日志:`钉钉收到消息`;若没有,说明钉钉未把消息推到本程序(回头检查开放平台「机器人」是否开通、是否选用 **Stream 模式**)。
|
||||||
|
|
||||||
|
4. **开放平台侧**
|
||||||
|
应用需已**发布**;在「机器人」能力中需开启**流式接入(Stream)** 用于接收消息(仅 HTTP 回调不够);权限管理里需有机器人接收、发送消息等权限。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 十、常见弯路(避免踩坑)
|
||||||
|
|
||||||
|
- **用错了机器人类型**:在钉钉**群里**添加的「自定义」机器人(Webhook + 加签)**不能**用来做对话,本程序只支持**开放平台「企业内部应用」**里的机器人。
|
||||||
|
- **只保存没重启**:在 CyberStrikeAI 里改完机器人配置后必须**重启应用**,否则长连接不会建立。
|
||||||
|
- **Client ID 抄错**:开放平台是 `504` 就填 `504`,不要填成 `5o4`;尽量用复制粘贴。
|
||||||
|
- **钉钉只开了 HTTP 回调没开 Stream**:本程序通过 **Stream 长连接**收消息,开放平台里机器人的消息接收方式必须选 **Stream 模式**。
|
||||||
|
- **应用没发布**:开放平台里修改了机器人或权限后,要在「版本管理与发布」里**发布新版本**,否则不生效。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 十一、注意事项
|
||||||
|
|
||||||
|
- 钉钉、飞书均**仅处理文本消息**;其他类型(如图片、语音)会提示暂不支持或忽略。
|
||||||
|
- 会话与 Web 端共用同一套对话数据:在机器人里创建的对话会在 Web 端「对话」列表中看到,反之亦然。
|
||||||
|
- 机器人执行逻辑与 **`/api/agent-loop/stream`** 一致(含进度回调、过程详情写入数据库),仅不向客户端推送 SSE,最后将完整回复一次性发回钉钉/飞书/企业微信。
|
||||||
@@ -0,0 +1,216 @@
|
|||||||
|
# CyberStrikeAI Robot / Chatbot Guide
|
||||||
|
|
||||||
|
[中文](robot.md)
|
||||||
|
|
||||||
|
This document explains how to chat with CyberStrikeAI from **DingTalk** and **Lark (Feishu)** using long-lived connections—no need to open a browser on the server. Following the steps below helps avoid common mistakes.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Where to configure in CyberStrikeAI
|
||||||
|
|
||||||
|
1. Log in to the CyberStrikeAI web UI.
|
||||||
|
2. Open **System Settings** in the left sidebar.
|
||||||
|
3. Click **Robot settings** (between “Basic” and “Security”).
|
||||||
|
4. Enable the platform and fill in credentials (DingTalk: Client ID / Client Secret; Lark: App ID / App Secret).
|
||||||
|
5. Click **Apply configuration** to save.
|
||||||
|
6. **Restart the CyberStrikeAI process** (saving alone does not establish the connection).
|
||||||
|
|
||||||
|
Settings are written to the `robots` section of `config.yaml`; you can also edit the file directly. **After changing DingTalk or Lark config, you must restart for the long-lived connection to take effect.**
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Supported platforms (long-lived connection)
|
||||||
|
|
||||||
|
| Platform | Description |
|
||||||
|
|----------|-------------|
|
||||||
|
| DingTalk | Stream long-lived connection; the app connects to DingTalk to receive messages |
|
||||||
|
| Lark (Feishu) | Long-lived connection; the app connects to Lark to receive messages |
|
||||||
|
|
||||||
|
Section 3 below describes, per platform, what to do in the developer console and which fields to copy into CyberStrikeAI.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Configuration and step-by-step setup
|
||||||
|
|
||||||
|
### 3.1 DingTalk
|
||||||
|
|
||||||
|
**Important: two types of DingTalk bots**
|
||||||
|
|
||||||
|
| Type | Where it’s created | Can do “user sends message → bot replies”? | Supported here? |
|
||||||
|
|------|-------------------|-------------------------------------------|------------------|
|
||||||
|
| **Custom bot (Webhook)** | In a DingTalk group: Group settings → Add robot → Custom (Webhook) | No; you can only post to the group | No |
|
||||||
|
| **Enterprise internal app bot** | [DingTalk Open Platform](https://open.dingtalk.com): create an app and enable the bot | Yes | Yes |
|
||||||
|
|
||||||
|
If you only have a **custom bot** Webhook URL (`oapi.dingtalk.com/robot/send?access_token=...`) and sign secret (`SEC...`), **do not** put them into CyberStrikeAI. You must create an **enterprise internal app** in the open platform and obtain **Client ID** and **Client Secret** as below.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**DingTalk setup (in order)**
|
||||||
|
|
||||||
|
1. **Open DingTalk Open Platform**
|
||||||
|
Go to [https://open.dingtalk.com](https://open.dingtalk.com) and log in with an **enterprise admin** account.
|
||||||
|
|
||||||
|
2. **Create or select an app**
|
||||||
|
In the left menu: **Application development** → **Enterprise internal development** → **Create application** (or choose an existing app). Fill in the app name and create.
|
||||||
|
|
||||||
|
3. **Get Client ID and Client Secret**
|
||||||
|
- In the left menu open **Credentials and basic info** (under “Basic information”).
|
||||||
|
- Copy **Client ID (formerly AppKey)** and **Client Secret (formerly AppSecret)**.
|
||||||
|
- Use copy/paste; avoid typing by hand. Watch for **0** vs **o** and **1** vs **l** (e.g. `ding9gf9tiozuc504aer` has the digits **504**, not 5o4).
|
||||||
|
|
||||||
|
4. **Enable the bot and choose Stream mode**
|
||||||
|
- Left menu: **Application capabilities** → **Robot**.
|
||||||
|
- Turn on “Robot configuration”.
|
||||||
|
- Fill in robot name, description, etc. as required.
|
||||||
|
- **Critical**: set message reception to **“Stream mode”** (流式接入). If you only enable “HTTP callback” or do not select Stream, CyberStrikeAI will not receive messages.
|
||||||
|
- Save.
|
||||||
|
|
||||||
|
5. **Permissions and release**
|
||||||
|
- Left menu: **Permission management** — search for “robot”, “message”, etc., and enable **receive message**, **send message**, and other bot-related permissions; confirm.
|
||||||
|
- Left menu: **Version management and release** — if there are unpublished changes, click **Release new version** / **Publish**; otherwise changes do not take effect.
|
||||||
|
|
||||||
|
6. **Fill in CyberStrikeAI**
|
||||||
|
- In CyberStrikeAI: System settings → Robot settings → DingTalk.
|
||||||
|
- Enable “Enable DingTalk robot”.
|
||||||
|
- Paste the Client ID and Client Secret from step 3.
|
||||||
|
- Click **Apply configuration**, then **restart CyberStrikeAI**.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Field mapping (DingTalk)**
|
||||||
|
|
||||||
|
| Field in CyberStrikeAI | Source in DingTalk Open Platform |
|
||||||
|
|------------------------|----------------------------------|
|
||||||
|
| Enable DingTalk robot | Check to enable |
|
||||||
|
| Client ID (AppKey) | Credentials and basic info → **Client ID (formerly AppKey)** |
|
||||||
|
| Client Secret | Credentials and basic info → **Client Secret (formerly AppSecret)** |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 3.2 Lark (Feishu)
|
||||||
|
|
||||||
|
| Field | Description |
|
||||||
|
|-------|-------------|
|
||||||
|
| Enable Lark robot | Check to start the Lark long-lived connection |
|
||||||
|
| App ID | From Lark open platform app credentials |
|
||||||
|
| App Secret | From Lark open platform app credentials |
|
||||||
|
| Verify Token | Optional; for event subscription |
|
||||||
|
|
||||||
|
**Lark setup in short**: Log in to [Lark Open Platform](https://open.feishu.cn) → Create an enterprise app → In “Credentials and basic info” get **App ID** and **App Secret** → In “Application capabilities” enable **Robot** and the right permissions → Publish the app → Enter App ID and App Secret in CyberStrikeAI robot settings → Save and **restart** the app.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Bot commands
|
||||||
|
|
||||||
|
Send these **text commands** to the bot in DingTalk or Lark (text only):
|
||||||
|
|
||||||
|
| Command | Description |
|
||||||
|
|---------|-------------|
|
||||||
|
| **帮助** (help) | Show command help |
|
||||||
|
| **列表** or **对话列表** (list) | List all conversation titles and IDs |
|
||||||
|
| **切换 \<conversationID\>** or **继续 \<conversationID\>** | Continue in the given conversation |
|
||||||
|
| **新对话** (new) | Start a new conversation |
|
||||||
|
| **清空** (clear) | Clear current context (same effect as new conversation) |
|
||||||
|
| **当前** (current) | Show current conversation ID and title |
|
||||||
|
|
||||||
|
Any other text is sent to the AI as a user message, same as in the web UI (e.g. penetration testing, security analysis).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. How to use (do I need to @ the bot?)
|
||||||
|
|
||||||
|
- **Direct chat (recommended)**: In DingTalk or Lark, **search for the bot and open a direct chat**. Type “帮助” or any message; **no @ needed**.
|
||||||
|
- **Group chat**: If the bot is in a group, only messages that **@ the bot** are received and answered; other group messages are ignored.
|
||||||
|
|
||||||
|
Summary: **Direct chat** — just send; **in a group** — @ the bot first, then send.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. Recommended flow (so you don’t skip steps)
|
||||||
|
|
||||||
|
1. **In the open platform**: Complete app creation, copy credentials, enable the bot (DingTalk: **Stream mode**), set permissions, and publish (Section 3).
|
||||||
|
2. **In CyberStrikeAI**: System settings → Robot settings → Enable the platform, paste Client ID/App ID and Client Secret/App Secret → **Apply configuration**.
|
||||||
|
3. **Restart the CyberStrikeAI process** (otherwise the long-lived connection is not established).
|
||||||
|
4. **On your phone**: Open DingTalk or Lark, find the bot (direct chat or @ in a group), send “帮助” or any message to test.
|
||||||
|
|
||||||
|
If the bot does not respond, see **Section 9 (troubleshooting)** and **Section 10 (common pitfalls)**.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. Config file example
|
||||||
|
|
||||||
|
Example `robots` section in `config.yaml`:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
robots:
|
||||||
|
dingtalk:
|
||||||
|
enabled: true
|
||||||
|
client_id: "your_dingtalk_app_key"
|
||||||
|
client_secret: "your_dingtalk_app_secret"
|
||||||
|
lark:
|
||||||
|
enabled: true
|
||||||
|
app_id: "your_lark_app_id"
|
||||||
|
app_secret: "your_lark_app_secret"
|
||||||
|
verify_token: ""
|
||||||
|
```
|
||||||
|
|
||||||
|
**Restart the app** after changes; the long-lived connection is created at startup.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. Testing without DingTalk/Lark installed
|
||||||
|
|
||||||
|
You can verify bot logic with the **test API** (no DingTalk/Lark client needed):
|
||||||
|
|
||||||
|
1. Log in to the CyberStrikeAI web UI (so you have a session).
|
||||||
|
2. Call the test endpoint with curl (include your session Cookie):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Replace YOUR_COOKIE with the Cookie from your browser (F12 → Network → any request → Request headers → Cookie)
|
||||||
|
curl -X POST "http://localhost:8080/api/robot/test" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "Cookie: YOUR_COOKIE" \
|
||||||
|
-d '{"platform":"dingtalk","user_id":"test_user","text":"帮助"}'
|
||||||
|
```
|
||||||
|
|
||||||
|
If the JSON response contains `"reply":"【CyberStrikeAI 机器人命令】..."`, command handling works. You can also try `"text":"列表"` or `"text":"当前"`.
|
||||||
|
|
||||||
|
API: `POST /api/robot/test` (requires login). Body: `{"platform":"optional","user_id":"optional","text":"required"}`. Response: `{"reply":"..."}`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. DingTalk: no response when sending messages
|
||||||
|
|
||||||
|
Check in this order:
|
||||||
|
|
||||||
|
1. **Client ID / Client Secret match the open platform exactly**
|
||||||
|
Copy from “Credentials and basic info”; avoid typing. Watch **0** vs **o** and **1** vs **l** (e.g. `ding9gf9tiozuc504aer` has **504**, not 5o4).
|
||||||
|
|
||||||
|
2. **Did you restart after saving?**
|
||||||
|
The long-lived connection is created at **startup**. “Apply configuration” only updates the config file; you **must restart the CyberStrikeAI process** for the DingTalk connection to start.
|
||||||
|
|
||||||
|
3. **Application logs**
|
||||||
|
- On startup you should see: `钉钉 Stream 正在连接…`, `钉钉 Stream 已启动(无需公网),等待收消息`.
|
||||||
|
- If you see `钉钉 Stream 长连接退出` with an error, it’s usually wrong **Client ID / Client Secret** or **Stream not enabled** in the open platform.
|
||||||
|
- After sending a message in DingTalk, you should see `钉钉收到消息` in the logs; if not, the platform is not pushing to this app (check that the bot is enabled and **Stream mode** is selected).
|
||||||
|
|
||||||
|
4. **Open platform**
|
||||||
|
The app must be **published**. Under “Robot” you must enable **Stream** for receiving messages (HTTP callback only is not enough). Permission management must include robot receive/send message permissions.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 10. Common pitfalls
|
||||||
|
|
||||||
|
- **Wrong bot type**: The “Custom” bot added in a DingTalk **group** (Webhook + sign secret) **cannot** be used for two-way chat. Only the **enterprise internal app** bot from the open platform is supported.
|
||||||
|
- **Saved but not restarted**: After changing robot settings in CyberStrikeAI you **must restart** the app, or the long-lived connection will not be established.
|
||||||
|
- **Client ID typo**: If the platform shows `504`, use `504` (not `5o4`); prefer copy/paste.
|
||||||
|
- **DingTalk: only HTTP callback, no Stream**: This app receives messages via **Stream**. In the open platform, message reception must be **Stream mode**.
|
||||||
|
- **App not published**: After changing the bot or permissions in the open platform, **publish a new version** under “Version management and release”, or changes won’t apply.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 11. Notes
|
||||||
|
|
||||||
|
- DingTalk and Lark: **text messages only**; other types (e.g. image, voice) are not supported and may be ignored.
|
||||||
|
- Conversations are shared with the web UI: conversations created from the bot appear in the web “Conversations” list and vice versa.
|
||||||
|
- Bot execution uses the same logic as **`/api/agent-loop/stream`** (progress callbacks, process details stored in the DB); only the final reply is sent back to DingTalk/Lark in one message (no SSE to the client).
|
||||||
@@ -1,11 +1,16 @@
|
|||||||
module cyberstrike-ai
|
module cyberstrike-ai
|
||||||
|
|
||||||
go 1.21
|
go 1.23.0
|
||||||
|
|
||||||
|
toolchain go1.24.4
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/gin-gonic/gin v1.9.1
|
github.com/gin-gonic/gin v1.9.1
|
||||||
github.com/google/uuid v1.5.0
|
github.com/google/uuid v1.5.0
|
||||||
|
github.com/larksuite/oapi-sdk-go/v3 v3.4.22
|
||||||
github.com/mattn/go-sqlite3 v1.14.18
|
github.com/mattn/go-sqlite3 v1.14.18
|
||||||
|
github.com/modelcontextprotocol/go-sdk v1.2.0
|
||||||
|
github.com/open-dingtalk/dingtalk-stream-sdk-go v0.9.1
|
||||||
github.com/pkoukk/tiktoken-go v0.1.8
|
github.com/pkoukk/tiktoken-go v0.1.8
|
||||||
go.uber.org/zap v1.26.0
|
go.uber.org/zap v1.26.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
@@ -21,6 +26,9 @@ require (
|
|||||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||||
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
||||||
github.com/goccy/go-json v0.10.2 // indirect
|
github.com/goccy/go-json v0.10.2 // indirect
|
||||||
|
github.com/gogo/protobuf v1.3.2 // indirect
|
||||||
|
github.com/google/jsonschema-go v0.3.0 // indirect
|
||||||
|
github.com/gorilla/websocket v1.5.0 // indirect
|
||||||
github.com/json-iterator/go v1.1.12 // indirect
|
github.com/json-iterator/go v1.1.12 // indirect
|
||||||
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
|
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
|
||||||
github.com/leodido/go-urn v1.2.4 // indirect
|
github.com/leodido/go-urn v1.2.4 // indirect
|
||||||
@@ -30,10 +38,12 @@ require (
|
|||||||
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
|
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
|
||||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||||
github.com/ugorji/go/codec v1.2.11 // indirect
|
github.com/ugorji/go/codec v1.2.11 // indirect
|
||||||
|
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
|
||||||
go.uber.org/multierr v1.11.0 // indirect
|
go.uber.org/multierr v1.11.0 // indirect
|
||||||
golang.org/x/arch v0.3.0 // indirect
|
golang.org/x/arch v0.3.0 // indirect
|
||||||
golang.org/x/crypto v0.14.0 // indirect
|
golang.org/x/crypto v0.14.0 // indirect
|
||||||
golang.org/x/net v0.17.0 // indirect
|
golang.org/x/net v0.17.0 // indirect
|
||||||
|
golang.org/x/oauth2 v0.30.0 // indirect
|
||||||
golang.org/x/sys v0.13.0 // indirect
|
golang.org/x/sys v0.13.0 // indirect
|
||||||
golang.org/x/text v0.13.0 // indirect
|
golang.org/x/text v0.13.0 // indirect
|
||||||
google.golang.org/protobuf v1.30.0 // indirect
|
google.golang.org/protobuf v1.30.0 // indirect
|
||||||
|
|||||||
@@ -25,28 +25,45 @@ github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg
|
|||||||
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
||||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
||||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||||
|
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||||
|
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
|
||||||
|
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
||||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||||
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
|
|
||||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||||
|
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||||
|
github.com/google/jsonschema-go v0.3.0 h1:6AH2TxVNtk3IlvkkhjrtbUc4S8AvO0Xii0DxIygDg+Q=
|
||||||
|
github.com/google/jsonschema-go v0.3.0/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
|
||||||
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
|
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
|
||||||
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
|
||||||
|
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||||
|
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||||
|
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||||
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
||||||
github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
|
github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
|
||||||
github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
|
github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
|
||||||
|
github.com/larksuite/oapi-sdk-go/v3 v3.4.22 h1:57daKuslQPX9X3hC2idc5bu8bl2krfsBGWGJ6b5FlD8=
|
||||||
|
github.com/larksuite/oapi-sdk-go/v3 v3.4.22/go.mod h1:ZEplY+kwuIrj/nqw5uSCINNATcH3KdxSN7y+UxYY5fI=
|
||||||
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
||||||
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
||||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
||||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
|
github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
|
||||||
github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
|
github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
|
||||||
|
github.com/modelcontextprotocol/go-sdk v1.2.0 h1:Y23co09300CEk8iZ/tMxIX1dVmKZkzoSBZOpJwUnc/s=
|
||||||
|
github.com/modelcontextprotocol/go-sdk v1.2.0/go.mod h1:6fM3LCm3yV7pAs8isnKLn07oKtB0MP9LHd3DfAcKw10=
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||||
|
github.com/open-dingtalk/dingtalk-stream-sdk-go v0.9.1 h1:Lb/Uzkiw2Ugt2Xf03J5wmv81PdkYOiWbI8CNBi1boC8=
|
||||||
|
github.com/open-dingtalk/dingtalk-stream-sdk-go v0.9.1/go.mod h1:ln3IqPYYocZbYvl9TAOrG/cxGR9xcn4pnZRLdCTEGEU=
|
||||||
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
|
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
|
||||||
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
|
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
|
||||||
github.com/pkoukk/tiktoken-go v0.1.8 h1:85ENo+3FpWgAACBaEUVp+lctuTcYUO7BtmfhlN/QTRo=
|
github.com/pkoukk/tiktoken-go v0.1.8 h1:85ENo+3FpWgAACBaEUVp+lctuTcYUO7BtmfhlN/QTRo=
|
||||||
@@ -68,6 +85,10 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
|
|||||||
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
||||||
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
|
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
|
||||||
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
||||||
|
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
|
||||||
|
github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
|
||||||
|
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
|
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
|
||||||
go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
|
go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
|
||||||
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||||
@@ -77,18 +98,45 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
|
|||||||
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||||
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
|
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
|
||||||
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||||
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
|
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
|
||||||
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
||||||
|
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
|
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
|
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
|
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
|
||||||
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
||||||
|
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
|
||||||
|
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
|
||||||
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
|
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
|
||||||
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
|
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
|
||||||
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
|
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||||
|
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
|
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
|
||||||
|
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
|
||||||
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
||||||
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 832 KiB |
+27
-13
@@ -529,8 +529,10 @@ func (a *Agent) AgentLoopWithProgress(ctx context.Context, userInput string, his
|
|||||||
|
|
||||||
maxIterations := a.maxIterations
|
maxIterations := a.maxIterations
|
||||||
for i := 0; i < maxIterations; i++ {
|
for i := 0; i < maxIterations; i++ {
|
||||||
// 每轮调用前先尝试压缩,防止历史消息持续膨胀
|
// 先获取本轮可用工具并统计 tools token,再压缩,以便压缩时预留 tools 占用的空间
|
||||||
messages = a.applyMemoryCompression(ctx, messages)
|
tools := a.getAvailableTools(roleTools)
|
||||||
|
toolsTokens := a.countToolsTokens(tools)
|
||||||
|
messages = a.applyMemoryCompression(ctx, messages, toolsTokens)
|
||||||
|
|
||||||
// 检查是否是最后一次迭代
|
// 检查是否是最后一次迭代
|
||||||
isLastIteration := (i == maxIterations-1)
|
isLastIteration := (i == maxIterations-1)
|
||||||
@@ -562,17 +564,17 @@ func (a *Agent) AgentLoopWithProgress(ctx context.Context, userInput string, his
|
|||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取可用工具
|
// 记录当前上下文的 Token 用量(messages + tools),展示压缩器运行状态
|
||||||
tools := a.getAvailableTools(roleTools)
|
|
||||||
|
|
||||||
// 记录当前上下文的Token用量,展示压缩器运行状态
|
|
||||||
if a.memoryCompressor != nil {
|
if a.memoryCompressor != nil {
|
||||||
totalTokens, systemCount, regularCount := a.memoryCompressor.totalTokensFor(messages)
|
messagesTokens, systemCount, regularCount := a.memoryCompressor.totalTokensFor(messages)
|
||||||
|
totalTokens := messagesTokens + toolsTokens
|
||||||
a.logger.Info("memory compressor context stats",
|
a.logger.Info("memory compressor context stats",
|
||||||
zap.Int("iteration", i+1),
|
zap.Int("iteration", i+1),
|
||||||
zap.Int("messagesCount", len(messages)),
|
zap.Int("messagesCount", len(messages)),
|
||||||
zap.Int("systemMessages", systemCount),
|
zap.Int("systemMessages", systemCount),
|
||||||
zap.Int("regularMessages", regularCount),
|
zap.Int("regularMessages", regularCount),
|
||||||
|
zap.Int("messagesTokens", messagesTokens),
|
||||||
|
zap.Int("toolsTokens", toolsTokens),
|
||||||
zap.Int("totalTokens", totalTokens),
|
zap.Int("totalTokens", totalTokens),
|
||||||
zap.Int("maxTotalTokens", a.memoryCompressor.maxTotalTokens),
|
zap.Int("maxTotalTokens", a.memoryCompressor.maxTotalTokens),
|
||||||
)
|
)
|
||||||
@@ -788,7 +790,7 @@ func (a *Agent) AgentLoopWithProgress(ctx context.Context, userInput string, his
|
|||||||
Role: "user",
|
Role: "user",
|
||||||
Content: "这是最后一次迭代。请总结到目前为止的所有测试结果、发现的问题和已完成的工作。如果需要继续测试,请提供详细的下一步执行计划。请直接回复,不要调用工具。",
|
Content: "这是最后一次迭代。请总结到目前为止的所有测试结果、发现的问题和已完成的工作。如果需要继续测试,请提供详细的下一步执行计划。请直接回复,不要调用工具。",
|
||||||
})
|
})
|
||||||
messages = a.applyMemoryCompression(ctx, messages)
|
messages = a.applyMemoryCompression(ctx, messages, 0) // 总结时不带 tools,不预留
|
||||||
// 立即调用OpenAI获取总结
|
// 立即调用OpenAI获取总结
|
||||||
summaryResponse, err := a.callOpenAI(ctx, messages, []Tool{}) // 不提供工具,强制AI直接回复
|
summaryResponse, err := a.callOpenAI(ctx, messages, []Tool{}) // 不提供工具,强制AI直接回复
|
||||||
if err == nil && summaryResponse != nil && len(summaryResponse.Choices) > 0 {
|
if err == nil && summaryResponse != nil && len(summaryResponse.Choices) > 0 {
|
||||||
@@ -828,7 +830,7 @@ func (a *Agent) AgentLoopWithProgress(ctx context.Context, userInput string, his
|
|||||||
Role: "user",
|
Role: "user",
|
||||||
Content: "这是最后一次迭代。请总结到目前为止的所有测试结果、发现的问题和已完成的工作。如果需要继续测试,请提供详细的下一步执行计划。请直接回复,不要调用工具。",
|
Content: "这是最后一次迭代。请总结到目前为止的所有测试结果、发现的问题和已完成的工作。如果需要继续测试,请提供详细的下一步执行计划。请直接回复,不要调用工具。",
|
||||||
})
|
})
|
||||||
messages = a.applyMemoryCompression(ctx, messages)
|
messages = a.applyMemoryCompression(ctx, messages, 0) // 总结时不带 tools,不预留
|
||||||
// 立即调用OpenAI获取总结
|
// 立即调用OpenAI获取总结
|
||||||
summaryResponse, err := a.callOpenAI(ctx, messages, []Tool{}) // 不提供工具,强制AI直接回复
|
summaryResponse, err := a.callOpenAI(ctx, messages, []Tool{}) // 不提供工具,强制AI直接回复
|
||||||
if err == nil && summaryResponse != nil && len(summaryResponse.Choices) > 0 {
|
if err == nil && summaryResponse != nil && len(summaryResponse.Choices) > 0 {
|
||||||
@@ -867,7 +869,7 @@ func (a *Agent) AgentLoopWithProgress(ctx context.Context, userInput string, his
|
|||||||
Content: fmt.Sprintf("已达到最大迭代次数(%d轮)。请总结到目前为止的所有测试结果、发现的问题和已完成的工作。如果需要继续测试,请提供详细的下一步执行计划。请直接回复,不要调用工具。", a.maxIterations),
|
Content: fmt.Sprintf("已达到最大迭代次数(%d轮)。请总结到目前为止的所有测试结果、发现的问题和已完成的工作。如果需要继续测试,请提供详细的下一步执行计划。请直接回复,不要调用工具。", a.maxIterations),
|
||||||
}
|
}
|
||||||
messages = append(messages, finalSummaryPrompt)
|
messages = append(messages, finalSummaryPrompt)
|
||||||
messages = a.applyMemoryCompression(ctx, messages)
|
messages = a.applyMemoryCompression(ctx, messages, 0) // 总结时不带 tools,不预留
|
||||||
|
|
||||||
summaryResponse, err := a.callOpenAI(ctx, messages, []Tool{}) // 不提供工具,强制AI直接回复
|
summaryResponse, err := a.callOpenAI(ctx, messages, []Tool{}) // 不提供工具,强制AI直接回复
|
||||||
if err == nil && summaryResponse != nil && len(summaryResponse.Choices) > 0 {
|
if err == nil && summaryResponse != nil && len(summaryResponse.Choices) > 0 {
|
||||||
@@ -1425,13 +1427,13 @@ func (a *Agent) formatToolError(toolName string, args map[string]interface{}, er
|
|||||||
return errorMsg
|
return errorMsg
|
||||||
}
|
}
|
||||||
|
|
||||||
// applyMemoryCompression 在调用LLM前对消息进行压缩,避免超过token限制
|
// applyMemoryCompression 在调用LLM前对消息进行压缩,避免超过 token 限制。reservedTokens 为预留给 tools 的 token 数,传 0 表示不预留。
|
||||||
func (a *Agent) applyMemoryCompression(ctx context.Context, messages []ChatMessage) []ChatMessage {
|
func (a *Agent) applyMemoryCompression(ctx context.Context, messages []ChatMessage, reservedTokens int) []ChatMessage {
|
||||||
if a.memoryCompressor == nil {
|
if a.memoryCompressor == nil {
|
||||||
return messages
|
return messages
|
||||||
}
|
}
|
||||||
|
|
||||||
compressed, changed, err := a.memoryCompressor.CompressHistory(ctx, messages)
|
compressed, changed, err := a.memoryCompressor.CompressHistory(ctx, messages, reservedTokens)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
a.logger.Warn("上下文压缩失败,将使用原始消息继续", zap.Error(err))
|
a.logger.Warn("上下文压缩失败,将使用原始消息继续", zap.Error(err))
|
||||||
return messages
|
return messages
|
||||||
@@ -1447,6 +1449,18 @@ func (a *Agent) applyMemoryCompression(ctx context.Context, messages []ChatMessa
|
|||||||
return messages
|
return messages
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// countToolsTokens 统计 tools 序列化后的 token 数,用于日志与压缩时预留空间。mc 为 nil 时返回 0。
|
||||||
|
func (a *Agent) countToolsTokens(tools []Tool) int {
|
||||||
|
if len(tools) == 0 || a.memoryCompressor == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
data, err := json.Marshal(tools)
|
||||||
|
if err != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return a.memoryCompressor.CountTextTokens(string(data))
|
||||||
|
}
|
||||||
|
|
||||||
// handleMissingToolError 当LLM调用不存在的工具时,向其追加提示消息并允许继续迭代
|
// handleMissingToolError 当LLM调用不存在的工具时,向其追加提示消息并允许继续迭代
|
||||||
func (a *Agent) handleMissingToolError(errMsg string, messages *[]ChatMessage) (bool, string) {
|
func (a *Agent) handleMissingToolError(errMsg string, messages *[]ChatMessage) (bool, string) {
|
||||||
lowerMsg := strings.ToLower(errMsg)
|
lowerMsg := strings.ToLower(errMsg)
|
||||||
|
|||||||
@@ -158,8 +158,8 @@ func (mc *MemoryCompressor) UpdateConfig(cfg *config.OpenAIConfig) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// CompressHistory 根据Token限制压缩历史消息。
|
// CompressHistory 根据 Token 限制压缩历史消息。reservedTokens 为预留给 tools 等非消息内容的 token 数,压缩时使用 (maxTotalTokens - reservedTokens) 作为消息上限。
|
||||||
func (mc *MemoryCompressor) CompressHistory(ctx context.Context, messages []ChatMessage) ([]ChatMessage, bool, error) {
|
func (mc *MemoryCompressor) CompressHistory(ctx context.Context, messages []ChatMessage, reservedTokens int) ([]ChatMessage, bool, error) {
|
||||||
if len(messages) == 0 {
|
if len(messages) == 0 {
|
||||||
return messages, false, nil
|
return messages, false, nil
|
||||||
}
|
}
|
||||||
@@ -171,8 +171,13 @@ func (mc *MemoryCompressor) CompressHistory(ctx context.Context, messages []Chat
|
|||||||
return messages, false, nil
|
return messages, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
effectiveMax := mc.maxTotalTokens
|
||||||
|
if reservedTokens > 0 && reservedTokens < mc.maxTotalTokens {
|
||||||
|
effectiveMax = mc.maxTotalTokens - reservedTokens
|
||||||
|
}
|
||||||
|
|
||||||
totalTokens := mc.countTotalTokens(systemMsgs, regularMsgs)
|
totalTokens := mc.countTotalTokens(systemMsgs, regularMsgs)
|
||||||
if totalTokens <= int(float64(mc.maxTotalTokens)*0.9) {
|
if totalTokens <= int(float64(effectiveMax)*0.9) {
|
||||||
return messages, false, nil
|
return messages, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -184,6 +189,8 @@ func (mc *MemoryCompressor) CompressHistory(ctx context.Context, messages []Chat
|
|||||||
mc.logger.Info("memory compression triggered",
|
mc.logger.Info("memory compression triggered",
|
||||||
zap.Int("total_tokens", totalTokens),
|
zap.Int("total_tokens", totalTokens),
|
||||||
zap.Int("max_total_tokens", mc.maxTotalTokens),
|
zap.Int("max_total_tokens", mc.maxTotalTokens),
|
||||||
|
zap.Int("reserved_tokens", reservedTokens),
|
||||||
|
zap.Int("effective_max", effectiveMax),
|
||||||
zap.Int("system_messages", len(systemMsgs)),
|
zap.Int("system_messages", len(systemMsgs)),
|
||||||
zap.Int("regular_messages", len(regularMsgs)),
|
zap.Int("regular_messages", len(regularMsgs)),
|
||||||
zap.Int("old_messages", len(oldMsgs)),
|
zap.Int("old_messages", len(oldMsgs)),
|
||||||
@@ -282,6 +289,11 @@ func (mc *MemoryCompressor) countTokens(text string) int {
|
|||||||
return count
|
return count
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CountTextTokens 对外暴露的文本 Token 计数,用于统计 tools 等非消息内容的 token(如 agent 侧序列化 tools 后计数)。
|
||||||
|
func (mc *MemoryCompressor) CountTextTokens(text string) int {
|
||||||
|
return mc.countTokens(text)
|
||||||
|
}
|
||||||
|
|
||||||
// totalTokensFor provides token statistics without mutating the message list.
|
// totalTokensFor provides token statistics without mutating the message list.
|
||||||
func (mc *MemoryCompressor) totalTokensFor(messages []ChatMessage) (totalTokens int, systemCount int, regularCount int) {
|
func (mc *MemoryCompressor) totalTokensFor(messages []ChatMessage) (totalTokens int, systemCount int, regularCount int) {
|
||||||
if len(messages) == 0 {
|
if len(messages) == 0 {
|
||||||
|
|||||||
+95
-1
@@ -7,6 +7,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"cyberstrike-ai/internal/agent"
|
"cyberstrike-ai/internal/agent"
|
||||||
@@ -14,6 +15,7 @@ import (
|
|||||||
"cyberstrike-ai/internal/database"
|
"cyberstrike-ai/internal/database"
|
||||||
"cyberstrike-ai/internal/handler"
|
"cyberstrike-ai/internal/handler"
|
||||||
"cyberstrike-ai/internal/knowledge"
|
"cyberstrike-ai/internal/knowledge"
|
||||||
|
"cyberstrike-ai/internal/robot"
|
||||||
"cyberstrike-ai/internal/logger"
|
"cyberstrike-ai/internal/logger"
|
||||||
"cyberstrike-ai/internal/mcp"
|
"cyberstrike-ai/internal/mcp"
|
||||||
"cyberstrike-ai/internal/mcp/builtin"
|
"cyberstrike-ai/internal/mcp/builtin"
|
||||||
@@ -43,6 +45,10 @@ type App struct {
|
|||||||
knowledgeIndexer *knowledge.Indexer // 知识库索引器(用于动态初始化)
|
knowledgeIndexer *knowledge.Indexer // 知识库索引器(用于动态初始化)
|
||||||
knowledgeHandler *handler.KnowledgeHandler // 知识库处理器(用于动态初始化)
|
knowledgeHandler *handler.KnowledgeHandler // 知识库处理器(用于动态初始化)
|
||||||
agentHandler *handler.AgentHandler // Agent处理器(用于更新知识库管理器)
|
agentHandler *handler.AgentHandler // Agent处理器(用于更新知识库管理器)
|
||||||
|
robotHandler *handler.RobotHandler // 机器人处理器(钉钉/飞书/企业微信)
|
||||||
|
robotMu sync.Mutex // 保护钉钉/飞书长连接的 cancel
|
||||||
|
dingCancel context.CancelFunc // 钉钉 Stream 取消函数,用于配置变更时重启
|
||||||
|
larkCancel context.CancelFunc // 飞书长连接取消函数,用于配置变更时重启
|
||||||
}
|
}
|
||||||
|
|
||||||
// New 创建新应用
|
// New 创建新应用
|
||||||
@@ -318,12 +324,14 @@ func New(cfg *config.Config, log *logger.Logger) (*App, error) {
|
|||||||
roleHandler := handler.NewRoleHandler(cfg, configPath, log.Logger)
|
roleHandler := handler.NewRoleHandler(cfg, configPath, log.Logger)
|
||||||
roleHandler.SetSkillsManager(skillsManager) // 设置Skills管理器到RoleHandler
|
roleHandler.SetSkillsManager(skillsManager) // 设置Skills管理器到RoleHandler
|
||||||
skillsHandler := handler.NewSkillsHandler(skillsManager, cfg, configPath, log.Logger)
|
skillsHandler := handler.NewSkillsHandler(skillsManager, cfg, configPath, log.Logger)
|
||||||
|
fofaHandler := handler.NewFofaHandler(cfg, log.Logger)
|
||||||
if db != nil {
|
if db != nil {
|
||||||
skillsHandler.SetDB(db) // 设置数据库连接以便获取调用统计
|
skillsHandler.SetDB(db) // 设置数据库连接以便获取调用统计
|
||||||
}
|
}
|
||||||
|
|
||||||
// 创建OpenAPI处理器
|
// 创建OpenAPI处理器
|
||||||
conversationHandler := handler.NewConversationHandler(db, log.Logger)
|
conversationHandler := handler.NewConversationHandler(db, log.Logger)
|
||||||
|
robotHandler := handler.NewRobotHandler(cfg, db, agentHandler, log.Logger)
|
||||||
openAPIHandler := handler.NewOpenAPIHandler(db, log.Logger, resultStorage, conversationHandler, agentHandler)
|
openAPIHandler := handler.NewOpenAPIHandler(db, log.Logger, resultStorage, conversationHandler, agentHandler)
|
||||||
|
|
||||||
// 创建 App 实例(部分字段稍后填充)
|
// 创建 App 实例(部分字段稍后填充)
|
||||||
@@ -343,7 +351,10 @@ func New(cfg *config.Config, log *logger.Logger) (*App, error) {
|
|||||||
knowledgeIndexer: knowledgeIndexer,
|
knowledgeIndexer: knowledgeIndexer,
|
||||||
knowledgeHandler: knowledgeHandler,
|
knowledgeHandler: knowledgeHandler,
|
||||||
agentHandler: agentHandler,
|
agentHandler: agentHandler,
|
||||||
|
robotHandler: robotHandler,
|
||||||
}
|
}
|
||||||
|
// 飞书/钉钉长连接(无需公网),启用时在后台启动;后续前端应用配置时会通过 RestartRobotConnections 重启
|
||||||
|
app.startRobotConnections()
|
||||||
|
|
||||||
// 设置漏洞工具注册器(内置工具,必须设置)
|
// 设置漏洞工具注册器(内置工具,必须设置)
|
||||||
vulnerabilityRegistrar := func() error {
|
vulnerabilityRegistrar := func() error {
|
||||||
@@ -400,6 +411,9 @@ func New(cfg *config.Config, log *logger.Logger) (*App, error) {
|
|||||||
configHandler.SetRetrieverUpdater(knowledgeRetriever)
|
configHandler.SetRetrieverUpdater(knowledgeRetriever)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 设置机器人连接重启器,前端应用配置后无需重启服务即可使钉钉/飞书新配置生效
|
||||||
|
configHandler.SetRobotRestarter(app)
|
||||||
|
|
||||||
// 设置路由(使用 App 实例以便动态获取 handler)
|
// 设置路由(使用 App 实例以便动态获取 handler)
|
||||||
setupRoutes(
|
setupRoutes(
|
||||||
router,
|
router,
|
||||||
@@ -407,6 +421,7 @@ func New(cfg *config.Config, log *logger.Logger) (*App, error) {
|
|||||||
agentHandler,
|
agentHandler,
|
||||||
monitorHandler,
|
monitorHandler,
|
||||||
conversationHandler,
|
conversationHandler,
|
||||||
|
robotHandler,
|
||||||
groupHandler,
|
groupHandler,
|
||||||
configHandler,
|
configHandler,
|
||||||
externalMCPHandler,
|
externalMCPHandler,
|
||||||
@@ -415,6 +430,7 @@ func New(cfg *config.Config, log *logger.Logger) (*App, error) {
|
|||||||
vulnerabilityHandler,
|
vulnerabilityHandler,
|
||||||
roleHandler,
|
roleHandler,
|
||||||
skillsHandler,
|
skillsHandler,
|
||||||
|
fofaHandler,
|
||||||
mcpServer,
|
mcpServer,
|
||||||
authManager,
|
authManager,
|
||||||
openAPIHandler,
|
openAPIHandler,
|
||||||
@@ -450,6 +466,18 @@ func (a *App) Run() error {
|
|||||||
|
|
||||||
// Shutdown 关闭应用
|
// Shutdown 关闭应用
|
||||||
func (a *App) Shutdown() {
|
func (a *App) Shutdown() {
|
||||||
|
// 停止钉钉/飞书长连接
|
||||||
|
a.robotMu.Lock()
|
||||||
|
if a.dingCancel != nil {
|
||||||
|
a.dingCancel()
|
||||||
|
a.dingCancel = nil
|
||||||
|
}
|
||||||
|
if a.larkCancel != nil {
|
||||||
|
a.larkCancel()
|
||||||
|
a.larkCancel = nil
|
||||||
|
}
|
||||||
|
a.robotMu.Unlock()
|
||||||
|
|
||||||
// 停止所有外部MCP客户端
|
// 停止所有外部MCP客户端
|
||||||
if a.externalMCPMgr != nil {
|
if a.externalMCPMgr != nil {
|
||||||
a.externalMCPMgr.StopAll()
|
a.externalMCPMgr.StopAll()
|
||||||
@@ -463,6 +491,40 @@ func (a *App) Shutdown() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// startRobotConnections 根据当前配置启动钉钉/飞书长连接(不先关闭已有连接,仅用于首次启动)
|
||||||
|
func (a *App) startRobotConnections() {
|
||||||
|
a.robotMu.Lock()
|
||||||
|
defer a.robotMu.Unlock()
|
||||||
|
cfg := a.config
|
||||||
|
if cfg.Robots.Lark.Enabled && cfg.Robots.Lark.AppID != "" && cfg.Robots.Lark.AppSecret != "" {
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
a.larkCancel = cancel
|
||||||
|
go robot.StartLark(ctx, cfg.Robots.Lark, a.robotHandler, a.logger.Logger)
|
||||||
|
}
|
||||||
|
if cfg.Robots.Dingtalk.Enabled && cfg.Robots.Dingtalk.ClientID != "" && cfg.Robots.Dingtalk.ClientSecret != "" {
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
a.dingCancel = cancel
|
||||||
|
go robot.StartDing(ctx, cfg.Robots.Dingtalk, a.robotHandler, a.logger.Logger)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// RestartRobotConnections 重启钉钉/飞书长连接,使前端应用配置后立即生效(实现 handler.RobotRestarter)
|
||||||
|
func (a *App) RestartRobotConnections() {
|
||||||
|
a.robotMu.Lock()
|
||||||
|
if a.dingCancel != nil {
|
||||||
|
a.dingCancel()
|
||||||
|
a.dingCancel = nil
|
||||||
|
}
|
||||||
|
if a.larkCancel != nil {
|
||||||
|
a.larkCancel()
|
||||||
|
a.larkCancel = nil
|
||||||
|
}
|
||||||
|
a.robotMu.Unlock()
|
||||||
|
// 给旧 goroutine 一点时间退出
|
||||||
|
time.Sleep(200 * time.Millisecond)
|
||||||
|
a.startRobotConnections()
|
||||||
|
}
|
||||||
|
|
||||||
// setupRoutes 设置路由
|
// setupRoutes 设置路由
|
||||||
func setupRoutes(
|
func setupRoutes(
|
||||||
router *gin.Engine,
|
router *gin.Engine,
|
||||||
@@ -470,6 +532,7 @@ func setupRoutes(
|
|||||||
agentHandler *handler.AgentHandler,
|
agentHandler *handler.AgentHandler,
|
||||||
monitorHandler *handler.MonitorHandler,
|
monitorHandler *handler.MonitorHandler,
|
||||||
conversationHandler *handler.ConversationHandler,
|
conversationHandler *handler.ConversationHandler,
|
||||||
|
robotHandler *handler.RobotHandler,
|
||||||
groupHandler *handler.GroupHandler,
|
groupHandler *handler.GroupHandler,
|
||||||
configHandler *handler.ConfigHandler,
|
configHandler *handler.ConfigHandler,
|
||||||
externalMCPHandler *handler.ExternalMCPHandler,
|
externalMCPHandler *handler.ExternalMCPHandler,
|
||||||
@@ -478,6 +541,7 @@ func setupRoutes(
|
|||||||
vulnerabilityHandler *handler.VulnerabilityHandler,
|
vulnerabilityHandler *handler.VulnerabilityHandler,
|
||||||
roleHandler *handler.RoleHandler,
|
roleHandler *handler.RoleHandler,
|
||||||
skillsHandler *handler.SkillsHandler,
|
skillsHandler *handler.SkillsHandler,
|
||||||
|
fofaHandler *handler.FofaHandler,
|
||||||
mcpServer *mcp.Server,
|
mcpServer *mcp.Server,
|
||||||
authManager *security.AuthManager,
|
authManager *security.AuthManager,
|
||||||
openAPIHandler *handler.OpenAPIHandler,
|
openAPIHandler *handler.OpenAPIHandler,
|
||||||
@@ -494,9 +558,18 @@ func setupRoutes(
|
|||||||
authRoutes.GET("/validate", security.AuthMiddleware(authManager), authHandler.Validate)
|
authRoutes.GET("/validate", security.AuthMiddleware(authManager), authHandler.Validate)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 机器人回调(无需登录,供企业微信/钉钉/飞书服务器调用)
|
||||||
|
api.GET("/robot/wecom", robotHandler.HandleWecomGET)
|
||||||
|
api.POST("/robot/wecom", robotHandler.HandleWecomPOST)
|
||||||
|
api.POST("/robot/dingtalk", robotHandler.HandleDingtalkPOST)
|
||||||
|
api.POST("/robot/lark", robotHandler.HandleLarkPOST)
|
||||||
|
|
||||||
protected := api.Group("")
|
protected := api.Group("")
|
||||||
protected.Use(security.AuthMiddleware(authManager))
|
protected.Use(security.AuthMiddleware(authManager))
|
||||||
{
|
{
|
||||||
|
// 机器人测试(需登录):POST /api/robot/test,body: {"platform":"dingtalk","user_id":"test","text":"帮助"},用于验证机器人逻辑
|
||||||
|
protected.POST("/robot/test", robotHandler.HandleRobotTest)
|
||||||
|
|
||||||
// Agent Loop
|
// Agent Loop
|
||||||
protected.POST("/agent-loop", agentHandler.AgentLoop)
|
protected.POST("/agent-loop", agentHandler.AgentLoop)
|
||||||
// Agent Loop 流式输出
|
// Agent Loop 流式输出
|
||||||
@@ -506,6 +579,11 @@ func setupRoutes(
|
|||||||
protected.GET("/agent-loop/tasks", agentHandler.ListAgentTasks)
|
protected.GET("/agent-loop/tasks", agentHandler.ListAgentTasks)
|
||||||
protected.GET("/agent-loop/tasks/completed", agentHandler.ListCompletedTasks)
|
protected.GET("/agent-loop/tasks/completed", agentHandler.ListCompletedTasks)
|
||||||
|
|
||||||
|
// 信息收集 - FOFA 查询(后端代理)
|
||||||
|
protected.POST("/fofa/search", fofaHandler.Search)
|
||||||
|
// 信息收集 - 自然语言解析为 FOFA 语法(需人工确认后再查询)
|
||||||
|
protected.POST("/fofa/parse", fofaHandler.ParseNaturalLanguage)
|
||||||
|
|
||||||
// 批量任务管理
|
// 批量任务管理
|
||||||
protected.POST("/batch-tasks", agentHandler.CreateBatchQueue)
|
protected.POST("/batch-tasks", agentHandler.CreateBatchQueue)
|
||||||
protected.GET("/batch-tasks", agentHandler.ListBatchQueues)
|
protected.GET("/batch-tasks", agentHandler.ListBatchQueues)
|
||||||
@@ -694,6 +772,18 @@ func setupRoutes(
|
|||||||
}
|
}
|
||||||
app.knowledgeHandler.Search(c)
|
app.knowledgeHandler.Search(c)
|
||||||
})
|
})
|
||||||
|
knowledgeRoutes.GET("/stats", func(c *gin.Context) {
|
||||||
|
if app.knowledgeHandler == nil {
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"enabled": false,
|
||||||
|
"total_categories": 0,
|
||||||
|
"total_items": 0,
|
||||||
|
"message": "知识库功能未启用,请前往系统设置启用知识检索功能",
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
app.knowledgeHandler.GetStats(c)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 漏洞管理
|
// 漏洞管理
|
||||||
@@ -746,7 +836,11 @@ func setupRoutes(
|
|||||||
|
|
||||||
// 前端页面
|
// 前端页面
|
||||||
router.GET("/", func(c *gin.Context) {
|
router.GET("/", func(c *gin.Context) {
|
||||||
c.HTML(http.StatusOK, "index.html", nil)
|
version := app.config.Version
|
||||||
|
if version == "" {
|
||||||
|
version = "v1.0.0"
|
||||||
|
}
|
||||||
|
c.HTML(http.StatusOK, "index.html", gin.H{"Version": version})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+73
-29
@@ -13,19 +13,54 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Server ServerConfig `yaml:"server"`
|
Version string `yaml:"version,omitempty" json:"version,omitempty"` // 前端显示的版本号,如 v1.3.3
|
||||||
Log LogConfig `yaml:"log"`
|
Server ServerConfig `yaml:"server"`
|
||||||
MCP MCPConfig `yaml:"mcp"`
|
Log LogConfig `yaml:"log"`
|
||||||
OpenAI OpenAIConfig `yaml:"openai"`
|
MCP MCPConfig `yaml:"mcp"`
|
||||||
Agent AgentConfig `yaml:"agent"`
|
OpenAI OpenAIConfig `yaml:"openai"`
|
||||||
Security SecurityConfig `yaml:"security"`
|
FOFA FofaConfig `yaml:"fofa,omitempty" json:"fofa,omitempty"`
|
||||||
Database DatabaseConfig `yaml:"database"`
|
Agent AgentConfig `yaml:"agent"`
|
||||||
Auth AuthConfig `yaml:"auth"`
|
Security SecurityConfig `yaml:"security"`
|
||||||
ExternalMCP ExternalMCPConfig `yaml:"external_mcp,omitempty"`
|
Database DatabaseConfig `yaml:"database"`
|
||||||
Knowledge KnowledgeConfig `yaml:"knowledge,omitempty"`
|
Auth AuthConfig `yaml:"auth"`
|
||||||
RolesDir string `yaml:"roles_dir,omitempty" json:"roles_dir,omitempty"` // 角色配置文件目录(新方式)
|
ExternalMCP ExternalMCPConfig `yaml:"external_mcp,omitempty"`
|
||||||
Roles map[string]RoleConfig `yaml:"roles,omitempty" json:"roles,omitempty"` // 向后兼容:支持在主配置文件中定义角色
|
Knowledge KnowledgeConfig `yaml:"knowledge,omitempty"`
|
||||||
SkillsDir string `yaml:"skills_dir,omitempty" json:"skills_dir,omitempty"` // Skills配置文件目录
|
Robots RobotsConfig `yaml:"robots,omitempty" json:"robots,omitempty"` // 企业微信/钉钉/飞书等机器人配置
|
||||||
|
RolesDir string `yaml:"roles_dir,omitempty" json:"roles_dir,omitempty"` // 角色配置文件目录(新方式)
|
||||||
|
Roles map[string]RoleConfig `yaml:"roles,omitempty" json:"roles,omitempty"` // 向后兼容:支持在主配置文件中定义角色
|
||||||
|
SkillsDir string `yaml:"skills_dir,omitempty" json:"skills_dir,omitempty"` // Skills配置文件目录
|
||||||
|
}
|
||||||
|
|
||||||
|
// RobotsConfig 机器人配置(企业微信、钉钉、飞书等)
|
||||||
|
type RobotsConfig struct {
|
||||||
|
Wecom RobotWecomConfig `yaml:"wecom,omitempty" json:"wecom,omitempty"` // 企业微信
|
||||||
|
Dingtalk RobotDingtalkConfig `yaml:"dingtalk,omitempty" json:"dingtalk,omitempty"` // 钉钉
|
||||||
|
Lark RobotLarkConfig `yaml:"lark,omitempty" json:"lark,omitempty"` // 飞书
|
||||||
|
}
|
||||||
|
|
||||||
|
// RobotWecomConfig 企业微信机器人配置
|
||||||
|
type RobotWecomConfig struct {
|
||||||
|
Enabled bool `yaml:"enabled" json:"enabled"`
|
||||||
|
Token string `yaml:"token" json:"token"` // 回调 URL 校验 Token
|
||||||
|
EncodingAESKey string `yaml:"encoding_aes_key" json:"encoding_aes_key"` // EncodingAESKey
|
||||||
|
CorpID string `yaml:"corp_id" json:"corp_id"` // 企业 ID
|
||||||
|
Secret string `yaml:"secret" json:"secret"` // 应用 Secret
|
||||||
|
AgentID int64 `yaml:"agent_id" json:"agent_id"` // 应用 AgentId
|
||||||
|
}
|
||||||
|
|
||||||
|
// RobotDingtalkConfig 钉钉机器人配置
|
||||||
|
type RobotDingtalkConfig struct {
|
||||||
|
Enabled bool `yaml:"enabled" json:"enabled"`
|
||||||
|
ClientID string `yaml:"client_id" json:"client_id"` // 应用 Key (AppKey)
|
||||||
|
ClientSecret string `yaml:"client_secret" json:"client_secret"` // 应用 Secret
|
||||||
|
}
|
||||||
|
|
||||||
|
// RobotLarkConfig 飞书机器人配置
|
||||||
|
type RobotLarkConfig struct {
|
||||||
|
Enabled bool `yaml:"enabled" json:"enabled"`
|
||||||
|
AppID string `yaml:"app_id" json:"app_id"` // 应用 App ID
|
||||||
|
AppSecret string `yaml:"app_secret" json:"app_secret"` // 应用 App Secret
|
||||||
|
VerifyToken string `yaml:"verify_token" json:"verify_token"` // 事件订阅 Verification Token(可选)
|
||||||
}
|
}
|
||||||
|
|
||||||
type ServerConfig struct {
|
type ServerConfig struct {
|
||||||
@@ -51,9 +86,17 @@ type OpenAIConfig struct {
|
|||||||
MaxTotalTokens int `yaml:"max_total_tokens,omitempty" json:"max_total_tokens,omitempty"`
|
MaxTotalTokens int `yaml:"max_total_tokens,omitempty" json:"max_total_tokens,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type FofaConfig struct {
|
||||||
|
// Email 为 FOFA 账号邮箱;APIKey 为 FOFA API Key(建议使用只读权限的 Key)
|
||||||
|
Email string `yaml:"email,omitempty" json:"email,omitempty"`
|
||||||
|
APIKey string `yaml:"api_key,omitempty" json:"api_key,omitempty"`
|
||||||
|
BaseURL string `yaml:"base_url,omitempty" json:"base_url,omitempty"` // 默认 https://fofa.info/api/v1/search/all
|
||||||
|
}
|
||||||
|
|
||||||
type SecurityConfig struct {
|
type SecurityConfig struct {
|
||||||
Tools []ToolConfig `yaml:"tools,omitempty"` // 向后兼容:支持在主配置文件中定义工具
|
Tools []ToolConfig `yaml:"tools,omitempty"` // 向后兼容:支持在主配置文件中定义工具
|
||||||
ToolsDir string `yaml:"tools_dir,omitempty"` // 工具配置文件目录(新方式)
|
ToolsDir string `yaml:"tools_dir,omitempty"` // 工具配置文件目录(新方式)
|
||||||
|
ToolDescriptionMode string `yaml:"tool_description_mode,omitempty"` // 工具描述模式: "short" | "full",默认 short
|
||||||
}
|
}
|
||||||
|
|
||||||
type DatabaseConfig struct {
|
type DatabaseConfig struct {
|
||||||
@@ -83,13 +126,14 @@ type ExternalMCPConfig struct {
|
|||||||
// ExternalMCPServerConfig 外部MCP服务器配置
|
// ExternalMCPServerConfig 外部MCP服务器配置
|
||||||
type ExternalMCPServerConfig struct {
|
type ExternalMCPServerConfig struct {
|
||||||
// stdio模式配置
|
// stdio模式配置
|
||||||
Command string `yaml:"command,omitempty" json:"command,omitempty"`
|
Command string `yaml:"command,omitempty" json:"command,omitempty"`
|
||||||
Args []string `yaml:"args,omitempty" json:"args,omitempty"`
|
Args []string `yaml:"args,omitempty" json:"args,omitempty"`
|
||||||
Env map[string]string `yaml:"env,omitempty" json:"env,omitempty"` // 环境变量(用于stdio模式)
|
Env map[string]string `yaml:"env,omitempty" json:"env,omitempty"` // 环境变量(用于stdio模式)
|
||||||
|
|
||||||
// HTTP模式配置
|
// HTTP模式配置
|
||||||
Transport string `yaml:"transport,omitempty" json:"transport,omitempty"` // "http" 或 "stdio"
|
Transport string `yaml:"transport,omitempty" json:"transport,omitempty"` // "stdio" | "sse" | "http"(Streamable) | "simple_http"(自建/简单POST端点,如本机 http://127.0.0.1:8081/mcp)
|
||||||
URL string `yaml:"url,omitempty" json:"url,omitempty"`
|
URL string `yaml:"url,omitempty" json:"url,omitempty"`
|
||||||
|
Headers map[string]string `yaml:"headers,omitempty" json:"headers,omitempty"` // HTTP/SSE 请求头(如 x-api-key)
|
||||||
|
|
||||||
// 通用配置
|
// 通用配置
|
||||||
Description string `yaml:"description,omitempty" json:"description,omitempty"`
|
Description string `yaml:"description,omitempty" json:"description,omitempty"`
|
||||||
@@ -108,8 +152,8 @@ type ToolConfig struct {
|
|||||||
ShortDescription string `yaml:"short_description,omitempty"` // 简短描述(用于工具列表,减少token消耗)
|
ShortDescription string `yaml:"short_description,omitempty"` // 简短描述(用于工具列表,减少token消耗)
|
||||||
Description string `yaml:"description"` // 详细描述(用于工具文档)
|
Description string `yaml:"description"` // 详细描述(用于工具文档)
|
||||||
Enabled bool `yaml:"enabled"`
|
Enabled bool `yaml:"enabled"`
|
||||||
Parameters []ParameterConfig `yaml:"parameters,omitempty"` // 参数定义(可选)
|
Parameters []ParameterConfig `yaml:"parameters,omitempty"` // 参数定义(可选)
|
||||||
ArgMapping string `yaml:"arg_mapping,omitempty"` // 参数映射方式: "auto", "manual", "template"(可选)
|
ArgMapping string `yaml:"arg_mapping,omitempty"` // 参数映射方式: "auto", "manual", "template"(可选)
|
||||||
AllowedExitCodes []int `yaml:"allowed_exit_codes,omitempty"` // 允许的退出码列表(某些工具在成功时也返回非零退出码)
|
AllowedExitCodes []int `yaml:"allowed_exit_codes,omitempty"` // 允许的退出码列表(某些工具在成功时也返回非零退出码)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -467,7 +511,7 @@ func LoadRoleFromFile(path string) (*RoleConfig, error) {
|
|||||||
icon := role.Icon
|
icon := role.Icon
|
||||||
// 去除可能的引号
|
// 去除可能的引号
|
||||||
icon = strings.Trim(icon, `"`)
|
icon = strings.Trim(icon, `"`)
|
||||||
|
|
||||||
// 检查是否是 Unicode 转义格式 \U0001F3C6(8位十六进制)或 \uXXXX(4位十六进制)
|
// 检查是否是 Unicode 转义格式 \U0001F3C6(8位十六进制)或 \uXXXX(4位十六进制)
|
||||||
if len(icon) >= 3 && icon[0] == '\\' {
|
if len(icon) >= 3 && icon[0] == '\\' {
|
||||||
if icon[1] == 'U' && len(icon) >= 10 {
|
if icon[1] == 'U' && len(icon) >= 10 {
|
||||||
@@ -576,12 +620,12 @@ type RolesConfig struct {
|
|||||||
|
|
||||||
// RoleConfig 单个角色配置
|
// RoleConfig 单个角色配置
|
||||||
type RoleConfig struct {
|
type RoleConfig struct {
|
||||||
Name string `yaml:"name" json:"name"` // 角色名称
|
Name string `yaml:"name" json:"name"` // 角色名称
|
||||||
Description string `yaml:"description" json:"description"` // 角色描述
|
Description string `yaml:"description" json:"description"` // 角色描述
|
||||||
UserPrompt string `yaml:"user_prompt" json:"user_prompt"` // 用户提示词(追加到用户消息前)
|
UserPrompt string `yaml:"user_prompt" json:"user_prompt"` // 用户提示词(追加到用户消息前)
|
||||||
Icon string `yaml:"icon,omitempty" json:"icon,omitempty"` // 角色图标(可选)
|
Icon string `yaml:"icon,omitempty" json:"icon,omitempty"` // 角色图标(可选)
|
||||||
Tools []string `yaml:"tools,omitempty" json:"tools,omitempty"` // 关联的工具列表(toolKey格式,如 "toolName" 或 "mcpName::toolName")
|
Tools []string `yaml:"tools,omitempty" json:"tools,omitempty"` // 关联的工具列表(toolKey格式,如 "toolName" 或 "mcpName::toolName")
|
||||||
MCPs []string `yaml:"mcps,omitempty" json:"mcps,omitempty"` // 向后兼容:关联的MCP服务器列表(已废弃,使用tools替代)
|
MCPs []string `yaml:"mcps,omitempty" json:"mcps,omitempty"` // 向后兼容:关联的MCP服务器列表(已废弃,使用tools替代)
|
||||||
Skills []string `yaml:"skills,omitempty" json:"skills,omitempty"` // 关联的skills列表(skill名称列表,在执行任务前会读取这些skills的内容)
|
Skills []string `yaml:"skills,omitempty" json:"skills,omitempty"` // 关联的skills列表(skill名称列表,在执行任务前会读取这些skills的内容)
|
||||||
Enabled bool `yaml:"enabled" json:"enabled"` // 是否启用
|
Enabled bool `yaml:"enabled" json:"enabled"` // 是否启用
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -259,6 +259,96 @@ func (h *AgentHandler) AgentLoop(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ProcessMessageForRobot 供机器人(企业微信/钉钉/飞书)调用:与 /api/agent-loop/stream 相同执行路径(含 progressCallback、过程详情),仅不发送 SSE,最后返回完整回复
|
||||||
|
func (h *AgentHandler) ProcessMessageForRobot(ctx context.Context, conversationID, message, role string) (response string, convID string, err error) {
|
||||||
|
if conversationID == "" {
|
||||||
|
title := safeTruncateString(message, 50)
|
||||||
|
conv, createErr := h.db.CreateConversation(title)
|
||||||
|
if createErr != nil {
|
||||||
|
return "", "", fmt.Errorf("创建对话失败: %w", createErr)
|
||||||
|
}
|
||||||
|
conversationID = conv.ID
|
||||||
|
} else {
|
||||||
|
if _, getErr := h.db.GetConversation(conversationID); getErr != nil {
|
||||||
|
return "", "", fmt.Errorf("对话不存在")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
agentHistoryMessages, err := h.loadHistoryFromReActData(conversationID)
|
||||||
|
if err != nil {
|
||||||
|
historyMessages, getErr := h.db.GetMessages(conversationID)
|
||||||
|
if getErr != nil {
|
||||||
|
agentHistoryMessages = []agent.ChatMessage{}
|
||||||
|
} else {
|
||||||
|
agentHistoryMessages = make([]agent.ChatMessage, 0, len(historyMessages))
|
||||||
|
for _, msg := range historyMessages {
|
||||||
|
agentHistoryMessages = append(agentHistoryMessages, agent.ChatMessage{Role: msg.Role, Content: msg.Content})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
finalMessage := message
|
||||||
|
var roleTools, roleSkills []string
|
||||||
|
if role != "" && role != "默认" && h.config.Roles != nil {
|
||||||
|
if r, exists := h.config.Roles[role]; exists && r.Enabled {
|
||||||
|
if r.UserPrompt != "" {
|
||||||
|
finalMessage = r.UserPrompt + "\n\n" + message
|
||||||
|
}
|
||||||
|
roleTools = r.Tools
|
||||||
|
roleSkills = r.Skills
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err = h.db.AddMessage(conversationID, "user", message, nil); err != nil {
|
||||||
|
return "", "", fmt.Errorf("保存用户消息失败: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 与 agent-loop/stream 一致:先创建助手消息占位,用 progressCallback 写过程详情(不发送 SSE)
|
||||||
|
assistantMsg, err := h.db.AddMessage(conversationID, "assistant", "处理中...", nil)
|
||||||
|
if err != nil {
|
||||||
|
h.logger.Warn("机器人:创建助手消息占位失败", zap.Error(err))
|
||||||
|
}
|
||||||
|
var assistantMessageID string
|
||||||
|
if assistantMsg != nil {
|
||||||
|
assistantMessageID = assistantMsg.ID
|
||||||
|
}
|
||||||
|
progressCallback := h.createProgressCallback(conversationID, assistantMessageID, nil)
|
||||||
|
|
||||||
|
result, err := h.agent.AgentLoopWithProgress(ctx, finalMessage, agentHistoryMessages, conversationID, progressCallback, roleTools, roleSkills)
|
||||||
|
if err != nil {
|
||||||
|
errMsg := "执行失败: " + err.Error()
|
||||||
|
if assistantMessageID != "" {
|
||||||
|
_, _ = h.db.Exec("UPDATE messages SET content = ? WHERE id = ?", errMsg, assistantMessageID)
|
||||||
|
_ = h.db.AddProcessDetail(assistantMessageID, conversationID, "error", errMsg, nil)
|
||||||
|
}
|
||||||
|
return "", conversationID, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 更新助手消息内容与 MCP 执行 ID(与 stream 一致)
|
||||||
|
if assistantMessageID != "" {
|
||||||
|
mcpIDsJSON := ""
|
||||||
|
if len(result.MCPExecutionIDs) > 0 {
|
||||||
|
jsonData, _ := json.Marshal(result.MCPExecutionIDs)
|
||||||
|
mcpIDsJSON = string(jsonData)
|
||||||
|
}
|
||||||
|
_, err = h.db.Exec(
|
||||||
|
"UPDATE messages SET content = ?, mcp_execution_ids = ? WHERE id = ?",
|
||||||
|
result.Response, mcpIDsJSON, assistantMessageID,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
h.logger.Warn("机器人:更新助手消息失败", zap.Error(err))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if _, err = h.db.AddMessage(conversationID, "assistant", result.Response, result.MCPExecutionIDs); err != nil {
|
||||||
|
h.logger.Warn("机器人:保存助手消息失败", zap.Error(err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if result.LastReActInput != "" || result.LastReActOutput != "" {
|
||||||
|
_ = h.db.SaveReActData(conversationID, result.LastReActInput, result.LastReActOutput)
|
||||||
|
}
|
||||||
|
return result.Response, conversationID, nil
|
||||||
|
}
|
||||||
|
|
||||||
// StreamEvent 流式事件
|
// StreamEvent 流式事件
|
||||||
type StreamEvent struct {
|
type StreamEvent struct {
|
||||||
Type string `json:"type"` // conversation, progress, tool_call, tool_result, response, error, cancelled, done
|
Type string `json:"type"` // conversation, progress, tool_call, tool_result, response, error, cancelled, done
|
||||||
|
|||||||
+230
-167
@@ -44,6 +44,11 @@ type AppUpdater interface {
|
|||||||
UpdateKnowledgeComponents(handler *KnowledgeHandler, manager interface{}, retriever interface{}, indexer interface{})
|
UpdateKnowledgeComponents(handler *KnowledgeHandler, manager interface{}, retriever interface{}, indexer interface{})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RobotRestarter 机器人连接重启器(用于配置应用后重启钉钉/飞书长连接)
|
||||||
|
type RobotRestarter interface {
|
||||||
|
RestartRobotConnections()
|
||||||
|
}
|
||||||
|
|
||||||
// ConfigHandler 配置处理器
|
// ConfigHandler 配置处理器
|
||||||
type ConfigHandler struct {
|
type ConfigHandler struct {
|
||||||
configPath string
|
configPath string
|
||||||
@@ -59,6 +64,7 @@ type ConfigHandler struct {
|
|||||||
retrieverUpdater RetrieverUpdater // 检索器更新器(可选)
|
retrieverUpdater RetrieverUpdater // 检索器更新器(可选)
|
||||||
knowledgeInitializer KnowledgeInitializer // 知识库初始化器(可选)
|
knowledgeInitializer KnowledgeInitializer // 知识库初始化器(可选)
|
||||||
appUpdater AppUpdater // App更新器(可选)
|
appUpdater AppUpdater // App更新器(可选)
|
||||||
|
robotRestarter RobotRestarter // 机器人连接重启器(可选),ApplyConfig 时重启钉钉/飞书
|
||||||
logger *zap.Logger
|
logger *zap.Logger
|
||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
lastEmbeddingConfig *config.EmbeddingConfig // 上一次的嵌入模型配置(用于检测变更)
|
lastEmbeddingConfig *config.EmbeddingConfig // 上一次的嵌入模型配置(用于检测变更)
|
||||||
@@ -142,13 +148,22 @@ func (h *ConfigHandler) SetAppUpdater(updater AppUpdater) {
|
|||||||
h.appUpdater = updater
|
h.appUpdater = updater
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetRobotRestarter 设置机器人连接重启器(ApplyConfig 时用于重启钉钉/飞书长连接)
|
||||||
|
func (h *ConfigHandler) SetRobotRestarter(restarter RobotRestarter) {
|
||||||
|
h.mu.Lock()
|
||||||
|
defer h.mu.Unlock()
|
||||||
|
h.robotRestarter = restarter
|
||||||
|
}
|
||||||
|
|
||||||
// GetConfigResponse 获取配置响应
|
// GetConfigResponse 获取配置响应
|
||||||
type GetConfigResponse struct {
|
type GetConfigResponse struct {
|
||||||
OpenAI config.OpenAIConfig `json:"openai"`
|
OpenAI config.OpenAIConfig `json:"openai"`
|
||||||
|
FOFA config.FofaConfig `json:"fofa"`
|
||||||
MCP config.MCPConfig `json:"mcp"`
|
MCP config.MCPConfig `json:"mcp"`
|
||||||
Tools []ToolConfigInfo `json:"tools"`
|
Tools []ToolConfigInfo `json:"tools"`
|
||||||
Agent config.AgentConfig `json:"agent"`
|
Agent config.AgentConfig `json:"agent"`
|
||||||
Knowledge config.KnowledgeConfig `json:"knowledge"`
|
Knowledge config.KnowledgeConfig `json:"knowledge"`
|
||||||
|
Robots config.RobotsConfig `json:"robots,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ToolConfigInfo 工具配置信息
|
// ToolConfigInfo 工具配置信息
|
||||||
@@ -174,18 +189,10 @@ func (h *ConfigHandler) GetConfig(c *gin.Context) {
|
|||||||
configToolMap[tool.Name] = true
|
configToolMap[tool.Name] = true
|
||||||
tools = append(tools, ToolConfigInfo{
|
tools = append(tools, ToolConfigInfo{
|
||||||
Name: tool.Name,
|
Name: tool.Name,
|
||||||
Description: tool.ShortDescription,
|
Description: h.pickToolDescription(tool.ShortDescription, tool.Description),
|
||||||
Enabled: tool.Enabled,
|
Enabled: tool.Enabled,
|
||||||
IsExternal: false,
|
IsExternal: false,
|
||||||
})
|
})
|
||||||
// 如果没有简短描述,使用详细描述的前100个字符
|
|
||||||
if tools[len(tools)-1].Description == "" {
|
|
||||||
desc := tool.Description
|
|
||||||
if len(desc) > 100 {
|
|
||||||
desc = desc[:100] + "..."
|
|
||||||
}
|
|
||||||
tools[len(tools)-1].Description = desc
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 从MCP服务器获取所有已注册的工具(包括直接注册的工具,如知识检索工具)
|
// 从MCP服务器获取所有已注册的工具(包括直接注册的工具,如知识检索工具)
|
||||||
@@ -201,8 +208,8 @@ func (h *ConfigHandler) GetConfig(c *gin.Context) {
|
|||||||
if description == "" {
|
if description == "" {
|
||||||
description = mcpTool.Description
|
description = mcpTool.Description
|
||||||
}
|
}
|
||||||
if len(description) > 100 {
|
if len(description) > 10000 {
|
||||||
description = description[:100] + "..."
|
description = description[:10000] + "..."
|
||||||
}
|
}
|
||||||
tools = append(tools, ToolConfigInfo{
|
tools = append(tools, ToolConfigInfo{
|
||||||
Name: mcpTool.Name,
|
Name: mcpTool.Name,
|
||||||
@@ -215,70 +222,21 @@ func (h *ConfigHandler) GetConfig(c *gin.Context) {
|
|||||||
|
|
||||||
// 获取外部MCP工具
|
// 获取外部MCP工具
|
||||||
if h.externalMCPMgr != nil {
|
if h.externalMCPMgr != nil {
|
||||||
// 增加超时时间到30秒,因为通过代理连接远程服务器可能需要更长时间
|
ctx := context.Background()
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
externalTools := h.getExternalMCPTools(ctx)
|
||||||
defer cancel()
|
for _, toolInfo := range externalTools {
|
||||||
|
tools = append(tools, toolInfo)
|
||||||
externalTools, err := h.externalMCPMgr.GetAllTools(ctx)
|
|
||||||
if err == nil {
|
|
||||||
externalMCPConfigs := h.externalMCPMgr.GetConfigs()
|
|
||||||
for _, externalTool := range externalTools {
|
|
||||||
var mcpName, actualToolName string
|
|
||||||
if idx := strings.Index(externalTool.Name, "::"); idx > 0 {
|
|
||||||
mcpName = externalTool.Name[:idx]
|
|
||||||
actualToolName = externalTool.Name[idx+2:]
|
|
||||||
} else {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
enabled := false
|
|
||||||
if cfg, exists := externalMCPConfigs[mcpName]; exists {
|
|
||||||
// 首先检查外部MCP是否启用
|
|
||||||
if !cfg.ExternalMCPEnable && !(cfg.Enabled && !cfg.Disabled) {
|
|
||||||
enabled = false // MCP未启用,所有工具都禁用
|
|
||||||
} else {
|
|
||||||
// MCP已启用,检查单个工具的启用状态
|
|
||||||
// 如果ToolEnabled为空或未设置该工具,默认为启用(向后兼容)
|
|
||||||
if cfg.ToolEnabled == nil {
|
|
||||||
enabled = true // 未设置工具状态,默认为启用
|
|
||||||
} else if toolEnabled, exists := cfg.ToolEnabled[actualToolName]; exists {
|
|
||||||
enabled = toolEnabled // 使用配置的工具状态
|
|
||||||
} else {
|
|
||||||
enabled = true // 工具未在配置中,默认为启用
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
client, exists := h.externalMCPMgr.GetClient(mcpName)
|
|
||||||
if !exists || !client.IsConnected() {
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
description := externalTool.ShortDescription
|
|
||||||
if description == "" {
|
|
||||||
description = externalTool.Description
|
|
||||||
}
|
|
||||||
if len(description) > 100 {
|
|
||||||
description = description[:100] + "..."
|
|
||||||
}
|
|
||||||
|
|
||||||
tools = append(tools, ToolConfigInfo{
|
|
||||||
Name: actualToolName,
|
|
||||||
Description: description,
|
|
||||||
Enabled: enabled,
|
|
||||||
IsExternal: true,
|
|
||||||
ExternalMCP: mcpName,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, GetConfigResponse{
|
c.JSON(http.StatusOK, GetConfigResponse{
|
||||||
OpenAI: h.config.OpenAI,
|
OpenAI: h.config.OpenAI,
|
||||||
|
FOFA: h.config.FOFA,
|
||||||
MCP: h.config.MCP,
|
MCP: h.config.MCP,
|
||||||
Tools: tools,
|
Tools: tools,
|
||||||
Agent: h.config.Agent,
|
Agent: h.config.Agent,
|
||||||
Knowledge: h.config.Knowledge,
|
Knowledge: h.config.Knowledge,
|
||||||
|
Robots: h.config.Robots,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -342,18 +300,10 @@ func (h *ConfigHandler) GetTools(c *gin.Context) {
|
|||||||
configToolMap[tool.Name] = true
|
configToolMap[tool.Name] = true
|
||||||
toolInfo := ToolConfigInfo{
|
toolInfo := ToolConfigInfo{
|
||||||
Name: tool.Name,
|
Name: tool.Name,
|
||||||
Description: tool.ShortDescription,
|
Description: h.pickToolDescription(tool.ShortDescription, tool.Description),
|
||||||
Enabled: tool.Enabled,
|
Enabled: tool.Enabled,
|
||||||
IsExternal: false,
|
IsExternal: false,
|
||||||
}
|
}
|
||||||
// 如果没有简短描述,使用详细描述的前100个字符
|
|
||||||
if toolInfo.Description == "" {
|
|
||||||
desc := tool.Description
|
|
||||||
if len(desc) > 100 {
|
|
||||||
desc = desc[:100] + "..."
|
|
||||||
}
|
|
||||||
toolInfo.Description = desc
|
|
||||||
}
|
|
||||||
|
|
||||||
// 根据角色配置标注工具状态
|
// 根据角色配置标注工具状态
|
||||||
if roleName != "" {
|
if roleName != "" {
|
||||||
@@ -405,8 +355,8 @@ func (h *ConfigHandler) GetTools(c *gin.Context) {
|
|||||||
if description == "" {
|
if description == "" {
|
||||||
description = mcpTool.Description
|
description = mcpTool.Description
|
||||||
}
|
}
|
||||||
if len(description) > 100 {
|
if len(description) > 10000 {
|
||||||
description = description[:100] + "..."
|
description = description[:10000] + "..."
|
||||||
}
|
}
|
||||||
|
|
||||||
toolInfo := ToolConfigInfo{
|
toolInfo := ToolConfigInfo{
|
||||||
@@ -451,99 +401,43 @@ func (h *ConfigHandler) GetTools(c *gin.Context) {
|
|||||||
|
|
||||||
// 获取外部MCP工具
|
// 获取外部MCP工具
|
||||||
if h.externalMCPMgr != nil {
|
if h.externalMCPMgr != nil {
|
||||||
// 增加超时时间到30秒,因为通过代理连接远程服务器可能需要更长时间
|
// 创建context用于获取外部工具
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
ctx := context.Background()
|
||||||
defer cancel()
|
externalTools := h.getExternalMCPTools(ctx)
|
||||||
|
|
||||||
externalTools, err := h.externalMCPMgr.GetAllTools(ctx)
|
// 应用搜索过滤和角色配置
|
||||||
if err != nil {
|
for _, toolInfo := range externalTools {
|
||||||
h.logger.Warn("获取外部MCP工具失败", zap.Error(err))
|
// 搜索过滤
|
||||||
} else {
|
if searchTermLower != "" {
|
||||||
// 获取外部MCP配置,用于判断启用状态
|
nameLower := strings.ToLower(toolInfo.Name)
|
||||||
externalMCPConfigs := h.externalMCPMgr.GetConfigs()
|
descLower := strings.ToLower(toolInfo.Description)
|
||||||
|
if !strings.Contains(nameLower, searchTermLower) && !strings.Contains(descLower, searchTermLower) {
|
||||||
for _, externalTool := range externalTools {
|
continue // 不匹配,跳过
|
||||||
// 解析工具名称:mcpName::toolName
|
|
||||||
var mcpName, actualToolName string
|
|
||||||
if idx := strings.Index(externalTool.Name, "::"); idx > 0 {
|
|
||||||
mcpName = externalTool.Name[:idx]
|
|
||||||
actualToolName = externalTool.Name[idx+2:]
|
|
||||||
} else {
|
|
||||||
continue // 跳过格式不正确的工具
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取外部工具的启用状态
|
|
||||||
enabled := false
|
|
||||||
if cfg, exists := externalMCPConfigs[mcpName]; exists {
|
|
||||||
// 首先检查外部MCP是否启用
|
|
||||||
if !cfg.ExternalMCPEnable && !(cfg.Enabled && !cfg.Disabled) {
|
|
||||||
enabled = false // MCP未启用,所有工具都禁用
|
|
||||||
} else {
|
|
||||||
// MCP已启用,检查单个工具的启用状态
|
|
||||||
// 如果ToolEnabled为空或未设置该工具,默认为启用(向后兼容)
|
|
||||||
if cfg.ToolEnabled == nil {
|
|
||||||
enabled = true // 未设置工具状态,默认为启用
|
|
||||||
} else if toolEnabled, exists := cfg.ToolEnabled[actualToolName]; exists {
|
|
||||||
enabled = toolEnabled // 使用配置的工具状态
|
|
||||||
} else {
|
|
||||||
enabled = true // 工具未在配置中,默认为启用
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查外部MCP是否已连接
|
|
||||||
client, exists := h.externalMCPMgr.GetClient(mcpName)
|
|
||||||
if !exists || !client.IsConnected() {
|
|
||||||
enabled = false // 未连接时视为禁用
|
|
||||||
}
|
|
||||||
|
|
||||||
description := externalTool.ShortDescription
|
|
||||||
if description == "" {
|
|
||||||
description = externalTool.Description
|
|
||||||
}
|
|
||||||
if len(description) > 100 {
|
|
||||||
description = description[:100] + "..."
|
|
||||||
}
|
|
||||||
|
|
||||||
// 如果有关键词,进行搜索过滤
|
|
||||||
if searchTermLower != "" {
|
|
||||||
nameLower := strings.ToLower(actualToolName)
|
|
||||||
descLower := strings.ToLower(description)
|
|
||||||
if !strings.Contains(nameLower, searchTermLower) && !strings.Contains(descLower, searchTermLower) {
|
|
||||||
continue // 不匹配,跳过
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
toolInfo := ToolConfigInfo{
|
|
||||||
Name: actualToolName, // 显示实际工具名称,不带前缀
|
|
||||||
Description: description,
|
|
||||||
Enabled: enabled,
|
|
||||||
IsExternal: true,
|
|
||||||
ExternalMCP: mcpName,
|
|
||||||
}
|
|
||||||
|
|
||||||
// 根据角色配置标注工具状态
|
|
||||||
if roleName != "" {
|
|
||||||
if roleUsesAllTools {
|
|
||||||
// 角色使用所有工具,标注启用的工具为role_enabled=true
|
|
||||||
toolInfo.RoleEnabled = &enabled
|
|
||||||
} else {
|
|
||||||
// 角色配置了工具列表,检查工具是否在列表中
|
|
||||||
// 外部工具使用 "mcpName::toolName" 格式作为key
|
|
||||||
externalToolKey := externalTool.Name // 这是 "mcpName::toolName" 格式
|
|
||||||
if roleToolsSet[externalToolKey] {
|
|
||||||
roleEnabled := enabled // 工具必须在角色列表中且本身启用
|
|
||||||
toolInfo.RoleEnabled = &roleEnabled
|
|
||||||
} else {
|
|
||||||
// 不在角色列表中,标记为false
|
|
||||||
roleEnabled := false
|
|
||||||
toolInfo.RoleEnabled = &roleEnabled
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
allTools = append(allTools, toolInfo)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 根据角色配置标注工具状态
|
||||||
|
if roleName != "" {
|
||||||
|
if roleUsesAllTools {
|
||||||
|
// 角色使用所有工具,标注启用的工具为role_enabled=true
|
||||||
|
roleEnabled := toolInfo.Enabled
|
||||||
|
toolInfo.RoleEnabled = &roleEnabled
|
||||||
|
} else {
|
||||||
|
// 角色配置了工具列表,检查工具是否在列表中
|
||||||
|
// 外部工具使用 "mcpName::toolName" 格式作为key
|
||||||
|
externalToolKey := fmt.Sprintf("%s::%s", toolInfo.ExternalMCP, toolInfo.Name)
|
||||||
|
if roleToolsSet[externalToolKey] {
|
||||||
|
roleEnabled := toolInfo.Enabled // 工具必须在角色列表中且本身启用
|
||||||
|
toolInfo.RoleEnabled = &roleEnabled
|
||||||
|
} else {
|
||||||
|
// 不在角色列表中,标记为false
|
||||||
|
roleEnabled := false
|
||||||
|
toolInfo.RoleEnabled = &roleEnabled
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
allTools = append(allTools, toolInfo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -595,10 +489,12 @@ func (h *ConfigHandler) GetTools(c *gin.Context) {
|
|||||||
// UpdateConfigRequest 更新配置请求
|
// UpdateConfigRequest 更新配置请求
|
||||||
type UpdateConfigRequest struct {
|
type UpdateConfigRequest struct {
|
||||||
OpenAI *config.OpenAIConfig `json:"openai,omitempty"`
|
OpenAI *config.OpenAIConfig `json:"openai,omitempty"`
|
||||||
|
FOFA *config.FofaConfig `json:"fofa,omitempty"`
|
||||||
MCP *config.MCPConfig `json:"mcp,omitempty"`
|
MCP *config.MCPConfig `json:"mcp,omitempty"`
|
||||||
Tools []ToolEnableStatus `json:"tools,omitempty"`
|
Tools []ToolEnableStatus `json:"tools,omitempty"`
|
||||||
Agent *config.AgentConfig `json:"agent,omitempty"`
|
Agent *config.AgentConfig `json:"agent,omitempty"`
|
||||||
Knowledge *config.KnowledgeConfig `json:"knowledge,omitempty"`
|
Knowledge *config.KnowledgeConfig `json:"knowledge,omitempty"`
|
||||||
|
Robots *config.RobotsConfig `json:"robots,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ToolEnableStatus 工具启用状态
|
// ToolEnableStatus 工具启用状态
|
||||||
@@ -629,6 +525,12 @@ func (h *ConfigHandler) UpdateConfig(c *gin.Context) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 更新FOFA配置
|
||||||
|
if req.FOFA != nil {
|
||||||
|
h.config.FOFA = *req.FOFA
|
||||||
|
h.logger.Info("更新FOFA配置", zap.String("email", h.config.FOFA.Email))
|
||||||
|
}
|
||||||
|
|
||||||
// 更新MCP配置
|
// 更新MCP配置
|
||||||
if req.MCP != nil {
|
if req.MCP != nil {
|
||||||
h.config.MCP = *req.MCP
|
h.config.MCP = *req.MCP
|
||||||
@@ -669,6 +571,16 @@ func (h *ConfigHandler) UpdateConfig(c *gin.Context) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 更新机器人配置
|
||||||
|
if req.Robots != nil {
|
||||||
|
h.config.Robots = *req.Robots
|
||||||
|
h.logger.Info("更新机器人配置",
|
||||||
|
zap.Bool("wecom_enabled", h.config.Robots.Wecom.Enabled),
|
||||||
|
zap.Bool("dingtalk_enabled", h.config.Robots.Dingtalk.Enabled),
|
||||||
|
zap.Bool("lark_enabled", h.config.Robots.Lark.Enabled),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// 更新工具启用状态
|
// 更新工具启用状态
|
||||||
if req.Tools != nil {
|
if req.Tools != nil {
|
||||||
// 分离内部工具和外部工具
|
// 分离内部工具和外部工具
|
||||||
@@ -938,6 +850,12 @@ func (h *ConfigHandler) ApplyConfig(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 重启钉钉/飞书长连接,使前端修改的机器人配置立即生效(无需重启服务)
|
||||||
|
if h.robotRestarter != nil {
|
||||||
|
h.robotRestarter.RestartRobotConnections()
|
||||||
|
h.logger.Info("已触发机器人连接重启(钉钉/飞书)")
|
||||||
|
}
|
||||||
|
|
||||||
h.logger.Info("配置已应用",
|
h.logger.Info("配置已应用",
|
||||||
zap.Int("tools_count", len(h.config.Security.Tools)),
|
zap.Int("tools_count", len(h.config.Security.Tools)),
|
||||||
)
|
)
|
||||||
@@ -968,7 +886,9 @@ func (h *ConfigHandler) saveConfig() error {
|
|||||||
updateAgentConfig(root, h.config.Agent.MaxIterations)
|
updateAgentConfig(root, h.config.Agent.MaxIterations)
|
||||||
updateMCPConfig(root, h.config.MCP)
|
updateMCPConfig(root, h.config.MCP)
|
||||||
updateOpenAIConfig(root, h.config.OpenAI)
|
updateOpenAIConfig(root, h.config.OpenAI)
|
||||||
|
updateFOFAConfig(root, h.config.FOFA)
|
||||||
updateKnowledgeConfig(root, h.config.Knowledge)
|
updateKnowledgeConfig(root, h.config.Knowledge)
|
||||||
|
updateRobotsConfig(root, h.config.Robots)
|
||||||
// 更新外部MCP配置(使用external_mcp.go中的函数,同一包中可直接调用)
|
// 更新外部MCP配置(使用external_mcp.go中的函数,同一包中可直接调用)
|
||||||
// 读取原始配置以保持向后兼容
|
// 读取原始配置以保持向后兼容
|
||||||
originalConfigs := make(map[string]map[string]bool)
|
originalConfigs := make(map[string]map[string]bool)
|
||||||
@@ -1112,6 +1032,14 @@ func updateOpenAIConfig(doc *yaml.Node, cfg config.OpenAIConfig) {
|
|||||||
setStringInMap(openaiNode, "model", cfg.Model)
|
setStringInMap(openaiNode, "model", cfg.Model)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func updateFOFAConfig(doc *yaml.Node, cfg config.FofaConfig) {
|
||||||
|
root := doc.Content[0]
|
||||||
|
fofaNode := ensureMap(root, "fofa")
|
||||||
|
setStringInMap(fofaNode, "base_url", cfg.BaseURL)
|
||||||
|
setStringInMap(fofaNode, "email", cfg.Email)
|
||||||
|
setStringInMap(fofaNode, "api_key", cfg.APIKey)
|
||||||
|
}
|
||||||
|
|
||||||
func updateKnowledgeConfig(doc *yaml.Node, cfg config.KnowledgeConfig) {
|
func updateKnowledgeConfig(doc *yaml.Node, cfg config.KnowledgeConfig) {
|
||||||
root := doc.Content[0]
|
root := doc.Content[0]
|
||||||
knowledgeNode := ensureMap(root, "knowledge")
|
knowledgeNode := ensureMap(root, "knowledge")
|
||||||
@@ -1136,6 +1064,30 @@ func updateKnowledgeConfig(doc *yaml.Node, cfg config.KnowledgeConfig) {
|
|||||||
setFloatInMap(retrievalNode, "hybrid_weight", cfg.Retrieval.HybridWeight)
|
setFloatInMap(retrievalNode, "hybrid_weight", cfg.Retrieval.HybridWeight)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func updateRobotsConfig(doc *yaml.Node, cfg config.RobotsConfig) {
|
||||||
|
root := doc.Content[0]
|
||||||
|
robotsNode := ensureMap(root, "robots")
|
||||||
|
|
||||||
|
wecomNode := ensureMap(robotsNode, "wecom")
|
||||||
|
setBoolInMap(wecomNode, "enabled", cfg.Wecom.Enabled)
|
||||||
|
setStringInMap(wecomNode, "token", cfg.Wecom.Token)
|
||||||
|
setStringInMap(wecomNode, "encoding_aes_key", cfg.Wecom.EncodingAESKey)
|
||||||
|
setStringInMap(wecomNode, "corp_id", cfg.Wecom.CorpID)
|
||||||
|
setStringInMap(wecomNode, "secret", cfg.Wecom.Secret)
|
||||||
|
setIntInMap(wecomNode, "agent_id", int(cfg.Wecom.AgentID))
|
||||||
|
|
||||||
|
dingtalkNode := ensureMap(robotsNode, "dingtalk")
|
||||||
|
setBoolInMap(dingtalkNode, "enabled", cfg.Dingtalk.Enabled)
|
||||||
|
setStringInMap(dingtalkNode, "client_id", cfg.Dingtalk.ClientID)
|
||||||
|
setStringInMap(dingtalkNode, "client_secret", cfg.Dingtalk.ClientSecret)
|
||||||
|
|
||||||
|
larkNode := ensureMap(robotsNode, "lark")
|
||||||
|
setBoolInMap(larkNode, "enabled", cfg.Lark.Enabled)
|
||||||
|
setStringInMap(larkNode, "app_id", cfg.Lark.AppID)
|
||||||
|
setStringInMap(larkNode, "app_secret", cfg.Lark.AppSecret)
|
||||||
|
setStringInMap(larkNode, "verify_token", cfg.Lark.VerifyToken)
|
||||||
|
}
|
||||||
|
|
||||||
func ensureMap(parent *yaml.Node, path ...string) *yaml.Node {
|
func ensureMap(parent *yaml.Node, path ...string) *yaml.Node {
|
||||||
current := parent
|
current := parent
|
||||||
for _, key := range path {
|
for _, key := range path {
|
||||||
@@ -1259,3 +1211,114 @@ func setFloatInMap(mapNode *yaml.Node, key string, value float64) {
|
|||||||
valueNode.Value = fmt.Sprintf("%g", value)
|
valueNode.Value = fmt.Sprintf("%g", value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// getExternalMCPTools 获取外部MCP工具列表(公共方法)
|
||||||
|
// 返回 ToolConfigInfo 列表,已处理启用状态和描述信息
|
||||||
|
func (h *ConfigHandler) getExternalMCPTools(ctx context.Context) []ToolConfigInfo {
|
||||||
|
var result []ToolConfigInfo
|
||||||
|
|
||||||
|
if h.externalMCPMgr == nil {
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用较短的超时时间(5秒)进行快速失败,避免阻塞页面加载
|
||||||
|
timeoutCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
externalTools, err := h.externalMCPMgr.GetAllTools(timeoutCtx)
|
||||||
|
if err != nil {
|
||||||
|
// 记录警告但不阻塞,继续返回已缓存的工具(如果有)
|
||||||
|
h.logger.Warn("获取外部MCP工具失败(可能连接断开),尝试返回缓存的工具",
|
||||||
|
zap.Error(err),
|
||||||
|
zap.String("hint", "如果外部MCP工具未显示,请检查连接状态或点击刷新按钮"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果获取到了工具(即使有错误),继续处理
|
||||||
|
if len(externalTools) == 0 {
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
externalMCPConfigs := h.externalMCPMgr.GetConfigs()
|
||||||
|
|
||||||
|
for _, externalTool := range externalTools {
|
||||||
|
// 解析工具名称:mcpName::toolName
|
||||||
|
mcpName, actualToolName := h.parseExternalToolName(externalTool.Name)
|
||||||
|
if mcpName == "" || actualToolName == "" {
|
||||||
|
continue // 跳过格式不正确的工具
|
||||||
|
}
|
||||||
|
|
||||||
|
// 计算启用状态
|
||||||
|
enabled := h.calculateExternalToolEnabled(mcpName, actualToolName, externalMCPConfigs)
|
||||||
|
|
||||||
|
// 处理描述信息
|
||||||
|
description := h.pickToolDescription(externalTool.ShortDescription, externalTool.Description)
|
||||||
|
|
||||||
|
result = append(result, ToolConfigInfo{
|
||||||
|
Name: actualToolName,
|
||||||
|
Description: description,
|
||||||
|
Enabled: enabled,
|
||||||
|
IsExternal: true,
|
||||||
|
ExternalMCP: mcpName,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseExternalToolName 解析外部工具名称(格式:mcpName::toolName)
|
||||||
|
func (h *ConfigHandler) parseExternalToolName(fullName string) (mcpName, toolName string) {
|
||||||
|
idx := strings.Index(fullName, "::")
|
||||||
|
if idx > 0 {
|
||||||
|
return fullName[:idx], fullName[idx+2:]
|
||||||
|
}
|
||||||
|
return "", ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// calculateExternalToolEnabled 计算外部工具的启用状态
|
||||||
|
func (h *ConfigHandler) calculateExternalToolEnabled(mcpName, toolName string, configs map[string]config.ExternalMCPServerConfig) bool {
|
||||||
|
cfg, exists := configs[mcpName]
|
||||||
|
if !exists {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// 首先检查外部MCP是否启用
|
||||||
|
if !cfg.ExternalMCPEnable && !(cfg.Enabled && !cfg.Disabled) {
|
||||||
|
return false // MCP未启用,所有工具都禁用
|
||||||
|
}
|
||||||
|
|
||||||
|
// MCP已启用,检查单个工具的启用状态
|
||||||
|
// 如果ToolEnabled为空或未设置该工具,默认为启用(向后兼容)
|
||||||
|
if cfg.ToolEnabled == nil {
|
||||||
|
// 未设置工具状态,默认为启用
|
||||||
|
} else if toolEnabled, exists := cfg.ToolEnabled[toolName]; exists {
|
||||||
|
// 使用配置的工具状态
|
||||||
|
if !toolEnabled {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 工具未在配置中,默认为启用
|
||||||
|
|
||||||
|
// 最后检查外部MCP是否已连接
|
||||||
|
client, exists := h.externalMCPMgr.GetClient(mcpName)
|
||||||
|
if !exists || !client.IsConnected() {
|
||||||
|
return false // 未连接时视为禁用
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// pickToolDescription 根据 security.tool_description_mode 选择 short 或 full 描述并限制长度
|
||||||
|
func (h *ConfigHandler) pickToolDescription(shortDesc, fullDesc string) string {
|
||||||
|
useFull := strings.TrimSpace(strings.ToLower(h.config.Security.ToolDescriptionMode)) == "full"
|
||||||
|
description := shortDesc
|
||||||
|
if useFull {
|
||||||
|
description = fullDesc
|
||||||
|
} else if description == "" {
|
||||||
|
description = fullDesc
|
||||||
|
}
|
||||||
|
if len(description) > 10000 {
|
||||||
|
description = description[:10000] + "..."
|
||||||
|
}
|
||||||
|
return description
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
|
|
||||||
"cyberstrike-ai/internal/config"
|
"cyberstrike-ai/internal/config"
|
||||||
"cyberstrike-ai/internal/mcp"
|
"cyberstrike-ai/internal/mcp"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
@@ -36,12 +37,12 @@ func NewExternalMCPHandler(manager *mcp.ExternalMCPManager, cfg *config.Config,
|
|||||||
func (h *ExternalMCPHandler) GetExternalMCPs(c *gin.Context) {
|
func (h *ExternalMCPHandler) GetExternalMCPs(c *gin.Context) {
|
||||||
h.mu.RLock()
|
h.mu.RLock()
|
||||||
defer h.mu.RUnlock()
|
defer h.mu.RUnlock()
|
||||||
|
|
||||||
configs := h.manager.GetConfigs()
|
configs := h.manager.GetConfigs()
|
||||||
|
|
||||||
// 获取所有外部MCP的工具数量
|
// 获取所有外部MCP的工具数量
|
||||||
toolCounts := h.manager.GetToolCounts()
|
toolCounts := h.manager.GetToolCounts()
|
||||||
|
|
||||||
// 转换为响应格式
|
// 转换为响应格式
|
||||||
result := make(map[string]ExternalMCPResponse)
|
result := make(map[string]ExternalMCPResponse)
|
||||||
for name, cfg := range configs {
|
for name, cfg := range configs {
|
||||||
@@ -54,13 +55,13 @@ func (h *ExternalMCPHandler) GetExternalMCPs(c *gin.Context) {
|
|||||||
} else {
|
} else {
|
||||||
status = "disabled"
|
status = "disabled"
|
||||||
}
|
}
|
||||||
|
|
||||||
toolCount := toolCounts[name]
|
toolCount := toolCounts[name]
|
||||||
errorMsg := ""
|
errorMsg := ""
|
||||||
if status == "error" {
|
if status == "error" {
|
||||||
errorMsg = h.manager.GetError(name)
|
errorMsg = h.manager.GetError(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
result[name] = ExternalMCPResponse{
|
result[name] = ExternalMCPResponse{
|
||||||
Config: cfg,
|
Config: cfg,
|
||||||
Status: status,
|
Status: status,
|
||||||
@@ -68,7 +69,7 @@ func (h *ExternalMCPHandler) GetExternalMCPs(c *gin.Context) {
|
|||||||
Error: errorMsg,
|
Error: errorMsg,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"servers": result,
|
"servers": result,
|
||||||
"stats": h.manager.GetStats(),
|
"stats": h.manager.GetStats(),
|
||||||
@@ -78,17 +79,17 @@ func (h *ExternalMCPHandler) GetExternalMCPs(c *gin.Context) {
|
|||||||
// GetExternalMCP 获取单个外部MCP配置
|
// GetExternalMCP 获取单个外部MCP配置
|
||||||
func (h *ExternalMCPHandler) GetExternalMCP(c *gin.Context) {
|
func (h *ExternalMCPHandler) GetExternalMCP(c *gin.Context) {
|
||||||
name := c.Param("name")
|
name := c.Param("name")
|
||||||
|
|
||||||
h.mu.RLock()
|
h.mu.RLock()
|
||||||
defer h.mu.RUnlock()
|
defer h.mu.RUnlock()
|
||||||
|
|
||||||
configs := h.manager.GetConfigs()
|
configs := h.manager.GetConfigs()
|
||||||
cfg, exists := configs[name]
|
cfg, exists := configs[name]
|
||||||
if !exists {
|
if !exists {
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "外部MCP配置不存在"})
|
c.JSON(http.StatusNotFound, gin.H{"error": "外部MCP配置不存在"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
client, clientExists := h.manager.GetClient(name)
|
client, clientExists := h.manager.GetClient(name)
|
||||||
status := "disconnected"
|
status := "disconnected"
|
||||||
if clientExists {
|
if clientExists {
|
||||||
@@ -98,7 +99,7 @@ func (h *ExternalMCPHandler) GetExternalMCP(c *gin.Context) {
|
|||||||
} else {
|
} else {
|
||||||
status = "disabled"
|
status = "disabled"
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取工具数量
|
// 获取工具数量
|
||||||
toolCount := 0
|
toolCount := 0
|
||||||
if clientExists && client.IsConnected() {
|
if clientExists && client.IsConnected() {
|
||||||
@@ -106,13 +107,13 @@ func (h *ExternalMCPHandler) GetExternalMCP(c *gin.Context) {
|
|||||||
toolCount = count
|
toolCount = count
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取错误信息
|
// 获取错误信息
|
||||||
errorMsg := ""
|
errorMsg := ""
|
||||||
if status == "error" {
|
if status == "error" {
|
||||||
errorMsg = h.manager.GetError(name)
|
errorMsg = h.manager.GetError(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, ExternalMCPResponse{
|
c.JSON(http.StatusOK, ExternalMCPResponse{
|
||||||
Config: cfg,
|
Config: cfg,
|
||||||
Status: status,
|
Status: status,
|
||||||
@@ -128,38 +129,38 @@ func (h *ExternalMCPHandler) AddOrUpdateExternalMCP(c *gin.Context) {
|
|||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "无效的请求参数: " + err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"error": "无效的请求参数: " + err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
name := c.Param("name")
|
name := c.Param("name")
|
||||||
if name == "" {
|
if name == "" {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "名称不能为空"})
|
c.JSON(http.StatusBadRequest, gin.H{"error": "名称不能为空"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 验证配置
|
// 验证配置
|
||||||
if err := h.validateConfig(req.Config); err != nil {
|
if err := h.validateConfig(req.Config); err != nil {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
h.mu.Lock()
|
h.mu.Lock()
|
||||||
defer h.mu.Unlock()
|
defer h.mu.Unlock()
|
||||||
|
|
||||||
// 添加或更新配置
|
// 添加或更新配置
|
||||||
if err := h.manager.AddOrUpdateConfig(name, req.Config); err != nil {
|
if err := h.manager.AddOrUpdateConfig(name, req.Config); err != nil {
|
||||||
h.logger.Error("添加或更新外部MCP配置失败", zap.Error(err))
|
h.logger.Error("添加或更新外部MCP配置失败", zap.Error(err))
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "添加或更新配置失败: " + err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "添加或更新配置失败: " + err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新内存中的配置
|
// 更新内存中的配置
|
||||||
if h.config.ExternalMCP.Servers == nil {
|
if h.config.ExternalMCP.Servers == nil {
|
||||||
h.config.ExternalMCP.Servers = make(map[string]config.ExternalMCPServerConfig)
|
h.config.ExternalMCP.Servers = make(map[string]config.ExternalMCPServerConfig)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果用户提供了 disabled 或 enabled 字段,保留它们以保持向后兼容
|
// 如果用户提供了 disabled 或 enabled 字段,保留它们以保持向后兼容
|
||||||
// 同时将值迁移到 external_mcp_enable
|
// 同时将值迁移到 external_mcp_enable
|
||||||
cfg := req.Config
|
cfg := req.Config
|
||||||
|
|
||||||
if req.Config.Disabled {
|
if req.Config.Disabled {
|
||||||
// 用户设置了 disabled: true
|
// 用户设置了 disabled: true
|
||||||
cfg.ExternalMCPEnable = false
|
cfg.ExternalMCPEnable = false
|
||||||
@@ -185,16 +186,16 @@ func (h *ExternalMCPHandler) AddOrUpdateExternalMCP(c *gin.Context) {
|
|||||||
cfg.Enabled = true
|
cfg.Enabled = true
|
||||||
cfg.Disabled = false
|
cfg.Disabled = false
|
||||||
}
|
}
|
||||||
|
|
||||||
h.config.ExternalMCP.Servers[name] = cfg
|
h.config.ExternalMCP.Servers[name] = cfg
|
||||||
|
|
||||||
// 保存到配置文件
|
// 保存到配置文件
|
||||||
if err := h.saveConfig(); err != nil {
|
if err := h.saveConfig(); err != nil {
|
||||||
h.logger.Error("保存配置失败", zap.Error(err))
|
h.logger.Error("保存配置失败", zap.Error(err))
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存配置失败: " + err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存配置失败: " + err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
h.logger.Info("外部MCP配置已更新", zap.String("name", name))
|
h.logger.Info("外部MCP配置已更新", zap.String("name", name))
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "配置已更新"})
|
c.JSON(http.StatusOK, gin.H{"message": "配置已更新"})
|
||||||
}
|
}
|
||||||
@@ -202,28 +203,28 @@ func (h *ExternalMCPHandler) AddOrUpdateExternalMCP(c *gin.Context) {
|
|||||||
// DeleteExternalMCP 删除外部MCP配置
|
// DeleteExternalMCP 删除外部MCP配置
|
||||||
func (h *ExternalMCPHandler) DeleteExternalMCP(c *gin.Context) {
|
func (h *ExternalMCPHandler) DeleteExternalMCP(c *gin.Context) {
|
||||||
name := c.Param("name")
|
name := c.Param("name")
|
||||||
|
|
||||||
h.mu.Lock()
|
h.mu.Lock()
|
||||||
defer h.mu.Unlock()
|
defer h.mu.Unlock()
|
||||||
|
|
||||||
// 移除配置
|
// 移除配置
|
||||||
if err := h.manager.RemoveConfig(name); err != nil {
|
if err := h.manager.RemoveConfig(name); err != nil {
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "配置不存在"})
|
c.JSON(http.StatusNotFound, gin.H{"error": "配置不存在"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 从内存配置中删除
|
// 从内存配置中删除
|
||||||
if h.config.ExternalMCP.Servers != nil {
|
if h.config.ExternalMCP.Servers != nil {
|
||||||
delete(h.config.ExternalMCP.Servers, name)
|
delete(h.config.ExternalMCP.Servers, name)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 保存到配置文件
|
// 保存到配置文件
|
||||||
if err := h.saveConfig(); err != nil {
|
if err := h.saveConfig(); err != nil {
|
||||||
h.logger.Error("保存配置失败", zap.Error(err))
|
h.logger.Error("保存配置失败", zap.Error(err))
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存配置失败: " + err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存配置失败: " + err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
h.logger.Info("外部MCP配置已删除", zap.String("name", name))
|
h.logger.Info("外部MCP配置已删除", zap.String("name", name))
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "配置已删除"})
|
c.JSON(http.StatusOK, gin.H{"message": "配置已删除"})
|
||||||
}
|
}
|
||||||
@@ -231,10 +232,10 @@ func (h *ExternalMCPHandler) DeleteExternalMCP(c *gin.Context) {
|
|||||||
// StartExternalMCP 启动外部MCP
|
// StartExternalMCP 启动外部MCP
|
||||||
func (h *ExternalMCPHandler) StartExternalMCP(c *gin.Context) {
|
func (h *ExternalMCPHandler) StartExternalMCP(c *gin.Context) {
|
||||||
name := c.Param("name")
|
name := c.Param("name")
|
||||||
|
|
||||||
h.mu.Lock()
|
h.mu.Lock()
|
||||||
defer h.mu.Unlock()
|
defer h.mu.Unlock()
|
||||||
|
|
||||||
// 更新配置为启用
|
// 更新配置为启用
|
||||||
if h.config.ExternalMCP.Servers == nil {
|
if h.config.ExternalMCP.Servers == nil {
|
||||||
h.config.ExternalMCP.Servers = make(map[string]config.ExternalMCPServerConfig)
|
h.config.ExternalMCP.Servers = make(map[string]config.ExternalMCPServerConfig)
|
||||||
@@ -242,32 +243,32 @@ func (h *ExternalMCPHandler) StartExternalMCP(c *gin.Context) {
|
|||||||
cfg := h.config.ExternalMCP.Servers[name]
|
cfg := h.config.ExternalMCP.Servers[name]
|
||||||
cfg.ExternalMCPEnable = true
|
cfg.ExternalMCPEnable = true
|
||||||
h.config.ExternalMCP.Servers[name] = cfg
|
h.config.ExternalMCP.Servers[name] = cfg
|
||||||
|
|
||||||
// 保存到配置文件
|
// 保存到配置文件
|
||||||
if err := h.saveConfig(); err != nil {
|
if err := h.saveConfig(); err != nil {
|
||||||
h.logger.Error("保存配置失败", zap.Error(err))
|
h.logger.Error("保存配置失败", zap.Error(err))
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存配置失败: " + err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存配置失败: " + err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 启动客户端(立即创建客户端并设置状态为connecting,实际连接在后台进行)
|
// 启动客户端(立即创建客户端并设置状态为connecting,实际连接在后台进行)
|
||||||
h.logger.Info("开始启动外部MCP", zap.String("name", name))
|
h.logger.Info("开始启动外部MCP", zap.String("name", name))
|
||||||
if err := h.manager.StartClient(name); err != nil {
|
if err := h.manager.StartClient(name); err != nil {
|
||||||
h.logger.Error("启动外部MCP失败", zap.String("name", name), zap.Error(err))
|
h.logger.Error("启动外部MCP失败", zap.String("name", name), zap.Error(err))
|
||||||
c.JSON(http.StatusBadRequest, gin.H{
|
c.JSON(http.StatusBadRequest, gin.H{
|
||||||
"error": err.Error(),
|
"error": err.Error(),
|
||||||
"status": "error",
|
"status": "error",
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取客户端状态(应该是connecting)
|
// 获取客户端状态(应该是connecting)
|
||||||
client, exists := h.manager.GetClient(name)
|
client, exists := h.manager.GetClient(name)
|
||||||
status := "connecting"
|
status := "connecting"
|
||||||
if exists {
|
if exists {
|
||||||
status = client.GetStatus()
|
status = client.GetStatus()
|
||||||
}
|
}
|
||||||
|
|
||||||
// 立即返回,不等待连接完成
|
// 立即返回,不等待连接完成
|
||||||
// 客户端会在后台异步连接,用户可以通过状态查询接口查看连接状态
|
// 客户端会在后台异步连接,用户可以通过状态查询接口查看连接状态
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
@@ -279,16 +280,16 @@ func (h *ExternalMCPHandler) StartExternalMCP(c *gin.Context) {
|
|||||||
// StopExternalMCP 停止外部MCP
|
// StopExternalMCP 停止外部MCP
|
||||||
func (h *ExternalMCPHandler) StopExternalMCP(c *gin.Context) {
|
func (h *ExternalMCPHandler) StopExternalMCP(c *gin.Context) {
|
||||||
name := c.Param("name")
|
name := c.Param("name")
|
||||||
|
|
||||||
h.mu.Lock()
|
h.mu.Lock()
|
||||||
defer h.mu.Unlock()
|
defer h.mu.Unlock()
|
||||||
|
|
||||||
// 停止客户端
|
// 停止客户端
|
||||||
if err := h.manager.StopClient(name); err != nil {
|
if err := h.manager.StopClient(name); err != nil {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新配置
|
// 更新配置
|
||||||
if h.config.ExternalMCP.Servers == nil {
|
if h.config.ExternalMCP.Servers == nil {
|
||||||
h.config.ExternalMCP.Servers = make(map[string]config.ExternalMCPServerConfig)
|
h.config.ExternalMCP.Servers = make(map[string]config.ExternalMCPServerConfig)
|
||||||
@@ -296,14 +297,14 @@ func (h *ExternalMCPHandler) StopExternalMCP(c *gin.Context) {
|
|||||||
cfg := h.config.ExternalMCP.Servers[name]
|
cfg := h.config.ExternalMCP.Servers[name]
|
||||||
cfg.ExternalMCPEnable = false
|
cfg.ExternalMCPEnable = false
|
||||||
h.config.ExternalMCP.Servers[name] = cfg
|
h.config.ExternalMCP.Servers[name] = cfg
|
||||||
|
|
||||||
// 保存到配置文件
|
// 保存到配置文件
|
||||||
if err := h.saveConfig(); err != nil {
|
if err := h.saveConfig(); err != nil {
|
||||||
h.logger.Error("保存配置失败", zap.Error(err))
|
h.logger.Error("保存配置失败", zap.Error(err))
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存配置失败: " + err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存配置失败: " + err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
h.logger.Info("外部MCP已停止", zap.String("name", name))
|
h.logger.Info("外部MCP已停止", zap.String("name", name))
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "外部MCP已停止"})
|
c.JSON(http.StatusOK, gin.H{"message": "外部MCP已停止"})
|
||||||
}
|
}
|
||||||
@@ -327,7 +328,7 @@ func (h *ExternalMCPHandler) validateConfig(cfg config.ExternalMCPServerConfig)
|
|||||||
return fmt.Errorf("需要指定command(stdio模式)或url(http/sse模式)")
|
return fmt.Errorf("需要指定command(stdio模式)或url(http/sse模式)")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch transport {
|
switch transport {
|
||||||
case "http":
|
case "http":
|
||||||
if cfg.URL == "" {
|
if cfg.URL == "" {
|
||||||
@@ -344,7 +345,7 @@ func (h *ExternalMCPHandler) validateConfig(cfg config.ExternalMCPServerConfig)
|
|||||||
default:
|
default:
|
||||||
return fmt.Errorf("不支持的传输模式: %s,支持的模式: http, stdio, sse", transport)
|
return fmt.Errorf("不支持的传输模式: %s,支持的模式: http, stdio, sse", transport)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -428,17 +429,17 @@ func updateExternalMCPConfig(doc *yaml.Node, cfg config.ExternalMCPConfig, origi
|
|||||||
root := doc.Content[0]
|
root := doc.Content[0]
|
||||||
externalMCPNode := ensureMap(root, "external_mcp")
|
externalMCPNode := ensureMap(root, "external_mcp")
|
||||||
serversNode := ensureMap(externalMCPNode, "servers")
|
serversNode := ensureMap(externalMCPNode, "servers")
|
||||||
|
|
||||||
// 清空现有服务器配置
|
// 清空现有服务器配置
|
||||||
serversNode.Content = nil
|
serversNode.Content = nil
|
||||||
|
|
||||||
// 添加新的服务器配置
|
// 添加新的服务器配置
|
||||||
for name, serverCfg := range cfg.Servers {
|
for name, serverCfg := range cfg.Servers {
|
||||||
// 添加服务器名称键
|
// 添加服务器名称键
|
||||||
nameNode := &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!str", Value: name}
|
nameNode := &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!str", Value: name}
|
||||||
serverNode := &yaml.Node{Kind: yaml.MappingNode, Tag: "!!map"}
|
serverNode := &yaml.Node{Kind: yaml.MappingNode, Tag: "!!map"}
|
||||||
serversNode.Content = append(serversNode.Content, nameNode, serverNode)
|
serversNode.Content = append(serversNode.Content, nameNode, serverNode)
|
||||||
|
|
||||||
// 设置服务器配置字段
|
// 设置服务器配置字段
|
||||||
if serverCfg.Command != "" {
|
if serverCfg.Command != "" {
|
||||||
setStringInMap(serverNode, "command", serverCfg.Command)
|
setStringInMap(serverNode, "command", serverCfg.Command)
|
||||||
@@ -459,6 +460,13 @@ func updateExternalMCPConfig(doc *yaml.Node, cfg config.ExternalMCPConfig, origi
|
|||||||
if serverCfg.URL != "" {
|
if serverCfg.URL != "" {
|
||||||
setStringInMap(serverNode, "url", serverCfg.URL)
|
setStringInMap(serverNode, "url", serverCfg.URL)
|
||||||
}
|
}
|
||||||
|
// 保存 headers 字段(HTTP/SSE 请求头)
|
||||||
|
if serverCfg.Headers != nil && len(serverCfg.Headers) > 0 {
|
||||||
|
headersNode := ensureMap(serverNode, "headers")
|
||||||
|
for k, v := range serverCfg.Headers {
|
||||||
|
setStringInMap(headersNode, k, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
if serverCfg.Description != "" {
|
if serverCfg.Description != "" {
|
||||||
setStringInMap(serverNode, "description", serverCfg.Description)
|
setStringInMap(serverNode, "description", serverCfg.Description)
|
||||||
}
|
}
|
||||||
@@ -476,7 +484,7 @@ func updateExternalMCPConfig(doc *yaml.Node, cfg config.ExternalMCPConfig, origi
|
|||||||
}
|
}
|
||||||
// 保留旧的 enabled/disabled 字段以保持向后兼容
|
// 保留旧的 enabled/disabled 字段以保持向后兼容
|
||||||
originalFields, hasOriginal := originalConfigs[name]
|
originalFields, hasOriginal := originalConfigs[name]
|
||||||
|
|
||||||
// 如果原始配置中有 enabled 字段,保留它
|
// 如果原始配置中有 enabled 字段,保留它
|
||||||
if hasOriginal {
|
if hasOriginal {
|
||||||
if enabledVal, hasEnabled := originalFields["enabled"]; hasEnabled {
|
if enabledVal, hasEnabled := originalFields["enabled"]; hasEnabled {
|
||||||
@@ -494,7 +502,7 @@ func updateExternalMCPConfig(doc *yaml.Node, cfg config.ExternalMCPConfig, origi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果用户在当前请求中明确设置了这些字段,也保存它们
|
// 如果用户在当前请求中明确设置了这些字段,也保存它们
|
||||||
if serverCfg.Enabled {
|
if serverCfg.Enabled {
|
||||||
setBoolInMap(serverNode, "enabled", serverCfg.Enabled)
|
setBoolInMap(serverNode, "enabled", serverCfg.Enabled)
|
||||||
@@ -528,8 +536,7 @@ type AddOrUpdateExternalMCPRequest struct {
|
|||||||
// ExternalMCPResponse 外部MCP响应
|
// ExternalMCPResponse 外部MCP响应
|
||||||
type ExternalMCPResponse struct {
|
type ExternalMCPResponse struct {
|
||||||
Config config.ExternalMCPServerConfig `json:"config"`
|
Config config.ExternalMCPServerConfig `json:"config"`
|
||||||
Status string `json:"status"` // "connected", "disconnected", "disabled", "error", "connecting"
|
Status string `json:"status"` // "connected", "disconnected", "disabled", "error", "connecting"
|
||||||
ToolCount int `json:"tool_count"` // 工具数量
|
ToolCount int `json:"tool_count"` // 工具数量
|
||||||
Error string `json:"error,omitempty"` // 错误信息(仅在status为error时存在)
|
Error string `json:"error,omitempty"` // 错误信息(仅在status为error时存在)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
|
|
||||||
"cyberstrike-ai/internal/config"
|
"cyberstrike-ai/internal/config"
|
||||||
"cyberstrike-ai/internal/mcp"
|
"cyberstrike-ai/internal/mcp"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
@@ -18,7 +19,7 @@ import (
|
|||||||
func setupTestRouter() (*gin.Engine, *ExternalMCPHandler, string) {
|
func setupTestRouter() (*gin.Engine, *ExternalMCPHandler, string) {
|
||||||
gin.SetMode(gin.TestMode)
|
gin.SetMode(gin.TestMode)
|
||||||
router := gin.New()
|
router := gin.New()
|
||||||
|
|
||||||
// 创建临时配置文件
|
// 创建临时配置文件
|
||||||
tmpFile, err := os.CreateTemp("", "test-config-*.yaml")
|
tmpFile, err := os.CreateTemp("", "test-config-*.yaml")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -27,7 +28,7 @@ func setupTestRouter() (*gin.Engine, *ExternalMCPHandler, string) {
|
|||||||
tmpFile.WriteString("server:\n host: 0.0.0.0\n port: 8080\n")
|
tmpFile.WriteString("server:\n host: 0.0.0.0\n port: 8080\n")
|
||||||
tmpFile.Close()
|
tmpFile.Close()
|
||||||
configPath := tmpFile.Name()
|
configPath := tmpFile.Name()
|
||||||
|
|
||||||
logger := zap.NewNop()
|
logger := zap.NewNop()
|
||||||
manager := mcp.NewExternalMCPManager(logger)
|
manager := mcp.NewExternalMCPManager(logger)
|
||||||
cfg := &config.Config{
|
cfg := &config.Config{
|
||||||
@@ -35,9 +36,9 @@ func setupTestRouter() (*gin.Engine, *ExternalMCPHandler, string) {
|
|||||||
Servers: make(map[string]config.ExternalMCPServerConfig),
|
Servers: make(map[string]config.ExternalMCPServerConfig),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
handler := NewExternalMCPHandler(manager, cfg, configPath, logger)
|
handler := NewExternalMCPHandler(manager, cfg, configPath, logger)
|
||||||
|
|
||||||
api := router.Group("/api")
|
api := router.Group("/api")
|
||||||
api.GET("/external-mcp", handler.GetExternalMCPs)
|
api.GET("/external-mcp", handler.GetExternalMCPs)
|
||||||
api.GET("/external-mcp/stats", handler.GetExternalMCPStats)
|
api.GET("/external-mcp/stats", handler.GetExternalMCPStats)
|
||||||
@@ -46,7 +47,7 @@ func setupTestRouter() (*gin.Engine, *ExternalMCPHandler, string) {
|
|||||||
api.DELETE("/external-mcp/:name", handler.DeleteExternalMCP)
|
api.DELETE("/external-mcp/:name", handler.DeleteExternalMCP)
|
||||||
api.POST("/external-mcp/:name/start", handler.StartExternalMCP)
|
api.POST("/external-mcp/:name/start", handler.StartExternalMCP)
|
||||||
api.POST("/external-mcp/:name/stop", handler.StopExternalMCP)
|
api.POST("/external-mcp/:name/stop", handler.StopExternalMCP)
|
||||||
|
|
||||||
return router, handler, configPath
|
return router, handler, configPath
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,7 +59,7 @@ func cleanupTestConfig(configPath string) {
|
|||||||
func TestExternalMCPHandler_AddOrUpdateExternalMCP_Stdio(t *testing.T) {
|
func TestExternalMCPHandler_AddOrUpdateExternalMCP_Stdio(t *testing.T) {
|
||||||
router, _, configPath := setupTestRouter()
|
router, _, configPath := setupTestRouter()
|
||||||
defer cleanupTestConfig(configPath)
|
defer cleanupTestConfig(configPath)
|
||||||
|
|
||||||
// 测试添加stdio模式的配置
|
// 测试添加stdio模式的配置
|
||||||
configJSON := `{
|
configJSON := `{
|
||||||
"command": "python3",
|
"command": "python3",
|
||||||
@@ -67,41 +68,41 @@ func TestExternalMCPHandler_AddOrUpdateExternalMCP_Stdio(t *testing.T) {
|
|||||||
"timeout": 300,
|
"timeout": 300,
|
||||||
"enabled": true
|
"enabled": true
|
||||||
}`
|
}`
|
||||||
|
|
||||||
var configObj config.ExternalMCPServerConfig
|
var configObj config.ExternalMCPServerConfig
|
||||||
if err := json.Unmarshal([]byte(configJSON), &configObj); err != nil {
|
if err := json.Unmarshal([]byte(configJSON), &configObj); err != nil {
|
||||||
t.Fatalf("解析配置JSON失败: %v", err)
|
t.Fatalf("解析配置JSON失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
reqBody := AddOrUpdateExternalMCPRequest{
|
reqBody := AddOrUpdateExternalMCPRequest{
|
||||||
Config: configObj,
|
Config: configObj,
|
||||||
}
|
}
|
||||||
|
|
||||||
body, _ := json.Marshal(reqBody)
|
body, _ := json.Marshal(reqBody)
|
||||||
req := httptest.NewRequest("PUT", "/api/external-mcp/test-stdio", bytes.NewBuffer(body))
|
req := httptest.NewRequest("PUT", "/api/external-mcp/test-stdio", bytes.NewBuffer(body))
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// 验证配置已添加
|
// 验证配置已添加
|
||||||
req2 := httptest.NewRequest("GET", "/api/external-mcp/test-stdio", nil)
|
req2 := httptest.NewRequest("GET", "/api/external-mcp/test-stdio", nil)
|
||||||
w2 := httptest.NewRecorder()
|
w2 := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w2, req2)
|
router.ServeHTTP(w2, req2)
|
||||||
|
|
||||||
if w2.Code != http.StatusOK {
|
if w2.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w2.Code, w2.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w2.Code, w2.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
var response ExternalMCPResponse
|
var response ExternalMCPResponse
|
||||||
if err := json.Unmarshal(w2.Body.Bytes(), &response); err != nil {
|
if err := json.Unmarshal(w2.Body.Bytes(), &response); err != nil {
|
||||||
t.Fatalf("解析响应失败: %v", err)
|
t.Fatalf("解析响应失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if response.Config.Command != "python3" {
|
if response.Config.Command != "python3" {
|
||||||
t.Errorf("期望command为python3,实际%s", response.Config.Command)
|
t.Errorf("期望command为python3,实际%s", response.Config.Command)
|
||||||
}
|
}
|
||||||
@@ -122,48 +123,48 @@ func TestExternalMCPHandler_AddOrUpdateExternalMCP_Stdio(t *testing.T) {
|
|||||||
func TestExternalMCPHandler_AddOrUpdateExternalMCP_HTTP(t *testing.T) {
|
func TestExternalMCPHandler_AddOrUpdateExternalMCP_HTTP(t *testing.T) {
|
||||||
router, _, configPath := setupTestRouter()
|
router, _, configPath := setupTestRouter()
|
||||||
defer cleanupTestConfig(configPath)
|
defer cleanupTestConfig(configPath)
|
||||||
|
|
||||||
// 测试添加HTTP模式的配置
|
// 测试添加HTTP模式的配置
|
||||||
configJSON := `{
|
configJSON := `{
|
||||||
"transport": "http",
|
"transport": "http",
|
||||||
"url": "http://127.0.0.1:8081/mcp",
|
"url": "http://127.0.0.1:8081/mcp",
|
||||||
"enabled": true
|
"enabled": true
|
||||||
}`
|
}`
|
||||||
|
|
||||||
var configObj config.ExternalMCPServerConfig
|
var configObj config.ExternalMCPServerConfig
|
||||||
if err := json.Unmarshal([]byte(configJSON), &configObj); err != nil {
|
if err := json.Unmarshal([]byte(configJSON), &configObj); err != nil {
|
||||||
t.Fatalf("解析配置JSON失败: %v", err)
|
t.Fatalf("解析配置JSON失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
reqBody := AddOrUpdateExternalMCPRequest{
|
reqBody := AddOrUpdateExternalMCPRequest{
|
||||||
Config: configObj,
|
Config: configObj,
|
||||||
}
|
}
|
||||||
|
|
||||||
body, _ := json.Marshal(reqBody)
|
body, _ := json.Marshal(reqBody)
|
||||||
req := httptest.NewRequest("PUT", "/api/external-mcp/test-http", bytes.NewBuffer(body))
|
req := httptest.NewRequest("PUT", "/api/external-mcp/test-http", bytes.NewBuffer(body))
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// 验证配置已添加
|
// 验证配置已添加
|
||||||
req2 := httptest.NewRequest("GET", "/api/external-mcp/test-http", nil)
|
req2 := httptest.NewRequest("GET", "/api/external-mcp/test-http", nil)
|
||||||
w2 := httptest.NewRecorder()
|
w2 := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w2, req2)
|
router.ServeHTTP(w2, req2)
|
||||||
|
|
||||||
if w2.Code != http.StatusOK {
|
if w2.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w2.Code, w2.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w2.Code, w2.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
var response ExternalMCPResponse
|
var response ExternalMCPResponse
|
||||||
if err := json.Unmarshal(w2.Body.Bytes(), &response); err != nil {
|
if err := json.Unmarshal(w2.Body.Bytes(), &response); err != nil {
|
||||||
t.Fatalf("解析响应失败: %v", err)
|
t.Fatalf("解析响应失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if response.Config.Transport != "http" {
|
if response.Config.Transport != "http" {
|
||||||
t.Errorf("期望transport为http,实际%s", response.Config.Transport)
|
t.Errorf("期望transport为http,实际%s", response.Config.Transport)
|
||||||
}
|
}
|
||||||
@@ -178,7 +179,7 @@ func TestExternalMCPHandler_AddOrUpdateExternalMCP_HTTP(t *testing.T) {
|
|||||||
func TestExternalMCPHandler_AddOrUpdateExternalMCP_InvalidConfig(t *testing.T) {
|
func TestExternalMCPHandler_AddOrUpdateExternalMCP_InvalidConfig(t *testing.T) {
|
||||||
router, _, configPath := setupTestRouter()
|
router, _, configPath := setupTestRouter()
|
||||||
defer cleanupTestConfig(configPath)
|
defer cleanupTestConfig(configPath)
|
||||||
|
|
||||||
testCases := []struct {
|
testCases := []struct {
|
||||||
name string
|
name string
|
||||||
configJSON string
|
configJSON string
|
||||||
@@ -187,7 +188,7 @@ func TestExternalMCPHandler_AddOrUpdateExternalMCP_InvalidConfig(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "缺少command和url",
|
name: "缺少command和url",
|
||||||
configJSON: `{"enabled": true}`,
|
configJSON: `{"enabled": true}`,
|
||||||
expectedErr: "需要指定command(stdio模式)或url(http模式)",
|
expectedErr: "需要指定command(stdio模式)或url(http/sse模式)",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "stdio模式缺少command",
|
name: "stdio模式缺少command",
|
||||||
@@ -205,34 +206,34 @@ func TestExternalMCPHandler_AddOrUpdateExternalMCP_InvalidConfig(t *testing.T) {
|
|||||||
expectedErr: "不支持的传输模式",
|
expectedErr: "不支持的传输模式",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range testCases {
|
for _, tc := range testCases {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
var configObj config.ExternalMCPServerConfig
|
var configObj config.ExternalMCPServerConfig
|
||||||
if err := json.Unmarshal([]byte(tc.configJSON), &configObj); err != nil {
|
if err := json.Unmarshal([]byte(tc.configJSON), &configObj); err != nil {
|
||||||
t.Fatalf("解析配置JSON失败: %v", err)
|
t.Fatalf("解析配置JSON失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
reqBody := AddOrUpdateExternalMCPRequest{
|
reqBody := AddOrUpdateExternalMCPRequest{
|
||||||
Config: configObj,
|
Config: configObj,
|
||||||
}
|
}
|
||||||
|
|
||||||
body, _ := json.Marshal(reqBody)
|
body, _ := json.Marshal(reqBody)
|
||||||
req := httptest.NewRequest("PUT", "/api/external-mcp/test-invalid", bytes.NewBuffer(body))
|
req := httptest.NewRequest("PUT", "/api/external-mcp/test-invalid", bytes.NewBuffer(body))
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusBadRequest {
|
if w.Code != http.StatusBadRequest {
|
||||||
t.Errorf("期望状态码400,实际%d: %s", w.Code, w.Body.String())
|
t.Errorf("期望状态码400,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
var response map[string]interface{}
|
var response map[string]interface{}
|
||||||
if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil {
|
if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil {
|
||||||
t.Fatalf("解析响应失败: %v", err)
|
t.Fatalf("解析响应失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
errorMsg := response["error"].(string)
|
errorMsg := response["error"].(string)
|
||||||
// 对于stdio模式缺少command的情况,错误信息可能略有不同
|
// 对于stdio模式缺少command的情况,错误信息可能略有不同
|
||||||
if tc.name == "stdio模式缺少command" {
|
if tc.name == "stdio模式缺少command" {
|
||||||
@@ -249,28 +250,28 @@ func TestExternalMCPHandler_AddOrUpdateExternalMCP_InvalidConfig(t *testing.T) {
|
|||||||
func TestExternalMCPHandler_DeleteExternalMCP(t *testing.T) {
|
func TestExternalMCPHandler_DeleteExternalMCP(t *testing.T) {
|
||||||
router, handler, configPath := setupTestRouter()
|
router, handler, configPath := setupTestRouter()
|
||||||
defer cleanupTestConfig(configPath)
|
defer cleanupTestConfig(configPath)
|
||||||
|
|
||||||
// 先添加一个配置
|
// 先添加一个配置
|
||||||
configObj := config.ExternalMCPServerConfig{
|
configObj := config.ExternalMCPServerConfig{
|
||||||
Command: "python3",
|
Command: "python3",
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
}
|
}
|
||||||
handler.manager.AddOrUpdateConfig("test-delete", configObj)
|
handler.manager.AddOrUpdateConfig("test-delete", configObj)
|
||||||
|
|
||||||
// 删除配置
|
// 删除配置
|
||||||
req := httptest.NewRequest("DELETE", "/api/external-mcp/test-delete", nil)
|
req := httptest.NewRequest("DELETE", "/api/external-mcp/test-delete", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// 验证配置已删除
|
// 验证配置已删除
|
||||||
req2 := httptest.NewRequest("GET", "/api/external-mcp/test-delete", nil)
|
req2 := httptest.NewRequest("GET", "/api/external-mcp/test-delete", nil)
|
||||||
w2 := httptest.NewRecorder()
|
w2 := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w2, req2)
|
router.ServeHTTP(w2, req2)
|
||||||
|
|
||||||
if w2.Code != http.StatusNotFound {
|
if w2.Code != http.StatusNotFound {
|
||||||
t.Errorf("期望状态码404,实际%d: %s", w2.Code, w2.Body.String())
|
t.Errorf("期望状态码404,实际%d: %s", w2.Code, w2.Body.String())
|
||||||
}
|
}
|
||||||
@@ -278,7 +279,7 @@ func TestExternalMCPHandler_DeleteExternalMCP(t *testing.T) {
|
|||||||
|
|
||||||
func TestExternalMCPHandler_GetExternalMCPs(t *testing.T) {
|
func TestExternalMCPHandler_GetExternalMCPs(t *testing.T) {
|
||||||
router, handler, _ := setupTestRouter()
|
router, handler, _ := setupTestRouter()
|
||||||
|
|
||||||
// 添加多个配置
|
// 添加多个配置
|
||||||
handler.manager.AddOrUpdateConfig("test1", config.ExternalMCPServerConfig{
|
handler.manager.AddOrUpdateConfig("test1", config.ExternalMCPServerConfig{
|
||||||
Command: "python3",
|
Command: "python3",
|
||||||
@@ -288,20 +289,20 @@ func TestExternalMCPHandler_GetExternalMCPs(t *testing.T) {
|
|||||||
URL: "http://127.0.0.1:8081/mcp",
|
URL: "http://127.0.0.1:8081/mcp",
|
||||||
Enabled: false,
|
Enabled: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/api/external-mcp", nil)
|
req := httptest.NewRequest("GET", "/api/external-mcp", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
var response map[string]interface{}
|
var response map[string]interface{}
|
||||||
if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil {
|
if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil {
|
||||||
t.Fatalf("解析响应失败: %v", err)
|
t.Fatalf("解析响应失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
servers := response["servers"].(map[string]interface{})
|
servers := response["servers"].(map[string]interface{})
|
||||||
if len(servers) != 2 {
|
if len(servers) != 2 {
|
||||||
t.Errorf("期望2个服务器,实际%d", len(servers))
|
t.Errorf("期望2个服务器,实际%d", len(servers))
|
||||||
@@ -312,7 +313,7 @@ func TestExternalMCPHandler_GetExternalMCPs(t *testing.T) {
|
|||||||
if _, ok := servers["test2"]; !ok {
|
if _, ok := servers["test2"]; !ok {
|
||||||
t.Error("期望包含test2")
|
t.Error("期望包含test2")
|
||||||
}
|
}
|
||||||
|
|
||||||
stats := response["stats"].(map[string]interface{})
|
stats := response["stats"].(map[string]interface{})
|
||||||
if int(stats["total"].(float64)) != 2 {
|
if int(stats["total"].(float64)) != 2 {
|
||||||
t.Errorf("期望总数为2,实际%d", int(stats["total"].(float64)))
|
t.Errorf("期望总数为2,实际%d", int(stats["total"].(float64)))
|
||||||
@@ -321,7 +322,7 @@ func TestExternalMCPHandler_GetExternalMCPs(t *testing.T) {
|
|||||||
|
|
||||||
func TestExternalMCPHandler_GetExternalMCPStats(t *testing.T) {
|
func TestExternalMCPHandler_GetExternalMCPStats(t *testing.T) {
|
||||||
router, handler, _ := setupTestRouter()
|
router, handler, _ := setupTestRouter()
|
||||||
|
|
||||||
// 添加配置
|
// 添加配置
|
||||||
handler.manager.AddOrUpdateConfig("enabled1", config.ExternalMCPServerConfig{
|
handler.manager.AddOrUpdateConfig("enabled1", config.ExternalMCPServerConfig{
|
||||||
Command: "python3",
|
Command: "python3",
|
||||||
@@ -336,20 +337,20 @@ func TestExternalMCPHandler_GetExternalMCPStats(t *testing.T) {
|
|||||||
Enabled: false,
|
Enabled: false,
|
||||||
Disabled: true,
|
Disabled: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/api/external-mcp/stats", nil)
|
req := httptest.NewRequest("GET", "/api/external-mcp/stats", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
var stats map[string]interface{}
|
var stats map[string]interface{}
|
||||||
if err := json.Unmarshal(w.Body.Bytes(), &stats); err != nil {
|
if err := json.Unmarshal(w.Body.Bytes(), &stats); err != nil {
|
||||||
t.Fatalf("解析响应失败: %v", err)
|
t.Fatalf("解析响应失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if int(stats["total"].(float64)) != 3 {
|
if int(stats["total"].(float64)) != 3 {
|
||||||
t.Errorf("期望总数为3,实际%d", int(stats["total"].(float64)))
|
t.Errorf("期望总数为3,实际%d", int(stats["total"].(float64)))
|
||||||
}
|
}
|
||||||
@@ -364,19 +365,19 @@ func TestExternalMCPHandler_GetExternalMCPStats(t *testing.T) {
|
|||||||
func TestExternalMCPHandler_StartStopExternalMCP(t *testing.T) {
|
func TestExternalMCPHandler_StartStopExternalMCP(t *testing.T) {
|
||||||
router, handler, configPath := setupTestRouter()
|
router, handler, configPath := setupTestRouter()
|
||||||
defer cleanupTestConfig(configPath)
|
defer cleanupTestConfig(configPath)
|
||||||
|
|
||||||
// 添加一个禁用的配置
|
// 添加一个禁用的配置
|
||||||
handler.manager.AddOrUpdateConfig("test-start-stop", config.ExternalMCPServerConfig{
|
handler.manager.AddOrUpdateConfig("test-start-stop", config.ExternalMCPServerConfig{
|
||||||
Command: "python3",
|
Command: "python3",
|
||||||
Enabled: false,
|
Enabled: false,
|
||||||
Disabled: true,
|
Disabled: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
// 测试启动(可能会失败,因为没有真实的服务器)
|
// 测试启动(可能会失败,因为没有真实的服务器)
|
||||||
req := httptest.NewRequest("POST", "/api/external-mcp/test-start-stop/start", nil)
|
req := httptest.NewRequest("POST", "/api/external-mcp/test-start-stop/start", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
// 启动可能会失败,但应该返回合理的状态码
|
// 启动可能会失败,但应该返回合理的状态码
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
// 如果启动失败,应该是400或500
|
// 如果启动失败,应该是400或500
|
||||||
@@ -384,12 +385,12 @@ func TestExternalMCPHandler_StartStopExternalMCP(t *testing.T) {
|
|||||||
t.Errorf("期望状态码200/400/500,实际%d: %s", w.Code, w.Body.String())
|
t.Errorf("期望状态码200/400/500,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 测试停止
|
// 测试停止
|
||||||
req2 := httptest.NewRequest("POST", "/api/external-mcp/test-start-stop/stop", nil)
|
req2 := httptest.NewRequest("POST", "/api/external-mcp/test-start-stop/stop", nil)
|
||||||
w2 := httptest.NewRecorder()
|
w2 := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w2, req2)
|
router.ServeHTTP(w2, req2)
|
||||||
|
|
||||||
if w2.Code != http.StatusOK {
|
if w2.Code != http.StatusOK {
|
||||||
t.Errorf("期望状态码200,实际%d: %s", w2.Code, w2.Body.String())
|
t.Errorf("期望状态码200,实际%d: %s", w2.Code, w2.Body.String())
|
||||||
}
|
}
|
||||||
@@ -397,11 +398,11 @@ func TestExternalMCPHandler_StartStopExternalMCP(t *testing.T) {
|
|||||||
|
|
||||||
func TestExternalMCPHandler_GetExternalMCP_NotFound(t *testing.T) {
|
func TestExternalMCPHandler_GetExternalMCP_NotFound(t *testing.T) {
|
||||||
router, _, _ := setupTestRouter()
|
router, _, _ := setupTestRouter()
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/api/external-mcp/nonexistent", nil)
|
req := httptest.NewRequest("GET", "/api/external-mcp/nonexistent", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusNotFound {
|
if w.Code != http.StatusNotFound {
|
||||||
t.Errorf("期望状态码404,实际%d: %s", w.Code, w.Body.String())
|
t.Errorf("期望状态码404,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
@@ -410,11 +411,11 @@ func TestExternalMCPHandler_GetExternalMCP_NotFound(t *testing.T) {
|
|||||||
func TestExternalMCPHandler_DeleteExternalMCP_NotFound(t *testing.T) {
|
func TestExternalMCPHandler_DeleteExternalMCP_NotFound(t *testing.T) {
|
||||||
router, _, configPath := setupTestRouter()
|
router, _, configPath := setupTestRouter()
|
||||||
defer cleanupTestConfig(configPath)
|
defer cleanupTestConfig(configPath)
|
||||||
|
|
||||||
req := httptest.NewRequest("DELETE", "/api/external-mcp/nonexistent", nil)
|
req := httptest.NewRequest("DELETE", "/api/external-mcp/nonexistent", nil)
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
// 删除不存在的配置可能返回200(幂等操作)或404,都是合理的
|
// 删除不存在的配置可能返回200(幂等操作)或404,都是合理的
|
||||||
if w.Code != http.StatusNotFound && w.Code != http.StatusOK {
|
if w.Code != http.StatusNotFound && w.Code != http.StatusOK {
|
||||||
t.Errorf("期望状态码404或200,实际%d: %s", w.Code, w.Body.String())
|
t.Errorf("期望状态码404或200,实际%d: %s", w.Code, w.Body.String())
|
||||||
@@ -423,23 +424,23 @@ func TestExternalMCPHandler_DeleteExternalMCP_NotFound(t *testing.T) {
|
|||||||
|
|
||||||
func TestExternalMCPHandler_AddOrUpdateExternalMCP_EmptyName(t *testing.T) {
|
func TestExternalMCPHandler_AddOrUpdateExternalMCP_EmptyName(t *testing.T) {
|
||||||
router, _, _ := setupTestRouter()
|
router, _, _ := setupTestRouter()
|
||||||
|
|
||||||
configObj := config.ExternalMCPServerConfig{
|
configObj := config.ExternalMCPServerConfig{
|
||||||
Command: "python3",
|
Command: "python3",
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
reqBody := AddOrUpdateExternalMCPRequest{
|
reqBody := AddOrUpdateExternalMCPRequest{
|
||||||
Config: configObj,
|
Config: configObj,
|
||||||
}
|
}
|
||||||
|
|
||||||
body, _ := json.Marshal(reqBody)
|
body, _ := json.Marshal(reqBody)
|
||||||
req := httptest.NewRequest("PUT", "/api/external-mcp/", bytes.NewBuffer(body))
|
req := httptest.NewRequest("PUT", "/api/external-mcp/", bytes.NewBuffer(body))
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
// 空名称应该返回404或400
|
// 空名称应该返回404或400
|
||||||
if w.Code != http.StatusNotFound && w.Code != http.StatusBadRequest {
|
if w.Code != http.StatusNotFound && w.Code != http.StatusBadRequest {
|
||||||
t.Errorf("期望状态码404或400,实际%d: %s", w.Code, w.Body.String())
|
t.Errorf("期望状态码404或400,实际%d: %s", w.Code, w.Body.String())
|
||||||
@@ -448,15 +449,15 @@ func TestExternalMCPHandler_AddOrUpdateExternalMCP_EmptyName(t *testing.T) {
|
|||||||
|
|
||||||
func TestExternalMCPHandler_AddOrUpdateExternalMCP_InvalidJSON(t *testing.T) {
|
func TestExternalMCPHandler_AddOrUpdateExternalMCP_InvalidJSON(t *testing.T) {
|
||||||
router, _, _ := setupTestRouter()
|
router, _, _ := setupTestRouter()
|
||||||
|
|
||||||
// 发送无效的JSON
|
// 发送无效的JSON
|
||||||
body := []byte(`{"config": invalid json}`)
|
body := []byte(`{"config": invalid json}`)
|
||||||
req := httptest.NewRequest("PUT", "/api/external-mcp/test", bytes.NewBuffer(body))
|
req := httptest.NewRequest("PUT", "/api/external-mcp/test", bytes.NewBuffer(body))
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusBadRequest {
|
if w.Code != http.StatusBadRequest {
|
||||||
t.Errorf("期望状态码400,实际%d: %s", w.Code, w.Body.String())
|
t.Errorf("期望状态码400,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
@@ -465,49 +466,49 @@ func TestExternalMCPHandler_AddOrUpdateExternalMCP_InvalidJSON(t *testing.T) {
|
|||||||
func TestExternalMCPHandler_UpdateExistingConfig(t *testing.T) {
|
func TestExternalMCPHandler_UpdateExistingConfig(t *testing.T) {
|
||||||
router, handler, configPath := setupTestRouter()
|
router, handler, configPath := setupTestRouter()
|
||||||
defer cleanupTestConfig(configPath)
|
defer cleanupTestConfig(configPath)
|
||||||
|
|
||||||
// 先添加配置
|
// 先添加配置
|
||||||
config1 := config.ExternalMCPServerConfig{
|
config1 := config.ExternalMCPServerConfig{
|
||||||
Command: "python3",
|
Command: "python3",
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
}
|
}
|
||||||
handler.manager.AddOrUpdateConfig("test-update", config1)
|
handler.manager.AddOrUpdateConfig("test-update", config1)
|
||||||
|
|
||||||
// 更新配置
|
// 更新配置
|
||||||
config2 := config.ExternalMCPServerConfig{
|
config2 := config.ExternalMCPServerConfig{
|
||||||
URL: "http://127.0.0.1:8081/mcp",
|
URL: "http://127.0.0.1:8081/mcp",
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
reqBody := AddOrUpdateExternalMCPRequest{
|
reqBody := AddOrUpdateExternalMCPRequest{
|
||||||
Config: config2,
|
Config: config2,
|
||||||
}
|
}
|
||||||
|
|
||||||
body, _ := json.Marshal(reqBody)
|
body, _ := json.Marshal(reqBody)
|
||||||
req := httptest.NewRequest("PUT", "/api/external-mcp/test-update", bytes.NewBuffer(body))
|
req := httptest.NewRequest("PUT", "/api/external-mcp/test-update", bytes.NewBuffer(body))
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
w := httptest.NewRecorder()
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
router.ServeHTTP(w, req)
|
router.ServeHTTP(w, req)
|
||||||
|
|
||||||
if w.Code != http.StatusOK {
|
if w.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w.Code, w.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// 验证配置已更新
|
// 验证配置已更新
|
||||||
req2 := httptest.NewRequest("GET", "/api/external-mcp/test-update", nil)
|
req2 := httptest.NewRequest("GET", "/api/external-mcp/test-update", nil)
|
||||||
w2 := httptest.NewRecorder()
|
w2 := httptest.NewRecorder()
|
||||||
router.ServeHTTP(w2, req2)
|
router.ServeHTTP(w2, req2)
|
||||||
|
|
||||||
if w2.Code != http.StatusOK {
|
if w2.Code != http.StatusOK {
|
||||||
t.Fatalf("期望状态码200,实际%d: %s", w2.Code, w2.Body.String())
|
t.Fatalf("期望状态码200,实际%d: %s", w2.Code, w2.Body.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
var response ExternalMCPResponse
|
var response ExternalMCPResponse
|
||||||
if err := json.Unmarshal(w2.Body.Bytes(), &response); err != nil {
|
if err := json.Unmarshal(w2.Body.Bytes(), &response); err != nil {
|
||||||
t.Fatalf("解析响应失败: %v", err)
|
t.Fatalf("解析响应失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if response.Config.URL != "http://127.0.0.1:8081/mcp" {
|
if response.Config.URL != "http://127.0.0.1:8081/mcp" {
|
||||||
t.Errorf("期望url为'http://127.0.0.1:8081/mcp',实际%s", response.Config.URL)
|
t.Errorf("期望url为'http://127.0.0.1:8081/mcp',实际%s", response.Config.URL)
|
||||||
}
|
}
|
||||||
@@ -515,4 +516,3 @@ func TestExternalMCPHandler_UpdateExistingConfig(t *testing.T) {
|
|||||||
t.Errorf("期望command为空,实际%s", response.Config.Command)
|
t.Errorf("期望command为空,实际%s", response.Config.Command)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,467 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"cyberstrike-ai/internal/config"
|
||||||
|
openaiClient "cyberstrike-ai/internal/openai"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"go.uber.org/zap"
|
||||||
|
)
|
||||||
|
|
||||||
|
type FofaHandler struct {
|
||||||
|
cfg *config.Config
|
||||||
|
logger *zap.Logger
|
||||||
|
client *http.Client
|
||||||
|
openAIClient *openaiClient.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewFofaHandler(cfg *config.Config, logger *zap.Logger) *FofaHandler {
|
||||||
|
// LLM 请求通常比 FOFA 查询更慢一点,单独给一个更宽松的超时。
|
||||||
|
llmHTTPClient := &http.Client{Timeout: 2 * time.Minute}
|
||||||
|
var llmCfg *config.OpenAIConfig
|
||||||
|
if cfg != nil {
|
||||||
|
llmCfg = &cfg.OpenAI
|
||||||
|
}
|
||||||
|
return &FofaHandler{
|
||||||
|
cfg: cfg,
|
||||||
|
logger: logger,
|
||||||
|
client: &http.Client{Timeout: 30 * time.Second},
|
||||||
|
openAIClient: openaiClient.NewClient(llmCfg, llmHTTPClient, logger),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type fofaSearchRequest struct {
|
||||||
|
Query string `json:"query" binding:"required"`
|
||||||
|
Size int `json:"size,omitempty"`
|
||||||
|
Page int `json:"page,omitempty"`
|
||||||
|
Fields string `json:"fields,omitempty"`
|
||||||
|
Full bool `json:"full,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type fofaParseRequest struct {
|
||||||
|
Text string `json:"text" binding:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type fofaParseResponse struct {
|
||||||
|
Query string `json:"query"`
|
||||||
|
Explanation string `json:"explanation,omitempty"`
|
||||||
|
Warnings []string `json:"warnings,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type fofaAPIResponse struct {
|
||||||
|
Error bool `json:"error"`
|
||||||
|
ErrMsg string `json:"errmsg"`
|
||||||
|
Size int `json:"size"`
|
||||||
|
Page int `json:"page"`
|
||||||
|
Total int `json:"total"`
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
Query string `json:"query"`
|
||||||
|
Results [][]interface{} `json:"results"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type fofaSearchResponse struct {
|
||||||
|
Query string `json:"query"`
|
||||||
|
Size int `json:"size"`
|
||||||
|
Page int `json:"page"`
|
||||||
|
Total int `json:"total"`
|
||||||
|
Fields []string `json:"fields"`
|
||||||
|
ResultsCount int `json:"results_count"`
|
||||||
|
Results []map[string]interface{} `json:"results"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *FofaHandler) resolveCredentials() (email, apiKey string) {
|
||||||
|
// 优先环境变量(便于容器部署),其次配置文件
|
||||||
|
email = strings.TrimSpace(os.Getenv("FOFA_EMAIL"))
|
||||||
|
apiKey = strings.TrimSpace(os.Getenv("FOFA_API_KEY"))
|
||||||
|
if email != "" && apiKey != "" {
|
||||||
|
return email, apiKey
|
||||||
|
}
|
||||||
|
if h.cfg != nil {
|
||||||
|
if email == "" {
|
||||||
|
email = strings.TrimSpace(h.cfg.FOFA.Email)
|
||||||
|
}
|
||||||
|
if apiKey == "" {
|
||||||
|
apiKey = strings.TrimSpace(h.cfg.FOFA.APIKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return email, apiKey
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *FofaHandler) resolveBaseURL() string {
|
||||||
|
if h.cfg != nil {
|
||||||
|
if v := strings.TrimSpace(h.cfg.FOFA.BaseURL); v != "" {
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "https://fofa.info/api/v1/search/all"
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseNaturalLanguage 将自然语言解析为 FOFA 查询语法(仅生成,不执行查询)
|
||||||
|
func (h *FofaHandler) ParseNaturalLanguage(c *gin.Context) {
|
||||||
|
var req fofaParseRequest
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "无效的请求参数: " + err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req.Text = strings.TrimSpace(req.Text)
|
||||||
|
if req.Text == "" {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "text 不能为空"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if h.cfg == nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "系统配置未初始化"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(h.cfg.OpenAI.APIKey) == "" || strings.TrimSpace(h.cfg.OpenAI.Model) == "" {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{
|
||||||
|
"error": "未配置 AI 模型:请在系统设置中填写 openai.api_key 与 openai.model(支持 OpenAI 兼容 API,如 DeepSeek)",
|
||||||
|
"need": []string{"openai.api_key", "openai.model"},
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if h.openAIClient == nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "AI 客户端未初始化"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
systemPrompt := strings.TrimSpace(`
|
||||||
|
你是“FOFA 查询语法生成器”。任务:把用户输入的自然语言搜索意图,转换成 FOFA 查询语法。
|
||||||
|
|
||||||
|
输出要求(非常重要):
|
||||||
|
1) 只输出 JSON(不要 markdown、不要代码块、不要额外解释文本)
|
||||||
|
2) JSON 结构必须是:
|
||||||
|
{
|
||||||
|
"query": "string,FOFA查询语法(可直接粘贴到 FOFA 或本系统查询框)",
|
||||||
|
"explanation": "string,可选,解释你如何映射字段/逻辑",
|
||||||
|
"warnings": ["string"...] 可选,列出歧义/风险/需要人工确认的点
|
||||||
|
}
|
||||||
|
3) 如果用户输入本身已经是 FOFA 查询语法(或非常接近 FOFA 语法的表达式),应当“原样返回”为 query:
|
||||||
|
- 不要擅自改写字段名、操作符、括号结构
|
||||||
|
- 不要改写任何字符串值(尤其是地理位置类值),不要做缩写/同义词替换/翻译/音译
|
||||||
|
|
||||||
|
查询语法要点(来自 FOFA 语法参考):
|
||||||
|
- 逻辑连接符:&&(与)、||(或),必要时用 () 包住子表达式以确认优先级(括号优先级最高)
|
||||||
|
- 当同一层级同时出现 && 与 ||(混用)时,用 () 明确优先级(避免歧义)
|
||||||
|
- 比较/匹配:
|
||||||
|
- = 匹配;当字段="" 时,可查询“不存在该字段”或“值为空”的情况
|
||||||
|
- == 完全匹配;当字段=="" 时,可查询“字段存在且值为空”的情况
|
||||||
|
- != 不匹配;当字段!="" 时,可查询“值不为空”的情况
|
||||||
|
- *= 模糊匹配;可使用 * 或 ? 进行搜索
|
||||||
|
- 直接输入关键词(不带字段)会在标题、HTML内容、HTTP头、URL字段中搜索;但当意图明确时优先用字段表达(更可控、更准确)
|
||||||
|
|
||||||
|
字段示例速查(来自用户提供的案例,可直接套用/拼接):
|
||||||
|
- 高级搜索操作符示例:
|
||||||
|
- title="beijing" (= 匹配)
|
||||||
|
- title=="" (== 完全匹配,字段存在且值为空)
|
||||||
|
- title="" (= 匹配,可能表示字段不存在或值为空)
|
||||||
|
- title!="" (!= 不匹配,可用于值不为空)
|
||||||
|
- title*="*Home*" (*= 模糊匹配,用 * 或 ?)
|
||||||
|
- (app="Apache" || app="Nginx") && country="CN" (混用 && / || 时用括号)
|
||||||
|
- 基础类(General):
|
||||||
|
- ip="1.1.1.1"
|
||||||
|
- ip="220.181.111.1/24"
|
||||||
|
- ip="2600:9000:202a:2600:18:4ab7:f600:93a1"
|
||||||
|
- port="6379"
|
||||||
|
- domain="qq.com"
|
||||||
|
- host=".fofa.info"
|
||||||
|
- os="centos"
|
||||||
|
- server="Microsoft-IIS/10"
|
||||||
|
- asn="19551"
|
||||||
|
- org="LLC Baxet"
|
||||||
|
- is_domain=true / is_domain=false
|
||||||
|
- is_ipv6=true / is_ipv6=false
|
||||||
|
- 标记类(Special Label):
|
||||||
|
- app="Microsoft-Exchange"
|
||||||
|
- fid="sSXXGNUO2FefBTcCLIT/2Q=="
|
||||||
|
- product="NGINX"
|
||||||
|
- product="Roundcube-Webmail" && product.version="1.6.10"
|
||||||
|
- category="服务"
|
||||||
|
- type="service" / type="subdomain"
|
||||||
|
- cloud_name="Aliyundun"
|
||||||
|
- is_cloud=true / is_cloud=false
|
||||||
|
- is_fraud=true / is_fraud=false
|
||||||
|
- is_honeypot=true / is_honeypot=false
|
||||||
|
- 协议类(type=service):
|
||||||
|
- protocol="quic"
|
||||||
|
- banner="users"
|
||||||
|
- banner_hash="7330105010150477363"
|
||||||
|
- banner_fid="zRpqmn0FXQRjZpH8MjMX55zpMy9SgsW8"
|
||||||
|
- base_protocol="udp" / base_protocol="tcp"
|
||||||
|
- 网站类(type=subdomain):
|
||||||
|
- title="beijing"
|
||||||
|
- header="elastic"
|
||||||
|
- header_hash="1258854265"
|
||||||
|
- body="网络空间测绘"
|
||||||
|
- body_hash="-2090962452"
|
||||||
|
- js_name="js/jquery.js"
|
||||||
|
- js_md5="82ac3f14327a8b7ba49baa208d4eaa15"
|
||||||
|
- cname="customers.spektrix.com"
|
||||||
|
- cname_domain="siteforce.com"
|
||||||
|
- icon_hash="-247388890"
|
||||||
|
- status_code="402"
|
||||||
|
- icp="京ICP证030173号"
|
||||||
|
- sdk_hash="Are3qNnP2Eqn7q5kAoUO3l+w3mgVIytO"
|
||||||
|
- 地理位置(Location):
|
||||||
|
- country="CN" 或 country="中国"
|
||||||
|
- region="Zhejiang" 或 region="浙江"(仅支持中国地区中文)
|
||||||
|
- city="Hangzhou"
|
||||||
|
- 证书类(Certificate):
|
||||||
|
- cert="baidu"
|
||||||
|
- cert.subject="Oracle Corporation"
|
||||||
|
- cert.issuer="DigiCert"
|
||||||
|
- cert.subject.org="Oracle Corporation"
|
||||||
|
- cert.subject.cn="baidu.com"
|
||||||
|
- cert.issuer.org="cPanel, Inc."
|
||||||
|
- cert.issuer.cn="Synology Inc. CA"
|
||||||
|
- cert.domain="huawei.com"
|
||||||
|
- cert.is_equal=true / cert.is_equal=false
|
||||||
|
- cert.is_valid=true / cert.is_valid=false
|
||||||
|
- cert.is_match=true / cert.is_match=false
|
||||||
|
- cert.is_expired=true / cert.is_expired=false
|
||||||
|
- jarm="2ad2ad0002ad2ad22c2ad2ad2ad2ad2eac92ec34bcc0cf7520e97547f83e81"
|
||||||
|
- tls.version="TLS 1.3"
|
||||||
|
- tls.ja3s="15af977ce25de452b96affa2addb1036"
|
||||||
|
- cert.sn="356078156165546797850343536942784588840297"
|
||||||
|
- cert.not_after.after="2025-03-01" / cert.not_after.before="2025-03-01"
|
||||||
|
- cert.not_before.after="2025-03-01" / cert.not_before.before="2025-03-01"
|
||||||
|
- 时间类(Last update time):
|
||||||
|
- after="2023-01-01"
|
||||||
|
- before="2023-12-01"
|
||||||
|
- after="2023-01-01" && before="2023-12-01"
|
||||||
|
- 独立IP语法(需配合 ip_filter / ip_exclude):
|
||||||
|
- ip_filter(banner="SSH-2.0-OpenSSH_6.7p2") && ip_filter(icon_hash="-1057022626")
|
||||||
|
- ip_filter(banner="SSH-2.0-OpenSSH_6.7p2" && asn="3462") && ip_exclude(title="EdgeOS")
|
||||||
|
- port_size="6" / port_size_gt="6" / port_size_lt="12"
|
||||||
|
- ip_ports="80,161"
|
||||||
|
- ip_country="CN"
|
||||||
|
- ip_region="Zhejiang"
|
||||||
|
- ip_city="Hangzhou"
|
||||||
|
- ip_after="2021-03-18"
|
||||||
|
- ip_before="2019-09-09"
|
||||||
|
|
||||||
|
生成约束与注意事项:
|
||||||
|
- 字符串值一律用英文双引号包裹,例如 title="登录"、country="CN"
|
||||||
|
- 字符串值保持字面一致:不要缩写(例如 city="beijing" 不要变成 city="BJ"),不要用别名(例如 Beijing/Peking),不要擅自翻译/音译/改写大小写
|
||||||
|
- 地理位置字段(country/region/city)更倾向于“按用户给定值输出”;不确定合法取值时,不要猜测,把备选写进 warnings
|
||||||
|
- 不要捏造不存在的 FOFA 字段;不确定时把不确定点写进 warnings,并输出一个保守的 query
|
||||||
|
- 当用户描述里有“多个与/或条件”,优先加 () 明确优先级,例如:(app="Apache" || app="Nginx") && country="CN"
|
||||||
|
- 当用户缺少关键条件导致范围过大或歧义(如地点/协议/端口/服务类型未说明),允许 query 为空字符串,并在 warnings 里明确需要补充的信息
|
||||||
|
`)
|
||||||
|
|
||||||
|
userPrompt := fmt.Sprintf("自然语言意图:%s", req.Text)
|
||||||
|
|
||||||
|
requestBody := map[string]interface{}{
|
||||||
|
"model": h.cfg.OpenAI.Model,
|
||||||
|
"messages": []map[string]interface{}{
|
||||||
|
{"role": "system", "content": systemPrompt},
|
||||||
|
{"role": "user", "content": userPrompt},
|
||||||
|
},
|
||||||
|
"temperature": 0.1,
|
||||||
|
"max_tokens": 1200,
|
||||||
|
}
|
||||||
|
|
||||||
|
// OpenAI 返回结构:只需要 choices[0].message.content
|
||||||
|
var apiResponse struct {
|
||||||
|
Choices []struct {
|
||||||
|
Message struct {
|
||||||
|
Content string `json:"content"`
|
||||||
|
} `json:"message"`
|
||||||
|
} `json:"choices"`
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(c.Request.Context(), 90*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
if err := h.openAIClient.ChatCompletion(ctx, requestBody, &apiResponse); err != nil {
|
||||||
|
var apiErr *openaiClient.APIError
|
||||||
|
if errors.As(err, &apiErr) {
|
||||||
|
h.logger.Warn("FOFA自然语言解析:LLM返回错误", zap.Int("status", apiErr.StatusCode))
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": "AI 解析失败(上游返回非 200),请检查模型配置或稍后重试"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": "AI 解析失败: " + err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(apiResponse.Choices) == 0 {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": "AI 未返回有效结果"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
content := strings.TrimSpace(apiResponse.Choices[0].Message.Content)
|
||||||
|
// 兼容模型偶尔返回 ```json ... ``` 的情况
|
||||||
|
content = strings.TrimPrefix(content, "```json")
|
||||||
|
content = strings.TrimPrefix(content, "```")
|
||||||
|
content = strings.TrimSuffix(content, "```")
|
||||||
|
content = strings.TrimSpace(content)
|
||||||
|
|
||||||
|
var parsed fofaParseResponse
|
||||||
|
if err := json.Unmarshal([]byte(content), &parsed); err != nil {
|
||||||
|
// 直接回传一部分原文,方便排查,但避免太大
|
||||||
|
snippet := content
|
||||||
|
if len(snippet) > 1200 {
|
||||||
|
snippet = snippet[:1200]
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{
|
||||||
|
"error": "AI 返回内容无法解析为 JSON,请稍后重试或换个描述方式",
|
||||||
|
"snippet": snippet,
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
parsed.Query = strings.TrimSpace(parsed.Query)
|
||||||
|
if parsed.Query == "" {
|
||||||
|
// query 允许为空(表示需求不明确),但前端需要明确提示
|
||||||
|
if len(parsed.Warnings) == 0 {
|
||||||
|
parsed.Warnings = []string{"需求信息不足,未能生成可用的 FOFA 查询语法,请补充关键条件(如国家/端口/产品/域名等)。"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, parsed)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Search FOFA 查询(后端代理,避免前端暴露 key)
|
||||||
|
func (h *FofaHandler) Search(c *gin.Context) {
|
||||||
|
var req fofaSearchRequest
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "无效的请求参数: " + err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
req.Query = strings.TrimSpace(req.Query)
|
||||||
|
if req.Query == "" {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "query 不能为空"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if req.Size <= 0 {
|
||||||
|
req.Size = 100
|
||||||
|
}
|
||||||
|
if req.Page <= 0 {
|
||||||
|
req.Page = 1
|
||||||
|
}
|
||||||
|
// FOFA 接口 size 上限和账户权限相关,这里只做一个合理的保护
|
||||||
|
if req.Size > 10000 {
|
||||||
|
req.Size = 10000
|
||||||
|
}
|
||||||
|
if req.Fields == "" {
|
||||||
|
req.Fields = "host,ip,port,domain,title,protocol,country,province,city,server"
|
||||||
|
}
|
||||||
|
|
||||||
|
email, apiKey := h.resolveCredentials()
|
||||||
|
if email == "" || apiKey == "" {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{
|
||||||
|
"error": "FOFA 未配置:请在系统设置中填写 FOFA Email/API Key,或设置环境变量 FOFA_EMAIL/FOFA_API_KEY",
|
||||||
|
"need": []string{"fofa.email", "fofa.api_key"},
|
||||||
|
"env_key": []string{"FOFA_EMAIL", "FOFA_API_KEY"},
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
baseURL := h.resolveBaseURL()
|
||||||
|
qb64 := base64.StdEncoding.EncodeToString([]byte(req.Query))
|
||||||
|
|
||||||
|
u, err := url.Parse(baseURL)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "FOFA base_url 无效: " + err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
params := u.Query()
|
||||||
|
params.Set("email", email)
|
||||||
|
params.Set("key", apiKey)
|
||||||
|
params.Set("qbase64", qb64)
|
||||||
|
params.Set("size", fmt.Sprintf("%d", req.Size))
|
||||||
|
params.Set("page", fmt.Sprintf("%d", req.Page))
|
||||||
|
params.Set("fields", strings.TrimSpace(req.Fields))
|
||||||
|
if req.Full {
|
||||||
|
params.Set("full", "true")
|
||||||
|
} else {
|
||||||
|
// 明确传 false,便于排查
|
||||||
|
params.Set("full", "false")
|
||||||
|
}
|
||||||
|
u.RawQuery = params.Encode()
|
||||||
|
|
||||||
|
httpReq, err := http.NewRequestWithContext(c.Request.Context(), http.MethodGet, u.String(), nil)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "创建请求失败: " + err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := h.client.Do(httpReq)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": "请求 FOFA 失败: " + err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": fmt.Sprintf("FOFA 返回非 2xx: %d", resp.StatusCode)})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var apiResp fofaAPIResponse
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&apiResp); err != nil {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": "解析 FOFA 响应失败: " + err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if apiResp.Error {
|
||||||
|
msg := strings.TrimSpace(apiResp.ErrMsg)
|
||||||
|
if msg == "" {
|
||||||
|
msg = "FOFA 返回错误"
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": msg})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fields := splitAndCleanCSV(req.Fields)
|
||||||
|
results := make([]map[string]interface{}, 0, len(apiResp.Results))
|
||||||
|
for _, row := range apiResp.Results {
|
||||||
|
item := make(map[string]interface{}, len(fields))
|
||||||
|
for i, f := range fields {
|
||||||
|
if i < len(row) {
|
||||||
|
item[f] = row[i]
|
||||||
|
} else {
|
||||||
|
item[f] = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
results = append(results, item)
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, fofaSearchResponse{
|
||||||
|
Query: req.Query,
|
||||||
|
Size: apiResp.Size,
|
||||||
|
Page: apiResp.Page,
|
||||||
|
Total: apiResp.Total,
|
||||||
|
Fields: fields,
|
||||||
|
ResultsCount: len(results),
|
||||||
|
Results: results,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func splitAndCleanCSV(s string) []string {
|
||||||
|
parts := strings.Split(s, ",")
|
||||||
|
out := make([]string, 0, len(parts))
|
||||||
|
seen := make(map[string]struct{}, len(parts))
|
||||||
|
for _, p := range parts {
|
||||||
|
v := strings.TrimSpace(p)
|
||||||
|
if v == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := seen[v]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[v] = struct{}{}
|
||||||
|
out = append(out, v)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -15,11 +15,11 @@ import (
|
|||||||
|
|
||||||
// KnowledgeHandler 知识库处理器
|
// KnowledgeHandler 知识库处理器
|
||||||
type KnowledgeHandler struct {
|
type KnowledgeHandler struct {
|
||||||
manager *knowledge.Manager
|
manager *knowledge.Manager
|
||||||
retriever *knowledge.Retriever
|
retriever *knowledge.Retriever
|
||||||
indexer *knowledge.Indexer
|
indexer *knowledge.Indexer
|
||||||
db *database.DB
|
db *database.DB
|
||||||
logger *zap.Logger
|
logger *zap.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewKnowledgeHandler 创建新的知识库处理器
|
// NewKnowledgeHandler 创建新的知识库处理器
|
||||||
@@ -55,7 +55,7 @@ func (h *KnowledgeHandler) GetCategories(c *gin.Context) {
|
|||||||
func (h *KnowledgeHandler) GetItems(c *gin.Context) {
|
func (h *KnowledgeHandler) GetItems(c *gin.Context) {
|
||||||
category := c.Query("category")
|
category := c.Query("category")
|
||||||
searchKeyword := c.Query("search") // 搜索关键字
|
searchKeyword := c.Query("search") // 搜索关键字
|
||||||
|
|
||||||
// 如果提供了搜索关键字,执行关键字搜索(在所有数据中搜索)
|
// 如果提供了搜索关键字,执行关键字搜索(在所有数据中搜索)
|
||||||
if searchKeyword != "" {
|
if searchKeyword != "" {
|
||||||
items, err := h.manager.SearchItemsByKeyword(searchKeyword, category)
|
items, err := h.manager.SearchItemsByKeyword(searchKeyword, category)
|
||||||
@@ -102,10 +102,10 @@ func (h *KnowledgeHandler) GetItems(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 分页模式:categoryPage=true 表示按分类分页,否则按项分页(向后兼容)
|
// 分页模式:categoryPage=true 表示按分类分页,否则按项分页(向后兼容)
|
||||||
categoryPageMode := c.Query("categoryPage") != "false" // 默认使用分类分页
|
categoryPageMode := c.Query("categoryPage") != "false" // 默认使用分类分页
|
||||||
|
|
||||||
// 分页参数
|
// 分页参数
|
||||||
limit := 50 // 默认每页50条(分类分页时为分类数,项分页时为项数)
|
limit := 50 // 默认每页50条(分类分页时为分类数,项分页时为项数)
|
||||||
offset := 0
|
offset := 0
|
||||||
@@ -192,9 +192,9 @@ func (h *KnowledgeHandler) GetItems(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"items": items,
|
"items": items,
|
||||||
"total": total,
|
"total": total,
|
||||||
"limit": limit,
|
"limit": limit,
|
||||||
"offset": offset,
|
"offset": offset,
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@@ -207,9 +207,9 @@ func (h *KnowledgeHandler) GetItems(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"items": items,
|
"items": items,
|
||||||
"total": total,
|
"total": total,
|
||||||
"limit": limit,
|
"limit": limit,
|
||||||
"offset": offset,
|
"offset": offset,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -341,12 +341,12 @@ func (h *KnowledgeHandler) ScanKnowledgeBase(c *gin.Context) {
|
|||||||
consecutiveFailures := 0
|
consecutiveFailures := 0
|
||||||
var firstFailureItemID string
|
var firstFailureItemID string
|
||||||
var firstFailureError error
|
var firstFailureError error
|
||||||
|
|
||||||
for i, itemID := range itemsToIndex {
|
for i, itemID := range itemsToIndex {
|
||||||
if err := h.indexer.IndexItem(ctx, itemID); err != nil {
|
if err := h.indexer.IndexItem(ctx, itemID); err != nil {
|
||||||
failedCount++
|
failedCount++
|
||||||
consecutiveFailures++
|
consecutiveFailures++
|
||||||
|
|
||||||
// 只在第一个失败时记录详细日志
|
// 只在第一个失败时记录详细日志
|
||||||
if consecutiveFailures == 1 {
|
if consecutiveFailures == 1 {
|
||||||
firstFailureItemID = itemID
|
firstFailureItemID = itemID
|
||||||
@@ -357,7 +357,7 @@ func (h *KnowledgeHandler) ScanKnowledgeBase(c *gin.Context) {
|
|||||||
zap.Error(err),
|
zap.Error(err),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果连续失败2次,立即停止增量索引
|
// 如果连续失败2次,立即停止增量索引
|
||||||
if consecutiveFailures >= 2 {
|
if consecutiveFailures >= 2 {
|
||||||
h.logger.Error("连续索引失败次数过多,立即停止增量索引",
|
h.logger.Error("连续索引失败次数过多,立即停止增量索引",
|
||||||
@@ -371,14 +371,14 @@ func (h *KnowledgeHandler) ScanKnowledgeBase(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// 成功时重置连续失败计数
|
// 成功时重置连续失败计数
|
||||||
if consecutiveFailures > 0 {
|
if consecutiveFailures > 0 {
|
||||||
consecutiveFailures = 0
|
consecutiveFailures = 0
|
||||||
firstFailureItemID = ""
|
firstFailureItemID = ""
|
||||||
firstFailureError = nil
|
firstFailureError = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 减少进度日志频率
|
// 减少进度日志频率
|
||||||
if (i+1)%10 == 0 || i+1 == len(itemsToIndex) {
|
if (i+1)%10 == 0 || i+1 == len(itemsToIndex) {
|
||||||
h.logger.Info("索引进度", zap.Int("current", i+1), zap.Int("total", len(itemsToIndex)), zap.Int("failed", failedCount))
|
h.logger.Info("索引进度", zap.Int("current", i+1), zap.Int("total", len(itemsToIndex)), zap.Int("failed", failedCount))
|
||||||
@@ -388,7 +388,7 @@ func (h *KnowledgeHandler) ScanKnowledgeBase(c *gin.Context) {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"message": fmt.Sprintf("扫描完成,开始索引 %d 个新添加或更新的知识项", len(itemsToIndex)),
|
"message": fmt.Sprintf("扫描完成,开始索引 %d 个新添加或更新的知识项", len(itemsToIndex)),
|
||||||
"items_to_index": len(itemsToIndex),
|
"items_to_index": len(itemsToIndex),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -470,10 +470,25 @@ func (h *KnowledgeHandler) Search(c *gin.Context) {
|
|||||||
c.JSON(http.StatusOK, gin.H{"results": results})
|
c.JSON(http.StatusOK, gin.H{"results": results})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetStats 获取知识库统计信息
|
||||||
|
func (h *KnowledgeHandler) GetStats(c *gin.Context) {
|
||||||
|
totalCategories, totalItems, err := h.manager.GetStats()
|
||||||
|
if err != nil {
|
||||||
|
h.logger.Error("获取知识库统计信息失败", zap.Error(err))
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"enabled": true,
|
||||||
|
"total_categories": totalCategories,
|
||||||
|
"total_items": totalItems,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// 辅助函数:解析整数
|
// 辅助函数:解析整数
|
||||||
func parseInt(s string) (int, error) {
|
func parseInt(s string) (int, error) {
|
||||||
var result int
|
var result int
|
||||||
_, err := fmt.Sscanf(s, "%d", &result)
|
_, err := fmt.Sscanf(s, "%d", &result)
|
||||||
return result, err
|
return result, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1309,7 +1309,7 @@ func (h *OpenAPIHandler) GetOpenAPISpec(c *gin.Context) {
|
|||||||
},
|
},
|
||||||
"/api/conversations/{id}/results": map[string]interface{}{
|
"/api/conversations/{id}/results": map[string]interface{}{
|
||||||
"get": map[string]interface{}{
|
"get": map[string]interface{}{
|
||||||
"tags": []string{"结果查询"},
|
"tags": []string{"对话管理"},
|
||||||
"summary": "获取对话结果",
|
"summary": "获取对话结果",
|
||||||
"description": "获取指定对话的执行结果,包括消息、漏洞信息和执行结果",
|
"description": "获取指定对话的执行结果,包括消息、漏洞信息和执行结果",
|
||||||
"operationId": "getConversationResults",
|
"operationId": "getConversationResults",
|
||||||
|
|||||||
@@ -0,0 +1,401 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/aes"
|
||||||
|
"crypto/cipher"
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/binary"
|
||||||
|
"encoding/xml"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"cyberstrike-ai/internal/config"
|
||||||
|
"cyberstrike-ai/internal/database"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"go.uber.org/zap"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
robotCmdHelp = "帮助"
|
||||||
|
robotCmdList = "列表"
|
||||||
|
robotCmdListAlt = "对话列表"
|
||||||
|
robotCmdSwitch = "切换"
|
||||||
|
robotCmdContinue = "继续"
|
||||||
|
robotCmdNew = "新对话"
|
||||||
|
robotCmdClear = "清空"
|
||||||
|
robotCmdCurrent = "当前"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RobotHandler 企业微信/钉钉/飞书等机器人回调处理
|
||||||
|
type RobotHandler struct {
|
||||||
|
config *config.Config
|
||||||
|
db *database.DB
|
||||||
|
agentHandler *AgentHandler
|
||||||
|
logger *zap.Logger
|
||||||
|
mu sync.RWMutex
|
||||||
|
sessions map[string]string // key: "platform_userID", value: conversationID
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewRobotHandler 创建机器人处理器
|
||||||
|
func NewRobotHandler(cfg *config.Config, db *database.DB, agentHandler *AgentHandler, logger *zap.Logger) *RobotHandler {
|
||||||
|
return &RobotHandler{
|
||||||
|
config: cfg,
|
||||||
|
db: db,
|
||||||
|
agentHandler: agentHandler,
|
||||||
|
logger: logger,
|
||||||
|
sessions: make(map[string]string),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// sessionKey 生成会话 key
|
||||||
|
func (h *RobotHandler) sessionKey(platform, userID string) string {
|
||||||
|
return platform + "_" + userID
|
||||||
|
}
|
||||||
|
|
||||||
|
// getOrCreateConversation 获取或创建当前会话
|
||||||
|
func (h *RobotHandler) getOrCreateConversation(platform, userID string) (convID string, isNew bool) {
|
||||||
|
h.mu.RLock()
|
||||||
|
convID = h.sessions[h.sessionKey(platform, userID)]
|
||||||
|
h.mu.RUnlock()
|
||||||
|
if convID != "" {
|
||||||
|
return convID, false
|
||||||
|
}
|
||||||
|
conv, err := h.db.CreateConversation("机器人对话")
|
||||||
|
if err != nil {
|
||||||
|
h.logger.Warn("创建机器人会话失败", zap.Error(err))
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
convID = conv.ID
|
||||||
|
h.mu.Lock()
|
||||||
|
h.sessions[h.sessionKey(platform, userID)] = convID
|
||||||
|
h.mu.Unlock()
|
||||||
|
return convID, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// setConversation 切换当前会话
|
||||||
|
func (h *RobotHandler) setConversation(platform, userID, convID string) {
|
||||||
|
h.mu.Lock()
|
||||||
|
h.sessions[h.sessionKey(platform, userID)] = convID
|
||||||
|
h.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// clearConversation 清空当前会话(切换到新对话)
|
||||||
|
func (h *RobotHandler) clearConversation(platform, userID string) (newConvID string) {
|
||||||
|
conv, err := h.db.CreateConversation("新对话")
|
||||||
|
if err != nil {
|
||||||
|
h.logger.Warn("创建新对话失败", zap.Error(err))
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
h.setConversation(platform, userID, conv.ID)
|
||||||
|
return conv.ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleMessage 处理用户输入,返回回复文本(供各平台 webhook 调用)
|
||||||
|
func (h *RobotHandler) HandleMessage(platform, userID, text string) (reply string) {
|
||||||
|
text = strings.TrimSpace(text)
|
||||||
|
if text == "" {
|
||||||
|
return "请输入内容或发送「帮助」查看命令。"
|
||||||
|
}
|
||||||
|
|
||||||
|
// 命令分发
|
||||||
|
switch {
|
||||||
|
case text == robotCmdHelp || text == "help" || text == "?" || text == "?":
|
||||||
|
return h.cmdHelp()
|
||||||
|
case text == robotCmdList || text == robotCmdListAlt:
|
||||||
|
return h.cmdList(userID)
|
||||||
|
case strings.HasPrefix(text, robotCmdSwitch+" ") || strings.HasPrefix(text, robotCmdContinue+" "):
|
||||||
|
var id string
|
||||||
|
if strings.HasPrefix(text, robotCmdSwitch+" ") {
|
||||||
|
id = strings.TrimSpace(text[len(robotCmdSwitch)+1:])
|
||||||
|
} else {
|
||||||
|
id = strings.TrimSpace(text[len(robotCmdContinue)+1:])
|
||||||
|
}
|
||||||
|
return h.cmdSwitch(platform, userID, id)
|
||||||
|
case text == robotCmdNew:
|
||||||
|
return h.cmdNew(platform, userID)
|
||||||
|
case text == robotCmdClear:
|
||||||
|
return h.cmdClear(platform, userID)
|
||||||
|
case text == robotCmdCurrent:
|
||||||
|
return h.cmdCurrent(platform, userID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 普通消息:走 Agent
|
||||||
|
convID, _ := h.getOrCreateConversation(platform, userID)
|
||||||
|
if convID == "" {
|
||||||
|
return "无法创建或获取对话,请稍后再试。"
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
|
||||||
|
defer cancel()
|
||||||
|
resp, newConvID, err := h.agentHandler.ProcessMessageForRobot(ctx, convID, text, "默认")
|
||||||
|
if err != nil {
|
||||||
|
h.logger.Warn("机器人 Agent 执行失败", zap.String("platform", platform), zap.String("userID", userID), zap.Error(err))
|
||||||
|
return "处理失败: " + err.Error()
|
||||||
|
}
|
||||||
|
if newConvID != convID {
|
||||||
|
h.setConversation(platform, userID, newConvID)
|
||||||
|
}
|
||||||
|
return resp
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *RobotHandler) cmdHelp() string {
|
||||||
|
return `【CyberStrikeAI 机器人命令】
|
||||||
|
· 帮助 — 显示本帮助
|
||||||
|
· 列表 / 对话列表 — 列出所有对话标题与 ID
|
||||||
|
· 切换 <对话ID> / 继续 <对话ID> — 指定对话继续
|
||||||
|
· 新对话 — 开启新对话
|
||||||
|
· 清空 — 清空当前上下文(等同于新对话)
|
||||||
|
· 当前 — 显示当前对话 ID 与标题
|
||||||
|
除以上命令外,直接输入内容将发送给 AI 进行渗透测试/安全分析。`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *RobotHandler) cmdList(userID string) string {
|
||||||
|
convs, err := h.db.ListConversations(50, 0, "")
|
||||||
|
if err != nil {
|
||||||
|
return "获取对话列表失败: " + err.Error()
|
||||||
|
}
|
||||||
|
if len(convs) == 0 {
|
||||||
|
return "暂无对话。发送任意内容将自动创建新对话。"
|
||||||
|
}
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString("【对话列表】\n")
|
||||||
|
for i, c := range convs {
|
||||||
|
if i >= 20 {
|
||||||
|
b.WriteString("… 仅显示前 20 条\n")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
b.WriteString(fmt.Sprintf("· %s\n ID: %s\n", c.Title, c.ID))
|
||||||
|
}
|
||||||
|
return strings.TrimSuffix(b.String(), "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *RobotHandler) cmdSwitch(platform, userID, convID string) string {
|
||||||
|
if convID == "" {
|
||||||
|
return "请指定对话 ID,例如:切换 xxx-xxx-xxx"
|
||||||
|
}
|
||||||
|
conv, err := h.db.GetConversation(convID)
|
||||||
|
if err != nil {
|
||||||
|
return "对话不存在或 ID 错误。"
|
||||||
|
}
|
||||||
|
h.setConversation(platform, userID, conv.ID)
|
||||||
|
return fmt.Sprintf("已切换到对话:「%s」\nID: %s", conv.Title, conv.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *RobotHandler) cmdNew(platform, userID string) string {
|
||||||
|
newID := h.clearConversation(platform, userID)
|
||||||
|
if newID == "" {
|
||||||
|
return "创建新对话失败,请重试。"
|
||||||
|
}
|
||||||
|
return "已开启新对话,可直接发送内容。"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *RobotHandler) cmdClear(platform, userID string) string {
|
||||||
|
return h.cmdNew(platform, userID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *RobotHandler) cmdCurrent(platform, userID string) string {
|
||||||
|
h.mu.RLock()
|
||||||
|
convID := h.sessions[h.sessionKey(platform, userID)]
|
||||||
|
h.mu.RUnlock()
|
||||||
|
if convID == "" {
|
||||||
|
return "当前没有进行中的对话。发送任意内容将创建新对话。"
|
||||||
|
}
|
||||||
|
conv, err := h.db.GetConversation(convID)
|
||||||
|
if err != nil {
|
||||||
|
return "当前对话 ID: " + convID + "(获取标题失败)"
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("当前对话:「%s」\nID: %s", conv.Title, conv.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// —————— 企业微信 ——————
|
||||||
|
|
||||||
|
// wecomXML 企业微信回调 XML(明文模式下的简化结构;加密模式需先解密再解析)
|
||||||
|
type wecomXML struct {
|
||||||
|
ToUserName string `xml:"ToUserName"`
|
||||||
|
FromUserName string `xml:"FromUserName"`
|
||||||
|
CreateTime int64 `xml:"CreateTime"`
|
||||||
|
MsgType string `xml:"MsgType"`
|
||||||
|
Content string `xml:"Content"`
|
||||||
|
MsgID string `xml:"MsgId"`
|
||||||
|
AgentID int64 `xml:"AgentID"`
|
||||||
|
Encrypt string `xml:"Encrypt"` // 加密模式下消息在此
|
||||||
|
}
|
||||||
|
|
||||||
|
// wecomReplyXML 被动回复 XML
|
||||||
|
type wecomReplyXML struct {
|
||||||
|
XMLName xml.Name `xml:"xml"`
|
||||||
|
ToUserName string `xml:"ToUserName"`
|
||||||
|
FromUserName string `xml:"FromUserName"`
|
||||||
|
CreateTime int64 `xml:"CreateTime"`
|
||||||
|
MsgType string `xml:"MsgType"`
|
||||||
|
Content string `xml:"Content"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleWecomGET 企业微信 URL 校验(GET)
|
||||||
|
func (h *RobotHandler) HandleWecomGET(c *gin.Context) {
|
||||||
|
if !h.config.Robots.Wecom.Enabled {
|
||||||
|
c.String(http.StatusNotFound, "")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
echostr := c.Query("echostr")
|
||||||
|
if echostr == "" {
|
||||||
|
c.String(http.StatusBadRequest, "missing echostr")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// 明文模式时企业微信可能直接传 echostr,先直接返回以通过校验
|
||||||
|
c.String(http.StatusOK, echostr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// wecomDecrypt 企业微信消息解密(AES-256-CBC,PKCS7,明文格式:16字节随机+4字节长度+消息+corpID)
|
||||||
|
func wecomDecrypt(encodingAESKey, encryptedB64 string) ([]byte, error) {
|
||||||
|
key, err := base64.StdEncoding.DecodeString(encodingAESKey + "=")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(key) != 32 {
|
||||||
|
return nil, fmt.Errorf("encoding_aes_key 解码后应为 32 字节")
|
||||||
|
}
|
||||||
|
ciphertext, err := base64.StdEncoding.DecodeString(encryptedB64)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
block, err := aes.NewCipher(key)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
iv := key[:16]
|
||||||
|
mode := cipher.NewCBCDecrypter(block, iv)
|
||||||
|
if len(ciphertext)%aes.BlockSize != 0 {
|
||||||
|
return nil, fmt.Errorf("密文长度不是块大小的倍数")
|
||||||
|
}
|
||||||
|
plain := make([]byte, len(ciphertext))
|
||||||
|
mode.CryptBlocks(plain, ciphertext)
|
||||||
|
// 去除 PKCS7 填充
|
||||||
|
n := int(plain[len(plain)-1])
|
||||||
|
if n < 1 || n > 32 {
|
||||||
|
return nil, fmt.Errorf("无效的 PKCS7 填充")
|
||||||
|
}
|
||||||
|
plain = plain[:len(plain)-n]
|
||||||
|
// 企业微信格式:16 字节随机 + 4 字节长度(大端) + 消息 + corpID
|
||||||
|
if len(plain) < 20 {
|
||||||
|
return nil, fmt.Errorf("明文过短")
|
||||||
|
}
|
||||||
|
msgLen := binary.BigEndian.Uint32(plain[16:20])
|
||||||
|
if int(20+msgLen) > len(plain) {
|
||||||
|
return nil, fmt.Errorf("消息长度越界")
|
||||||
|
}
|
||||||
|
return plain[20 : 20+msgLen], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleWecomPOST 企业微信消息回调(POST),支持明文与加密模式
|
||||||
|
func (h *RobotHandler) HandleWecomPOST(c *gin.Context) {
|
||||||
|
if !h.config.Robots.Wecom.Enabled {
|
||||||
|
c.String(http.StatusOK, "")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bodyRaw, _ := io.ReadAll(c.Request.Body)
|
||||||
|
var body wecomXML
|
||||||
|
if err := xml.Unmarshal(bodyRaw, &body); err != nil {
|
||||||
|
h.logger.Debug("企业微信 POST 解析 XML 失败", zap.Error(err))
|
||||||
|
c.String(http.StatusOK, "")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// 加密模式:先解密再解析内层 XML
|
||||||
|
if body.Encrypt != "" && h.config.Robots.Wecom.EncodingAESKey != "" {
|
||||||
|
decrypted, err := wecomDecrypt(h.config.Robots.Wecom.EncodingAESKey, body.Encrypt)
|
||||||
|
if err != nil {
|
||||||
|
h.logger.Warn("企业微信消息解密失败", zap.Error(err))
|
||||||
|
c.String(http.StatusOK, "")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := xml.Unmarshal(decrypted, &body); err != nil {
|
||||||
|
h.logger.Warn("企业微信解密后 XML 解析失败", zap.Error(err))
|
||||||
|
c.String(http.StatusOK, "")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if body.MsgType != "text" {
|
||||||
|
c.XML(http.StatusOK, wecomReplyXML{
|
||||||
|
ToUserName: body.FromUserName,
|
||||||
|
FromUserName: body.ToUserName,
|
||||||
|
CreateTime: time.Now().Unix(),
|
||||||
|
MsgType: "text",
|
||||||
|
Content: "暂仅支持文本消息,请发送文字。",
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
userID := body.FromUserName
|
||||||
|
text := strings.TrimSpace(body.Content)
|
||||||
|
reply := h.HandleMessage("wecom", userID, text)
|
||||||
|
// 加密模式需加密回复(此处简化为明文回复;若企业要求加密需再实现加密)
|
||||||
|
c.XML(http.StatusOK, wecomReplyXML{
|
||||||
|
ToUserName: body.FromUserName,
|
||||||
|
FromUserName: body.ToUserName,
|
||||||
|
CreateTime: time.Now().Unix(),
|
||||||
|
MsgType: "text",
|
||||||
|
Content: reply,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// —————— 测试接口(需登录,用于验证机器人逻辑,无需钉钉/飞书客户端) ——————
|
||||||
|
|
||||||
|
// RobotTestRequest 模拟机器人消息请求
|
||||||
|
type RobotTestRequest struct {
|
||||||
|
Platform string `json:"platform"` // 如 "dingtalk"、"lark"、"wecom"
|
||||||
|
UserID string `json:"user_id"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleRobotTest 供本地验证:POST JSON { "platform", "user_id", "text" },返回 { "reply": "..." }
|
||||||
|
func (h *RobotHandler) HandleRobotTest(c *gin.Context) {
|
||||||
|
var req RobotTestRequest
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "请求体需为 JSON,包含 platform、user_id、text"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
platform := strings.TrimSpace(req.Platform)
|
||||||
|
if platform == "" {
|
||||||
|
platform = "test"
|
||||||
|
}
|
||||||
|
userID := strings.TrimSpace(req.UserID)
|
||||||
|
if userID == "" {
|
||||||
|
userID = "test_user"
|
||||||
|
}
|
||||||
|
reply := h.HandleMessage(platform, userID, req.Text)
|
||||||
|
c.JSON(http.StatusOK, gin.H{"reply": reply})
|
||||||
|
}
|
||||||
|
|
||||||
|
// —————— 钉钉 ——————
|
||||||
|
|
||||||
|
// HandleDingtalkPOST 钉钉事件回调(流式接入等);当前为占位,返回 200
|
||||||
|
func (h *RobotHandler) HandleDingtalkPOST(c *gin.Context) {
|
||||||
|
if !h.config.Robots.Dingtalk.Enabled {
|
||||||
|
c.JSON(http.StatusOK, gin.H{})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// 钉钉流式/事件回调格式需按官方文档解析并异步回复,此处仅返回 200
|
||||||
|
c.JSON(http.StatusOK, gin.H{"message": "ok"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// —————— 飞书 ——————
|
||||||
|
|
||||||
|
// HandleLarkPOST 飞书事件回调;当前为占位,返回 200;验证时需返回 challenge
|
||||||
|
func (h *RobotHandler) HandleLarkPOST(c *gin.Context) {
|
||||||
|
if !h.config.Robots.Lark.Enabled {
|
||||||
|
c.JSON(http.StatusOK, gin.H{})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var body struct {
|
||||||
|
Challenge string `json:"challenge"`
|
||||||
|
}
|
||||||
|
if err := c.ShouldBindJSON(&body); err == nil && body.Challenge != "" {
|
||||||
|
c.JSON(http.StatusOK, gin.H{"challenge": body.Challenge})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusOK, gin.H{})
|
||||||
|
}
|
||||||
@@ -153,6 +153,25 @@ func (m *Manager) GetCategories() ([]string, error) {
|
|||||||
return categories, nil
|
return categories, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetStats 获取知识库统计信息
|
||||||
|
func (m *Manager) GetStats() (int, int, error) {
|
||||||
|
// 获取分类总数
|
||||||
|
categories, err := m.GetCategories()
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, fmt.Errorf("获取分类失败: %w", err)
|
||||||
|
}
|
||||||
|
totalCategories := len(categories)
|
||||||
|
|
||||||
|
// 获取知识项总数
|
||||||
|
var totalItems int
|
||||||
|
err = m.db.QueryRow("SELECT COUNT(*) FROM knowledge_base_items").Scan(&totalItems)
|
||||||
|
if err != nil {
|
||||||
|
return totalCategories, 0, fmt.Errorf("获取知识项总数失败: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return totalCategories, totalItems, nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetCategoriesWithItems 按分类分页获取知识项(每个分类包含其下的所有知识项)
|
// GetCategoriesWithItems 按分类分页获取知识项(每个分类包含其下的所有知识项)
|
||||||
// limit: 每页分类数量(0表示不限制)
|
// limit: 每页分类数量(0表示不限制)
|
||||||
// offset: 偏移量(按分类偏移)
|
// offset: 偏移量(按分类偏移)
|
||||||
@@ -359,7 +378,7 @@ func (m *Manager) SearchItemsByKeyword(keyword string, category string) ([]*Know
|
|||||||
// SQLite的LIKE不区分大小写,使用COLLATE NOCASE或LOWER()函数
|
// SQLite的LIKE不区分大小写,使用COLLATE NOCASE或LOWER()函数
|
||||||
// 使用%keyword%进行模糊匹配
|
// 使用%keyword%进行模糊匹配
|
||||||
searchPattern := "%" + keyword + "%"
|
searchPattern := "%" + keyword + "%"
|
||||||
|
|
||||||
query = `
|
query = `
|
||||||
SELECT id, category, title, file_path, created_at, updated_at
|
SELECT id, category, title, file_path, created_at, updated_at
|
||||||
FROM knowledge_base_items
|
FROM knowledge_base_items
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,551 @@
|
|||||||
|
// Package mcp 外部 MCP 客户端 - 基于官方 go-sdk 实现,保证协议兼容性
|
||||||
|
package mcp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"cyberstrike-ai/internal/config"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
"github.com/modelcontextprotocol/go-sdk/mcp"
|
||||||
|
"go.uber.org/zap"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
clientName = "CyberStrikeAI"
|
||||||
|
clientVersion = "1.0.0"
|
||||||
|
)
|
||||||
|
|
||||||
|
// sdkClient 基于官方 MCP Go SDK 的外部 MCP 客户端,实现 ExternalMCPClient 接口
|
||||||
|
type sdkClient struct {
|
||||||
|
session *mcp.ClientSession
|
||||||
|
client *mcp.Client
|
||||||
|
logger *zap.Logger
|
||||||
|
mu sync.RWMutex
|
||||||
|
status string // "disconnected", "connecting", "connected", "error"
|
||||||
|
}
|
||||||
|
|
||||||
|
// newSDKClientFromSession 用已连接成功的 session 构造(供 createSDKClient 内部使用)
|
||||||
|
func newSDKClientFromSession(session *mcp.ClientSession, client *mcp.Client, logger *zap.Logger) *sdkClient {
|
||||||
|
return &sdkClient{
|
||||||
|
session: session,
|
||||||
|
client: client,
|
||||||
|
logger: logger,
|
||||||
|
status: "connected",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// lazySDKClient 延迟连接:Initialize() 时才调用官方 SDK 建立连接,对外实现 ExternalMCPClient
|
||||||
|
type lazySDKClient struct {
|
||||||
|
serverCfg config.ExternalMCPServerConfig
|
||||||
|
logger *zap.Logger
|
||||||
|
inner ExternalMCPClient // 连接成功后为 *sdkClient
|
||||||
|
mu sync.RWMutex
|
||||||
|
status string
|
||||||
|
}
|
||||||
|
|
||||||
|
func newLazySDKClient(serverCfg config.ExternalMCPServerConfig, logger *zap.Logger) *lazySDKClient {
|
||||||
|
return &lazySDKClient{
|
||||||
|
serverCfg: serverCfg,
|
||||||
|
logger: logger,
|
||||||
|
status: "connecting",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *lazySDKClient) setStatus(s string) {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
c.status = s
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *lazySDKClient) GetStatus() string {
|
||||||
|
c.mu.RLock()
|
||||||
|
defer c.mu.RUnlock()
|
||||||
|
if c.inner != nil {
|
||||||
|
return c.inner.GetStatus()
|
||||||
|
}
|
||||||
|
return c.status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *lazySDKClient) IsConnected() bool {
|
||||||
|
c.mu.RLock()
|
||||||
|
inner := c.inner
|
||||||
|
c.mu.RUnlock()
|
||||||
|
if inner != nil {
|
||||||
|
return inner.IsConnected()
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *lazySDKClient) Initialize(ctx context.Context) error {
|
||||||
|
c.mu.Lock()
|
||||||
|
if c.inner != nil {
|
||||||
|
c.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
c.mu.Unlock()
|
||||||
|
|
||||||
|
inner, err := createSDKClient(ctx, c.serverCfg, c.logger)
|
||||||
|
if err != nil {
|
||||||
|
c.setStatus("error")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
c.mu.Lock()
|
||||||
|
c.inner = inner
|
||||||
|
c.mu.Unlock()
|
||||||
|
c.setStatus("connected")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *lazySDKClient) ListTools(ctx context.Context) ([]Tool, error) {
|
||||||
|
c.mu.RLock()
|
||||||
|
inner := c.inner
|
||||||
|
c.mu.RUnlock()
|
||||||
|
if inner == nil {
|
||||||
|
return nil, fmt.Errorf("未连接")
|
||||||
|
}
|
||||||
|
return inner.ListTools(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *lazySDKClient) CallTool(ctx context.Context, name string, args map[string]interface{}) (*ToolResult, error) {
|
||||||
|
c.mu.RLock()
|
||||||
|
inner := c.inner
|
||||||
|
c.mu.RUnlock()
|
||||||
|
if inner == nil {
|
||||||
|
return nil, fmt.Errorf("未连接")
|
||||||
|
}
|
||||||
|
return inner.CallTool(ctx, name, args)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *lazySDKClient) Close() error {
|
||||||
|
c.mu.Lock()
|
||||||
|
inner := c.inner
|
||||||
|
c.inner = nil
|
||||||
|
c.mu.Unlock()
|
||||||
|
c.setStatus("disconnected")
|
||||||
|
if inner != nil {
|
||||||
|
return inner.Close()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *sdkClient) setStatus(s string) {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
c.status = s
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *sdkClient) GetStatus() string {
|
||||||
|
c.mu.RLock()
|
||||||
|
defer c.mu.RUnlock()
|
||||||
|
return c.status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *sdkClient) IsConnected() bool {
|
||||||
|
return c.GetStatus() == "connected"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *sdkClient) Initialize(ctx context.Context) error {
|
||||||
|
// sdkClient 由 createSDKClient 在 Connect 成功后才创建,因此 Initialize 时已经连接
|
||||||
|
// 此方法仅用于满足 ExternalMCPClient 接口,实际连接在 createSDKClient 中完成
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *sdkClient) ListTools(ctx context.Context) ([]Tool, error) {
|
||||||
|
if c.session == nil {
|
||||||
|
return nil, fmt.Errorf("未连接")
|
||||||
|
}
|
||||||
|
res, err := c.session.ListTools(ctx, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if res == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return sdkToolsToOur(res.Tools), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *sdkClient) CallTool(ctx context.Context, name string, args map[string]interface{}) (*ToolResult, error) {
|
||||||
|
if c.session == nil {
|
||||||
|
return nil, fmt.Errorf("未连接")
|
||||||
|
}
|
||||||
|
params := &mcp.CallToolParams{
|
||||||
|
Name: name,
|
||||||
|
Arguments: args,
|
||||||
|
}
|
||||||
|
res, err := c.session.CallTool(ctx, params)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return sdkCallToolResultToOurs(res), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *sdkClient) Close() error {
|
||||||
|
c.setStatus("disconnected")
|
||||||
|
if c.session != nil {
|
||||||
|
err := c.session.Close()
|
||||||
|
c.session = nil
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// sdkToolsToOur 将 SDK 的 []*mcp.Tool 转为我们的 []Tool
|
||||||
|
func sdkToolsToOur(tools []*mcp.Tool) []Tool {
|
||||||
|
if len(tools) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
out := make([]Tool, 0, len(tools))
|
||||||
|
for _, t := range tools {
|
||||||
|
if t == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
schema := make(map[string]interface{})
|
||||||
|
if t.InputSchema != nil {
|
||||||
|
// SDK InputSchema 可能为 *jsonschema.Schema 或 map,统一转为 map
|
||||||
|
if m, ok := t.InputSchema.(map[string]interface{}); ok {
|
||||||
|
schema = m
|
||||||
|
} else {
|
||||||
|
_ = json.Unmarshal(mustJSON(t.InputSchema), &schema)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
desc := t.Description
|
||||||
|
shortDesc := desc
|
||||||
|
if t.Annotations != nil && t.Annotations.Title != "" {
|
||||||
|
shortDesc = t.Annotations.Title
|
||||||
|
}
|
||||||
|
out = append(out, Tool{
|
||||||
|
Name: t.Name,
|
||||||
|
Description: desc,
|
||||||
|
ShortDescription: shortDesc,
|
||||||
|
InputSchema: schema,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// sdkCallToolResultToOurs 将 SDK 的 *mcp.CallToolResult 转为我们的 *ToolResult
|
||||||
|
func sdkCallToolResultToOurs(res *mcp.CallToolResult) *ToolResult {
|
||||||
|
if res == nil {
|
||||||
|
return &ToolResult{Content: []Content{}}
|
||||||
|
}
|
||||||
|
content := sdkContentToOurs(res.Content)
|
||||||
|
return &ToolResult{
|
||||||
|
Content: content,
|
||||||
|
IsError: res.IsError,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func sdkContentToOurs(list []mcp.Content) []Content {
|
||||||
|
if len(list) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
out := make([]Content, 0, len(list))
|
||||||
|
for _, c := range list {
|
||||||
|
switch v := c.(type) {
|
||||||
|
case *mcp.TextContent:
|
||||||
|
out = append(out, Content{Type: "text", Text: v.Text})
|
||||||
|
default:
|
||||||
|
out = append(out, Content{Type: "text", Text: fmt.Sprintf("%v", c)})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func mustJSON(v interface{}) []byte {
|
||||||
|
b, _ := json.Marshal(v)
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
// simpleHTTPClient 简单 JSON-RPC over HTTP:每次请求一次 POST、响应在 body。实现 ExternalMCPClient。
|
||||||
|
// 用于自建 MCP(如 http://127.0.0.1:8081/mcp)或其它仅支持简单 POST 的端点。
|
||||||
|
type simpleHTTPClient struct {
|
||||||
|
url string
|
||||||
|
client *http.Client
|
||||||
|
logger *zap.Logger
|
||||||
|
mu sync.RWMutex
|
||||||
|
status string
|
||||||
|
}
|
||||||
|
|
||||||
|
func newSimpleHTTPClient(ctx context.Context, url string, timeout time.Duration, headers map[string]string, logger *zap.Logger) (ExternalMCPClient, error) {
|
||||||
|
c := &simpleHTTPClient{
|
||||||
|
url: url,
|
||||||
|
client: httpClientWithTimeoutAndHeaders(timeout, headers),
|
||||||
|
logger: logger,
|
||||||
|
status: "connecting",
|
||||||
|
}
|
||||||
|
if err := c.initialize(ctx); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
c.mu.Lock()
|
||||||
|
c.status = "connected"
|
||||||
|
c.mu.Unlock()
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) setStatus(s string) {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
c.status = s
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) GetStatus() string {
|
||||||
|
c.mu.RLock()
|
||||||
|
defer c.mu.RUnlock()
|
||||||
|
return c.status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) IsConnected() bool {
|
||||||
|
return c.GetStatus() == "connected"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) Initialize(context.Context) error {
|
||||||
|
return nil // 已在 newSimpleHTTPClient 中完成
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) initialize(ctx context.Context) error {
|
||||||
|
params := InitializeRequest{
|
||||||
|
ProtocolVersion: ProtocolVersion,
|
||||||
|
Capabilities: make(map[string]interface{}),
|
||||||
|
ClientInfo: ClientInfo{Name: clientName, Version: clientVersion},
|
||||||
|
}
|
||||||
|
paramsJSON, _ := json.Marshal(params)
|
||||||
|
req := &Message{
|
||||||
|
ID: MessageID{value: "1"},
|
||||||
|
Method: "initialize",
|
||||||
|
Version: "2.0",
|
||||||
|
Params: paramsJSON,
|
||||||
|
}
|
||||||
|
resp, err := c.sendRequest(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("initialize: %w", err)
|
||||||
|
}
|
||||||
|
if resp.Error != nil {
|
||||||
|
return fmt.Errorf("initialize: %s (code %d)", resp.Error.Message, resp.Error.Code)
|
||||||
|
}
|
||||||
|
// 发送 notifications/initialized(协议要求)
|
||||||
|
notify := &Message{
|
||||||
|
ID: MessageID{value: nil},
|
||||||
|
Method: "notifications/initialized",
|
||||||
|
Version: "2.0",
|
||||||
|
Params: json.RawMessage("{}"),
|
||||||
|
}
|
||||||
|
_ = c.sendNotification(notify)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) sendRequest(ctx context.Context, msg *Message) (*Message, error) {
|
||||||
|
body, err := json.Marshal(msg)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, c.url, bytes.NewReader(body))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
httpReq.Header.Set("Content-Type", "application/json")
|
||||||
|
resp, err := c.client.Do(httpReq)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
b, _ := io.ReadAll(resp.Body)
|
||||||
|
return nil, fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(b))
|
||||||
|
}
|
||||||
|
var out Message
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) sendNotification(msg *Message) error {
|
||||||
|
body, _ := json.Marshal(msg)
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
httpReq, _ := http.NewRequestWithContext(ctx, http.MethodPost, c.url, bytes.NewReader(body))
|
||||||
|
httpReq.Header.Set("Content-Type", "application/json")
|
||||||
|
resp, err := c.client.Do(httpReq)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
resp.Body.Close()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) ListTools(ctx context.Context) ([]Tool, error) {
|
||||||
|
req := &Message{
|
||||||
|
ID: MessageID{value: uuid.New().String()},
|
||||||
|
Method: "tools/list",
|
||||||
|
Version: "2.0",
|
||||||
|
Params: json.RawMessage("{}"),
|
||||||
|
}
|
||||||
|
resp, err := c.sendRequest(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if resp.Error != nil {
|
||||||
|
return nil, fmt.Errorf("tools/list: %s (code %d)", resp.Error.Message, resp.Error.Code)
|
||||||
|
}
|
||||||
|
var listResp ListToolsResponse
|
||||||
|
if err := json.Unmarshal(resp.Result, &listResp); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return listResp.Tools, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) CallTool(ctx context.Context, name string, args map[string]interface{}) (*ToolResult, error) {
|
||||||
|
params := CallToolRequest{Name: name, Arguments: args}
|
||||||
|
paramsJSON, _ := json.Marshal(params)
|
||||||
|
req := &Message{
|
||||||
|
ID: MessageID{value: uuid.New().String()},
|
||||||
|
Method: "tools/call",
|
||||||
|
Version: "2.0",
|
||||||
|
Params: paramsJSON,
|
||||||
|
}
|
||||||
|
resp, err := c.sendRequest(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if resp.Error != nil {
|
||||||
|
return nil, fmt.Errorf("tools/call: %s (code %d)", resp.Error.Message, resp.Error.Code)
|
||||||
|
}
|
||||||
|
var callResp CallToolResponse
|
||||||
|
if err := json.Unmarshal(resp.Result, &callResp); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &ToolResult{Content: callResp.Content, IsError: callResp.IsError}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *simpleHTTPClient) Close() error {
|
||||||
|
c.setStatus("disconnected")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// createSDKClient 根据配置创建并连接外部 MCP 客户端(使用官方 SDK),返回实现 ExternalMCPClient 的 *sdkClient
|
||||||
|
// 若连接失败返回 (nil, error)。ctx 用于连接超时与取消。
|
||||||
|
func createSDKClient(ctx context.Context, serverCfg config.ExternalMCPServerConfig, logger *zap.Logger) (ExternalMCPClient, error) {
|
||||||
|
timeout := time.Duration(serverCfg.Timeout) * time.Second
|
||||||
|
if timeout <= 0 {
|
||||||
|
timeout = 30 * time.Second
|
||||||
|
}
|
||||||
|
|
||||||
|
transport := serverCfg.Transport
|
||||||
|
if transport == "" {
|
||||||
|
if serverCfg.Command != "" {
|
||||||
|
transport = "stdio"
|
||||||
|
} else if serverCfg.URL != "" {
|
||||||
|
transport = "http"
|
||||||
|
} else {
|
||||||
|
return nil, fmt.Errorf("配置缺少 command 或 url")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
client := mcp.NewClient(&mcp.Implementation{
|
||||||
|
Name: clientName,
|
||||||
|
Version: clientVersion,
|
||||||
|
}, nil)
|
||||||
|
|
||||||
|
var t mcp.Transport
|
||||||
|
switch transport {
|
||||||
|
case "stdio":
|
||||||
|
if serverCfg.Command == "" {
|
||||||
|
return nil, fmt.Errorf("stdio 模式需要配置 command")
|
||||||
|
}
|
||||||
|
// 必须用 exec.Command 而非 CommandContext:doConnect 返回后 ctx 会被 cancel,
|
||||||
|
// 若用 CommandContext(ctx) 会立刻杀掉子进程,导致 ListTools 等后续请求失败、显示 0 工具
|
||||||
|
cmd := exec.Command(serverCfg.Command, serverCfg.Args...)
|
||||||
|
if len(serverCfg.Env) > 0 {
|
||||||
|
cmd.Env = append(cmd.Env, envMapToSlice(serverCfg.Env)...)
|
||||||
|
}
|
||||||
|
t = &mcp.CommandTransport{Command: cmd}
|
||||||
|
case "sse":
|
||||||
|
if serverCfg.URL == "" {
|
||||||
|
return nil, fmt.Errorf("sse 模式需要配置 url")
|
||||||
|
}
|
||||||
|
httpClient := httpClientWithTimeoutAndHeaders(timeout, serverCfg.Headers)
|
||||||
|
t = &mcp.SSEClientTransport{
|
||||||
|
Endpoint: serverCfg.URL,
|
||||||
|
HTTPClient: httpClient,
|
||||||
|
}
|
||||||
|
case "http":
|
||||||
|
if serverCfg.URL == "" {
|
||||||
|
return nil, fmt.Errorf("http 模式需要配置 url")
|
||||||
|
}
|
||||||
|
httpClient := httpClientWithTimeoutAndHeaders(timeout, serverCfg.Headers)
|
||||||
|
t = &mcp.StreamableClientTransport{
|
||||||
|
Endpoint: serverCfg.URL,
|
||||||
|
HTTPClient: httpClient,
|
||||||
|
}
|
||||||
|
case "simple_http":
|
||||||
|
// 简单 JSON-RPC HTTP:每次请求一次 POST、响应在 body。用于自建 MCP 或兼容旧端点(如 http://127.0.0.1:8081/mcp)
|
||||||
|
if serverCfg.URL == "" {
|
||||||
|
return nil, fmt.Errorf("simple_http 模式需要配置 url")
|
||||||
|
}
|
||||||
|
return newSimpleHTTPClient(ctx, serverCfg.URL, timeout, serverCfg.Headers, logger)
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("不支持的传输模式: %s", transport)
|
||||||
|
}
|
||||||
|
|
||||||
|
session, err := client.Connect(ctx, t, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("连接失败: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return newSDKClientFromSession(session, client, logger), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func envMapToSlice(env map[string]string) []string {
|
||||||
|
m := make(map[string]string)
|
||||||
|
for _, s := range os.Environ() {
|
||||||
|
if i := strings.IndexByte(s, '='); i > 0 {
|
||||||
|
m[s[:i]] = s[i+1:]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for k, v := range env {
|
||||||
|
m[k] = v
|
||||||
|
}
|
||||||
|
out := make([]string, 0, len(m))
|
||||||
|
for k, v := range m {
|
||||||
|
out = append(out, k+"="+v)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func httpClientWithTimeoutAndHeaders(timeout time.Duration, headers map[string]string) *http.Client {
|
||||||
|
transport := http.DefaultTransport
|
||||||
|
if len(headers) > 0 {
|
||||||
|
transport = &headerRoundTripper{
|
||||||
|
headers: headers,
|
||||||
|
base: http.DefaultTransport,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &http.Client{
|
||||||
|
Timeout: timeout,
|
||||||
|
Transport: transport,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type headerRoundTripper struct {
|
||||||
|
headers map[string]string
|
||||||
|
base http.RoundTripper
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *headerRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||||
|
for k, v := range h.headers {
|
||||||
|
req.Header.Set(k, v)
|
||||||
|
}
|
||||||
|
return h.base.RoundTrip(req)
|
||||||
|
}
|
||||||
@@ -25,6 +25,8 @@ type ExternalMCPManager struct {
|
|||||||
errors map[string]string // 错误信息
|
errors map[string]string // 错误信息
|
||||||
toolCounts map[string]int // 工具数量缓存
|
toolCounts map[string]int // 工具数量缓存
|
||||||
toolCountsMu sync.RWMutex // 工具数量缓存的锁
|
toolCountsMu sync.RWMutex // 工具数量缓存的锁
|
||||||
|
toolCache map[string][]Tool // 工具列表缓存:MCP名称 -> 工具列表
|
||||||
|
toolCacheMu sync.RWMutex // 工具列表缓存的锁
|
||||||
stopRefresh chan struct{} // 停止后台刷新的信号
|
stopRefresh chan struct{} // 停止后台刷新的信号
|
||||||
refreshWg sync.WaitGroup // 等待后台刷新goroutine完成
|
refreshWg sync.WaitGroup // 等待后台刷新goroutine完成
|
||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
@@ -46,6 +48,7 @@ func NewExternalMCPManagerWithStorage(logger *zap.Logger, storage MonitorStorage
|
|||||||
stats: make(map[string]*ToolStats),
|
stats: make(map[string]*ToolStats),
|
||||||
errors: make(map[string]string),
|
errors: make(map[string]string),
|
||||||
toolCounts: make(map[string]int),
|
toolCounts: make(map[string]int),
|
||||||
|
toolCache: make(map[string][]Tool),
|
||||||
stopRefresh: make(chan struct{}),
|
stopRefresh: make(chan struct{}),
|
||||||
}
|
}
|
||||||
// 启动后台刷新工具数量的goroutine
|
// 启动后台刷新工具数量的goroutine
|
||||||
@@ -119,6 +122,11 @@ func (m *ExternalMCPManager) RemoveConfig(name string) error {
|
|||||||
delete(m.toolCounts, name)
|
delete(m.toolCounts, name)
|
||||||
m.toolCountsMu.Unlock()
|
m.toolCountsMu.Unlock()
|
||||||
|
|
||||||
|
// 清理工具列表缓存
|
||||||
|
m.toolCacheMu.Lock()
|
||||||
|
delete(m.toolCache, name)
|
||||||
|
m.toolCacheMu.Unlock()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,8 +204,15 @@ func (m *ExternalMCPManager) StartClient(name string) error {
|
|||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
delete(m.errors, name)
|
delete(m.errors, name)
|
||||||
m.mu.Unlock()
|
m.mu.Unlock()
|
||||||
// 连接成功,立即刷新工具数量
|
// 立即刷新工具数量和工具列表缓存
|
||||||
m.triggerToolCountRefresh()
|
m.triggerToolCountRefresh()
|
||||||
|
m.refreshToolCache(name, client)
|
||||||
|
// 2 秒后再刷新一次,覆盖 SSE/Streamable 等需稍等就绪的远端
|
||||||
|
go func() {
|
||||||
|
time.Sleep(2 * time.Second)
|
||||||
|
m.triggerToolCountRefresh()
|
||||||
|
m.refreshToolCache(name, client)
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@@ -253,6 +268,11 @@ func (m *ExternalMCPManager) GetError(name string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// GetAllTools 获取所有外部MCP的工具
|
// GetAllTools 获取所有外部MCP的工具
|
||||||
|
// 优先从已连接的客户端获取,如果连接断开则返回缓存的工具列表
|
||||||
|
// 策略:
|
||||||
|
// - error 状态:不使用缓存,直接跳过(配置错误或服务不可用)
|
||||||
|
// - disconnected/connecting 状态:使用缓存(临时断开)
|
||||||
|
// - connected 状态:正常获取,失败时降级使用缓存
|
||||||
func (m *ExternalMCPManager) GetAllTools(ctx context.Context) ([]Tool, error) {
|
func (m *ExternalMCPManager) GetAllTools(ctx context.Context) ([]Tool, error) {
|
||||||
m.mu.RLock()
|
m.mu.RLock()
|
||||||
clients := make(map[string]ExternalMCPClient)
|
clients := make(map[string]ExternalMCPClient)
|
||||||
@@ -262,17 +282,21 @@ func (m *ExternalMCPManager) GetAllTools(ctx context.Context) ([]Tool, error) {
|
|||||||
m.mu.RUnlock()
|
m.mu.RUnlock()
|
||||||
|
|
||||||
var allTools []Tool
|
var allTools []Tool
|
||||||
for name, client := range clients {
|
var hasError bool
|
||||||
if !client.IsConnected() {
|
var lastError error
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
tools, err := client.ListTools(ctx)
|
// 使用较短的超时时间进行快速检查(3秒),避免阻塞
|
||||||
|
quickCtx, quickCancel := context.WithTimeout(ctx, 3*time.Second)
|
||||||
|
defer quickCancel()
|
||||||
|
|
||||||
|
for name, client := range clients {
|
||||||
|
tools, err := m.getToolsForClient(name, client, quickCtx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
m.logger.Warn("获取外部MCP工具列表失败",
|
// 记录错误,但继续处理其他客户端
|
||||||
zap.String("name", name),
|
hasError = true
|
||||||
zap.Error(err),
|
if lastError == nil {
|
||||||
)
|
lastError = err
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -283,9 +307,97 @@ func (m *ExternalMCPManager) GetAllTools(ctx context.Context) ([]Tool, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 如果有错误但至少返回了一些工具,不返回错误(部分成功)
|
||||||
|
if hasError && len(allTools) == 0 {
|
||||||
|
return nil, fmt.Errorf("获取外部MCP工具失败: %w", lastError)
|
||||||
|
}
|
||||||
|
|
||||||
return allTools, nil
|
return allTools, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// getToolsForClient 获取指定客户端的工具列表
|
||||||
|
// 返回工具列表和错误(如果完全无法获取)
|
||||||
|
func (m *ExternalMCPManager) getToolsForClient(name string, client ExternalMCPClient, ctx context.Context) ([]Tool, error) {
|
||||||
|
status := client.GetStatus()
|
||||||
|
|
||||||
|
// error 状态:不使用缓存,直接返回错误
|
||||||
|
if status == "error" {
|
||||||
|
m.logger.Debug("跳过连接失败的外部MCP(不使用缓存)",
|
||||||
|
zap.String("name", name),
|
||||||
|
zap.String("status", status),
|
||||||
|
)
|
||||||
|
return nil, fmt.Errorf("外部MCP连接失败: %s", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 已连接:尝试获取最新工具列表
|
||||||
|
if client.IsConnected() {
|
||||||
|
tools, err := client.ListTools(ctx)
|
||||||
|
if err != nil {
|
||||||
|
// 获取失败,尝试使用缓存
|
||||||
|
return m.getCachedTools(name, "连接正常但获取失败", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取成功,更新缓存
|
||||||
|
m.updateToolCache(name, tools)
|
||||||
|
return tools, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// 未连接:根据状态决定是否使用缓存
|
||||||
|
if status == "disconnected" || status == "connecting" {
|
||||||
|
return m.getCachedTools(name, fmt.Sprintf("客户端临时断开(状态: %s)", status), nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 其他未知状态,不使用缓存
|
||||||
|
m.logger.Debug("跳过外部MCP(未知状态)",
|
||||||
|
zap.String("name", name),
|
||||||
|
zap.String("status", status),
|
||||||
|
)
|
||||||
|
return nil, fmt.Errorf("外部MCP状态未知: %s (状态: %s)", name, status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// getCachedTools 获取缓存的工具列表
|
||||||
|
func (m *ExternalMCPManager) getCachedTools(name, reason string, originalErr error) ([]Tool, error) {
|
||||||
|
m.toolCacheMu.RLock()
|
||||||
|
cachedTools, hasCache := m.toolCache[name]
|
||||||
|
m.toolCacheMu.RUnlock()
|
||||||
|
|
||||||
|
if hasCache && len(cachedTools) > 0 {
|
||||||
|
m.logger.Debug("使用缓存的工具列表",
|
||||||
|
zap.String("name", name),
|
||||||
|
zap.String("reason", reason),
|
||||||
|
zap.Int("count", len(cachedTools)),
|
||||||
|
zap.Error(originalErr),
|
||||||
|
)
|
||||||
|
return cachedTools, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// 无缓存,返回错误
|
||||||
|
if originalErr != nil {
|
||||||
|
return nil, fmt.Errorf("获取外部MCP工具失败且无缓存: %w", originalErr)
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("外部MCP无缓存工具: %s", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// updateToolCache 更新工具列表缓存
|
||||||
|
func (m *ExternalMCPManager) updateToolCache(name string, tools []Tool) {
|
||||||
|
m.toolCacheMu.Lock()
|
||||||
|
m.toolCache[name] = tools
|
||||||
|
m.toolCacheMu.Unlock()
|
||||||
|
|
||||||
|
// 如果返回空列表,记录警告
|
||||||
|
if len(tools) == 0 {
|
||||||
|
m.logger.Warn("外部MCP返回空工具列表",
|
||||||
|
zap.String("name", name),
|
||||||
|
zap.String("hint", "服务可能暂时不可用,工具列表为空"),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
m.logger.Debug("工具列表缓存已更新",
|
||||||
|
zap.String("name", name),
|
||||||
|
zap.Int("count", len(tools)),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// CallTool 调用外部MCP工具(返回执行ID)
|
// CallTool 调用外部MCP工具(返回执行ID)
|
||||||
func (m *ExternalMCPManager) CallTool(ctx context.Context, toolName string, args map[string]interface{}) (*ToolResult, string, error) {
|
func (m *ExternalMCPManager) CallTool(ctx context.Context, toolName string, args map[string]interface{}) (*ToolResult, string, error) {
|
||||||
// 解析工具名称:name::toolName
|
// 解析工具名称:name::toolName
|
||||||
@@ -302,8 +414,18 @@ func (m *ExternalMCPManager) CallTool(ctx context.Context, toolName string, args
|
|||||||
return nil, "", fmt.Errorf("外部MCP客户端不存在: %s", mcpName)
|
return nil, "", fmt.Errorf("外部MCP客户端不存在: %s", mcpName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 检查连接状态,如果未连接或状态为error,不允许调用
|
||||||
if !client.IsConnected() {
|
if !client.IsConnected() {
|
||||||
return nil, "", fmt.Errorf("外部MCP客户端未连接: %s", mcpName)
|
status := client.GetStatus()
|
||||||
|
if status == "error" {
|
||||||
|
// 获取错误信息(如果有)
|
||||||
|
errorMsg := m.GetError(mcpName)
|
||||||
|
if errorMsg != "" {
|
||||||
|
return nil, "", fmt.Errorf("外部MCP连接失败: %s (错误: %s)", mcpName, errorMsg)
|
||||||
|
}
|
||||||
|
return nil, "", fmt.Errorf("外部MCP连接失败: %s", mcpName)
|
||||||
|
}
|
||||||
|
return nil, "", fmt.Errorf("外部MCP客户端未连接: %s (状态: %s)", mcpName, status)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 创建执行记录
|
// 创建执行记录
|
||||||
@@ -630,11 +752,20 @@ func (m *ExternalMCPManager) refreshToolCounts() {
|
|||||||
cancel()
|
cancel()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
m.logger.Debug("获取外部MCP工具数量失败",
|
errStr := err.Error()
|
||||||
zap.String("name", n),
|
// SSE 连接 EOF:远端可能关闭了流或未按规范在流上推送响应,仅首次用 Warn 提示
|
||||||
zap.Error(err),
|
if strings.Contains(errStr, "EOF") || strings.Contains(errStr, "client is closing") {
|
||||||
)
|
m.logger.Warn("获取外部MCP工具数量失败(SSE 流已关闭或服务端未在流上返回 tools/list 响应)",
|
||||||
// 如果获取失败,保留旧值(在更新时处理)
|
zap.String("name", n),
|
||||||
|
zap.String("hint", "若为 SSE 连接,请确认服务端保持 GET 流打开并按 MCP 规范以 event: message 推送 JSON-RPC 响应"),
|
||||||
|
zap.Error(err),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
m.logger.Warn("获取外部MCP工具数量失败,请检查连接或服务端 tools/list",
|
||||||
|
zap.String("name", n),
|
||||||
|
zap.Error(err),
|
||||||
|
)
|
||||||
|
}
|
||||||
resultChan <- countResult{name: n, count: -1} // -1 表示使用旧值
|
resultChan <- countResult{name: n, count: -1} // -1 表示使用旧值
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -680,6 +811,40 @@ func (m *ExternalMCPManager) refreshToolCounts() {
|
|||||||
m.toolCountsMu.Unlock()
|
m.toolCountsMu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// refreshToolCache 刷新指定MCP的工具列表缓存
|
||||||
|
func (m *ExternalMCPManager) refreshToolCache(name string, client ExternalMCPClient) {
|
||||||
|
if !client.IsConnected() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查状态,如果是error状态,不更新缓存
|
||||||
|
status := client.GetStatus()
|
||||||
|
if status == "error" {
|
||||||
|
m.logger.Debug("跳过刷新工具列表缓存(连接失败)",
|
||||||
|
zap.String("name", name),
|
||||||
|
zap.String("status", status),
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用较短的超时时间(5秒)
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
tools, err := client.ListTools(ctx)
|
||||||
|
if err != nil {
|
||||||
|
m.logger.Debug("刷新工具列表缓存失败",
|
||||||
|
zap.String("name", name),
|
||||||
|
zap.Error(err),
|
||||||
|
)
|
||||||
|
// 刷新失败时不更新缓存,保留旧缓存(如果有)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用统一的缓存更新方法
|
||||||
|
m.updateToolCache(name, tools)
|
||||||
|
}
|
||||||
|
|
||||||
// startToolCountRefresh 启动后台刷新工具数量的goroutine
|
// startToolCountRefresh 启动后台刷新工具数量的goroutine
|
||||||
func (m *ExternalMCPManager) startToolCountRefresh() {
|
func (m *ExternalMCPManager) startToolCountRefresh() {
|
||||||
m.refreshWg.Add(1)
|
m.refreshWg.Add(1)
|
||||||
@@ -707,21 +872,13 @@ func (m *ExternalMCPManager) triggerToolCountRefresh() {
|
|||||||
go m.refreshToolCounts()
|
go m.refreshToolCounts()
|
||||||
}
|
}
|
||||||
|
|
||||||
// createClient 创建客户端(不连接)
|
// createClient 创建客户端(不连接)。统一使用官方 MCP Go SDK 的 lazy 客户端,连接在 Initialize 时完成。
|
||||||
func (m *ExternalMCPManager) createClient(serverCfg config.ExternalMCPServerConfig) ExternalMCPClient {
|
func (m *ExternalMCPManager) createClient(serverCfg config.ExternalMCPServerConfig) ExternalMCPClient {
|
||||||
timeout := time.Duration(serverCfg.Timeout) * time.Second
|
|
||||||
if timeout <= 0 {
|
|
||||||
timeout = 30 * time.Second
|
|
||||||
}
|
|
||||||
|
|
||||||
// 根据传输模式创建客户端
|
|
||||||
transport := serverCfg.Transport
|
transport := serverCfg.Transport
|
||||||
if transport == "" {
|
if transport == "" {
|
||||||
// 如果没有指定transport,根据是否有command或url判断
|
|
||||||
if serverCfg.Command != "" {
|
if serverCfg.Command != "" {
|
||||||
transport = "stdio"
|
transport = "stdio"
|
||||||
} else if serverCfg.URL != "" {
|
} else if serverCfg.URL != "" {
|
||||||
// 默认使用http,但可以通过transport字段指定sse
|
|
||||||
transport = "http"
|
transport = "http"
|
||||||
} else {
|
} else {
|
||||||
return nil
|
return nil
|
||||||
@@ -733,17 +890,23 @@ func (m *ExternalMCPManager) createClient(serverCfg config.ExternalMCPServerConf
|
|||||||
if serverCfg.URL == "" {
|
if serverCfg.URL == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return NewHTTPMCPClient(serverCfg.URL, timeout, m.logger)
|
return newLazySDKClient(serverCfg, m.logger)
|
||||||
|
case "simple_http":
|
||||||
|
// 简单 HTTP(一次 POST 一次响应),用于自建 MCP 等
|
||||||
|
if serverCfg.URL == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return newLazySDKClient(serverCfg, m.logger)
|
||||||
case "stdio":
|
case "stdio":
|
||||||
if serverCfg.Command == "" {
|
if serverCfg.Command == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return NewStdioMCPClient(serverCfg.Command, serverCfg.Args, serverCfg.Env, timeout, m.logger)
|
return newLazySDKClient(serverCfg, m.logger)
|
||||||
case "sse":
|
case "sse":
|
||||||
if serverCfg.URL == "" {
|
if serverCfg.URL == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return NewSSEMCPClient(serverCfg.URL, timeout, m.logger)
|
return newLazySDKClient(serverCfg, m.logger)
|
||||||
default:
|
default:
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -773,12 +936,7 @@ func (m *ExternalMCPManager) doConnect(name string, serverCfg config.ExternalMCP
|
|||||||
|
|
||||||
// setClientStatus 设置客户端状态(通过类型断言)
|
// setClientStatus 设置客户端状态(通过类型断言)
|
||||||
func (m *ExternalMCPManager) setClientStatus(client ExternalMCPClient, status string) {
|
func (m *ExternalMCPManager) setClientStatus(client ExternalMCPClient, status string) {
|
||||||
switch c := client.(type) {
|
if c, ok := client.(*lazySDKClient); ok {
|
||||||
case *HTTPMCPClient:
|
|
||||||
c.setStatus(status)
|
|
||||||
case *StdioMCPClient:
|
|
||||||
c.setStatus(status)
|
|
||||||
case *SSEMCPClient:
|
|
||||||
c.setStatus(status)
|
c.setStatus(status)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -819,8 +977,13 @@ func (m *ExternalMCPManager) connectClient(name string, serverCfg config.Externa
|
|||||||
zap.String("name", name),
|
zap.String("name", name),
|
||||||
)
|
)
|
||||||
|
|
||||||
// 连接成功,触发工具数量刷新
|
// 连接成功,触发工具数量刷新和工具列表缓存刷新
|
||||||
m.triggerToolCountRefresh()
|
m.triggerToolCountRefresh()
|
||||||
|
m.mu.RLock()
|
||||||
|
if client, exists := m.clients[name]; exists {
|
||||||
|
m.refreshToolCache(name, client)
|
||||||
|
}
|
||||||
|
m.mu.RUnlock()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -926,6 +1089,11 @@ func (m *ExternalMCPManager) StopAll() {
|
|||||||
m.toolCounts = make(map[string]int)
|
m.toolCounts = make(map[string]int)
|
||||||
m.toolCountsMu.Unlock()
|
m.toolCountsMu.Unlock()
|
||||||
|
|
||||||
|
// 清理所有工具列表缓存
|
||||||
|
m.toolCacheMu.Lock()
|
||||||
|
m.toolCache = make(map[string][]Tool)
|
||||||
|
m.toolCacheMu.Unlock()
|
||||||
|
|
||||||
// 停止后台刷新(使用 select 避免重复关闭 channel)
|
// 停止后台刷新(使用 select 避免重复关闭 channel)
|
||||||
select {
|
select {
|
||||||
case <-m.stopRefresh:
|
case <-m.stopRefresh:
|
||||||
|
|||||||
@@ -151,48 +151,26 @@ func TestExternalMCPManager_LoadConfigs(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestHTTPMCPClient_Initialize(t *testing.T) {
|
// TestLazySDKClient_InitializeFails 验证无效配置时 SDK 客户端 Initialize 失败并设置 error 状态
|
||||||
// 注意:这个测试需要一个真实的HTTP MCP服务器
|
func TestLazySDKClient_InitializeFails(t *testing.T) {
|
||||||
// 如果没有服务器,这个测试会失败
|
|
||||||
// 在实际测试中,可以使用mock服务器
|
|
||||||
logger := zap.NewNop()
|
logger := zap.NewNop()
|
||||||
client := NewHTTPMCPClient("http://127.0.0.1:8081/mcp", 5*time.Second, logger)
|
// 使用不存在的 HTTP 地址,Initialize 应失败
|
||||||
|
cfg := config.ExternalMCPServerConfig{
|
||||||
|
Transport: "http",
|
||||||
|
URL: "http://127.0.0.1:19999/nonexistent",
|
||||||
|
Timeout: 2,
|
||||||
|
}
|
||||||
|
c := newLazySDKClient(cfg, logger)
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
err := c.Initialize(ctx)
|
||||||
// 这个测试可能会失败,如果没有真实的服务器
|
if err == nil {
|
||||||
// 在实际环境中,应该使用mock服务器
|
t.Fatal("expected error when connecting to invalid server")
|
||||||
err := client.Initialize(ctx)
|
|
||||||
if err != nil {
|
|
||||||
t.Logf("初始化失败(可能是没有服务器): %v", err)
|
|
||||||
}
|
}
|
||||||
|
if c.GetStatus() != "error" {
|
||||||
status := client.GetStatus()
|
t.Errorf("expected status error, got %s", c.GetStatus())
|
||||||
if status == "" {
|
|
||||||
t.Error("状态不应该为空")
|
|
||||||
}
|
}
|
||||||
|
c.Close()
|
||||||
client.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStdioMCPClient_Initialize(t *testing.T) {
|
|
||||||
// 注意:这个测试需要一个真实的stdio MCP服务器
|
|
||||||
// 如果没有服务器,这个测试会失败
|
|
||||||
logger := zap.NewNop()
|
|
||||||
client := NewStdioMCPClient("echo", []string{"test"}, nil, 5*time.Second, logger)
|
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
// 这个测试可能会失败,因为echo不是MCP服务器
|
|
||||||
// 在实际环境中,应该使用真实的MCP服务器或mock
|
|
||||||
err := client.Initialize(ctx)
|
|
||||||
if err != nil {
|
|
||||||
t.Logf("初始化失败(echo不是MCP服务器): %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
client.Close()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestExternalMCPManager_StartStopClient(t *testing.T) {
|
func TestExternalMCPManager_StartStopClient(t *testing.T) {
|
||||||
|
|||||||
+76
-10
@@ -1,6 +1,7 @@
|
|||||||
package mcp
|
package mcp
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bufio"
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -125,6 +126,13 @@ func (s *Server) HandleHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 官方 MCP SSE 规范:带 sessionid 的 POST 表示消息发往该 SSE 会话,响应通过 SSE 流返回
|
||||||
|
if sessionID := r.URL.Query().Get("sessionid"); sessionID != "" {
|
||||||
|
s.serveSSESessionMessage(w, r, sessionID)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 简单 POST:请求体为 JSON-RPC,响应在 body 中返回
|
||||||
body, err := io.ReadAll(r.Body)
|
body, err := io.ReadAll(r.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.sendError(w, nil, -32700, "Parse error", err.Error())
|
s.sendError(w, nil, -32700, "Parse error", err.Error())
|
||||||
@@ -137,14 +145,56 @@ func (s *Server) HandleHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理消息
|
|
||||||
response := s.handleMessage(&msg)
|
response := s.handleMessage(&msg)
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
json.NewEncoder(w).Encode(response)
|
json.NewEncoder(w).Encode(response)
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleSSE 处理SSE连接(用于MCP HTTP传输的事件通道)
|
// serveSSESessionMessage 处理发往 SSE 会话的 POST:读取 JSON-RPC 请求,处理后将响应通过该会话的 SSE 流推送
|
||||||
|
func (s *Server) serveSSESessionMessage(w http.ResponseWriter, r *http.Request, sessionID string) {
|
||||||
|
s.mu.RLock()
|
||||||
|
client, exists := s.sseClients[sessionID]
|
||||||
|
s.mu.RUnlock()
|
||||||
|
if !exists || client == nil {
|
||||||
|
http.Error(w, "session not found", http.StatusNotFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := io.ReadAll(r.Body)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "failed to read body", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var msg Message
|
||||||
|
if err := json.Unmarshal(body, &msg); err != nil {
|
||||||
|
http.Error(w, "failed to parse body", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
response := s.handleMessage(&msg)
|
||||||
|
if response == nil {
|
||||||
|
w.WriteHeader(http.StatusAccepted)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
respBytes, err := json.Marshal(response)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "failed to encode response", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case client.send <- respBytes:
|
||||||
|
w.WriteHeader(http.StatusAccepted)
|
||||||
|
default:
|
||||||
|
http.Error(w, "session send buffer full", http.StatusServiceUnavailable)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleSSE 处理 SSE 连接,兼容官方 MCP 2024-11-05 SSE 规范:
|
||||||
|
// 1. 首个事件必须为 event: endpoint,data 为客户端 POST 消息的 URL(含 sessionid)
|
||||||
|
// 2. 后续事件为 event: message,data 为 JSON-RPC 响应
|
||||||
func (s *Server) handleSSE(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleSSE(w http.ResponseWriter, r *http.Request) {
|
||||||
flusher, ok := w.(http.Flusher)
|
flusher, ok := w.(http.Flusher)
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -157,16 +207,25 @@ func (s *Server) handleSSE(w http.ResponseWriter, r *http.Request) {
|
|||||||
w.Header().Set("Connection", "keep-alive")
|
w.Header().Set("Connection", "keep-alive")
|
||||||
w.Header().Set("X-Accel-Buffering", "no")
|
w.Header().Set("X-Accel-Buffering", "no")
|
||||||
|
|
||||||
|
sessionID := uuid.New().String()
|
||||||
client := &sseClient{
|
client := &sseClient{
|
||||||
id: uuid.New().String(),
|
id: sessionID,
|
||||||
send: make(chan []byte, 8),
|
send: make(chan []byte, 32),
|
||||||
}
|
}
|
||||||
|
|
||||||
s.addSSEClient(client)
|
s.addSSEClient(client)
|
||||||
defer s.removeSSEClient(client.id)
|
defer s.removeSSEClient(client.id)
|
||||||
|
|
||||||
// 发送初始ready事件,告知客户端连接成功
|
// 官方规范:首个事件为 endpoint,data 为消息端点 URL(客户端将向该 URL POST 请求)
|
||||||
fmt.Fprintf(w, "event: message\ndata: {\"type\":\"ready\",\"status\":\"ok\"}\n\n")
|
scheme := "http"
|
||||||
|
if r.TLS != nil {
|
||||||
|
scheme = "https"
|
||||||
|
}
|
||||||
|
if r.URL.Scheme != "" {
|
||||||
|
scheme = r.URL.Scheme
|
||||||
|
}
|
||||||
|
endpointURL := fmt.Sprintf("%s://%s%s?sessionid=%s", scheme, r.Host, r.URL.Path, sessionID)
|
||||||
|
fmt.Fprintf(w, "event: endpoint\ndata: %s\n\n", endpointURL)
|
||||||
flusher.Flush()
|
flusher.Flush()
|
||||||
|
|
||||||
ticker := time.NewTicker(15 * time.Second)
|
ticker := time.NewTicker(15 * time.Second)
|
||||||
@@ -183,7 +242,6 @@ func (s *Server) handleSSE(w http.ResponseWriter, r *http.Request) {
|
|||||||
fmt.Fprintf(w, "event: message\ndata: %s\n\n", msg)
|
fmt.Fprintf(w, "event: message\ndata: %s\n\n", msg)
|
||||||
flusher.Flush()
|
flusher.Flush()
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
// 心跳保持连接
|
|
||||||
fmt.Fprintf(w, ": ping\n\n")
|
fmt.Fprintf(w, ": ping\n\n")
|
||||||
flusher.Flush()
|
flusher.Flush()
|
||||||
}
|
}
|
||||||
@@ -311,6 +369,7 @@ func (s *Server) handleListTools(msg *Message) *Message {
|
|||||||
tools = append(tools, tool)
|
tools = append(tools, tool)
|
||||||
}
|
}
|
||||||
s.mu.RUnlock()
|
s.mu.RUnlock()
|
||||||
|
s.logger.Debug("tools/list 请求", zap.Int("返回工具数", len(tools)))
|
||||||
|
|
||||||
response := ListToolsResponse{Tools: tools}
|
response := ListToolsResponse{Tools: tools}
|
||||||
result, _ := json.Marshal(response)
|
result, _ := json.Marshal(response)
|
||||||
@@ -1110,10 +1169,11 @@ func (s *Server) RegisterResource(resource *Resource) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// HandleStdio 处理标准输入输出(用于 stdio 传输模式)
|
// HandleStdio 处理标准输入输出(用于 stdio 传输模式)
|
||||||
// MCP 协议使用换行分隔的 JSON-RPC 消息
|
// MCP 协议使用换行分隔的 JSON-RPC 消息;管道下需每次写入后 Flush,否则客户端会读不到响应
|
||||||
func (s *Server) HandleStdio() error {
|
func (s *Server) HandleStdio() error {
|
||||||
decoder := json.NewDecoder(os.Stdin)
|
decoder := json.NewDecoder(os.Stdin)
|
||||||
encoder := json.NewEncoder(os.Stdout)
|
stdout := bufio.NewWriter(os.Stdout)
|
||||||
|
encoder := json.NewEncoder(stdout)
|
||||||
// 注意:不设置缩进,MCP 协议期望紧凑的 JSON 格式
|
// 注意:不设置缩进,MCP 协议期望紧凑的 JSON 格式
|
||||||
|
|
||||||
for {
|
for {
|
||||||
@@ -1134,6 +1194,9 @@ func (s *Server) HandleStdio() error {
|
|||||||
if err := encoder.Encode(errorMsg); err != nil {
|
if err := encoder.Encode(errorMsg); err != nil {
|
||||||
return fmt.Errorf("发送错误响应失败: %w", err)
|
return fmt.Errorf("发送错误响应失败: %w", err)
|
||||||
}
|
}
|
||||||
|
if err := stdout.Flush(); err != nil {
|
||||||
|
return fmt.Errorf("刷新 stdout 失败: %w", err)
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1149,6 +1212,9 @@ func (s *Server) HandleStdio() error {
|
|||||||
if err := encoder.Encode(response); err != nil {
|
if err := encoder.Encode(response); err != nil {
|
||||||
return fmt.Errorf("发送响应失败: %w", err)
|
return fmt.Errorf("发送响应失败: %w", err)
|
||||||
}
|
}
|
||||||
|
if err := stdout.Flush(); err != nil {
|
||||||
|
return fmt.Errorf("刷新 stdout 失败: %w", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
+44
-34
@@ -1,11 +1,22 @@
|
|||||||
package mcp
|
package mcp
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ExternalMCPClient 外部 MCP 客户端接口(由 client_sdk.go 基于官方 SDK 实现)
|
||||||
|
type ExternalMCPClient interface {
|
||||||
|
Initialize(ctx context.Context) error
|
||||||
|
ListTools(ctx context.Context) ([]Tool, error)
|
||||||
|
CallTool(ctx context.Context, name string, args map[string]interface{}) (*ToolResult, error)
|
||||||
|
Close() error
|
||||||
|
IsConnected() bool
|
||||||
|
GetStatus() string
|
||||||
|
}
|
||||||
|
|
||||||
// MCP消息类型
|
// MCP消息类型
|
||||||
const (
|
const (
|
||||||
MessageTypeRequest = "request"
|
MessageTypeRequest = "request"
|
||||||
@@ -29,21 +40,21 @@ func (m *MessageID) UnmarshalJSON(data []byte) error {
|
|||||||
m.value = nil
|
m.value = nil
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 尝试解析为字符串
|
// 尝试解析为字符串
|
||||||
var str string
|
var str string
|
||||||
if err := json.Unmarshal(data, &str); err == nil {
|
if err := json.Unmarshal(data, &str); err == nil {
|
||||||
m.value = str
|
m.value = str
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// 尝试解析为数字
|
// 尝试解析为数字
|
||||||
var num json.Number
|
var num json.Number
|
||||||
if err := json.Unmarshal(data, &num); err == nil {
|
if err := json.Unmarshal(data, &num); err == nil {
|
||||||
m.value = num
|
m.value = num
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Errorf("invalid id type")
|
return fmt.Errorf("invalid id type")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,15 +92,15 @@ type Message struct {
|
|||||||
|
|
||||||
// Error 表示MCP错误
|
// Error 表示MCP错误
|
||||||
type Error struct {
|
type Error struct {
|
||||||
Code int `json:"code"`
|
Code int `json:"code"`
|
||||||
Message string `json:"message"`
|
Message string `json:"message"`
|
||||||
Data interface{} `json:"data,omitempty"`
|
Data interface{} `json:"data,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tool 表示MCP工具定义
|
// Tool 表示MCP工具定义
|
||||||
type Tool struct {
|
type Tool struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Description string `json:"description"` // 详细描述
|
Description string `json:"description"` // 详细描述
|
||||||
ShortDescription string `json:"shortDescription,omitempty"` // 简短描述(用于工具列表,减少token消耗)
|
ShortDescription string `json:"shortDescription,omitempty"` // 简短描述(用于工具列表,减少token消耗)
|
||||||
InputSchema map[string]interface{} `json:"inputSchema"`
|
InputSchema map[string]interface{} `json:"inputSchema"`
|
||||||
}
|
}
|
||||||
@@ -127,9 +138,9 @@ type ClientInfo struct {
|
|||||||
|
|
||||||
// InitializeResponse 初始化响应
|
// InitializeResponse 初始化响应
|
||||||
type InitializeResponse struct {
|
type InitializeResponse struct {
|
||||||
ProtocolVersion string `json:"protocolVersion"`
|
ProtocolVersion string `json:"protocolVersion"`
|
||||||
Capabilities ServerCapabilities `json:"capabilities"`
|
Capabilities ServerCapabilities `json:"capabilities"`
|
||||||
ServerInfo ServerInfo `json:"serverInfo"`
|
ServerInfo ServerInfo `json:"serverInfo"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ServerCapabilities 服务器能力
|
// ServerCapabilities 服务器能力
|
||||||
@@ -178,31 +189,31 @@ type CallToolResponse struct {
|
|||||||
|
|
||||||
// ToolExecution 工具执行记录
|
// ToolExecution 工具执行记录
|
||||||
type ToolExecution struct {
|
type ToolExecution struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
ToolName string `json:"toolName"`
|
ToolName string `json:"toolName"`
|
||||||
Arguments map[string]interface{} `json:"arguments"`
|
Arguments map[string]interface{} `json:"arguments"`
|
||||||
Status string `json:"status"` // pending, running, completed, failed
|
Status string `json:"status"` // pending, running, completed, failed
|
||||||
Result *ToolResult `json:"result,omitempty"`
|
Result *ToolResult `json:"result,omitempty"`
|
||||||
Error string `json:"error,omitempty"`
|
Error string `json:"error,omitempty"`
|
||||||
StartTime time.Time `json:"startTime"`
|
StartTime time.Time `json:"startTime"`
|
||||||
EndTime *time.Time `json:"endTime,omitempty"`
|
EndTime *time.Time `json:"endTime,omitempty"`
|
||||||
Duration time.Duration `json:"duration,omitempty"`
|
Duration time.Duration `json:"duration,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ToolStats 工具统计信息
|
// ToolStats 工具统计信息
|
||||||
type ToolStats struct {
|
type ToolStats struct {
|
||||||
ToolName string `json:"toolName"`
|
ToolName string `json:"toolName"`
|
||||||
TotalCalls int `json:"totalCalls"`
|
TotalCalls int `json:"totalCalls"`
|
||||||
SuccessCalls int `json:"successCalls"`
|
SuccessCalls int `json:"successCalls"`
|
||||||
FailedCalls int `json:"failedCalls"`
|
FailedCalls int `json:"failedCalls"`
|
||||||
LastCallTime *time.Time `json:"lastCallTime,omitempty"`
|
LastCallTime *time.Time `json:"lastCallTime,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prompt 提示词模板
|
// Prompt 提示词模板
|
||||||
type Prompt struct {
|
type Prompt struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Description string `json:"description,omitempty"`
|
Description string `json:"description,omitempty"`
|
||||||
Arguments []PromptArgument `json:"arguments,omitempty"`
|
Arguments []PromptArgument `json:"arguments,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// PromptArgument 提示词参数
|
// PromptArgument 提示词参数
|
||||||
@@ -257,11 +268,11 @@ type ResourceContent struct {
|
|||||||
|
|
||||||
// SamplingRequest 采样请求
|
// SamplingRequest 采样请求
|
||||||
type SamplingRequest struct {
|
type SamplingRequest struct {
|
||||||
Messages []SamplingMessage `json:"messages"`
|
Messages []SamplingMessage `json:"messages"`
|
||||||
Model string `json:"model,omitempty"`
|
Model string `json:"model,omitempty"`
|
||||||
MaxTokens int `json:"maxTokens,omitempty"`
|
MaxTokens int `json:"maxTokens,omitempty"`
|
||||||
Temperature float64 `json:"temperature,omitempty"`
|
Temperature float64 `json:"temperature,omitempty"`
|
||||||
TopP float64 `json:"topP,omitempty"`
|
TopP float64 `json:"topP,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SamplingMessage 采样消息
|
// SamplingMessage 采样消息
|
||||||
@@ -272,9 +283,9 @@ type SamplingMessage struct {
|
|||||||
|
|
||||||
// SamplingResponse 采样响应
|
// SamplingResponse 采样响应
|
||||||
type SamplingResponse struct {
|
type SamplingResponse struct {
|
||||||
Content []SamplingContent `json:"content"`
|
Content []SamplingContent `json:"content"`
|
||||||
Model string `json:"model,omitempty"`
|
Model string `json:"model,omitempty"`
|
||||||
StopReason string `json:"stopReason,omitempty"`
|
StopReason string `json:"stopReason,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SamplingContent 采样内容
|
// SamplingContent 采样内容
|
||||||
@@ -282,4 +293,3 @@ type SamplingContent struct {
|
|||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
Text string `json:"text,omitempty"`
|
Text string `json:"text,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
package robot
|
||||||
|
|
||||||
|
// MessageHandler 供飞书/钉钉长连接调用的消息处理接口(由 handler.RobotHandler 实现)
|
||||||
|
type MessageHandler interface {
|
||||||
|
HandleMessage(platform, userID, text string) string
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
package robot
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"cyberstrike-ai/internal/config"
|
||||||
|
|
||||||
|
"github.com/open-dingtalk/dingtalk-stream-sdk-go/chatbot"
|
||||||
|
"github.com/open-dingtalk/dingtalk-stream-sdk-go/client"
|
||||||
|
dingutils "github.com/open-dingtalk/dingtalk-stream-sdk-go/utils"
|
||||||
|
"go.uber.org/zap"
|
||||||
|
)
|
||||||
|
|
||||||
|
// StartDing 启动钉钉 Stream 长连接(无需公网),收到消息后调用 handler 并通过 SessionWebhook 回复。
|
||||||
|
// ctx 被取消时长连接会退出,便于配置变更时重启。
|
||||||
|
func StartDing(ctx context.Context, cfg config.RobotDingtalkConfig, h MessageHandler, logger *zap.Logger) {
|
||||||
|
if !cfg.Enabled || cfg.ClientID == "" || cfg.ClientSecret == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
streamClient := client.NewStreamClient(
|
||||||
|
client.WithAppCredential(client.NewAppCredentialConfig(cfg.ClientID, cfg.ClientSecret)),
|
||||||
|
client.WithSubscription(dingutils.SubscriptionTypeKCallback, "/v1.0/im/bot/messages/get",
|
||||||
|
chatbot.NewDefaultChatBotFrameHandler(func(ctx context.Context, msg *chatbot.BotCallbackDataModel) ([]byte, error) {
|
||||||
|
go handleDingMessage(ctx, msg, h, logger)
|
||||||
|
return nil, nil
|
||||||
|
}).OnEventReceived),
|
||||||
|
)
|
||||||
|
logger.Info("钉钉 Stream 正在连接…", zap.String("client_id", cfg.ClientID))
|
||||||
|
go func() {
|
||||||
|
err := streamClient.Start(ctx)
|
||||||
|
if err != nil && ctx.Err() == nil {
|
||||||
|
logger.Error("钉钉 Stream 长连接退出", zap.Error(err))
|
||||||
|
} else if ctx.Err() != nil {
|
||||||
|
logger.Info("钉钉 Stream 已按配置重启关闭")
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
logger.Info("钉钉 Stream 已启动(无需公网),等待收消息", zap.String("client_id", cfg.ClientID))
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleDingMessage(ctx context.Context, msg *chatbot.BotCallbackDataModel, h MessageHandler, logger *zap.Logger) {
|
||||||
|
if msg == nil || msg.SessionWebhook == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
content := ""
|
||||||
|
if msg.Text.Content != "" {
|
||||||
|
content = strings.TrimSpace(msg.Text.Content)
|
||||||
|
}
|
||||||
|
if content == "" && msg.Msgtype == "richText" {
|
||||||
|
if cMap, ok := msg.Content.(map[string]interface{}); ok {
|
||||||
|
if rich, ok := cMap["richText"].([]interface{}); ok {
|
||||||
|
for _, c := range rich {
|
||||||
|
if m, ok := c.(map[string]interface{}); ok {
|
||||||
|
if txt, ok := m["text"].(string); ok {
|
||||||
|
content = strings.TrimSpace(txt)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if content == "" {
|
||||||
|
logger.Debug("钉钉消息内容为空,已忽略", zap.String("msgtype", msg.Msgtype))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
logger.Info("钉钉收到消息", zap.String("sender", msg.SenderId), zap.String("content", content))
|
||||||
|
userID := msg.SenderId
|
||||||
|
if userID == "" {
|
||||||
|
userID = msg.ConversationId
|
||||||
|
}
|
||||||
|
reply := h.HandleMessage("dingtalk", userID, content)
|
||||||
|
body := map[string]interface{}{
|
||||||
|
"msgtype": "text",
|
||||||
|
"text": map[string]string{"content": reply},
|
||||||
|
}
|
||||||
|
bodyBytes, _ := json.Marshal(body)
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, msg.SessionWebhook, bytes.NewReader(bodyBytes))
|
||||||
|
if err != nil {
|
||||||
|
logger.Warn("钉钉构造回复请求失败", zap.Error(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
resp, err := http.DefaultClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
logger.Warn("钉钉回复请求失败", zap.Error(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
logger.Warn("钉钉回复非 200", zap.Int("status", resp.StatusCode))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
logger.Debug("钉钉回复成功", zap.String("content_preview", reply))
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package robot
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"cyberstrike-ai/internal/config"
|
||||||
|
|
||||||
|
larkcore "github.com/larksuite/oapi-sdk-go/v3/core"
|
||||||
|
"github.com/larksuite/oapi-sdk-go/v3/event/dispatcher"
|
||||||
|
larkim "github.com/larksuite/oapi-sdk-go/v3/service/im/v1"
|
||||||
|
lark "github.com/larksuite/oapi-sdk-go/v3"
|
||||||
|
larkws "github.com/larksuite/oapi-sdk-go/v3/ws"
|
||||||
|
"go.uber.org/zap"
|
||||||
|
)
|
||||||
|
|
||||||
|
type larkTextContent struct {
|
||||||
|
Text string `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartLark 启动飞书长连接(无需公网),收到消息后调用 handler 并回复。
|
||||||
|
// ctx 被取消时长连接会退出,便于配置变更时重启。
|
||||||
|
func StartLark(ctx context.Context, cfg config.RobotLarkConfig, h MessageHandler, logger *zap.Logger) {
|
||||||
|
if !cfg.Enabled || cfg.AppID == "" || cfg.AppSecret == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
larkClient := lark.NewClient(cfg.AppID, cfg.AppSecret)
|
||||||
|
eventHandler := dispatcher.NewEventDispatcher("", "").OnP2MessageReceiveV1(func(ctx context.Context, event *larkim.P2MessageReceiveV1) error {
|
||||||
|
go handleLarkMessage(ctx, event, h, larkClient, logger)
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
wsClient := larkws.NewClient(cfg.AppID, cfg.AppSecret,
|
||||||
|
larkws.WithEventHandler(eventHandler),
|
||||||
|
larkws.WithLogLevel(larkcore.LogLevelInfo),
|
||||||
|
)
|
||||||
|
go func() {
|
||||||
|
err := wsClient.Start(ctx)
|
||||||
|
if err != nil && ctx.Err() == nil {
|
||||||
|
logger.Error("飞书长连接退出", zap.Error(err))
|
||||||
|
} else if ctx.Err() != nil {
|
||||||
|
logger.Info("飞书长连接已按配置重启关闭")
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
logger.Info("飞书长连接已启动(无需公网)", zap.String("app_id", cfg.AppID))
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleLarkMessage(ctx context.Context, event *larkim.P2MessageReceiveV1, h MessageHandler, client *lark.Client, logger *zap.Logger) {
|
||||||
|
if event == nil || event.Event == nil || event.Event.Message == nil || event.Event.Sender == nil || event.Event.Sender.SenderId == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
msg := event.Event.Message
|
||||||
|
msgType := larkcore.StringValue(msg.MessageType)
|
||||||
|
if msgType != larkim.MsgTypeText {
|
||||||
|
logger.Debug("飞书暂仅处理文本消息", zap.String("msg_type", msgType))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var textBody larkTextContent
|
||||||
|
if err := json.Unmarshal([]byte(larkcore.StringValue(msg.Content)), &textBody); err != nil {
|
||||||
|
logger.Warn("飞书消息 Content 解析失败", zap.Error(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
text := strings.TrimSpace(textBody.Text)
|
||||||
|
if text == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
userID := ""
|
||||||
|
if event.Event.Sender.SenderId.UserId != nil {
|
||||||
|
userID = *event.Event.Sender.SenderId.UserId
|
||||||
|
}
|
||||||
|
messageID := larkcore.StringValue(msg.MessageId)
|
||||||
|
reply := h.HandleMessage("lark", userID, text)
|
||||||
|
contentBytes, _ := json.Marshal(larkTextContent{Text: reply})
|
||||||
|
_, err := client.Im.Message.Reply(ctx, larkim.NewReplyMessageReqBuilder().
|
||||||
|
MessageId(messageID).
|
||||||
|
Body(larkim.NewReplyMessageReqBodyBuilder().
|
||||||
|
MsgType(larkim.MsgTypeText).
|
||||||
|
Content(string(contentBytes)).
|
||||||
|
Build()).
|
||||||
|
Build())
|
||||||
|
if err != nil {
|
||||||
|
logger.Warn("飞书回复失败", zap.String("message_id", messageID), zap.Error(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
logger.Debug("飞书已回复", zap.String("message_id", messageID))
|
||||||
|
}
|
||||||
@@ -224,22 +224,25 @@ func (e *Executor) RegisterTools(mcpServer *mcp.Server) {
|
|||||||
toolName := toolConfig.Name
|
toolName := toolConfig.Name
|
||||||
toolConfigCopy := toolConfig
|
toolConfigCopy := toolConfig
|
||||||
|
|
||||||
// 使用简短描述(如果存在),否则使用详细描述的前100个字符
|
// 根据配置决定暴露给 AI/API 的描述:short_description 或 description
|
||||||
|
useFullDescription := strings.TrimSpace(strings.ToLower(e.config.ToolDescriptionMode)) == "full"
|
||||||
shortDesc := toolConfigCopy.ShortDescription
|
shortDesc := toolConfigCopy.ShortDescription
|
||||||
if shortDesc == "" {
|
if shortDesc == "" {
|
||||||
// 如果没有简短描述,从详细描述中提取第一行或前100个字符
|
// 如果没有简短描述,从详细描述中提取第一行或前10000个字符
|
||||||
desc := toolConfigCopy.Description
|
desc := toolConfigCopy.Description
|
||||||
if len(desc) > 100 {
|
if len(desc) > 10000 {
|
||||||
// 尝试找到第一个换行符
|
if idx := strings.Index(desc, "\n"); idx > 0 && idx < 10000 {
|
||||||
if idx := strings.Index(desc, "\n"); idx > 0 && idx < 100 {
|
|
||||||
shortDesc = strings.TrimSpace(desc[:idx])
|
shortDesc = strings.TrimSpace(desc[:idx])
|
||||||
} else {
|
} else {
|
||||||
shortDesc = desc[:100] + "..."
|
shortDesc = desc[:10000] + "..."
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
shortDesc = desc
|
shortDesc = desc
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if useFullDescription {
|
||||||
|
shortDesc = "" // 使用 description 时清空 ShortDescription,下游会回退到 Description
|
||||||
|
}
|
||||||
|
|
||||||
tool := mcp.Tool{
|
tool := mcp.Tool{
|
||||||
Name: toolConfigCopy.Name,
|
Name: toolConfigCopy.Name,
|
||||||
@@ -303,7 +306,23 @@ func (e *Executor) buildCommandArgs(toolName string, toolConfig *config.ToolConf
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 先处理标志参数(对于大多数命令,标志应该在位置参数之前)
|
// 对于需要子命令的工具(如 gobuster dir),position 0 必须紧跟在命令名后、所有 flag 之前
|
||||||
|
for _, param := range positionalParams {
|
||||||
|
if param.Name == "additional_args" || param.Name == "scan_type" || param.Name == "action" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if param.Position != nil && *param.Position == 0 {
|
||||||
|
value := e.getParamValue(args, param)
|
||||||
|
if value == nil && param.Default != nil {
|
||||||
|
value = param.Default
|
||||||
|
}
|
||||||
|
if value != nil {
|
||||||
|
cmdArgs = append(cmdArgs, e.formatParamValue(param, value))
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 处理标志参数
|
// 处理标志参数
|
||||||
for _, param := range flagParams {
|
for _, param := range flagParams {
|
||||||
// 跳过特殊参数,它们会在后面单独处理
|
// 跳过特殊参数,它们会在后面单独处理
|
||||||
@@ -416,7 +435,11 @@ func (e *Executor) buildCommandArgs(toolName string, toolConfig *config.ToolConf
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 按位置顺序处理参数,确保即使某些位置没有参数或使用默认值,也能正确传递
|
// 按位置顺序处理参数,确保即使某些位置没有参数或使用默认值,也能正确传递
|
||||||
|
// position 0 已在前面插入(子命令优先),此处从 1 开始
|
||||||
for i := 0; i <= maxPosition; i++ {
|
for i := 0; i <= maxPosition; i++ {
|
||||||
|
if i == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
for _, param := range positionalParams {
|
for _, param := range positionalParams {
|
||||||
// 跳过特殊参数,它们会在后面单独处理
|
// 跳过特殊参数,它们会在后面单独处理
|
||||||
// action 参数仅用于工具内部逻辑,不传递给命令
|
// action 参数仅用于工具内部逻辑,不传递给命令
|
||||||
@@ -1190,7 +1213,15 @@ func (e *Executor) buildInputSchema(toolConfig *config.ToolConfig) map[string]in
|
|||||||
required := []string{}
|
required := []string{}
|
||||||
|
|
||||||
for _, param := range toolConfig.Parameters {
|
for _, param := range toolConfig.Parameters {
|
||||||
// 转换类型为OpenAI/JSON Schema标准类型
|
// 跳过 name 为空的参数(避免 YAML 中 name: null 或空导致非法 schema)
|
||||||
|
if strings.TrimSpace(param.Name) == "" {
|
||||||
|
e.logger.Debug("跳过无名称的参数",
|
||||||
|
zap.String("tool", toolConfig.Name),
|
||||||
|
zap.String("type", param.Type),
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// 转换类型为OpenAI/JSON Schema标准类型(空类型默认为 string)
|
||||||
openAIType := e.convertToOpenAIType(param.Type)
|
openAIType := e.convertToOpenAIType(param.Type)
|
||||||
|
|
||||||
prop := map[string]interface{}{
|
prop := map[string]interface{}{
|
||||||
@@ -1232,6 +1263,10 @@ func (e *Executor) buildInputSchema(toolConfig *config.ToolConfig) map[string]in
|
|||||||
|
|
||||||
// convertToOpenAIType 将配置中的类型转换为OpenAI/JSON Schema标准类型
|
// convertToOpenAIType 将配置中的类型转换为OpenAI/JSON Schema标准类型
|
||||||
func (e *Executor) convertToOpenAIType(configType string) string {
|
func (e *Executor) convertToOpenAIType(configType string) string {
|
||||||
|
// 空或 null 类型统一视为 string,避免非法 schema 导致工具调用失败
|
||||||
|
if strings.TrimSpace(configType) == "" {
|
||||||
|
return "string"
|
||||||
|
}
|
||||||
switch configType {
|
switch configType {
|
||||||
case "bool":
|
case "bool":
|
||||||
return "boolean"
|
return "boolean"
|
||||||
|
|||||||
@@ -12,3 +12,6 @@ uro>=1.0.2
|
|||||||
|
|
||||||
bloodhound>=1.6.1
|
bloodhound>=1.6.1
|
||||||
impacket>=0.11.0
|
impacket>=0.11.0
|
||||||
|
|
||||||
|
# MCP (Model Context Protocol) SDK
|
||||||
|
mcp>=1.0.0
|
||||||
|
|||||||
+1
-1
@@ -407,7 +407,7 @@ go run cmd/test-config/main.go
|
|||||||
|
|
||||||
### Q: 参数顺序如何控制?
|
### Q: 参数顺序如何控制?
|
||||||
|
|
||||||
A: 使用 `position` 字段控制位置参数的顺序。标志参数会按照在 `parameters` 列表中的顺序添加。`additional_args` 会追加到命令末尾。
|
A: 使用 `position` 字段控制位置参数的顺序。**位置 0 的参数(如 gobuster 的 `dir` 子命令)会紧跟在命令名后、所有标志参数之前**,以便兼容需要“子命令 + 选项”形式的 CLI。其余标志参数按在 `parameters` 列表中的顺序添加,再按 position 1、2… 添加其余位置参数。`additional_args` 会追加到命令末尾。
|
||||||
|
|
||||||
## 工具配置模板
|
## 工具配置模板
|
||||||
|
|
||||||
|
|||||||
@@ -1,52 +0,0 @@
|
|||||||
name: "list-files"
|
|
||||||
command: "ls"
|
|
||||||
enabled: true
|
|
||||||
short_description: "列出目录文件工具"
|
|
||||||
description: |
|
|
||||||
列出服务器上指定目录中的文件。
|
|
||||||
|
|
||||||
**主要功能:**
|
|
||||||
- 列出文件
|
|
||||||
- 显示详细信息
|
|
||||||
- 递归列出
|
|
||||||
|
|
||||||
**使用场景:**
|
|
||||||
- 目录浏览
|
|
||||||
- 文件查找
|
|
||||||
- 系统检查
|
|
||||||
parameters:
|
|
||||||
- name: "directory"
|
|
||||||
type: "string"
|
|
||||||
description: "要列出的目录(相对于服务器基础目录)"
|
|
||||||
required: false
|
|
||||||
default: "."
|
|
||||||
position: 0
|
|
||||||
format: "positional"
|
|
||||||
- name: "long_format"
|
|
||||||
type: "bool"
|
|
||||||
description: "显示详细信息(长格式)"
|
|
||||||
required: false
|
|
||||||
flag: "-l"
|
|
||||||
format: "flag"
|
|
||||||
default: false
|
|
||||||
- name: "recursive"
|
|
||||||
type: "bool"
|
|
||||||
description: "递归列出"
|
|
||||||
required: false
|
|
||||||
flag: "-R"
|
|
||||||
format: "flag"
|
|
||||||
default: false
|
|
||||||
- name: "additional_args"
|
|
||||||
type: "string"
|
|
||||||
description: |
|
|
||||||
额外的list-files参数。用于传递未在参数列表中定义的list-files选项。
|
|
||||||
|
|
||||||
**示例值:**
|
|
||||||
- 根据工具特性添加常用参数示例
|
|
||||||
|
|
||||||
**注意事项:**
|
|
||||||
- 多个参数用空格分隔
|
|
||||||
- 确保参数格式正确,避免命令注入
|
|
||||||
- 此参数会直接追加到命令末尾
|
|
||||||
required: false
|
|
||||||
format: "positional"
|
|
||||||
+1642
-96
File diff suppressed because it is too large
Load Diff
@@ -519,14 +519,18 @@ function renderTestSection(endpoint) {
|
|||||||
</svg>
|
</svg>
|
||||||
发送请求
|
发送请求
|
||||||
</button>
|
</button>
|
||||||
<button class="api-test-btn secondary" onclick="copyCurlCommand(event, '${method}', '${escapeHtml(path)}')" title="复制curl命令">
|
<button class="api-test-btn copy-curl" onclick="copyCurlCommand(event, '${method}', '${escapeHtml(path)}')" title="复制curl命令">
|
||||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
<rect x="9" y="9" width="13" height="13" rx="2" ry="2" stroke="currentColor" stroke-width="2"/>
|
<rect x="9" y="9" width="13" height="13" rx="2" ry="2" stroke="currentColor" stroke-width="2"/>
|
||||||
<path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1" stroke="currentColor" stroke-width="2"/>
|
<path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1" stroke="currentColor" stroke-width="2"/>
|
||||||
</svg>
|
</svg>
|
||||||
复制curl
|
复制curl
|
||||||
</button>
|
</button>
|
||||||
<button class="api-test-btn secondary" onclick="clearTestResult('${escapeId(path)}-${method}')">
|
<button class="api-test-btn clear-result" onclick="clearTestResult('${escapeId(path)}-${method}')" title="清除测试结果">
|
||||||
|
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<polyline points="3 6 5 6 21 6"/>
|
||||||
|
<path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/>
|
||||||
|
</svg>
|
||||||
清除结果
|
清除结果
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+111
-1
@@ -4994,9 +4994,25 @@ function closeBatchManageModal() {
|
|||||||
function showCreateGroupModal(andMoveConversation = false) {
|
function showCreateGroupModal(andMoveConversation = false) {
|
||||||
const modal = document.getElementById('create-group-modal');
|
const modal = document.getElementById('create-group-modal');
|
||||||
const input = document.getElementById('create-group-name-input');
|
const input = document.getElementById('create-group-name-input');
|
||||||
|
const iconBtn = document.getElementById('create-group-icon-btn');
|
||||||
|
const iconPicker = document.getElementById('group-icon-picker');
|
||||||
|
const customInput = document.getElementById('custom-icon-input');
|
||||||
|
|
||||||
if (input) {
|
if (input) {
|
||||||
input.value = '';
|
input.value = '';
|
||||||
}
|
}
|
||||||
|
// 重置图标为默认值
|
||||||
|
if (iconBtn) {
|
||||||
|
iconBtn.textContent = '📁';
|
||||||
|
}
|
||||||
|
// 清空自定义图标输入框
|
||||||
|
if (customInput) {
|
||||||
|
customInput.value = '';
|
||||||
|
}
|
||||||
|
// 关闭图标选择器
|
||||||
|
if (iconPicker) {
|
||||||
|
iconPicker.style.display = 'none';
|
||||||
|
}
|
||||||
if (modal) {
|
if (modal) {
|
||||||
modal.style.display = 'flex';
|
modal.style.display = 'flex';
|
||||||
modal.dataset.moveConversation = andMoveConversation ? 'true' : 'false';
|
modal.dataset.moveConversation = andMoveConversation ? 'true' : 'false';
|
||||||
@@ -5016,6 +5032,21 @@ function closeCreateGroupModal() {
|
|||||||
if (input) {
|
if (input) {
|
||||||
input.value = '';
|
input.value = '';
|
||||||
}
|
}
|
||||||
|
// 重置图标为默认值
|
||||||
|
const iconBtn = document.getElementById('create-group-icon-btn');
|
||||||
|
if (iconBtn) {
|
||||||
|
iconBtn.textContent = '📁';
|
||||||
|
}
|
||||||
|
// 清空自定义图标输入框
|
||||||
|
const customInput = document.getElementById('custom-icon-input');
|
||||||
|
if (customInput) {
|
||||||
|
customInput.value = '';
|
||||||
|
}
|
||||||
|
// 关闭图标选择器
|
||||||
|
const iconPicker = document.getElementById('group-icon-picker');
|
||||||
|
if (iconPicker) {
|
||||||
|
iconPicker.style.display = 'none';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 选择建议标签
|
// 选择建议标签
|
||||||
@@ -5027,6 +5058,81 @@ function selectSuggestion(name) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 切换图标选择器显示状态
|
||||||
|
function toggleGroupIconPicker() {
|
||||||
|
const picker = document.getElementById('group-icon-picker');
|
||||||
|
if (picker) {
|
||||||
|
const isVisible = picker.style.display !== 'none';
|
||||||
|
picker.style.display = isVisible ? 'none' : 'block';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 选择分组图标
|
||||||
|
function selectGroupIcon(icon) {
|
||||||
|
const iconBtn = document.getElementById('create-group-icon-btn');
|
||||||
|
if (iconBtn) {
|
||||||
|
iconBtn.textContent = icon;
|
||||||
|
}
|
||||||
|
// 清空自定义输入框
|
||||||
|
const customInput = document.getElementById('custom-icon-input');
|
||||||
|
if (customInput) {
|
||||||
|
customInput.value = '';
|
||||||
|
}
|
||||||
|
// 关闭选择器
|
||||||
|
const picker = document.getElementById('group-icon-picker');
|
||||||
|
if (picker) {
|
||||||
|
picker.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 应用自定义图标
|
||||||
|
function applyCustomIcon() {
|
||||||
|
const customInput = document.getElementById('custom-icon-input');
|
||||||
|
if (!customInput) return;
|
||||||
|
|
||||||
|
const customIcon = customInput.value.trim();
|
||||||
|
if (!customIcon) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const iconBtn = document.getElementById('create-group-icon-btn');
|
||||||
|
if (iconBtn) {
|
||||||
|
iconBtn.textContent = customIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清空输入框并关闭选择器
|
||||||
|
customInput.value = '';
|
||||||
|
const picker = document.getElementById('group-icon-picker');
|
||||||
|
if (picker) {
|
||||||
|
picker.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 自定义图标输入框回车键处理
|
||||||
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
const customInput = document.getElementById('custom-icon-input');
|
||||||
|
if (customInput) {
|
||||||
|
customInput.addEventListener('keydown', function(e) {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
e.preventDefault();
|
||||||
|
applyCustomIcon();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 点击外部关闭图标选择器
|
||||||
|
document.addEventListener('click', function(event) {
|
||||||
|
const picker = document.getElementById('group-icon-picker');
|
||||||
|
const iconBtn = document.getElementById('create-group-icon-btn');
|
||||||
|
if (picker && iconBtn) {
|
||||||
|
// 如果点击的不是图标按钮和选择器本身,则关闭选择器
|
||||||
|
if (!picker.contains(event.target) && !iconBtn.contains(event.target)) {
|
||||||
|
picker.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// 创建分组
|
// 创建分组
|
||||||
async function createGroup(event) {
|
async function createGroup(event) {
|
||||||
// 阻止事件冒泡
|
// 阻止事件冒泡
|
||||||
@@ -5071,6 +5177,10 @@ async function createGroup(event) {
|
|||||||
console.error('检查分组名称失败:', error);
|
console.error('检查分组名称失败:', error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取选中的图标
|
||||||
|
const iconBtn = document.getElementById('create-group-icon-btn');
|
||||||
|
const selectedIcon = iconBtn ? iconBtn.textContent.trim() : '📁';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await apiFetch('/api/groups', {
|
const response = await apiFetch('/api/groups', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -5079,7 +5189,7 @@ async function createGroup(event) {
|
|||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
name: name,
|
name: name,
|
||||||
icon: '📁',
|
icon: selectedIcon,
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,350 @@
|
|||||||
|
// 仪表盘页面:拉取运行中任务、漏洞统计、批量任务、工具与 Skills 统计并渲染
|
||||||
|
|
||||||
|
async function refreshDashboard() {
|
||||||
|
const runningEl = document.getElementById('dashboard-running-tasks');
|
||||||
|
const vulnTotalEl = document.getElementById('dashboard-vuln-total');
|
||||||
|
const severityIds = ['critical', 'high', 'medium', 'low', 'info'];
|
||||||
|
|
||||||
|
if (runningEl) runningEl.textContent = '…';
|
||||||
|
if (vulnTotalEl) vulnTotalEl.textContent = '…';
|
||||||
|
severityIds.forEach(s => {
|
||||||
|
const el = document.getElementById('dashboard-severity-' + s);
|
||||||
|
if (el) el.textContent = '0';
|
||||||
|
const barEl = document.getElementById('dashboard-bar-' + s);
|
||||||
|
if (barEl) barEl.style.width = '0%';
|
||||||
|
});
|
||||||
|
setDashboardOverviewPlaceholder('…');
|
||||||
|
setEl('dashboard-kpi-tools-calls', '…');
|
||||||
|
setEl('dashboard-kpi-success-rate', '…');
|
||||||
|
var chartPlaceholder = document.getElementById('dashboard-tools-pie-placeholder');
|
||||||
|
if (chartPlaceholder) { chartPlaceholder.style.removeProperty('display'); chartPlaceholder.textContent = '加载中…'; }
|
||||||
|
var barChartEl = document.getElementById('dashboard-tools-bar-chart');
|
||||||
|
if (barChartEl) { barChartEl.style.display = 'none'; barChartEl.innerHTML = ''; }
|
||||||
|
|
||||||
|
if (typeof apiFetch === 'undefined') {
|
||||||
|
if (runningEl) runningEl.textContent = '-';
|
||||||
|
if (vulnTotalEl) vulnTotalEl.textContent = '-';
|
||||||
|
setDashboardOverviewPlaceholder('-');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const [tasksRes, vulnRes, batchRes, monitorRes, knowledgeRes, skillsRes] = await Promise.all([
|
||||||
|
apiFetch('/api/agent-loop/tasks').then(r => r.ok ? r.json() : null).catch(() => null),
|
||||||
|
apiFetch('/api/vulnerabilities/stats').then(r => r.ok ? r.json() : null).catch(() => null),
|
||||||
|
apiFetch('/api/batch-tasks?limit=500&page=1').then(r => r.ok ? r.json() : null).catch(() => null),
|
||||||
|
apiFetch('/api/monitor/stats').then(r => r.ok ? r.json() : null).catch(() => null),
|
||||||
|
apiFetch('/api/knowledge/stats').then(r => r.ok ? r.json() : null).catch(() => null),
|
||||||
|
apiFetch('/api/skills/stats').then(r => r.ok ? r.json() : null).catch(() => null)
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (tasksRes && Array.isArray(tasksRes.tasks)) {
|
||||||
|
if (runningEl) runningEl.textContent = String(tasksRes.tasks.length);
|
||||||
|
} else {
|
||||||
|
if (runningEl) runningEl.textContent = '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vulnRes && typeof vulnRes.total === 'number') {
|
||||||
|
if (vulnTotalEl) vulnTotalEl.textContent = String(vulnRes.total);
|
||||||
|
const bySeverity = vulnRes.by_severity || {};
|
||||||
|
const total = vulnRes.total || 0;
|
||||||
|
severityIds.forEach(sev => {
|
||||||
|
const count = bySeverity[sev] || 0;
|
||||||
|
const el = document.getElementById('dashboard-severity-' + sev);
|
||||||
|
if (el) el.textContent = String(count);
|
||||||
|
const barEl = document.getElementById('dashboard-bar-' + sev);
|
||||||
|
if (barEl) barEl.style.width = total > 0 ? (count / total * 100) + '%' : '0%';
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
if (vulnTotalEl) vulnTotalEl.textContent = '-';
|
||||||
|
severityIds.forEach(sev => {
|
||||||
|
const barEl = document.getElementById('dashboard-bar-' + sev);
|
||||||
|
if (barEl) barEl.style.width = '0%';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 批量任务队列:按状态统计(优化版)
|
||||||
|
if (batchRes && Array.isArray(batchRes.queues)) {
|
||||||
|
const queues = batchRes.queues;
|
||||||
|
let pending = 0, running = 0, done = 0;
|
||||||
|
queues.forEach(q => {
|
||||||
|
const s = (q.status || '').toLowerCase();
|
||||||
|
if (s === 'pending' || s === 'paused') pending++;
|
||||||
|
else if (s === 'running') running++;
|
||||||
|
else if (s === 'completed' || s === 'cancelled') done++;
|
||||||
|
});
|
||||||
|
const total = pending + running + done;
|
||||||
|
setEl('dashboard-batch-pending', String(pending));
|
||||||
|
setEl('dashboard-batch-running', String(running));
|
||||||
|
setEl('dashboard-batch-done', String(done));
|
||||||
|
setEl('dashboard-batch-total', total > 0 ? `共 ${total} 个` : '暂无任务');
|
||||||
|
|
||||||
|
// 更新进度条
|
||||||
|
if (total > 0) {
|
||||||
|
const pendingPct = (pending / total * 100).toFixed(1);
|
||||||
|
const runningPct = (running / total * 100).toFixed(1);
|
||||||
|
const donePct = (done / total * 100).toFixed(1);
|
||||||
|
updateProgressBar('dashboard-batch-progress-pending', pendingPct);
|
||||||
|
updateProgressBar('dashboard-batch-progress-running', runningPct);
|
||||||
|
updateProgressBar('dashboard-batch-progress-done', donePct);
|
||||||
|
} else {
|
||||||
|
updateProgressBar('dashboard-batch-progress-pending', '0');
|
||||||
|
updateProgressBar('dashboard-batch-progress-running', '0');
|
||||||
|
updateProgressBar('dashboard-batch-progress-done', '0');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
setEl('dashboard-batch-pending', '-');
|
||||||
|
setEl('dashboard-batch-running', '-');
|
||||||
|
setEl('dashboard-batch-done', '-');
|
||||||
|
setEl('dashboard-batch-total', '-');
|
||||||
|
updateProgressBar('dashboard-batch-progress-pending', '0');
|
||||||
|
updateProgressBar('dashboard-batch-progress-running', '0');
|
||||||
|
updateProgressBar('dashboard-batch-progress-done', '0');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 工具调用:monitor/stats 为 { toolName: { totalCalls, successCalls, failedCalls, ... } }(优化版)
|
||||||
|
if (monitorRes && typeof monitorRes === 'object') {
|
||||||
|
const names = Object.keys(monitorRes);
|
||||||
|
let totalCalls = 0, totalSuccess = 0, totalFailed = 0;
|
||||||
|
names.forEach(k => {
|
||||||
|
const v = monitorRes[k];
|
||||||
|
const n = v && (v.totalCalls ?? v.TotalCalls);
|
||||||
|
if (typeof n === 'number') totalCalls += n;
|
||||||
|
const s = v && (v.successCalls ?? v.SuccessCalls);
|
||||||
|
if (typeof s === 'number') totalSuccess += s;
|
||||||
|
const f = v && (v.failedCalls ?? v.FailedCalls);
|
||||||
|
if (typeof f === 'number') totalFailed += f;
|
||||||
|
});
|
||||||
|
setEl('dashboard-tools-count', String(names.length));
|
||||||
|
setEl('dashboard-tools-calls', formatNumber(totalCalls));
|
||||||
|
setEl('dashboard-kpi-tools-calls', String(totalCalls));
|
||||||
|
var rateStr = totalCalls > 0 ? ((totalSuccess / totalCalls) * 100).toFixed(1) + '%' : '-';
|
||||||
|
setEl('dashboard-kpi-success-rate', rateStr);
|
||||||
|
setEl('dashboard-tools-success-rate', rateStr !== '-' ? `成功率 ${rateStr}` : '-');
|
||||||
|
renderDashboardToolsBar(monitorRes);
|
||||||
|
} else {
|
||||||
|
setEl('dashboard-tools-count', '-');
|
||||||
|
setEl('dashboard-tools-calls', '-');
|
||||||
|
setEl('dashboard-kpi-tools-calls', '-');
|
||||||
|
setEl('dashboard-kpi-success-rate', '-');
|
||||||
|
setEl('dashboard-tools-success-rate', '-');
|
||||||
|
renderDashboardToolsBar(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 知识:{ enabled, total_categories, total_items, ... }(优化版)
|
||||||
|
const knowledgeItemsEl = document.getElementById('dashboard-knowledge-items');
|
||||||
|
const knowledgeCategoriesEl = document.getElementById('dashboard-knowledge-categories');
|
||||||
|
const knowledgeStatusEl = document.getElementById('dashboard-knowledge-status');
|
||||||
|
if (knowledgeRes && typeof knowledgeRes === 'object') {
|
||||||
|
if (knowledgeRes.enabled === false) {
|
||||||
|
// 功能未启用:用状态标签展示,数值保持为 "-"
|
||||||
|
if (knowledgeStatusEl) knowledgeStatusEl.textContent = '未启用';
|
||||||
|
if (knowledgeItemsEl) knowledgeItemsEl.textContent = '-';
|
||||||
|
if (knowledgeCategoriesEl) knowledgeCategoriesEl.textContent = '-';
|
||||||
|
} else {
|
||||||
|
const categories = knowledgeRes.total_categories ?? 0;
|
||||||
|
const items = knowledgeRes.total_items ?? 0;
|
||||||
|
if (knowledgeItemsEl) knowledgeItemsEl.textContent = formatNumber(items);
|
||||||
|
if (knowledgeCategoriesEl) knowledgeCategoriesEl.textContent = formatNumber(categories);
|
||||||
|
// 根据数据量给个轻量状态文案
|
||||||
|
if (knowledgeStatusEl) {
|
||||||
|
if (items > 0 || categories > 0) {
|
||||||
|
knowledgeStatusEl.textContent = '已启用';
|
||||||
|
} else {
|
||||||
|
knowledgeStatusEl.textContent = '待配置';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (knowledgeItemsEl) knowledgeItemsEl.textContent = '-';
|
||||||
|
if (knowledgeCategoriesEl) knowledgeCategoriesEl.textContent = '-';
|
||||||
|
if (knowledgeStatusEl) knowledgeStatusEl.textContent = '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skills:{ total_skills, total_calls, ... }(优化版)
|
||||||
|
if (skillsRes && typeof skillsRes === 'object') {
|
||||||
|
const totalSkills = skillsRes.total_skills ?? 0;
|
||||||
|
const totalCalls = skillsRes.total_calls ?? 0;
|
||||||
|
setEl('dashboard-skills-count', formatNumber(totalSkills));
|
||||||
|
setEl('dashboard-skills-calls', formatNumber(totalCalls));
|
||||||
|
|
||||||
|
// 设置状态标签
|
||||||
|
const statusEl = document.getElementById('dashboard-skills-status');
|
||||||
|
if (statusEl) {
|
||||||
|
if (totalCalls === 0) {
|
||||||
|
statusEl.textContent = '待使用';
|
||||||
|
statusEl.style.background = 'rgba(0, 0, 0, 0.05)';
|
||||||
|
statusEl.style.color = 'var(--text-secondary)';
|
||||||
|
} else if (totalCalls < 10) {
|
||||||
|
statusEl.textContent = '活跃';
|
||||||
|
statusEl.style.background = 'rgba(16, 185, 129, 0.1)';
|
||||||
|
statusEl.style.color = '#10b981';
|
||||||
|
} else {
|
||||||
|
statusEl.textContent = '高频';
|
||||||
|
statusEl.style.background = 'rgba(59, 130, 246, 0.1)';
|
||||||
|
statusEl.style.color = '#3b82f6';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
setEl('dashboard-skills-count', '-');
|
||||||
|
setEl('dashboard-skills-calls', '-');
|
||||||
|
const statusEl = document.getElementById('dashboard-skills-status');
|
||||||
|
if (statusEl) statusEl.textContent = '-';
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('仪表盘拉取统计失败', e);
|
||||||
|
if (runningEl) runningEl.textContent = '-';
|
||||||
|
if (vulnTotalEl) vulnTotalEl.textContent = '-';
|
||||||
|
setDashboardOverviewPlaceholder('-');
|
||||||
|
setEl('dashboard-kpi-success-rate', '-');
|
||||||
|
setEl('dashboard-kpi-tools-calls', '-');
|
||||||
|
renderDashboardToolsBar(null);
|
||||||
|
var ph = document.getElementById('dashboard-tools-pie-placeholder');
|
||||||
|
if (ph) { ph.style.removeProperty('display'); ph.textContent = '暂无调用数据'; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function setEl(id, text) {
|
||||||
|
const el = document.getElementById(id);
|
||||||
|
if (el) el.textContent = text;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setDashboardOverviewPlaceholder(t) {
|
||||||
|
['dashboard-batch-pending', 'dashboard-batch-running', 'dashboard-batch-done', 'dashboard-batch-total',
|
||||||
|
'dashboard-tools-count', 'dashboard-tools-calls', 'dashboard-tools-success-rate',
|
||||||
|
'dashboard-skills-count', 'dashboard-skills-calls', 'dashboard-skills-status',
|
||||||
|
'dashboard-knowledge-items', 'dashboard-knowledge-categories', 'dashboard-knowledge-status'].forEach(id => setEl(id, t));
|
||||||
|
updateProgressBar('dashboard-batch-progress-pending', '0');
|
||||||
|
updateProgressBar('dashboard-batch-progress-running', '0');
|
||||||
|
updateProgressBar('dashboard-batch-progress-done', '0');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 格式化数字,添加千位分隔符
|
||||||
|
function formatNumber(num) {
|
||||||
|
if (typeof num !== 'number' || isNaN(num)) return '-';
|
||||||
|
if (num === 0) return '0';
|
||||||
|
return num.toLocaleString('zh-CN');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 更新进度条宽度
|
||||||
|
function updateProgressBar(id, percentage) {
|
||||||
|
const el = document.getElementById(id);
|
||||||
|
if (el) {
|
||||||
|
const pct = parseFloat(percentage) || 0;
|
||||||
|
el.style.width = Math.max(0, Math.min(100, pct)) + '%';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Top 30 工具执行次数柱状图颜色(30 色不重复,柔和、易区分)
|
||||||
|
var DASHBOARD_BAR_COLORS = [
|
||||||
|
'#93c5fd', '#a78bfa', '#6ee7b7', '#fde047', '#fda4af',
|
||||||
|
'#7dd3fc', '#a5b4fc', '#5eead4', '#fdba74', '#e9d5ff',
|
||||||
|
'#67e8f9', '#c4b5fd', '#86efac', '#fcd34d', '#f9a8d4',
|
||||||
|
'#bae6fd', '#c7d2fe', '#99f6e4', '#fed7aa', '#ddd6fe',
|
||||||
|
'#22d3ee', '#8b5cf6', '#4ade80', '#fbbf24', '#fb7185',
|
||||||
|
'#38bdf8', '#818cf8', '#2dd4bf', '#fb923c', '#e0e7ff'
|
||||||
|
];
|
||||||
|
|
||||||
|
function esc(s) {
|
||||||
|
if (typeof s !== 'string') return '';
|
||||||
|
return s.replace(/&/g, '&').replace(/</g, '<').replace(/"/g, '"');
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderDashboardToolsBar(monitorRes) {
|
||||||
|
const placeholder = document.getElementById('dashboard-tools-pie-placeholder');
|
||||||
|
const barChartEl = document.getElementById('dashboard-tools-bar-chart');
|
||||||
|
if (!placeholder || !barChartEl) return;
|
||||||
|
|
||||||
|
if (!monitorRes || typeof monitorRes !== 'object') {
|
||||||
|
placeholder.style.removeProperty('display');
|
||||||
|
placeholder.textContent = '暂无调用数据';
|
||||||
|
barChartEl.style.display = 'none';
|
||||||
|
barChartEl.innerHTML = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const entries = Object.keys(monitorRes).map(function (k) {
|
||||||
|
const v = monitorRes[k];
|
||||||
|
const totalCalls = v && (v.totalCalls ?? v.TotalCalls);
|
||||||
|
return { name: k, totalCalls: typeof totalCalls === 'number' ? totalCalls : 0 };
|
||||||
|
}).filter(function (e) { return e.totalCalls > 0; })
|
||||||
|
.sort(function (a, b) { return b.totalCalls - a.totalCalls; })
|
||||||
|
.slice(0, 30);
|
||||||
|
|
||||||
|
if (entries.length === 0) {
|
||||||
|
placeholder.style.removeProperty('display');
|
||||||
|
placeholder.textContent = '暂无调用数据';
|
||||||
|
barChartEl.style.display = 'none';
|
||||||
|
barChartEl.innerHTML = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
placeholder.style.display = 'none';
|
||||||
|
barChartEl.style.display = 'block';
|
||||||
|
|
||||||
|
const maxCalls = Math.max.apply(null, entries.map(function (e) { return e.totalCalls; }));
|
||||||
|
var html = '';
|
||||||
|
entries.forEach(function (e, i) {
|
||||||
|
var pct = maxCalls > 0 ? (e.totalCalls / maxCalls) * 100 : 0;
|
||||||
|
var label = e.name.length > 12 ? e.name.slice(0, 10) + '…' : e.name;
|
||||||
|
var color = DASHBOARD_BAR_COLORS[i % DASHBOARD_BAR_COLORS.length];
|
||||||
|
var fullName = esc(e.name);
|
||||||
|
html += '<div class="dashboard-tools-bar-item" data-tooltip="' + fullName + '">';
|
||||||
|
html += '<span class="dashboard-tools-bar-label">' + esc(label) + '</span>';
|
||||||
|
html += '<div class="dashboard-tools-bar-track"><div class="dashboard-tools-bar-fill" style="width:' + pct + '%;background:' + color + '"></div></div>';
|
||||||
|
html += '<span class="dashboard-tools-bar-value">' + e.totalCalls + '</span>';
|
||||||
|
html += '</div>';
|
||||||
|
});
|
||||||
|
barChartEl.innerHTML = html;
|
||||||
|
attachDashboardBarTooltips(barChartEl);
|
||||||
|
}
|
||||||
|
|
||||||
|
var dashboardBarTooltipEl = null;
|
||||||
|
var dashboardBarTooltipTimer = null;
|
||||||
|
|
||||||
|
function attachDashboardBarTooltips(barChartEl) {
|
||||||
|
if (!barChartEl) return;
|
||||||
|
if (!dashboardBarTooltipEl) {
|
||||||
|
dashboardBarTooltipEl = document.createElement('div');
|
||||||
|
dashboardBarTooltipEl.className = 'dashboard-tools-bar-tooltip';
|
||||||
|
dashboardBarTooltipEl.setAttribute('role', 'tooltip');
|
||||||
|
document.body.appendChild(dashboardBarTooltipEl);
|
||||||
|
}
|
||||||
|
barChartEl.removeEventListener('mouseover', dashboardBarTooltipOnOver);
|
||||||
|
barChartEl.removeEventListener('mouseout', dashboardBarTooltipOnOut);
|
||||||
|
barChartEl.addEventListener('mouseover', dashboardBarTooltipOnOver);
|
||||||
|
barChartEl.addEventListener('mouseout', dashboardBarTooltipOnOut);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dashboardBarTooltipOnOver(ev) {
|
||||||
|
var item = ev.target && ev.target.closest && ev.target.closest('.dashboard-tools-bar-item');
|
||||||
|
if (!item || !dashboardBarTooltipEl) return;
|
||||||
|
var text = item.getAttribute('data-tooltip');
|
||||||
|
if (!text) return;
|
||||||
|
clearTimeout(dashboardBarTooltipTimer);
|
||||||
|
dashboardBarTooltipTimer = setTimeout(function () {
|
||||||
|
dashboardBarTooltipEl.textContent = text;
|
||||||
|
dashboardBarTooltipEl.style.display = 'block';
|
||||||
|
requestAnimationFrame(function () {
|
||||||
|
var rect = item.getBoundingClientRect();
|
||||||
|
var ttRect = dashboardBarTooltipEl.getBoundingClientRect();
|
||||||
|
var x = rect.left + (rect.width / 2) - (ttRect.width / 2);
|
||||||
|
var y = rect.top - ttRect.height - 6;
|
||||||
|
if (y < 8) y = rect.bottom + 6;
|
||||||
|
var pad = 8;
|
||||||
|
if (x < pad) x = pad;
|
||||||
|
if (x + ttRect.width > window.innerWidth - pad) x = window.innerWidth - ttRect.width - pad;
|
||||||
|
dashboardBarTooltipEl.style.left = x + 'px';
|
||||||
|
dashboardBarTooltipEl.style.top = y + 'px';
|
||||||
|
});
|
||||||
|
}, 180);
|
||||||
|
}
|
||||||
|
|
||||||
|
function dashboardBarTooltipOnOut(ev) {
|
||||||
|
var item = ev.target && ev.target.closest && ev.target.closest('.dashboard-tools-bar-item');
|
||||||
|
var related = ev.relatedTarget && ev.relatedTarget.closest && ev.relatedTarget.closest('.dashboard-tools-bar-item');
|
||||||
|
if (item && item === related) return;
|
||||||
|
clearTimeout(dashboardBarTooltipTimer);
|
||||||
|
dashboardBarTooltipTimer = null;
|
||||||
|
if (dashboardBarTooltipEl) dashboardBarTooltipEl.style.display = 'none';
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
+27
-7
@@ -1,5 +1,5 @@
|
|||||||
// 页面路由管理
|
// 页面路由管理
|
||||||
let currentPage = 'chat';
|
let currentPage = 'dashboard';
|
||||||
|
|
||||||
// 初始化路由
|
// 初始化路由
|
||||||
function initRouter() {
|
function initRouter() {
|
||||||
@@ -8,7 +8,7 @@ function initRouter() {
|
|||||||
if (hash) {
|
if (hash) {
|
||||||
const hashParts = hash.split('?');
|
const hashParts = hash.split('?');
|
||||||
const pageId = hashParts[0];
|
const pageId = hashParts[0];
|
||||||
if (pageId && ['chat', 'vulnerabilities', 'mcp-monitor', 'mcp-management', 'knowledge-management', 'knowledge-retrieval-logs', 'roles-management', 'skills-monitor', 'skills-management', 'settings', 'tasks'].includes(pageId)) {
|
if (pageId && ['dashboard', 'chat', 'info-collect', 'vulnerabilities', 'mcp-monitor', 'mcp-management', 'knowledge-management', 'knowledge-retrieval-logs', 'roles-management', 'skills-monitor', 'skills-management', 'settings', 'tasks'].includes(pageId)) {
|
||||||
switchPage(pageId);
|
switchPage(pageId);
|
||||||
|
|
||||||
// 如果是chat页面且带有conversation参数,加载对应对话
|
// 如果是chat页面且带有conversation参数,加载对应对话
|
||||||
@@ -32,8 +32,8 @@ function initRouter() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 默认显示对话页面
|
// 默认显示仪表盘
|
||||||
switchPage('chat');
|
switchPage('dashboard');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 切换页面
|
// 切换页面
|
||||||
@@ -237,9 +237,20 @@ function showSubmenuPopup(navItem, menuId) {
|
|||||||
// 初始化页面
|
// 初始化页面
|
||||||
function initPage(pageId) {
|
function initPage(pageId) {
|
||||||
switch(pageId) {
|
switch(pageId) {
|
||||||
|
case 'dashboard':
|
||||||
|
if (typeof refreshDashboard === 'function') {
|
||||||
|
refreshDashboard();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 'chat':
|
case 'chat':
|
||||||
// 对话页面已由chat.js初始化
|
// 对话页面已由chat.js初始化
|
||||||
break;
|
break;
|
||||||
|
case 'info-collect':
|
||||||
|
// 信息收集页面
|
||||||
|
if (typeof initInfoCollectPage === 'function') {
|
||||||
|
initInfoCollectPage();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 'tasks':
|
case 'tasks':
|
||||||
// 初始化任务管理页面
|
// 初始化任务管理页面
|
||||||
if (typeof initTasksPage === 'function') {
|
if (typeof initTasksPage === 'function') {
|
||||||
@@ -254,16 +265,25 @@ function initPage(pageId) {
|
|||||||
break;
|
break;
|
||||||
case 'mcp-management':
|
case 'mcp-management':
|
||||||
// 初始化MCP管理
|
// 初始化MCP管理
|
||||||
|
// 先加载外部MCP列表(快速),然后加载工具列表
|
||||||
if (typeof loadExternalMCPs === 'function') {
|
if (typeof loadExternalMCPs === 'function') {
|
||||||
loadExternalMCPs();
|
loadExternalMCPs().catch(err => {
|
||||||
|
console.warn('加载外部MCP列表失败:', err);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
// 加载工具列表(MCP工具配置已移到MCP管理页面)
|
// 加载工具列表(MCP工具配置已移到MCP管理页面)
|
||||||
|
// 使用异步加载,避免阻塞页面渲染
|
||||||
if (typeof loadToolsList === 'function') {
|
if (typeof loadToolsList === 'function') {
|
||||||
// 确保工具分页设置已初始化
|
// 确保工具分页设置已初始化
|
||||||
if (typeof getToolsPageSize === 'function' && typeof toolsPagination !== 'undefined') {
|
if (typeof getToolsPageSize === 'function' && typeof toolsPagination !== 'undefined') {
|
||||||
toolsPagination.pageSize = getToolsPageSize();
|
toolsPagination.pageSize = getToolsPageSize();
|
||||||
}
|
}
|
||||||
loadToolsList(1, '');
|
// 延迟加载,让页面先渲染
|
||||||
|
setTimeout(() => {
|
||||||
|
loadToolsList(1, '').catch(err => {
|
||||||
|
console.error('加载工具列表失败:', err);
|
||||||
|
});
|
||||||
|
}, 100);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'vulnerabilities':
|
case 'vulnerabilities':
|
||||||
@@ -341,7 +361,7 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
const hashParts = hash.split('?');
|
const hashParts = hash.split('?');
|
||||||
const pageId = hashParts[0];
|
const pageId = hashParts[0];
|
||||||
|
|
||||||
if (pageId && ['chat', 'tasks', 'vulnerabilities', 'mcp-monitor', 'mcp-management', 'knowledge-management', 'knowledge-retrieval-logs', 'roles-management', 'skills-monitor', 'skills-management', 'settings'].includes(pageId)) {
|
if (pageId && ['chat', 'info-collect', 'tasks', 'vulnerabilities', 'mcp-monitor', 'mcp-management', 'knowledge-management', 'knowledge-retrieval-logs', 'roles-management', 'skills-monitor', 'skills-management', 'settings'].includes(pageId)) {
|
||||||
switchPage(pageId);
|
switchPage(pageId);
|
||||||
|
|
||||||
// 如果是chat页面且带有conversation参数,加载对应对话
|
// 如果是chat页面且带有conversation参数,加载对应对话
|
||||||
|
|||||||
+143
-18
@@ -102,6 +102,15 @@ async function loadConfig(loadTools = true) {
|
|||||||
document.getElementById('openai-api-key').value = currentConfig.openai.api_key || '';
|
document.getElementById('openai-api-key').value = currentConfig.openai.api_key || '';
|
||||||
document.getElementById('openai-base-url').value = currentConfig.openai.base_url || '';
|
document.getElementById('openai-base-url').value = currentConfig.openai.base_url || '';
|
||||||
document.getElementById('openai-model').value = currentConfig.openai.model || '';
|
document.getElementById('openai-model').value = currentConfig.openai.model || '';
|
||||||
|
|
||||||
|
// 填充FOFA配置
|
||||||
|
const fofa = currentConfig.fofa || {};
|
||||||
|
const fofaEmailEl = document.getElementById('fofa-email');
|
||||||
|
const fofaKeyEl = document.getElementById('fofa-api-key');
|
||||||
|
const fofaBaseUrlEl = document.getElementById('fofa-base-url');
|
||||||
|
if (fofaEmailEl) fofaEmailEl.value = fofa.email || '';
|
||||||
|
if (fofaKeyEl) fofaKeyEl.value = fofa.api_key || '';
|
||||||
|
if (fofaBaseUrlEl) fofaBaseUrlEl.value = fofa.base_url || '';
|
||||||
|
|
||||||
// 填充Agent配置
|
// 填充Agent配置
|
||||||
document.getElementById('agent-max-iterations').value = currentConfig.agent.max_iterations || 30;
|
document.getElementById('agent-max-iterations').value = currentConfig.agent.max_iterations || 30;
|
||||||
@@ -161,6 +170,38 @@ async function loadConfig(loadTools = true) {
|
|||||||
retrievalWeightInput.value = (hybridWeight !== undefined && hybridWeight !== null) ? hybridWeight : 0.7;
|
retrievalWeightInput.value = (hybridWeight !== undefined && hybridWeight !== null) ? hybridWeight : 0.7;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 填充机器人配置
|
||||||
|
const robots = currentConfig.robots || {};
|
||||||
|
const wecom = robots.wecom || {};
|
||||||
|
const dingtalk = robots.dingtalk || {};
|
||||||
|
const lark = robots.lark || {};
|
||||||
|
const wecomEnabled = document.getElementById('robot-wecom-enabled');
|
||||||
|
if (wecomEnabled) wecomEnabled.checked = wecom.enabled === true;
|
||||||
|
const wecomToken = document.getElementById('robot-wecom-token');
|
||||||
|
if (wecomToken) wecomToken.value = wecom.token || '';
|
||||||
|
const wecomAes = document.getElementById('robot-wecom-encoding-aes-key');
|
||||||
|
if (wecomAes) wecomAes.value = wecom.encoding_aes_key || '';
|
||||||
|
const wecomCorp = document.getElementById('robot-wecom-corp-id');
|
||||||
|
if (wecomCorp) wecomCorp.value = wecom.corp_id || '';
|
||||||
|
const wecomSecret = document.getElementById('robot-wecom-secret');
|
||||||
|
if (wecomSecret) wecomSecret.value = wecom.secret || '';
|
||||||
|
const wecomAgentId = document.getElementById('robot-wecom-agent-id');
|
||||||
|
if (wecomAgentId) wecomAgentId.value = wecom.agent_id || '0';
|
||||||
|
const dingtalkEnabled = document.getElementById('robot-dingtalk-enabled');
|
||||||
|
if (dingtalkEnabled) dingtalkEnabled.checked = dingtalk.enabled === true;
|
||||||
|
const dingtalkClientId = document.getElementById('robot-dingtalk-client-id');
|
||||||
|
if (dingtalkClientId) dingtalkClientId.value = dingtalk.client_id || '';
|
||||||
|
const dingtalkClientSecret = document.getElementById('robot-dingtalk-client-secret');
|
||||||
|
if (dingtalkClientSecret) dingtalkClientSecret.value = dingtalk.client_secret || '';
|
||||||
|
const larkEnabled = document.getElementById('robot-lark-enabled');
|
||||||
|
if (larkEnabled) larkEnabled.checked = lark.enabled === true;
|
||||||
|
const larkAppId = document.getElementById('robot-lark-app-id');
|
||||||
|
if (larkAppId) larkAppId.value = lark.app_id || '';
|
||||||
|
const larkAppSecret = document.getElementById('robot-lark-app-secret');
|
||||||
|
if (larkAppSecret) larkAppSecret.value = lark.app_secret || '';
|
||||||
|
const larkVerify = document.getElementById('robot-lark-verify-token');
|
||||||
|
if (larkVerify) larkVerify.value = lark.verify_token || '';
|
||||||
|
|
||||||
// 只有在需要时才加载工具列表(MCP管理页面需要,系统设置页面不需要)
|
// 只有在需要时才加载工具列表(MCP管理页面需要,系统设置页面不需要)
|
||||||
if (loadTools) {
|
if (loadTools) {
|
||||||
@@ -183,6 +224,14 @@ let toolsSearchKeyword = '';
|
|||||||
|
|
||||||
// 加载工具列表(分页)
|
// 加载工具列表(分页)
|
||||||
async function loadToolsList(page = 1, searchKeyword = '') {
|
async function loadToolsList(page = 1, searchKeyword = '') {
|
||||||
|
const toolsList = document.getElementById('tools-list');
|
||||||
|
|
||||||
|
// 显示加载状态
|
||||||
|
if (toolsList) {
|
||||||
|
// 清空整个容器,包括可能存在的分页控件
|
||||||
|
toolsList.innerHTML = '<div class="tools-list-items"><div class="loading" style="padding: 20px; text-align: center; color: var(--text-muted);">⏳ 正在加载工具列表...</div></div>';
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 在加载新页面之前,先保存当前页的状态到全局映射
|
// 在加载新页面之前,先保存当前页的状态到全局映射
|
||||||
saveCurrentPageToolStates();
|
saveCurrentPageToolStates();
|
||||||
@@ -193,7 +242,15 @@ async function loadToolsList(page = 1, searchKeyword = '') {
|
|||||||
url += `&search=${encodeURIComponent(searchKeyword)}`;
|
url += `&search=${encodeURIComponent(searchKeyword)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await apiFetch(url);
|
// 使用较短的超时时间(10秒),避免长时间等待
|
||||||
|
const controller = new AbortController();
|
||||||
|
const timeoutId = setTimeout(() => controller.abort(), 10000);
|
||||||
|
|
||||||
|
const response = await apiFetch(url, {
|
||||||
|
signal: controller.signal
|
||||||
|
});
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('获取工具列表失败');
|
throw new Error('获取工具列表失败');
|
||||||
}
|
}
|
||||||
@@ -224,9 +281,12 @@ async function loadToolsList(page = 1, searchKeyword = '') {
|
|||||||
renderToolsPagination();
|
renderToolsPagination();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('加载工具列表失败:', error);
|
console.error('加载工具列表失败:', error);
|
||||||
const toolsList = document.getElementById('tools-list');
|
|
||||||
if (toolsList) {
|
if (toolsList) {
|
||||||
toolsList.innerHTML = `<div class="error">加载工具列表失败: ${escapeHtml(error.message)}</div>`;
|
const isTimeout = error.name === 'AbortError' || error.message.includes('timeout');
|
||||||
|
const errorMsg = isTimeout
|
||||||
|
? '加载工具列表超时,可能是外部MCP连接较慢。请点击"刷新"按钮重试,或检查外部MCP连接状态。'
|
||||||
|
: `加载工具列表失败: ${escapeHtml(error.message)}`;
|
||||||
|
toolsList.innerHTML = `<div class="error" style="padding: 20px; text-align: center;">${errorMsg}</div>`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -281,9 +341,21 @@ function renderToolsList() {
|
|||||||
const toolsList = document.getElementById('tools-list');
|
const toolsList = document.getElementById('tools-list');
|
||||||
if (!toolsList) return;
|
if (!toolsList) return;
|
||||||
|
|
||||||
// 只渲染列表部分,分页控件单独渲染
|
// 移除可能存在的分页控件(会在 renderToolsPagination 中重新添加)
|
||||||
const listContainer = toolsList.querySelector('.tools-list-items') || document.createElement('div');
|
const oldPagination = toolsList.querySelector('.tools-pagination');
|
||||||
listContainer.className = 'tools-list-items';
|
if (oldPagination) {
|
||||||
|
oldPagination.remove();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取或创建列表容器
|
||||||
|
let listContainer = toolsList.querySelector('.tools-list-items');
|
||||||
|
if (!listContainer) {
|
||||||
|
listContainer = document.createElement('div');
|
||||||
|
listContainer.className = 'tools-list-items';
|
||||||
|
toolsList.appendChild(listContainer);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清空列表容器内容(移除加载提示)
|
||||||
listContainer.innerHTML = '';
|
listContainer.innerHTML = '';
|
||||||
|
|
||||||
if (allTools.length === 0) {
|
if (allTools.length === 0) {
|
||||||
@@ -656,16 +728,43 @@ async function applySettings() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const wecomAgentIdVal = document.getElementById('robot-wecom-agent-id')?.value.trim();
|
||||||
const config = {
|
const config = {
|
||||||
openai: {
|
openai: {
|
||||||
api_key: apiKey,
|
api_key: apiKey,
|
||||||
base_url: baseUrl,
|
base_url: baseUrl,
|
||||||
model: model
|
model: model
|
||||||
},
|
},
|
||||||
|
fofa: {
|
||||||
|
email: document.getElementById('fofa-email')?.value.trim() || '',
|
||||||
|
api_key: document.getElementById('fofa-api-key')?.value.trim() || '',
|
||||||
|
base_url: document.getElementById('fofa-base-url')?.value.trim() || ''
|
||||||
|
},
|
||||||
agent: {
|
agent: {
|
||||||
max_iterations: parseInt(document.getElementById('agent-max-iterations').value) || 30
|
max_iterations: parseInt(document.getElementById('agent-max-iterations').value) || 30
|
||||||
},
|
},
|
||||||
knowledge: knowledgeConfig,
|
knowledge: knowledgeConfig,
|
||||||
|
robots: {
|
||||||
|
wecom: {
|
||||||
|
enabled: document.getElementById('robot-wecom-enabled')?.checked === true,
|
||||||
|
token: document.getElementById('robot-wecom-token')?.value.trim() || '',
|
||||||
|
encoding_aes_key: document.getElementById('robot-wecom-encoding-aes-key')?.value.trim() || '',
|
||||||
|
corp_id: document.getElementById('robot-wecom-corp-id')?.value.trim() || '',
|
||||||
|
secret: document.getElementById('robot-wecom-secret')?.value.trim() || '',
|
||||||
|
agent_id: parseInt(wecomAgentIdVal, 10) || 0
|
||||||
|
},
|
||||||
|
dingtalk: {
|
||||||
|
enabled: document.getElementById('robot-dingtalk-enabled')?.checked === true,
|
||||||
|
client_id: document.getElementById('robot-dingtalk-client-id')?.value.trim() || '',
|
||||||
|
client_secret: document.getElementById('robot-dingtalk-client-secret')?.value.trim() || ''
|
||||||
|
},
|
||||||
|
lark: {
|
||||||
|
enabled: document.getElementById('robot-lark-enabled')?.checked === true,
|
||||||
|
app_id: document.getElementById('robot-lark-app-id')?.value.trim() || '',
|
||||||
|
app_secret: document.getElementById('robot-lark-app-secret')?.value.trim() || '',
|
||||||
|
verify_token: document.getElementById('robot-lark-verify-token')?.value.trim() || ''
|
||||||
|
}
|
||||||
|
},
|
||||||
tools: []
|
tools: []
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -974,15 +1073,17 @@ async function changePassword() {
|
|||||||
|
|
||||||
let currentEditingMCPName = null;
|
let currentEditingMCPName = null;
|
||||||
|
|
||||||
// 加载外部MCP列表
|
// 拉取外部MCP列表数据(供轮询使用,返回 { servers, stats })
|
||||||
|
async function fetchExternalMCPs() {
|
||||||
|
const response = await apiFetch('/api/external-mcp');
|
||||||
|
if (!response.ok) throw new Error('获取外部MCP列表失败');
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 加载外部MCP列表并渲染
|
||||||
async function loadExternalMCPs() {
|
async function loadExternalMCPs() {
|
||||||
try {
|
try {
|
||||||
const response = await apiFetch('/api/external-mcp');
|
const data = await fetchExternalMCPs();
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('获取外部MCP列表失败');
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
renderExternalMCPList(data.servers || {});
|
renderExternalMCPList(data.servers || {});
|
||||||
renderExternalMCPStats(data.stats || {});
|
renderExternalMCPStats(data.stats || {});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -994,6 +1095,29 @@ async function loadExternalMCPs() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 轮询列表直到指定 MCP 的工具数量已更新(每秒拉一次,拿到即停,无固定延迟)
|
||||||
|
// name 为 null 时仅按 maxAttempts 次数轮询,不判断 tool_count
|
||||||
|
async function pollExternalMCPToolCount(name, maxAttempts = 10) {
|
||||||
|
const pollIntervalMs = 1000;
|
||||||
|
for (let attempt = 0; attempt < maxAttempts; attempt++) {
|
||||||
|
await new Promise(r => setTimeout(r, pollIntervalMs));
|
||||||
|
try {
|
||||||
|
const data = await fetchExternalMCPs();
|
||||||
|
renderExternalMCPList(data.servers || {});
|
||||||
|
renderExternalMCPStats(data.stats || {});
|
||||||
|
if (name != null) {
|
||||||
|
const server = data.servers && data.servers[name];
|
||||||
|
if (server && server.tool_count > 0) break;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('轮询工具数量失败:', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (typeof window !== 'undefined' && typeof window.refreshMentionTools === 'function') {
|
||||||
|
window.refreshMentionTools();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 渲染外部MCP列表
|
// 渲染外部MCP列表
|
||||||
function renderExternalMCPList(servers) {
|
function renderExternalMCPList(servers) {
|
||||||
const list = document.getElementById('external-mcp-list');
|
const list = document.getElementById('external-mcp-list');
|
||||||
@@ -1350,10 +1474,11 @@ async function saveExternalMCP() {
|
|||||||
|
|
||||||
closeExternalMCPModal();
|
closeExternalMCPModal();
|
||||||
await loadExternalMCPs();
|
await loadExternalMCPs();
|
||||||
// 刷新对话界面的工具列表,使新添加的MCP工具立即可用
|
|
||||||
if (typeof window !== 'undefined' && typeof window.refreshMentionTools === 'function') {
|
if (typeof window !== 'undefined' && typeof window.refreshMentionTools === 'function') {
|
||||||
window.refreshMentionTools();
|
window.refreshMentionTools();
|
||||||
}
|
}
|
||||||
|
// 轮询几次以拉取后端异步更新的工具数量(无固定延迟,拿到即停)
|
||||||
|
pollExternalMCPToolCount(null, 5);
|
||||||
alert('保存成功');
|
alert('保存成功');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('保存外部MCP失败:', error);
|
console.error('保存外部MCP失败:', error);
|
||||||
@@ -1427,12 +1552,12 @@ async function toggleExternalMCP(name, currentStatus) {
|
|||||||
const status = statusData.status || 'disconnected';
|
const status = statusData.status || 'disconnected';
|
||||||
|
|
||||||
if (status === 'connected') {
|
if (status === 'connected') {
|
||||||
// 已经连接,立即刷新
|
|
||||||
await loadExternalMCPs();
|
await loadExternalMCPs();
|
||||||
// 刷新对话界面的工具列表
|
|
||||||
if (typeof window !== 'undefined' && typeof window.refreshMentionTools === 'function') {
|
if (typeof window !== 'undefined' && typeof window.refreshMentionTools === 'function') {
|
||||||
window.refreshMentionTools();
|
window.refreshMentionTools();
|
||||||
}
|
}
|
||||||
|
// 轮询直到该 MCP 工具数量已更新(每秒拉一次,无固定延迟)
|
||||||
|
pollExternalMCPToolCount(name, 10);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1490,12 +1615,12 @@ async function pollExternalMCPStatus(name, maxAttempts = 30) {
|
|||||||
const button = document.getElementById(buttonId);
|
const button = document.getElementById(buttonId);
|
||||||
|
|
||||||
if (status === 'connected') {
|
if (status === 'connected') {
|
||||||
// 连接成功,刷新列表
|
|
||||||
await loadExternalMCPs();
|
await loadExternalMCPs();
|
||||||
// 刷新对话界面的工具列表
|
|
||||||
if (typeof window !== 'undefined' && typeof window.refreshMentionTools === 'function') {
|
if (typeof window !== 'undefined' && typeof window.refreshMentionTools === 'function') {
|
||||||
window.refreshMentionTools();
|
window.refreshMentionTools();
|
||||||
}
|
}
|
||||||
|
// 轮询直到该 MCP 工具数量已更新(每秒拉一次,无固定延迟)
|
||||||
|
pollExternalMCPToolCount(name, 10);
|
||||||
return;
|
return;
|
||||||
} else if (status === 'error' || status === 'disconnected') {
|
} else if (status === 'error' || status === 'disconnected') {
|
||||||
// 连接失败,刷新列表并显示错误
|
// 连接失败,刷新列表并显示错误
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ function getSkillsPageSize() {
|
|||||||
const saved = localStorage.getItem('skillsPageSize');
|
const saved = localStorage.getItem('skillsPageSize');
|
||||||
if (saved) {
|
if (saved) {
|
||||||
const size = parseInt(saved);
|
const size = parseInt(saved);
|
||||||
if ([20, 50, 100].includes(size)) {
|
if ([10, 20, 50, 100].includes(size)) {
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -109,8 +109,8 @@ function renderSkillsList() {
|
|||||||
<div class="skill-card">
|
<div class="skill-card">
|
||||||
<div class="skill-card-header">
|
<div class="skill-card-header">
|
||||||
<h3 class="skill-card-title">${escapeHtml(skill.name || '')}</h3>
|
<h3 class="skill-card-title">${escapeHtml(skill.name || '')}</h3>
|
||||||
|
<div class="skill-card-description">${escapeHtml(skill.description || '无描述')}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="skill-card-description">${escapeHtml(skill.description || '无描述')}</div>
|
|
||||||
<div class="skill-card-actions">
|
<div class="skill-card-actions">
|
||||||
<button class="btn-secondary btn-small" onclick="viewSkill('${escapeHtml(skill.name)}')">查看</button>
|
<button class="btn-secondary btn-small" onclick="viewSkill('${escapeHtml(skill.name)}')">查看</button>
|
||||||
<button class="btn-secondary btn-small" onclick="editSkill('${escapeHtml(skill.name)}')">编辑</button>
|
<button class="btn-secondary btn-small" onclick="editSkill('${escapeHtml(skill.name)}')">编辑</button>
|
||||||
@@ -161,6 +161,7 @@ function renderSkillsPagination() {
|
|||||||
<label class="pagination-page-size">
|
<label class="pagination-page-size">
|
||||||
每页显示
|
每页显示
|
||||||
<select id="skills-page-size-pagination" onchange="changeSkillsPageSize()">
|
<select id="skills-page-size-pagination" onchange="changeSkillsPageSize()">
|
||||||
|
<option value="10" ${pageSize === 10 ? 'selected' : ''}>10</option>
|
||||||
<option value="20" ${pageSize === 20 ? 'selected' : ''}>20</option>
|
<option value="20" ${pageSize === 20 ? 'selected' : ''}>20</option>
|
||||||
<option value="50" ${pageSize === 50 ? 'selected' : ''}>50</option>
|
<option value="50" ${pageSize === 50 ? 'selected' : ''}>50</option>
|
||||||
<option value="100" ${pageSize === 100 ? 'selected' : ''}>100</option>
|
<option value="100" ${pageSize === 100 ? 'selected' : ''}>100</option>
|
||||||
|
|||||||
@@ -1197,7 +1197,8 @@ async function showBatchQueueDetail(queueId) {
|
|||||||
batchQueuesState.currentQueueId = queueId;
|
batchQueuesState.currentQueueId = queueId;
|
||||||
|
|
||||||
if (title) {
|
if (title) {
|
||||||
title.textContent = queue.title ? `批量任务队列 - ${escapeHtml(queue.title)}` : '批量任务队列';
|
// textContent 本身会做转义;这里不要再 escapeHtml,否则会把 && 显示成 &...(看起来像“变形/乱码”)
|
||||||
|
title.textContent = queue.title ? `批量任务队列 - ${String(queue.title)}` : '批量任务队列';
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新按钮显示
|
// 更新按钮显示
|
||||||
|
|||||||
@@ -516,20 +516,36 @@
|
|||||||
min-width: 150px;
|
min-width: 150px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 参数名、类型、必需、示例列不换行 */
|
/* 参数名、类型、必需列不换行 */
|
||||||
.api-params-table th:nth-child(1),
|
.api-params-table th:nth-child(1),
|
||||||
.api-params-table td:nth-child(1),
|
.api-params-table td:nth-child(1),
|
||||||
.api-params-table th:nth-child(2),
|
.api-params-table th:nth-child(2),
|
||||||
.api-params-table td:nth-child(2),
|
.api-params-table td:nth-child(2),
|
||||||
.api-params-table th:nth-child(4),
|
.api-params-table th:nth-child(4),
|
||||||
.api-params-table td:nth-child(4),
|
.api-params-table td:nth-child(4) {
|
||||||
.api-params-table th:nth-child(5),
|
|
||||||
.api-params-table td:nth-child(5) {
|
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 示例列允许换行,完整显示 */
|
||||||
|
.api-params-table th:nth-child(5),
|
||||||
|
.api-params-table td:nth-child(5) {
|
||||||
|
white-space: normal;
|
||||||
|
word-wrap: break-word;
|
||||||
|
overflow-wrap: break-word;
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 确保示例列中的code标签也能完整显示 */
|
||||||
|
.api-params-table td:nth-child(5) code {
|
||||||
|
white-space: normal;
|
||||||
|
word-wrap: break-word;
|
||||||
|
overflow-wrap: break-word;
|
||||||
|
display: inline-block;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
/* 描述列允许换行,但保持水平方向 */
|
/* 描述列允许换行,但保持水平方向 */
|
||||||
.api-params-table th:nth-child(3),
|
.api-params-table th:nth-child(3),
|
||||||
.api-params-table td:nth-child(3) {
|
.api-params-table td:nth-child(3) {
|
||||||
@@ -674,6 +690,44 @@
|
|||||||
background: var(--bg-secondary);
|
background: var(--bg-secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 复制curl按钮 - 黄色主题 */
|
||||||
|
.api-test-btn.copy-curl {
|
||||||
|
background: #ffc107;
|
||||||
|
color: white;
|
||||||
|
border: 1px solid #ffb300;
|
||||||
|
}
|
||||||
|
|
||||||
|
.api-test-btn.copy-curl:hover {
|
||||||
|
background: #ffb300;
|
||||||
|
border-color: #ffa000;
|
||||||
|
transform: translateY(-1px);
|
||||||
|
box-shadow: 0 2px 8px rgba(255, 193, 7, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.api-test-btn.copy-curl:active {
|
||||||
|
transform: translateY(0);
|
||||||
|
box-shadow: 0 1px 4px rgba(255, 193, 7, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 清除结果按钮 - 红色/橙色主题 */
|
||||||
|
.api-test-btn.clear-result {
|
||||||
|
background: #ff6b6b;
|
||||||
|
color: white;
|
||||||
|
border: 1px solid #ff5252;
|
||||||
|
}
|
||||||
|
|
||||||
|
.api-test-btn.clear-result:hover {
|
||||||
|
background: #ff5252;
|
||||||
|
border-color: #ff4444;
|
||||||
|
transform: translateY(-1px);
|
||||||
|
box-shadow: 0 2px 8px rgba(255, 107, 107, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.api-test-btn.clear-result:active {
|
||||||
|
transform: translateY(0);
|
||||||
|
box-shadow: 0 1px 4px rgba(255, 107, 107, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
.api-test-result {
|
.api-test-result {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
|
|||||||
+471
-10
@@ -11,7 +11,7 @@
|
|||||||
<body>
|
<body>
|
||||||
<div id="login-overlay" class="login-overlay" style="display: none;">
|
<div id="login-overlay" class="login-overlay" style="display: none;">
|
||||||
<div class="login-card">
|
<div class="login-card">
|
||||||
<div class="login-header">
|
<div class="login-brand">
|
||||||
<h2>登录 CyberStrikeAI</h2>
|
<h2>登录 CyberStrikeAI</h2>
|
||||||
<p class="login-subtitle">请输入配置中的访问密码</p>
|
<p class="login-subtitle">请输入配置中的访问密码</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -21,7 +21,9 @@
|
|||||||
<input type="password" id="login-password" placeholder="输入登录密码" required autocomplete="current-password" />
|
<input type="password" id="login-password" placeholder="输入登录密码" required autocomplete="current-password" />
|
||||||
</div>
|
</div>
|
||||||
<div id="login-error" class="login-error" role="alert" style="display: none;"></div>
|
<div id="login-error" class="login-error" role="alert" style="display: none;"></div>
|
||||||
<button type="submit" class="btn-primary login-submit">登录</button>
|
<button type="submit" class="btn-primary login-submit">
|
||||||
|
<span>登录</span>
|
||||||
|
</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -29,12 +31,12 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
<header>
|
<header>
|
||||||
<div class="header-content">
|
<div class="header-content">
|
||||||
<div class="logo">
|
<div class="logo header-logo-link" onclick="switchPage('dashboard')" role="button" title="返回仪表盘">
|
||||||
<img src="/static/logo.png" alt="CyberStrikeAI Logo" style="width: 32px; height: 32px; margin-right: 8px;">
|
<img src="/static/logo.png" alt="CyberStrikeAI Logo" style="width: 32px; height: 32px; margin-right: 8px;">
|
||||||
<h1>CyberStrikeAI</h1>
|
<h1>CyberStrikeAI</h1>
|
||||||
|
<span class="version-badge" title="当前版本">{{.Version}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="header-right">
|
<div class="header-right">
|
||||||
<p class="header-subtitle">AI 驱动的自动化安全测试平台</p>
|
|
||||||
<div class="header-actions">
|
<div class="header-actions">
|
||||||
<button class="openapi-doc-btn" onclick="window.open('/api-docs', '_blank')" title="OpenAPI 文档">
|
<button class="openapi-doc-btn" onclick="window.open('/api-docs', '_blank')" title="OpenAPI 文档">
|
||||||
<span>API 文档</span>
|
<span>API 文档</span>
|
||||||
@@ -71,6 +73,17 @@
|
|||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<nav class="main-sidebar-nav">
|
<nav class="main-sidebar-nav">
|
||||||
|
<div class="nav-item" data-page="dashboard">
|
||||||
|
<div class="nav-item-content" data-title="仪表盘" onclick="switchPage('dashboard')">
|
||||||
|
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<rect x="3" y="3" width="7" height="9"></rect>
|
||||||
|
<rect x="14" y="3" width="7" height="5"></rect>
|
||||||
|
<rect x="14" y="12" width="7" height="9"></rect>
|
||||||
|
<rect x="3" y="16" width="7" height="5"></rect>
|
||||||
|
</svg>
|
||||||
|
<span>仪表盘</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="nav-item" data-page="chat">
|
<div class="nav-item" data-page="chat">
|
||||||
<div class="nav-item-content" data-title="对话" onclick="switchPage('chat')">
|
<div class="nav-item-content" data-title="对话" onclick="switchPage('chat')">
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
@@ -79,6 +92,15 @@
|
|||||||
<span>对话</span>
|
<span>对话</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="nav-item" data-page="info-collect">
|
||||||
|
<div class="nav-item-content" data-title="信息收集" onclick="switchPage('info-collect')">
|
||||||
|
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<circle cx="11" cy="11" r="8"></circle>
|
||||||
|
<line x1="21" y1="21" x2="16.65" y2="16.65"></line>
|
||||||
|
</svg>
|
||||||
|
<span>信息收集</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="nav-item" data-page="tasks">
|
<div class="nav-item" data-page="tasks">
|
||||||
<div class="nav-item-content" data-title="任务管理" onclick="switchPage('tasks')">
|
<div class="nav-item-content" data-title="任务管理" onclick="switchPage('tasks')">
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
@@ -192,8 +214,175 @@
|
|||||||
|
|
||||||
<!-- 内容区域 -->
|
<!-- 内容区域 -->
|
||||||
<div class="content-area">
|
<div class="content-area">
|
||||||
|
<!-- 仪表盘页面 -->
|
||||||
|
<div id="page-dashboard" class="page active">
|
||||||
|
<div class="dashboard-page">
|
||||||
|
<div class="page-header">
|
||||||
|
<h2>仪表盘</h2>
|
||||||
|
<div class="page-header-actions">
|
||||||
|
<button class="btn-secondary" onclick="refreshDashboard()" title="刷新数据">刷新</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-content">
|
||||||
|
<!-- 第一行:核心 KPI(仪表盘最佳实践:关键指标置顶) -->
|
||||||
|
<div class="dashboard-kpi-row" id="dashboard-cards">
|
||||||
|
<div class="dashboard-kpi-card" role="button" tabindex="0" onclick="switchPage('tasks')" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); switchPage('tasks'); }" title="点击查看任务管理"> <div class="dashboard-kpi-value" id="dashboard-running-tasks">-</div><div class="dashboard-kpi-label">运行中任务</div></div>
|
||||||
|
<div class="dashboard-kpi-card" role="button" tabindex="0" onclick="switchPage('vulnerabilities')" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); switchPage('vulnerabilities'); }" title="点击查看漏洞管理"><div class="dashboard-kpi-value" id="dashboard-vuln-total">-</div><div class="dashboard-kpi-label">漏洞总数</div></div>
|
||||||
|
<div class="dashboard-kpi-card" role="button" tabindex="0" onclick="switchPage('mcp-monitor')" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); switchPage('mcp-monitor'); }" title="点击查看 MCP 监控"><div class="dashboard-kpi-value" id="dashboard-kpi-tools-calls">-</div><div class="dashboard-kpi-label">工具调用次数</div></div>
|
||||||
|
<div class="dashboard-kpi-card" role="button" tabindex="0" onclick="switchPage('mcp-monitor')" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); switchPage('mcp-monitor'); }" title="点击查看 MCP 监控"><div class="dashboard-kpi-value" id="dashboard-kpi-success-rate">-</div><div class="dashboard-kpi-label">工具执行成功率</div></div>
|
||||||
|
</div>
|
||||||
|
<!-- 两列主内容区 -->
|
||||||
|
<div class="dashboard-grid">
|
||||||
|
<div class="dashboard-main">
|
||||||
|
<section class="dashboard-section dashboard-section-chart">
|
||||||
|
<h3 class="dashboard-section-title">漏洞严重程度分布</h3>
|
||||||
|
<div class="dashboard-chart-wrap">
|
||||||
|
<div class="dashboard-stacked-bar" id="dashboard-stacked-bar">
|
||||||
|
<span class="dashboard-bar-seg seg-critical" id="dashboard-bar-critical" style="width: 0%"></span>
|
||||||
|
<span class="dashboard-bar-seg seg-high" id="dashboard-bar-high" style="width: 0%"></span>
|
||||||
|
<span class="dashboard-bar-seg seg-medium" id="dashboard-bar-medium" style="width: 0%"></span>
|
||||||
|
<span class="dashboard-bar-seg seg-low" id="dashboard-bar-low" style="width: 0%"></span>
|
||||||
|
<span class="dashboard-bar-seg seg-info" id="dashboard-bar-info" style="width: 0%"></span>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-legend" id="dashboard-vuln-bars">
|
||||||
|
<div class="dashboard-legend-item"><span class="dashboard-legend-dot critical"></span><span class="dashboard-legend-label">严重</span><span class="dashboard-legend-value" id="dashboard-severity-critical">0</span></div>
|
||||||
|
<div class="dashboard-legend-item"><span class="dashboard-legend-dot high"></span><span class="dashboard-legend-label">高危</span><span class="dashboard-legend-value" id="dashboard-severity-high">0</span></div>
|
||||||
|
<div class="dashboard-legend-item"><span class="dashboard-legend-dot medium"></span><span class="dashboard-legend-label">中危</span><span class="dashboard-legend-value" id="dashboard-severity-medium">0</span></div>
|
||||||
|
<div class="dashboard-legend-item"><span class="dashboard-legend-dot low"></span><span class="dashboard-legend-label">低危</span><span class="dashboard-legend-value" id="dashboard-severity-low">0</span></div>
|
||||||
|
<div class="dashboard-legend-item"><span class="dashboard-legend-dot info"></span><span class="dashboard-legend-label">信息</span><span class="dashboard-legend-value" id="dashboard-severity-info">0</span></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<section class="dashboard-section dashboard-section-overview">
|
||||||
|
<h3 class="dashboard-section-title">运行概览</h3>
|
||||||
|
<div class="dashboard-overview-list">
|
||||||
|
<div class="dashboard-overview-item dashboard-overview-item-batch" role="button" tabindex="0" onclick="switchPage('tasks')" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); switchPage('tasks'); }">
|
||||||
|
<span class="dashboard-overview-icon dashboard-overview-icon-batch" aria-hidden="true"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/></svg></span>
|
||||||
|
<div class="dashboard-overview-content">
|
||||||
|
<div class="dashboard-overview-header">
|
||||||
|
<span class="dashboard-overview-label">批量任务队列</span>
|
||||||
|
<span class="dashboard-overview-total" id="dashboard-batch-total">-</span>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-overview-stats">
|
||||||
|
<span class="dashboard-overview-stat dashboard-overview-stat-pending">
|
||||||
|
<span class="dashboard-overview-stat-badge badge-pending"></span>
|
||||||
|
<span class="dashboard-overview-stat-value" id="dashboard-batch-pending">-</span>
|
||||||
|
<span class="dashboard-overview-stat-label">待执行</span>
|
||||||
|
</span>
|
||||||
|
<span class="dashboard-overview-stat dashboard-overview-stat-running">
|
||||||
|
<span class="dashboard-overview-stat-badge badge-running"></span>
|
||||||
|
<span class="dashboard-overview-stat-value" id="dashboard-batch-running">-</span>
|
||||||
|
<span class="dashboard-overview-stat-label">执行中</span>
|
||||||
|
</span>
|
||||||
|
<span class="dashboard-overview-stat dashboard-overview-stat-done">
|
||||||
|
<span class="dashboard-overview-stat-badge badge-done"></span>
|
||||||
|
<span class="dashboard-overview-stat-value" id="dashboard-batch-done">-</span>
|
||||||
|
<span class="dashboard-overview-stat-label">已完成</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-overview-progress">
|
||||||
|
<div class="dashboard-overview-progress-bar">
|
||||||
|
<div class="dashboard-overview-progress-segment dashboard-overview-progress-pending" id="dashboard-batch-progress-pending" style="width: 0%"></div>
|
||||||
|
<div class="dashboard-overview-progress-segment dashboard-overview-progress-running" id="dashboard-batch-progress-running" style="width: 0%"></div>
|
||||||
|
<div class="dashboard-overview-progress-segment dashboard-overview-progress-done" id="dashboard-batch-progress-done" style="width: 0%"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-overview-item dashboard-overview-item-tools" role="button" tabindex="0" onclick="switchPage('mcp-monitor')" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); switchPage('mcp-monitor'); }">
|
||||||
|
<span class="dashboard-overview-icon dashboard-overview-icon-tools" aria-hidden="true"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z"/></svg></span>
|
||||||
|
<div class="dashboard-overview-content">
|
||||||
|
<div class="dashboard-overview-header">
|
||||||
|
<span class="dashboard-overview-label">工具调用</span>
|
||||||
|
<span class="dashboard-overview-success-rate" id="dashboard-tools-success-rate">-</span>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-overview-value-group">
|
||||||
|
<span class="dashboard-overview-value-large" id="dashboard-tools-calls">-</span>
|
||||||
|
<span class="dashboard-overview-value-unit">次调用</span>
|
||||||
|
<span class="dashboard-overview-value-separator">·</span>
|
||||||
|
<span class="dashboard-overview-value-normal" id="dashboard-tools-count">-</span>
|
||||||
|
<span class="dashboard-overview-value-unit">个工具</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-overview-item dashboard-overview-item-knowledge" role="button" tabindex="0" onclick="switchPage('knowledge-management')" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); switchPage('knowledge-management'); }">
|
||||||
|
<span class="dashboard-overview-icon dashboard-overview-icon-knowledge" aria-hidden="true"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M4 19.5A2.5 2.5 0 0 1 6.5 17H20"></path><path d="M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z"></path></svg></span>
|
||||||
|
<div class="dashboard-overview-content">
|
||||||
|
<div class="dashboard-overview-header">
|
||||||
|
<span class="dashboard-overview-label">知识</span>
|
||||||
|
<span class="dashboard-overview-status" id="dashboard-knowledge-status">-</span>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-overview-value-group">
|
||||||
|
<span class="dashboard-overview-value-large" id="dashboard-knowledge-items">-</span>
|
||||||
|
<span class="dashboard-overview-value-unit">项知识</span>
|
||||||
|
<span class="dashboard-overview-value-separator">·</span>
|
||||||
|
<span class="dashboard-overview-value-normal" id="dashboard-knowledge-categories">-</span>
|
||||||
|
<span class="dashboard-overview-value-unit">个分类</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-overview-item dashboard-overview-item-skills" role="button" tabindex="0" onclick="switchPage('skills-monitor')" onkeydown="if(event.key==='Enter'||event.key===' ') { event.preventDefault(); switchPage('skills-monitor'); }">
|
||||||
|
<span class="dashboard-overview-icon dashboard-overview-icon-skills" aria-hidden="true"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg></span>
|
||||||
|
<div class="dashboard-overview-content">
|
||||||
|
<div class="dashboard-overview-header">
|
||||||
|
<span class="dashboard-overview-label">Skills</span>
|
||||||
|
<span class="dashboard-overview-status" id="dashboard-skills-status">-</span>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-overview-value-group">
|
||||||
|
<span class="dashboard-overview-value-large" id="dashboard-skills-calls">-</span>
|
||||||
|
<span class="dashboard-overview-value-unit">次调用</span>
|
||||||
|
<span class="dashboard-overview-value-separator">·</span>
|
||||||
|
<span class="dashboard-overview-value-normal" id="dashboard-skills-count">-</span>
|
||||||
|
<span class="dashboard-overview-value-unit">个 Skill</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<section class="dashboard-section dashboard-section-quick dashboard-quick-inline">
|
||||||
|
<h3 class="dashboard-section-title">快捷入口</h3>
|
||||||
|
<div class="dashboard-quick-links dashboard-quick-links-row">
|
||||||
|
<a class="dashboard-quick-link" onclick="switchPage('chat')"><span class="dashboard-quick-icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"></path></svg></span><span>对话</span></a>
|
||||||
|
<a class="dashboard-quick-link" onclick="switchPage('tasks')"><span class="dashboard-quick-icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M9 11l3 3L22 4"></path><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg></span><span>任务管理</span></a>
|
||||||
|
<a class="dashboard-quick-link" onclick="switchPage('vulnerabilities')"><span class="dashboard-quick-icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"></path></svg></span><span>漏洞管理</span></a>
|
||||||
|
<a class="dashboard-quick-link" onclick="switchPage('mcp-management')"><span class="dashboard-quick-icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M13 2L3 14h9l-1 8 10-12h-9l1-8z"></path></svg></span><span>MCP 管理</span></a>
|
||||||
|
<a class="dashboard-quick-link" onclick="switchPage('knowledge-management')"><span class="dashboard-quick-icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"></path><path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"></path></svg></span><span>知识管理</span></a>
|
||||||
|
<a class="dashboard-quick-link" onclick="switchPage('skills-management')"><span class="dashboard-quick-icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M14.5 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7.5L14.5 2z"></path><polyline points="14 2 14 8 20 8"></polyline></svg></span><span>Skills 管理</span></a>
|
||||||
|
<a class="dashboard-quick-link" onclick="switchPage('roles-management')"><span class="dashboard-quick-icon"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg></span><span>角色管理</span></a>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-side">
|
||||||
|
<section class="dashboard-section dashboard-section-tools">
|
||||||
|
<h3 class="dashboard-section-title">工具执行次数</h3>
|
||||||
|
<div class="dashboard-tools-chart-wrap">
|
||||||
|
<div class="dashboard-tools-chart-placeholder" id="dashboard-tools-pie-placeholder">暂无数据</div>
|
||||||
|
<div class="dashboard-tools-bar-chart" id="dashboard-tools-bar-chart"></div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-cta-block">
|
||||||
|
<div class="dashboard-cta-content">
|
||||||
|
<div class="dashboard-cta-icon" aria-hidden="true">
|
||||||
|
<svg width="28" height="28" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"></path></svg>
|
||||||
|
</div>
|
||||||
|
<div class="dashboard-cta-copy">
|
||||||
|
<p class="dashboard-cta-text">开始你的安全之旅</p>
|
||||||
|
<p class="dashboard-cta-sub">在对话中描述目标,AI 将协助执行扫描与漏洞分析</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button class="dashboard-cta-btn" onclick="switchPage('chat')">
|
||||||
|
<span>前往对话</span>
|
||||||
|
<span class="dashboard-cta-btn-arrow" aria-hidden="true"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><path d="M5 12h14M12 5l7 7-7 7"/></svg></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- 对话页面 -->
|
<!-- 对话页面 -->
|
||||||
<div id="page-chat" class="page active">
|
<div id="page-chat" class="page">
|
||||||
<div class="chat-page-layout">
|
<div class="chat-page-layout">
|
||||||
<!-- 历史对话侧边栏 -->
|
<!-- 历史对话侧边栏 -->
|
||||||
<aside class="conversation-sidebar">
|
<aside class="conversation-sidebar">
|
||||||
@@ -544,6 +733,106 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- 信息收集页面 -->
|
||||||
|
<div id="page-info-collect" class="page">
|
||||||
|
<div class="page-header">
|
||||||
|
<h2>信息收集</h2>
|
||||||
|
<div class="page-header-actions">
|
||||||
|
<button class="btn-secondary" onclick="resetFofaForm()">重置</button>
|
||||||
|
<button class="btn-primary" onclick="submitFofaSearch()">确定</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="page-content">
|
||||||
|
<div class="info-collect-panel">
|
||||||
|
<div class="info-collect-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="fofa-query">FOFA 查询语法</label>
|
||||||
|
<textarea id="fofa-query" class="info-collect-query-input" rows="1" placeholder='例如:app="Apache" && country="CN"'></textarea>
|
||||||
|
<small class="form-hint">查询语法参考 FOFA 文档,支持 && / || / () 等。</small>
|
||||||
|
<div class="info-collect-presets" aria-label="FOFA 查询示例">
|
||||||
|
<button class="preset-chip" type="button" onclick="applyFofaQueryPreset('app="Apache" && country="CN"')" title="填入示例">Apache + 中国</button>
|
||||||
|
<button class="preset-chip" type="button" onclick="applyFofaQueryPreset('title="登录" && country="CN"')" title="填入示例">登录页 + 中国</button>
|
||||||
|
<button class="preset-chip" type="button" onclick="applyFofaQueryPreset('domain="example.com"')" title="填入示例">指定域名</button>
|
||||||
|
<button class="preset-chip" type="button" onclick="applyFofaQueryPreset('ip="1.1.1.1"')" title="填入示例">指定 IP</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="fofa-nl">自然语言(AI 解析为 FOFA 语法)</label>
|
||||||
|
<div class="info-collect-nl-row">
|
||||||
|
<textarea id="fofa-nl" class="info-collect-query-input" rows="1" placeholder="例如:找美国 Missouri 的 Apache 站点,标题包含 Home"></textarea>
|
||||||
|
<button id="fofa-nl-parse-btn" class="btn-secondary" type="button" onclick="parseFofaNaturalLanguage()" title="将自然语言解析为 FOFA 查询语法">AI 解析</button>
|
||||||
|
</div>
|
||||||
|
<div id="fofa-nl-status" class="fofa-nl-status muted" style="display: none;" aria-live="polite"></div>
|
||||||
|
<small class="form-hint">解析后会弹窗展示 FOFA 语法(可编辑),确认无误后再填入查询框并执行查询。</small>
|
||||||
|
</div>
|
||||||
|
<div class="info-collect-form-row">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="fofa-size">返回数量</label>
|
||||||
|
<input type="number" id="fofa-size" min="1" max="10000" value="100" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="fofa-page">页码</label>
|
||||||
|
<input type="number" id="fofa-page" min="1" value="1" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="checkbox-label" style="margin-top: 24px;">
|
||||||
|
<input type="checkbox" id="fofa-full" class="modern-checkbox" />
|
||||||
|
<span class="checkbox-custom"></span>
|
||||||
|
<span class="checkbox-text">full</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="fofa-fields">返回字段名(逗号分隔)</label>
|
||||||
|
<input type="text" id="fofa-fields" value="host,ip,port,domain,title,protocol,country,province,city,server" />
|
||||||
|
<div class="info-collect-presets" aria-label="FOFA 字段模板">
|
||||||
|
<button class="preset-chip" type="button" onclick="applyFofaFieldsPreset('host,ip,port,domain')" title="适合快速导出目标">最小字段</button>
|
||||||
|
<button class="preset-chip" type="button" onclick="applyFofaFieldsPreset('host,title,ip,port,domain,protocol,server,icp,country,province,city')" title="适合浏览和筛选">Web 常用</button>
|
||||||
|
<button class="preset-chip" type="button" onclick="applyFofaFieldsPreset('host,ip,port,domain,title,protocol,country,province,city,server,as_number,as_organization,icp,header,banner')" title="更偏指纹/情报">情报增强</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="info-collect-results">
|
||||||
|
<div class="info-collect-results-header">
|
||||||
|
<div class="info-collect-results-header-left">
|
||||||
|
<div class="info-collect-results-title">查询结果</div>
|
||||||
|
<div class="info-collect-results-meta" id="fofa-results-meta">-</div>
|
||||||
|
</div>
|
||||||
|
<div class="info-collect-results-toolbar" aria-label="结果工具条">
|
||||||
|
<div class="info-collect-selected" id="fofa-selected-meta">已选择 0 条</div>
|
||||||
|
<button class="btn-secondary btn-small" type="button" onclick="toggleFofaColumnsPanel()" title="显示/隐藏字段">列</button>
|
||||||
|
<button class="btn-secondary btn-small" type="button" onclick="exportFofaResults('csv')" title="导出当前结果为 CSV(UTF-8,兼容中文)">导出 CSV</button>
|
||||||
|
<button class="btn-secondary btn-small" type="button" onclick="exportFofaResults('json')" title="导出当前结果为 JSON">导出 JSON</button>
|
||||||
|
<button class="btn-secondary btn-small" type="button" onclick="exportFofaResults('xlsx')" title="导出当前结果为 Excel">导出 XLSX</button>
|
||||||
|
<button class="btn-primary btn-small" type="button" onclick="batchScanSelectedFofaRows()" title="将所选行创建为批量任务队列">批量扫描</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="info-collect-results-table-wrap">
|
||||||
|
<!-- 字段显示/隐藏面板 -->
|
||||||
|
<div id="fofa-columns-panel" class="info-collect-columns-panel" style="display: none;">
|
||||||
|
<div class="info-collect-columns-panel-header">
|
||||||
|
<div class="info-collect-columns-title">显示字段</div>
|
||||||
|
<div class="info-collect-columns-actions">
|
||||||
|
<button class="btn-secondary btn-small" type="button" onclick="showAllFofaColumns()">全选</button>
|
||||||
|
<button class="btn-secondary btn-small" type="button" onclick="hideAllFofaColumns()">全不选</button>
|
||||||
|
<button class="btn-secondary btn-small" type="button" onclick="closeFofaColumnsPanel()">关闭</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="fofa-columns-list" class="info-collect-columns-list"></div>
|
||||||
|
</div>
|
||||||
|
<table class="info-collect-table">
|
||||||
|
<thead id="fofa-results-thead"></thead>
|
||||||
|
<tbody id="fofa-results-tbody">
|
||||||
|
<tr><td class="muted" style="padding: 16px;">暂无数据</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- 漏洞管理页面 -->
|
<!-- 漏洞管理页面 -->
|
||||||
<div id="page-vulnerabilities" class="page">
|
<div id="page-vulnerabilities" class="page">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
@@ -773,6 +1062,9 @@
|
|||||||
<div class="settings-nav-item active" data-section="basic" onclick="switchSettingsSection('basic')">
|
<div class="settings-nav-item active" data-section="basic" onclick="switchSettingsSection('basic')">
|
||||||
<span>基本设置</span>
|
<span>基本设置</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="settings-nav-item" data-section="robots" onclick="switchSettingsSection('robots')">
|
||||||
|
<span>机器人设置</span>
|
||||||
|
</div>
|
||||||
<div class="settings-nav-item" data-section="security" onclick="switchSettingsSection('security')">
|
<div class="settings-nav-item" data-section="security" onclick="switchSettingsSection('security')">
|
||||||
<span>安全设置</span>
|
<span>安全设置</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -806,6 +1098,27 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- FOFA配置 -->
|
||||||
|
<div class="settings-subsection">
|
||||||
|
<h4>FOFA 配置</h4>
|
||||||
|
<div class="settings-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="fofa-base-url">Base URL</label>
|
||||||
|
<input type="text" id="fofa-base-url" placeholder="https://fofa.info/api/v1/search/all(可选)" />
|
||||||
|
<small class="form-hint">留空则使用默认地址。</small>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="fofa-email">Email</label>
|
||||||
|
<input type="text" id="fofa-email" placeholder="输入 FOFA 账号邮箱" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="fofa-api-key">API Key</label>
|
||||||
|
<input type="password" id="fofa-api-key" placeholder="输入 FOFA API Key" autocomplete="off" />
|
||||||
|
<small class="form-hint">仅保存在服务器配置中(`config.yaml`)。</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Agent配置 -->
|
<!-- Agent配置 -->
|
||||||
<div class="settings-subsection">
|
<div class="settings-subsection">
|
||||||
<h4>Agent 配置</h4>
|
<h4>Agent 配置</h4>
|
||||||
@@ -884,6 +1197,114 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- 机器人设置 -->
|
||||||
|
<div id="settings-section-robots" class="settings-section-content">
|
||||||
|
<div class="settings-section-header">
|
||||||
|
<h3>机器人设置</h3>
|
||||||
|
<p class="settings-description">配置企业微信、钉钉、飞书等机器人,在手机端直接与 CyberStrikeAI 对话,无需在服务器上打开网页。</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 企业微信 -->
|
||||||
|
<div class="settings-subsection">
|
||||||
|
<h4>企业微信</h4>
|
||||||
|
<div class="settings-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="checkbox-label">
|
||||||
|
<input type="checkbox" id="robot-wecom-enabled" class="modern-checkbox" />
|
||||||
|
<span class="checkbox-custom"></span>
|
||||||
|
<span class="checkbox-text">启用企业微信机器人</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-wecom-token">Token</label>
|
||||||
|
<input type="text" id="robot-wecom-token" placeholder="Token" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-wecom-encoding-aes-key">EncodingAESKey</label>
|
||||||
|
<input type="text" id="robot-wecom-encoding-aes-key" placeholder="EncodingAESKey(明文模式可留空)" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-wecom-corp-id">CorpID</label>
|
||||||
|
<input type="text" id="robot-wecom-corp-id" placeholder="企业 ID" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-wecom-secret">Secret</label>
|
||||||
|
<input type="password" id="robot-wecom-secret" placeholder="应用 Secret" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-wecom-agent-id">AgentID</label>
|
||||||
|
<input type="number" id="robot-wecom-agent-id" placeholder="应用 AgentId" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 钉钉 -->
|
||||||
|
<div class="settings-subsection">
|
||||||
|
<h4>钉钉</h4>
|
||||||
|
<div class="settings-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="checkbox-label">
|
||||||
|
<input type="checkbox" id="robot-dingtalk-enabled" class="modern-checkbox" />
|
||||||
|
<span class="checkbox-custom"></span>
|
||||||
|
<span class="checkbox-text">启用钉钉机器人</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-dingtalk-client-id">Client ID (AppKey)</label>
|
||||||
|
<input type="text" id="robot-dingtalk-client-id" placeholder="钉钉应用 AppKey" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-dingtalk-client-secret">Client Secret</label>
|
||||||
|
<input type="password" id="robot-dingtalk-client-secret" placeholder="钉钉应用 Secret" autocomplete="off" />
|
||||||
|
<small class="form-hint">需开启机器人能力并配置流式接入</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 飞书 -->
|
||||||
|
<div class="settings-subsection">
|
||||||
|
<h4>飞书 (Lark)</h4>
|
||||||
|
<div class="settings-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="checkbox-label">
|
||||||
|
<input type="checkbox" id="robot-lark-enabled" class="modern-checkbox" />
|
||||||
|
<span class="checkbox-custom"></span>
|
||||||
|
<span class="checkbox-text">启用飞书机器人</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-lark-app-id">App ID</label>
|
||||||
|
<input type="text" id="robot-lark-app-id" placeholder="飞书应用 App ID" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-lark-app-secret">App Secret</label>
|
||||||
|
<input type="password" id="robot-lark-app-secret" placeholder="飞书应用 App Secret" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="robot-lark-verify-token">Verify Token(可选)</label>
|
||||||
|
<input type="text" id="robot-lark-verify-token" placeholder="事件订阅 Verification Token" autocomplete="off" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="settings-subsection">
|
||||||
|
<h4>机器人命令说明</h4>
|
||||||
|
<p class="settings-description">在对话中可发送以下命令:</p>
|
||||||
|
<ul style="color: var(--text-muted); font-size: 13px; line-height: 1.8; margin: 8px 0 0 16px;">
|
||||||
|
<li><strong>帮助</strong> — 显示命令帮助</li>
|
||||||
|
<li><strong>列表</strong> 或 <strong>对话列表</strong> — 列出所有对话标题与 ID</li>
|
||||||
|
<li><strong>切换 <对话ID></strong> 或 <strong>继续 <对话ID></strong> — 指定对话 ID 继续对话</li>
|
||||||
|
<li><strong>新对话</strong> — 开启新对话</li>
|
||||||
|
<li><strong>清空</strong> — 清空当前对话上下文(不删除历史)</li>
|
||||||
|
<li><strong>当前</strong> — 显示当前对话 ID 与标题</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="settings-actions">
|
||||||
|
<button class="btn-primary" onclick="applySettings()">应用配置</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- 安全设置 -->
|
<!-- 安全设置 -->
|
||||||
<div id="settings-section-security" class="settings-section-content">
|
<div id="settings-section-security" class="settings-section-content">
|
||||||
<div class="settings-section-header">
|
<div class="settings-section-header">
|
||||||
@@ -1163,6 +1584,8 @@
|
|||||||
<script src="https://cdn.jsdelivr.net/npm/cytoscape@3.27.0/dist/cytoscape.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/cytoscape@3.27.0/dist/cytoscape.min.js"></script>
|
||||||
<!-- ELK.js for high-quality DAG layout (reduces edge crossings) -->
|
<!-- ELK.js for high-quality DAG layout (reduces edge crossings) -->
|
||||||
<script src="https://cdn.jsdelivr.net/npm/elkjs@0.9.2/lib/elk.bundled.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/elkjs@0.9.2/lib/elk.bundled.js"></script>
|
||||||
|
<!-- SheetJS for XLSX export (info-collect) -->
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/xlsx@0.18.5/dist/xlsx.full.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
// 确保ELK对象全局可用
|
// 确保ELK对象全局可用
|
||||||
if (typeof ELK === 'undefined' && typeof elk !== 'undefined') {
|
if (typeof ELK === 'undefined' && typeof elk !== 'undefined') {
|
||||||
@@ -1284,8 +1707,44 @@ version: 1.0.0<br>
|
|||||||
<div class="modal-body create-group-body">
|
<div class="modal-body create-group-body">
|
||||||
<p class="create-group-description">分组功能可将对话集中归类管理,让对话更加井然有序。</p>
|
<p class="create-group-description">分组功能可将对话集中归类管理,让对话更加井然有序。</p>
|
||||||
<div class="create-group-input-wrapper">
|
<div class="create-group-input-wrapper">
|
||||||
<span class="group-icon-input">😊</span>
|
<button type="button" class="group-icon-input" id="create-group-icon-btn" onclick="toggleGroupIconPicker()" title="点击选择图标">📁</button>
|
||||||
<input type="text" id="create-group-name-input" placeholder="请输入分组名称" />
|
<input type="text" id="create-group-name-input" placeholder="请输入分组名称" />
|
||||||
|
<!-- Emoji选择器面板 -->
|
||||||
|
<div id="group-icon-picker" class="group-icon-picker" style="display: none;">
|
||||||
|
<div class="icon-picker-header">
|
||||||
|
<span>选择图标</span>
|
||||||
|
<div class="icon-picker-custom">
|
||||||
|
<input type="text" id="custom-icon-input" class="custom-icon-input" placeholder="自定义" maxlength="2" />
|
||||||
|
<button type="button" class="custom-icon-btn" onclick="applyCustomIcon()">确定</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="icon-picker-grid">
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('📁')">📁</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🔒')">🔒</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🛡️')">🛡️</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('⚔️')">⚔️</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🎯')">🎯</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🔍')">🔍</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('💻')">💻</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🐛')">🐛</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🚀')">🚀</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('⚡')">⚡</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🔥')">🔥</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('💡')">💡</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🎮')">🎮</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🏴☠️')">🏴☠️</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🕵️')">🕵️</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🔑')">🔑</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('📡')">📡</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🌐')">🌐</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('📊')">📊</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('📝')">📝</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('🗂️')">🗂️</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('📌')">📌</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('⭐')">⭐</span>
|
||||||
|
<span class="icon-option" onclick="selectGroupIcon('💎')">💎</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="create-group-suggestions">
|
<div class="create-group-suggestions">
|
||||||
<div class="suggestion-tag" onclick="selectSuggestion('渗透测试')">渗透测试</div>
|
<div class="suggestion-tag" onclick="selectSuggestion('渗透测试')">渗透测试</div>
|
||||||
@@ -1425,10 +1884,10 @@ version: 1.0.0<br>
|
|||||||
<h2 id="batch-queue-detail-title">批量任务队列详情</h2>
|
<h2 id="batch-queue-detail-title">批量任务队列详情</h2>
|
||||||
<div style="display: flex; align-items: center; gap: 12px;">
|
<div style="display: flex; align-items: center; gap: 12px;">
|
||||||
<div class="modal-header-actions">
|
<div class="modal-header-actions">
|
||||||
<button class="btn-secondary" id="batch-queue-add-task-btn" onclick="showAddBatchTaskModal()" style="display: none;">添加任务</button>
|
<button class="btn-secondary btn-small" id="batch-queue-add-task-btn" onclick="showAddBatchTaskModal()" style="display: none;">添加任务</button>
|
||||||
<button class="btn-primary" id="batch-queue-start-btn" onclick="startBatchQueue()" style="display: none;">开始执行</button>
|
<button class="btn-primary btn-small" id="batch-queue-start-btn" onclick="startBatchQueue()" style="display: none;">开始执行</button>
|
||||||
<button class="btn-secondary" id="batch-queue-pause-btn" onclick="pauseBatchQueue()" style="display: none;">暂停队列</button>
|
<button class="btn-secondary btn-small" id="batch-queue-pause-btn" onclick="pauseBatchQueue()" style="display: none;">暂停队列</button>
|
||||||
<button class="btn-secondary btn-danger" id="batch-queue-delete-btn" onclick="deleteBatchQueue()" style="display: none;">删除队列</button>
|
<button class="btn-secondary btn-small btn-danger" id="batch-queue-delete-btn" onclick="deleteBatchQueue()" style="display: none;">删除队列</button>
|
||||||
</div>
|
</div>
|
||||||
<span class="modal-close" onclick="closeBatchQueueDetailModal()">×</span>
|
<span class="modal-close" onclick="closeBatchQueueDetailModal()">×</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -1664,7 +2123,9 @@ version: 1.0.0<br>
|
|||||||
|
|
||||||
<script src="/static/js/builtin-tools.js"></script>
|
<script src="/static/js/builtin-tools.js"></script>
|
||||||
<script src="/static/js/auth.js"></script>
|
<script src="/static/js/auth.js"></script>
|
||||||
|
<script src="/static/js/info-collect.js"></script>
|
||||||
<script src="/static/js/router.js"></script>
|
<script src="/static/js/router.js"></script>
|
||||||
|
<script src="/static/js/dashboard.js"></script>
|
||||||
<script src="/static/js/monitor.js"></script>
|
<script src="/static/js/monitor.js"></script>
|
||||||
<script src="/static/js/chat.js"></script>
|
<script src="/static/js/chat.js"></script>
|
||||||
<script src="/static/js/settings.js"></script>
|
<script src="/static/js/settings.js"></script>
|
||||||
|
|||||||
Reference in New Issue
Block a user