Logan.LiandClaude
327e282356
前端: - src/srv/api → src/api，按域分文件夹(auth/cluster/host/storage/deployment/collector) - 新增 http.ts 引擎(http.get/post/put/delete)，域模块改用语义化调用 - index.html 增加 favicon(匹配应用 logo 的 emerald + Activity 脉冲) 后端分层增强(保留包名): - 新增 repository/：从 models 拆出 JsonDB 持久化层(InitDB/GetDB/Shutdown/RequestSave) - 新增 dto/：从 controllers 抽出各域请求契约(带 binding 校验) - 新增 pkg/crypto、pkg/jwt：从 utils 拆出安全原语(外部 jwt 别名 jwtv5 避免冲突) - models 只留领域实体 + sanitizer；utils 只留 gin/应用相关(response/errors) v2 优化移植与缺陷修复: - 移植密钥分离/SSH TOFU/并发写安全/Loki 生产级配置/Docker 加固 - 修复 deployment.go 并发丢更新、Helm values 重复键、EncryptField 哨兵、loki-gateway 端点等审计缺陷 - 实现真正的优雅关停(main.go http.Server + signal + repository.Shutdown) - 修复登录契约:后端返回 accessToken，前端 auth.ts/Login.tsx 对齐 - 补 crypto/jwt/repository 单元测试(含并发写回归) 验证: go build/vet/test 全绿；npm run build 通过；登录→鉴权→优雅关停冒烟通过 Co-Authored-By: Claude <noreply@anthropic.com>
64 lines
1.9 KiB
Go
64 lines
1.9 KiB
Go
package models
|
|
|
|
import (
|
|
"time"
|
|
|
|
"lokideploy/pkg/crypto"
|
|
)
|
|
|
|
type Cluster struct {
|
|
ID uint `json:"id"`
|
|
Name string `json:"name"`
|
|
Description string `json:"description"`
|
|
ConfigType string `json:"configType"` // kubeconfig | token
|
|
APIServer string `json:"apiServer"` // 展示用
|
|
KubeConfig string `json:"kubeconfig"` // 统一存储（加密存储时带ENC:前缀）
|
|
KubeConfigPath string `json:"kubeconfigPath"`
|
|
Context string `json:"context"`
|
|
Version string `json:"version"`
|
|
NodesCount int `json:"nodesCount"`
|
|
Status string `json:"status"`
|
|
LastConnected time.Time `json:"lastConnected"`
|
|
CreatedAt time.Time `json:"createdAt"`
|
|
UpdatedAt time.Time `json:"updatedAt"`
|
|
}
|
|
|
|
func (c *Cluster) Sanitized() map[string]interface{} {
|
|
return map[string]interface{}{
|
|
"id": c.ID,
|
|
"name": c.Name,
|
|
"description": c.Description,
|
|
"configType": c.ConfigType,
|
|
"apiServer": c.APIServer,
|
|
"context": c.Context,
|
|
"version": c.Version,
|
|
"nodesCount": c.NodesCount,
|
|
"status": c.Status,
|
|
"hasKubeconfig": c.KubeConfig != "",
|
|
"lastConnected": c.LastConnected,
|
|
"createdAt": c.CreatedAt,
|
|
"updatedAt": c.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
// DecryptKubeconfig 解密集群的kubeconfig配置
|
|
// kubeconfig字段可能以ENC:前缀存储加密数据
|
|
func (c *Cluster) DecryptKubeconfig() string {
|
|
return crypto.DecryptField(c.KubeConfig)
|
|
}
|
|
|
|
// IsKubeconfigEncrypted 检查kubeconfig是否已加密存储
|
|
func (c *Cluster) IsKubeconfigEncrypted() bool {
|
|
return crypto.IsEncryptedField(c.KubeConfig)
|
|
}
|
|
|
|
// EncryptAndSetKubeconfig 加密并设置kubeconfig
|
|
func (c *Cluster) EncryptAndSetKubeconfig(kubeconfig string) error {
|
|
enc, err := crypto.EncryptField(kubeconfig)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
c.KubeConfig = enc
|
|
return nil
|
|
}
|