server: 平台抽象层+bilibili、服务端加密凭据库、角色中间件;web: 精简页面/路由、macOS 客户端(Swift)与多份方案文档;移除误入库的编译产物
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"crypto/ed25519"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
@@ -12,11 +11,13 @@ import (
|
||||
"everypublish/server/internal/api/middleware"
|
||||
"everypublish/server/internal/cache"
|
||||
"everypublish/server/internal/config"
|
||||
"everypublish/server/internal/credentials"
|
||||
"everypublish/server/internal/platform"
|
||||
"everypublish/server/internal/ws"
|
||||
)
|
||||
|
||||
// Router 装配 gin 路由
|
||||
func Router(cfg *config.Config, db *gorm.DB, rds *cache.Redis, hub *ws.Hub, serverKey ed25519.PrivateKey, dsp *ws.Dispatcher) *gin.Engine {
|
||||
func Router(cfg *config.Config, db *gorm.DB, rds *cache.Redis, hub *ws.Hub, dsp *ws.Dispatcher) *gin.Engine {
|
||||
r := gin.New()
|
||||
r.Use(gin.Logger(), gin.Recovery())
|
||||
|
||||
@@ -35,23 +36,41 @@ func Router(cfg *config.Config, db *gorm.DB, rds *cache.Redis, hub *ws.Hub, serv
|
||||
})
|
||||
})
|
||||
|
||||
// WSS 双通道:Agent 设备签名 / 浏览器 JWT
|
||||
r.GET("/ws/agent", ws.HandleAgent(cfg, db, hub, serverKey))
|
||||
r.GET("/ws/browser", ws.HandleBrowser(cfg, hub))
|
||||
|
||||
api := r.Group("/api/v1")
|
||||
api.Use(middleware.Audit(db))
|
||||
api.GET("/runtime/status", middleware.AuthRequired(cfg), func(c *gin.Context) {
|
||||
mode := cfg.ExecutorMode
|
||||
adapters := []string(nil)
|
||||
if dsp != nil && dsp.Registry != nil {
|
||||
adapters = dsp.Registry.Names()
|
||||
}
|
||||
dbOK := false
|
||||
if sqlDB, err := db.DB(); err == nil {
|
||||
dbOK = sqlDB.Ping() == nil
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{"code": 0, "message": "ok", "data": gin.H{
|
||||
"executorMode": mode, "adapters": adapters, "db": dbOK, "redis": rds.Ping() == nil,
|
||||
}})
|
||||
})
|
||||
|
||||
authH := &handlers.AuthHandler{DB: db, Rds: rds, Cfg: cfg}
|
||||
wsH := &handlers.WorkspaceHandler{DB: db}
|
||||
mbH := &handlers.MemberHandler{DB: db, Cfg: cfg}
|
||||
adH := &handlers.AuditHandler{DB: db}
|
||||
accH := &handlers.AccountHandler{DB: db, Hub: hub}
|
||||
var registry *platform.Registry
|
||||
var credentialStore *credentials.Store
|
||||
if dsp != nil {
|
||||
registry = dsp.Registry
|
||||
credentialStore = dsp.Credentials
|
||||
}
|
||||
accH := &handlers.AccountHandler{DB: db, Hub: hub, Registry: registry, Credentials: credentialStore, ExecutorMode: cfg.ExecutorMode}
|
||||
matH := &handlers.MaterialHandler{DB: db, Cfg: cfg}
|
||||
tskH := &handlers.TaskHandler{DB: db, Dispatcher: dsp}
|
||||
chlH := &handlers.ChallengeHandler{DB: db}
|
||||
chlH := &handlers.ChallengeHandler{DB: db, Hub: hub, Registry: registry, ExecutorMode: cfg.ExecutorMode}
|
||||
chlH.StartLoginPoll = accH.StartLoginPoll
|
||||
ntfH := &handlers.NotificationHandler{DB: db}
|
||||
agH := &handlers.AgentHandler{DB: db, Hub: hub}
|
||||
|
||||
auth := api.Group("/auth")
|
||||
{
|
||||
@@ -59,7 +78,9 @@ func Router(cfg *config.Config, db *gorm.DB, rds *cache.Redis, hub *ws.Hub, serv
|
||||
auth.POST("/login", authH.Login)
|
||||
auth.POST("/refresh", authH.Refresh)
|
||||
auth.POST("/logout", middleware.AuthRequired(cfg), authH.Logout)
|
||||
auth.POST("/password", middleware.AuthRequired(cfg), authH.ChangePassword)
|
||||
auth.GET("/me", middleware.AuthRequired(cfg), authH.Me)
|
||||
auth.POST("/switch-workspace/:id", middleware.AuthRequired(cfg), authH.SwitchWorkspace)
|
||||
}
|
||||
|
||||
wsg := api.Group("/workspaces", middleware.AuthRequired(cfg))
|
||||
@@ -86,17 +107,20 @@ func Router(cfg *config.Config, db *gorm.DB, rds *cache.Redis, hub *ws.Hub, serv
|
||||
acc := api.Group("/accounts", middleware.AuthRequired(cfg))
|
||||
{
|
||||
acc.GET("", accH.List)
|
||||
acc.POST("", accH.Create)
|
||||
acc.PUT("/:id", accH.Update)
|
||||
acc.DELETE("/:id", accH.Delete)
|
||||
acc.POST("/:id/bind", accH.Bind)
|
||||
acc.POST("", middleware.WorkspaceRoles("owner", "admin", "operator"), accH.Create)
|
||||
acc.PUT("/:id", middleware.WorkspaceRoles("owner", "admin", "operator"), accH.Update)
|
||||
acc.DELETE("/:id", middleware.WorkspaceRoles("owner", "admin"), accH.Delete)
|
||||
acc.POST("/:id/bind", middleware.WorkspaceRoles("owner", "admin", "operator"), accH.Bind)
|
||||
acc.POST("/:id/credentials", middleware.WorkspaceRoles("owner", "admin", "operator"), accH.ImportCredentials)
|
||||
acc.POST("/:id/check", middleware.WorkspaceRoles("owner", "admin", "operator"), accH.Check)
|
||||
acc.POST("/:id/unbind", middleware.WorkspaceRoles("owner", "admin"), accH.Unbind)
|
||||
}
|
||||
|
||||
mat := api.Group("/materials", middleware.AuthRequired(cfg))
|
||||
{
|
||||
mat.GET("", matH.List)
|
||||
mat.POST("", matH.Upload)
|
||||
mat.DELETE("/:id", matH.Delete)
|
||||
mat.POST("", middleware.WorkspaceRoles("owner", "admin", "operator"), matH.Upload)
|
||||
mat.DELETE("/:id", middleware.WorkspaceRoles("owner", "admin", "operator"), matH.Delete)
|
||||
mat.GET("/:id/url", matH.URL)
|
||||
}
|
||||
|
||||
@@ -108,24 +132,25 @@ func Router(cfg *config.Config, db *gorm.DB, rds *cache.Redis, hub *ws.Hub, serv
|
||||
tsk := api.Group("/tasks", middleware.AuthRequired(cfg))
|
||||
{
|
||||
tsk.GET("", tskH.List)
|
||||
tsk.POST("", tskH.Create)
|
||||
tsk.POST("", middleware.WorkspaceRoles("owner", "admin", "operator"), tskH.Create)
|
||||
tsk.GET("/:id/events", tskH.Events)
|
||||
tsk.GET("/:id", tskH.Get)
|
||||
tsk.PUT("/:id", tskH.Update)
|
||||
tsk.DELETE("/:id", tskH.Delete)
|
||||
tsk.POST("/:id/submit", tskH.Submit)
|
||||
tsk.POST("/:id/approve", tskH.Approve)
|
||||
tsk.POST("/:id/reject", tskH.Reject)
|
||||
tsk.POST("/:id/resubmit", tskH.Resubmit)
|
||||
tsk.POST("/:id/retry", tskH.Retry)
|
||||
tsk.POST("/:id/cancel", tskH.Cancel)
|
||||
tsk.PUT("/:id", middleware.WorkspaceRoles("owner", "admin", "operator"), tskH.Update)
|
||||
tsk.DELETE("/:id", middleware.WorkspaceRoles("owner", "admin", "operator"), tskH.Delete)
|
||||
tsk.POST("/:id/submit", middleware.WorkspaceRoles("owner", "admin", "operator"), tskH.Submit)
|
||||
tsk.POST("/:id/approve", middleware.WorkspaceRoles("owner", "admin", "reviewer"), tskH.Approve)
|
||||
tsk.POST("/:id/reject", middleware.WorkspaceRoles("owner", "admin", "reviewer"), tskH.Reject)
|
||||
tsk.POST("/:id/resubmit", middleware.WorkspaceRoles("owner", "admin", "operator"), tskH.Resubmit)
|
||||
tsk.POST("/:id/retry", middleware.WorkspaceRoles("owner", "admin", "operator"), tskH.Retry)
|
||||
tsk.POST("/:id/cancel", middleware.WorkspaceRoles("owner", "admin", "operator"), tskH.Cancel)
|
||||
}
|
||||
|
||||
chl := api.Group("/challenges", middleware.AuthRequired(cfg))
|
||||
{
|
||||
chl.GET("", chlH.List)
|
||||
chl.POST("/:id/solve", chlH.Solve)
|
||||
chl.POST("/:id/resend", chlH.Resend)
|
||||
chl.POST("/:id/suspend", chlH.Suspend)
|
||||
chl.POST("/:id/solve", middleware.WorkspaceRoles("owner", "admin", "operator", "reviewer"), chlH.Solve)
|
||||
chl.POST("/:id/resend", middleware.WorkspaceRoles("owner", "admin", "operator", "reviewer"), chlH.Resend)
|
||||
chl.POST("/:id/suspend", middleware.WorkspaceRoles("owner", "admin", "operator", "reviewer"), chlH.Suspend)
|
||||
}
|
||||
|
||||
ntf := api.Group("/notifications", middleware.AuthRequired(cfg))
|
||||
@@ -135,21 +160,11 @@ func Router(cfg *config.Config, db *gorm.DB, rds *cache.Redis, hub *ws.Hub, serv
|
||||
ntf.POST("/read-all", ntfH.ReadAll)
|
||||
}
|
||||
|
||||
ag := api.Group("/agent")
|
||||
{
|
||||
ag.POST("/pair-code", middleware.AuthRequired(cfg), agH.PairCode)
|
||||
ag.GET("/devices", middleware.AuthRequired(cfg), agH.Devices)
|
||||
ag.PUT("/devices/:id/revoke", middleware.AuthRequired(cfg), agH.Revoke)
|
||||
}
|
||||
api.POST("/agent/pair", agH.Pair)
|
||||
|
||||
admH := &handlers.AdminHandler{DB: db, Hub: hub}
|
||||
adm := api.Group("/admin", middleware.AuthRequired(cfg), middleware.AdminRequired())
|
||||
{
|
||||
adm.GET("/tenants", admH.Tenants)
|
||||
adm.PUT("/tenants/:id/status", admH.TenantStatus)
|
||||
adm.GET("/agents", admH.Agents)
|
||||
adm.PUT("/agents/:id/revoke", admH.AgentRevoke)
|
||||
}
|
||||
|
||||
return r
|
||||
|
||||
Reference in New Issue
Block a user