refactor: 前后端目录结构模块化 + v2 优化移植与缺陷修复
前端: - 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>
This commit is contained in:
1 parent
fb8d10231a
commit
327e282356
93 files changed
+8433
-3089
No files matched your search
+31
-24
@@ -1,7 +1,9 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"lokideploy/dto"
|
||||
"lokideploy/models"
|
||||
"lokideploy/pkg/jwt"
|
||||
"lokideploy/services"
|
||||
"lokideploy/utils"
|
||||
|
||||
@@ -16,38 +18,43 @@ func NewAuthController() *AuthController {
|
||||
return &AuthController{service: services.NewAuthService()}
|
||||
}
|
||||
|
||||
type LoginRequest struct {
|
||||
Username string `json:"username" binding:"required"`
|
||||
Password string `json:"password" binding:"required"`
|
||||
}
|
||||
|
||||
type RegisterRequest struct {
|
||||
Username string `json:"username" binding:"required"`
|
||||
Password string `json:"password" binding:"required,min=6"`
|
||||
Nickname string `json:"nickname"`
|
||||
Role string `json:"role"`
|
||||
}
|
||||
|
||||
type ChangePasswordRequest struct {
|
||||
OldPassword string `json:"oldPassword" binding:"required"`
|
||||
NewPassword string `json:"newPassword" binding:"required,min=6"`
|
||||
}
|
||||
|
||||
func (ctrl *AuthController) Login(c *gin.Context) {
|
||||
var req LoginRequest
|
||||
var req dto.LoginRequest
|
||||
if !utils.BindAndValidate(c, &req) {
|
||||
return
|
||||
}
|
||||
user, token, err := ctrl.service.Login(req.Username, req.Password)
|
||||
user, tokenPair, err := ctrl.service.Login(req.Username, req.Password)
|
||||
if err != nil {
|
||||
utils.Unauthorized(c, "用户名或密码错误")
|
||||
return
|
||||
}
|
||||
utils.Success(c, gin.H{"token": token, "user": models.SanitizedJSON(user)})
|
||||
utils.Success(c, gin.H{
|
||||
"accessToken": tokenPair.AccessToken,
|
||||
"refreshToken": tokenPair.RefreshToken,
|
||||
"expiresAt": tokenPair.ExpiresAt.Unix(),
|
||||
"user": models.SanitizedJSON(user),
|
||||
})
|
||||
}
|
||||
|
||||
func (ctrl *AuthController) RefreshToken(c *gin.Context) {
|
||||
var req dto.RefreshTokenRequest
|
||||
if !utils.BindAndValidate(c, &req) {
|
||||
return
|
||||
}
|
||||
tokenPair, err := jwt.RefreshAccessToken(req.RefreshToken)
|
||||
if err != nil {
|
||||
utils.Unauthorized(c, "invalid or expired refresh token")
|
||||
return
|
||||
}
|
||||
utils.Success(c, gin.H{
|
||||
"accessToken": tokenPair.AccessToken,
|
||||
"refreshToken": tokenPair.RefreshToken,
|
||||
"expiresAt": tokenPair.ExpiresAt.Unix(),
|
||||
})
|
||||
}
|
||||
|
||||
func (ctrl *AuthController) Register(c *gin.Context) {
|
||||
var req RegisterRequest
|
||||
var req dto.RegisterRequest
|
||||
if !utils.BindAndValidate(c, &req) {
|
||||
return
|
||||
}
|
||||
@@ -63,7 +70,7 @@ func (ctrl *AuthController) Register(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (ctrl *AuthController) GetUser(c *gin.Context) {
|
||||
claims, ok := utils.GetUserFromContext(c)
|
||||
claims, ok := jwt.GetUserFromContext(c)
|
||||
if !ok {
|
||||
utils.Unauthorized(c, "")
|
||||
return
|
||||
@@ -77,11 +84,11 @@ func (ctrl *AuthController) GetUser(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (ctrl *AuthController) ChangePassword(c *gin.Context) {
|
||||
var req ChangePasswordRequest
|
||||
var req dto.ChangePasswordRequest
|
||||
if !utils.BindAndValidate(c, &req) {
|
||||
return
|
||||
}
|
||||
claims, ok := utils.GetUserFromContext(c)
|
||||
claims, ok := jwt.GetUserFromContext(c)
|
||||
if !ok {
|
||||
utils.Unauthorized(c, "")
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user