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
@@ -1,9 +1,11 @@
|
||||
package routers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"lokideploy/controllers"
|
||||
"lokideploy/middleware"
|
||||
@@ -33,8 +35,25 @@ func SetupRouter() *gin.Engine {
|
||||
// API v1
|
||||
api := r.Group("/api/v1")
|
||||
|
||||
// 健康检查(公开访问,用于负载均衡和监控)
|
||||
api.GET("/health", func(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"status": "ok",
|
||||
"timestamp": time.Now().Unix(),
|
||||
"version": "2.0.0",
|
||||
})
|
||||
})
|
||||
|
||||
// Prometheus metrics 端点(公开访问,可被Prometheus抓取)
|
||||
api.GET("/metrics", func(c *gin.Context) {
|
||||
// 基础metrics输出(符合Prometheus文本格式)
|
||||
c.Header("Content-Type", "text/plain; version=0.0.4; charset=utf-8")
|
||||
c.String(http.StatusOK, "# LokiDeploy Metrics\n")
|
||||
})
|
||||
|
||||
// Public
|
||||
api.POST("/auth/login", authCtrl.Login)
|
||||
api.POST("/auth/refresh", authCtrl.RefreshToken)
|
||||
|
||||
// Auth required
|
||||
authorized := api.Group("")
|
||||
@@ -84,7 +103,7 @@ func SetupRouter() *gin.Engine {
|
||||
authorized.GET("/deployments/:id/logs", deploymentCtrl.GetLogs)
|
||||
authorized.GET("/deployments/stats", deploymentCtrl.GetStats)
|
||||
|
||||
// Collectors(日志采集器 / 部署客户端)
|
||||
// Collectors
|
||||
authorized.GET("/collectors", collectorCtrl.List)
|
||||
authorized.GET("/collectors/:id", collectorCtrl.Get)
|
||||
authorized.POST("/collectors", collectorCtrl.Create)
|
||||
@@ -98,6 +117,21 @@ func SetupRouter() *gin.Engine {
|
||||
|
||||
if distPath != "" {
|
||||
r.Static("/assets", filepath.Join(distPath, "assets"))
|
||||
|
||||
// favicon:NoRoute 会把所有非 /api/ 请求回退到 index.html,
|
||||
// 故此处显式注册 /favicon.svg 与 /favicon.ico,否则浏览器请求图标只会拿到 HTML。
|
||||
faviconSVG := filepath.Join(distPath, "favicon.svg")
|
||||
serveFavicon := func(c *gin.Context) {
|
||||
if _, err := os.Stat(faviconSVG); err != nil {
|
||||
c.Status(404)
|
||||
return
|
||||
}
|
||||
c.Header("Content-Type", "image/svg+xml")
|
||||
c.File(faviconSVG)
|
||||
}
|
||||
r.GET("/favicon.svg", serveFavicon)
|
||||
r.GET("/favicon.ico", serveFavicon)
|
||||
|
||||
r.NoRoute(func(c *gin.Context) {
|
||||
if strings.HasPrefix(c.Request.URL.Path, "/api/") {
|
||||
c.JSON(404, gin.H{"code": 404, "message": "API endpoint not found"})
|
||||
|
||||
Reference in new issue
Block a user