mirror of
https://github.com/Ed1s0nZ/CyberStrikeAI.git
synced 2026-05-22 15:39:47 +02:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eb47077082 | |||
| f9a482857d | |||
| 679a68b12f | |||
| 840a26c7ef | |||
| 030e69c02d | |||
| d9683cdb44 | |||
| 60a063dd7d | |||
| 5f0c1805a7 |
+1
-1
@@ -10,7 +10,7 @@
|
|||||||
# ============================================
|
# ============================================
|
||||||
|
|
||||||
# 前端显示的版本号(可选,不填则显示默认版本)
|
# 前端显示的版本号(可选,不填则显示默认版本)
|
||||||
version: "v1.6.11"
|
version: "v1.6.12"
|
||||||
# 服务器配置
|
# 服务器配置
|
||||||
server:
|
server:
|
||||||
host: 0.0.0.0 # 监听地址,0.0.0.0 表示监听所有网络接口
|
host: 0.0.0.0 # 监听地址,0.0.0.0 表示监听所有网络接口
|
||||||
|
|||||||
@@ -391,7 +391,8 @@ type MultiAgentAPIUpdate struct {
|
|||||||
RobotUseMultiAgent bool `json:"robot_use_multi_agent"`
|
RobotUseMultiAgent bool `json:"robot_use_multi_agent"`
|
||||||
BatchUseMultiAgent bool `json:"batch_use_multi_agent"`
|
BatchUseMultiAgent bool `json:"batch_use_multi_agent"`
|
||||||
PlanExecuteLoopMaxIterations *int `json:"plan_execute_loop_max_iterations,omitempty"`
|
PlanExecuteLoopMaxIterations *int `json:"plan_execute_loop_max_iterations,omitempty"`
|
||||||
ToolSearchAlwaysVisibleTools []string `json:"tool_search_always_visible_tools,omitempty"`
|
// 指针区分「JSON 未传该字段」与「传空数组要清空」;省略时不应覆盖 YAML 中的常驻工具白名单。
|
||||||
|
ToolSearchAlwaysVisibleTools *[]string `json:"tool_search_always_visible_tools,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// RobotsConfig 机器人配置(企业微信、钉钉、飞书等)
|
// RobotsConfig 机器人配置(企业微信、钉钉、飞书等)
|
||||||
|
|||||||
@@ -755,7 +755,9 @@ func (h *ConfigHandler) UpdateConfig(c *gin.Context) {
|
|||||||
if req.MultiAgent.PlanExecuteLoopMaxIterations != nil {
|
if req.MultiAgent.PlanExecuteLoopMaxIterations != nil {
|
||||||
h.config.MultiAgent.PlanExecuteLoopMaxIterations = *req.MultiAgent.PlanExecuteLoopMaxIterations
|
h.config.MultiAgent.PlanExecuteLoopMaxIterations = *req.MultiAgent.PlanExecuteLoopMaxIterations
|
||||||
}
|
}
|
||||||
h.config.MultiAgent.EinoMiddleware.ToolSearchAlwaysVisibleTools = dedupeToolNameList(req.MultiAgent.ToolSearchAlwaysVisibleTools)
|
if req.MultiAgent.ToolSearchAlwaysVisibleTools != nil {
|
||||||
|
h.config.MultiAgent.EinoMiddleware.ToolSearchAlwaysVisibleTools = dedupeToolNameList(*req.MultiAgent.ToolSearchAlwaysVisibleTools)
|
||||||
|
}
|
||||||
h.logger.Info("更新多代理配置",
|
h.logger.Info("更新多代理配置",
|
||||||
zap.Bool("enabled", h.config.MultiAgent.Enabled),
|
zap.Bool("enabled", h.config.MultiAgent.Enabled),
|
||||||
zap.Bool("robot_use_multi_agent", h.config.MultiAgent.RobotUseMultiAgent),
|
zap.Bool("robot_use_multi_agent", h.config.MultiAgent.RobotUseMultiAgent),
|
||||||
@@ -1474,6 +1476,11 @@ func updateRobotsConfig(doc *yaml.Node, cfg config.RobotsConfig) {
|
|||||||
root := doc.Content[0]
|
root := doc.Content[0]
|
||||||
robotsNode := ensureMap(root, "robots")
|
robotsNode := ensureMap(root, "robots")
|
||||||
|
|
||||||
|
if cfg.Session.StrictUserIdentity != nil {
|
||||||
|
sessionNode := ensureMap(robotsNode, "session")
|
||||||
|
setBoolInMap(sessionNode, "strict_user_identity", *cfg.Session.StrictUserIdentity)
|
||||||
|
}
|
||||||
|
|
||||||
wecomNode := ensureMap(robotsNode, "wecom")
|
wecomNode := ensureMap(robotsNode, "wecom")
|
||||||
setBoolInMap(wecomNode, "enabled", cfg.Wecom.Enabled)
|
setBoolInMap(wecomNode, "enabled", cfg.Wecom.Enabled)
|
||||||
setStringInMap(wecomNode, "token", cfg.Wecom.Token)
|
setStringInMap(wecomNode, "token", cfg.Wecom.Token)
|
||||||
@@ -1486,12 +1493,14 @@ func updateRobotsConfig(doc *yaml.Node, cfg config.RobotsConfig) {
|
|||||||
setBoolInMap(dingtalkNode, "enabled", cfg.Dingtalk.Enabled)
|
setBoolInMap(dingtalkNode, "enabled", cfg.Dingtalk.Enabled)
|
||||||
setStringInMap(dingtalkNode, "client_id", cfg.Dingtalk.ClientID)
|
setStringInMap(dingtalkNode, "client_id", cfg.Dingtalk.ClientID)
|
||||||
setStringInMap(dingtalkNode, "client_secret", cfg.Dingtalk.ClientSecret)
|
setStringInMap(dingtalkNode, "client_secret", cfg.Dingtalk.ClientSecret)
|
||||||
|
setBoolInMap(dingtalkNode, "allow_conversation_id_fallback", cfg.Dingtalk.AllowConversationIDFallback)
|
||||||
|
|
||||||
larkNode := ensureMap(robotsNode, "lark")
|
larkNode := ensureMap(robotsNode, "lark")
|
||||||
setBoolInMap(larkNode, "enabled", cfg.Lark.Enabled)
|
setBoolInMap(larkNode, "enabled", cfg.Lark.Enabled)
|
||||||
setStringInMap(larkNode, "app_id", cfg.Lark.AppID)
|
setStringInMap(larkNode, "app_id", cfg.Lark.AppID)
|
||||||
setStringInMap(larkNode, "app_secret", cfg.Lark.AppSecret)
|
setStringInMap(larkNode, "app_secret", cfg.Lark.AppSecret)
|
||||||
setStringInMap(larkNode, "verify_token", cfg.Lark.VerifyToken)
|
setStringInMap(larkNode, "verify_token", cfg.Lark.VerifyToken)
|
||||||
|
setBoolInMap(larkNode, "allow_chat_id_fallback", cfg.Lark.AllowChatIDFallback)
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateMultiAgentConfig(doc *yaml.Node, cfg config.MultiAgentConfig) {
|
func updateMultiAgentConfig(doc *yaml.Node, cfg config.MultiAgentConfig) {
|
||||||
|
|||||||
@@ -1087,6 +1087,7 @@ async function applySettings() {
|
|||||||
|
|
||||||
const wecomAgentIdVal = document.getElementById('robot-wecom-agent-id')?.value.trim();
|
const wecomAgentIdVal = document.getElementById('robot-wecom-agent-id')?.value.trim();
|
||||||
const prevOpenai = (currentConfig && currentConfig.openai) ? currentConfig.openai : {};
|
const prevOpenai = (currentConfig && currentConfig.openai) ? currentConfig.openai : {};
|
||||||
|
const prevRobots = (currentConfig && currentConfig.robots) ? currentConfig.robots : {};
|
||||||
const config = {
|
const config = {
|
||||||
openai: {
|
openai: {
|
||||||
...prevOpenai,
|
...prevOpenai,
|
||||||
@@ -1118,7 +1119,7 @@ async function applySettings() {
|
|||||||
return {
|
return {
|
||||||
enabled: document.getElementById('multi-agent-enabled')?.checked === true,
|
enabled: document.getElementById('multi-agent-enabled')?.checked === true,
|
||||||
robot_use_multi_agent: document.getElementById('multi-agent-robot-use')?.checked === true,
|
robot_use_multi_agent: document.getElementById('multi-agent-robot-use')?.checked === true,
|
||||||
batch_use_multi_agent: false,
|
batch_use_multi_agent: currentConfig?.multi_agent?.batch_use_multi_agent === true,
|
||||||
plan_execute_loop_max_iterations: peLoop
|
plan_execute_loop_max_iterations: peLoop
|
||||||
};
|
};
|
||||||
})(),
|
})(),
|
||||||
@@ -1127,6 +1128,7 @@ async function applySettings() {
|
|||||||
enabled: c2Enabled
|
enabled: c2Enabled
|
||||||
},
|
},
|
||||||
robots: {
|
robots: {
|
||||||
|
...(prevRobots.session && typeof prevRobots.session === 'object' ? { session: prevRobots.session } : {}),
|
||||||
wecom: {
|
wecom: {
|
||||||
enabled: document.getElementById('robot-wecom-enabled')?.checked === true,
|
enabled: document.getElementById('robot-wecom-enabled')?.checked === true,
|
||||||
token: document.getElementById('robot-wecom-token')?.value.trim() || '',
|
token: document.getElementById('robot-wecom-token')?.value.trim() || '',
|
||||||
@@ -1138,13 +1140,15 @@ async function applySettings() {
|
|||||||
dingtalk: {
|
dingtalk: {
|
||||||
enabled: document.getElementById('robot-dingtalk-enabled')?.checked === true,
|
enabled: document.getElementById('robot-dingtalk-enabled')?.checked === true,
|
||||||
client_id: document.getElementById('robot-dingtalk-client-id')?.value.trim() || '',
|
client_id: document.getElementById('robot-dingtalk-client-id')?.value.trim() || '',
|
||||||
client_secret: document.getElementById('robot-dingtalk-client-secret')?.value.trim() || ''
|
client_secret: document.getElementById('robot-dingtalk-client-secret')?.value.trim() || '',
|
||||||
|
allow_conversation_id_fallback: !!(prevRobots.dingtalk && prevRobots.dingtalk.allow_conversation_id_fallback)
|
||||||
},
|
},
|
||||||
lark: {
|
lark: {
|
||||||
enabled: document.getElementById('robot-lark-enabled')?.checked === true,
|
enabled: document.getElementById('robot-lark-enabled')?.checked === true,
|
||||||
app_id: document.getElementById('robot-lark-app-id')?.value.trim() || '',
|
app_id: document.getElementById('robot-lark-app-id')?.value.trim() || '',
|
||||||
app_secret: document.getElementById('robot-lark-app-secret')?.value.trim() || '',
|
app_secret: document.getElementById('robot-lark-app-secret')?.value.trim() || '',
|
||||||
verify_token: document.getElementById('robot-lark-verify-token')?.value.trim() || ''
|
verify_token: document.getElementById('robot-lark-verify-token')?.value.trim() || '',
|
||||||
|
allow_chat_id_fallback: !!(prevRobots.lark && prevRobots.lark.allow_chat_id_fallback)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
tools: []
|
tools: []
|
||||||
|
|||||||
Reference in New Issue
Block a user