feat(llm): 大模型双协议(OpenAI+Anthropic)接入 + SSH凭证修复 + 容量预测AI解读
后端双协议: 新增 anthropic.go(Complete/Stream/工具转换) + client.go 工厂按 Protocol 路由; llm.Client 加 Stream; llm_chat 三方法收敛复用 llm.Client; resolveProtocol 按 provider 路由; Agent CLI 注入协议。编码套餐(GLM-5.2/Kimi/MiMo/Anthropic)走 Anthropic /v1/messages。 SSH凭证修复: applyCredential 正确解析凭证 JSON 的 private_key(旧实现把整个 JSON 当私钥 → ssh.ParsePrivateKey 失败 → ssh-key 登录不通); AssignCredential/批量导入/单台 CRUD 三处统一; 单台补齐 credential_id 字段(原被忽略)。 容量预测: 新增 AI 深度解读(buildCapacityInsightPrompt + PredictiveCapacityTab 按钮, 复用 aiApi.chat)。 其他: DeepSeek 模型名更新为 deepseek-v4-flash/pro; 智能助手去掉重复模型配置按钮; LLMConfig 精简生成参数(Claude Code 式)。 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
1 parent
c0ee8e4ddd
commit
0b2e43ea9e
16 files changed
+689
-296
No files matched your search
@@ -1,6 +1,7 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
@@ -43,15 +44,7 @@ func (h *CredentialHandler) AssignCredential(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
if cred.SecretType == "ssh" {
|
||||
server.SSHKey = plain
|
||||
server.AuthType = "key"
|
||||
server.Password = ""
|
||||
} else {
|
||||
server.Password = plain
|
||||
server.AuthType = "password"
|
||||
server.SSHKey = ""
|
||||
}
|
||||
applyCredential(cred, plain, &server)
|
||||
|
||||
if err := h.db.Save(&server).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, model.Response{Code: 500, Message: "分配失败: " + err.Error()})
|
||||
@@ -60,3 +53,30 @@ func (h *CredentialHandler) AssignCredential(c *gin.Context) {
|
||||
|
||||
c.JSON(http.StatusOK, model.Response{Code: 200, Message: "凭据已关联"})
|
||||
}
|
||||
|
||||
// applyCredential 将解密后的明文 plain 填充到 server 认证字段(统一入口,避免 plain JSON 误用) // Logan.Li
|
||||
// ssh 凭证 plain 是 JSON {"private_key":...,"ssh_user":...,"ssh_port":...},须解析出 private_key(旧实现直接把
|
||||
// 整个 JSON 当私钥,导致 ssh.ParsePrivateKey 失败 → ssh-key 登录不通);其余类型 plain 即密码。
|
||||
// 供 AssignCredential / 单台服务器 CRUD / 批量导入 三处复用。
|
||||
func applyCredential(cred model.Credential, plain string, server *model.Server) {
|
||||
if cred.SecretType == "ssh" {
|
||||
privateKey := plain
|
||||
var sshc model.SSHSecretContent
|
||||
if json.Unmarshal([]byte(plain), &sshc) == nil && sshc.PrivateKey != "" {
|
||||
privateKey = sshc.PrivateKey
|
||||
if sshc.SSHUser != "" {
|
||||
server.Username = sshc.SSHUser
|
||||
}
|
||||
if sshc.SSHPort > 0 {
|
||||
server.Port = sshc.SSHPort
|
||||
}
|
||||
}
|
||||
server.SSHKey = privateKey
|
||||
server.AuthType = "key"
|
||||
server.Password = ""
|
||||
} else {
|
||||
server.Password = plain
|
||||
server.AuthType = "password"
|
||||
server.SSHKey = ""
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user