前端: - 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>
85 lines
2.8 KiB
Go
85 lines
2.8 KiB
Go
package models
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/google/uuid"
|
|
)
|
|
|
|
type LokiDeployment struct {
|
|
ID uint `json:"id"`
|
|
UUID string `json:"uuid"`
|
|
Name string `json:"name"`
|
|
Description string `json:"description"`
|
|
Version string `json:"version"`
|
|
Mode string `json:"mode"`
|
|
ClusterID *uint `json:"clusterID,omitempty"`
|
|
Cluster *Cluster `json:"cluster,omitempty"`
|
|
HostID *uint `json:"hostID,omitempty"`
|
|
Host *Host `json:"host,omitempty"`
|
|
Namespace string `json:"namespace"`
|
|
StorageConfigID uint `json:"storageConfigID"`
|
|
StorageConfig *StorageConfig `json:"storageConfig,omitempty"`
|
|
AuthEnabled bool `json:"authEnabled"`
|
|
RetentionDays int `json:"retentionDays"`
|
|
Replicas int `json:"replicas"`
|
|
ResourcesCPU string `json:"resourcesCPU"`
|
|
ResourcesMem string `json:"resourcesMem"`
|
|
StorageSize string `json:"storageSize"`
|
|
Status string `json:"status"`
|
|
StatusMessage string `json:"statusMessage"`
|
|
HelmValues string `json:"helmValues"`
|
|
Endpoint string `json:"endpoint"`
|
|
AdminUser string `json:"adminUser"`
|
|
AdminPassword string `json:"adminPassword"`
|
|
CreatedAt time.Time `json:"createdAt"`
|
|
UpdatedAt time.Time `json:"updatedAt"`
|
|
}
|
|
|
|
func (d *LokiDeployment) BeforeCreate() {
|
|
if d.UUID == "" {
|
|
d.UUID = uuid.New().String()
|
|
}
|
|
}
|
|
|
|
// Sanitized 返回去除敏感字段(AdminPassword)的部署视图,并对嵌套的
|
|
// Cluster/Host/StorageConfig 一并做脱敏,避免经部署接口泄漏各自凭证。
|
|
func (d *LokiDeployment) Sanitized() map[string]interface{} {
|
|
out := map[string]interface{}{
|
|
"id": d.ID,
|
|
"uuid": d.UUID,
|
|
"name": d.Name,
|
|
"description": d.Description,
|
|
"version": d.Version,
|
|
"mode": d.Mode,
|
|
"clusterID": d.ClusterID,
|
|
"hostID": d.HostID,
|
|
"namespace": d.Namespace,
|
|
"storageConfigID": d.StorageConfigID,
|
|
"authEnabled": d.AuthEnabled,
|
|
"retentionDays": d.RetentionDays,
|
|
"replicas": d.Replicas,
|
|
"resourcesCPU": d.ResourcesCPU,
|
|
"resourcesMem": d.ResourcesMem,
|
|
"storageSize": d.StorageSize,
|
|
"status": d.Status,
|
|
"statusMessage": d.StatusMessage,
|
|
"helmValues": d.HelmValues,
|
|
"endpoint": d.Endpoint,
|
|
"adminUser": d.AdminUser,
|
|
// AdminPassword 故意省略
|
|
"createdAt": d.CreatedAt,
|
|
"updatedAt": d.UpdatedAt,
|
|
}
|
|
if d.Cluster != nil {
|
|
out["cluster"] = d.Cluster.Sanitized()
|
|
}
|
|
if d.Host != nil {
|
|
out["host"] = d.Host.Sanitized()
|
|
}
|
|
if d.StorageConfig != nil {
|
|
out["storageConfig"] = d.StorageConfig.Sanitized()
|
|
}
|
|
return out
|
|
}
|