feat: update template
This commit is contained in:
48
internal/handler/admin/access_log.go
Normal file
48
internal/handler/admin/access_log.go
Normal file
@@ -0,0 +1,48 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"server/internal/model/common"
|
||||
"server/internal/pkg/httputil"
|
||||
"server/internal/router"
|
||||
"server/internal/service/admin"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
type AccessLogHandler struct {
|
||||
accessLogService *admin.AccessLogService
|
||||
}
|
||||
|
||||
var _ router.Registrar = (*AccessLogHandler)(nil)
|
||||
|
||||
func NewAccessLogHandler(accessLogService *admin.AccessLogService) *AccessLogHandler {
|
||||
return &AccessLogHandler{
|
||||
accessLogService: accessLogService,
|
||||
}
|
||||
}
|
||||
|
||||
func (h *AccessLogHandler) Register(r chi.Router) {
|
||||
r.Route("/access-logs", func(r chi.Router) {
|
||||
r.Get("/", h.List)
|
||||
})
|
||||
}
|
||||
|
||||
func (h *AccessLogHandler) List(w http.ResponseWriter, r *http.Request) {
|
||||
pagination := httputil.Pagination(r)
|
||||
|
||||
result, err := h.accessLogService.List(r.Context(), pagination)
|
||||
if err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
resp := common.PageResponse{
|
||||
Page: pagination.Page,
|
||||
PageSize: pagination.PageSize,
|
||||
List: result.List,
|
||||
Total: result.Total,
|
||||
}
|
||||
|
||||
httputil.OkWithPage(w, &resp)
|
||||
}
|
||||
@@ -84,7 +84,7 @@ func (h *ApiHandler) ListApiGroups(w http.ResponseWriter, r *http.Request) {
|
||||
func (h *ApiHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.CreateApiRequest
|
||||
|
||||
if err := httputil.BindJson(r, &req); err != nil {
|
||||
if err := httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -106,7 +106,7 @@ func (h *ApiHandler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"server/internal/config"
|
||||
"server/internal/model/request"
|
||||
@@ -48,7 +49,7 @@ func (h *AuthHandler) clearRefreshTokenCookie(w http.ResponseWriter) {
|
||||
func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.LoginRequest
|
||||
|
||||
if err := httputil.BindJson(r, &req); err != nil {
|
||||
if err := httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, errs.ErrInvalidCredentials)
|
||||
return
|
||||
}
|
||||
@@ -95,9 +96,12 @@ func (h *AuthHandler) RefreshToken(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
res, err := h.authService.RefreshToken(r.Context(), cookie.Value)
|
||||
if err != nil {
|
||||
// 用户被禁用 调用logout
|
||||
_ = h.authService.Logout(r.Context(), cookie.Value)
|
||||
h.clearRefreshTokenCookie(w)
|
||||
|
||||
if errors.Is(err, errs.ErrInvalidRefreshToken) {
|
||||
// 用户被禁用 调用logout
|
||||
_ = h.authService.Logout(r.Context(), cookie.Value)
|
||||
h.clearRefreshTokenCookie(w)
|
||||
}
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ func (h *CategoryHandler) ListAll(w http.ResponseWriter, r *http.Request) {
|
||||
func (h *CategoryHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.CreateCategoryRequest
|
||||
|
||||
if err := httputil.BindJson(r, &req); err != nil {
|
||||
if err := httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -82,7 +82,7 @@ func (h *CategoryHandler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
var req request.UpdateCategoryRequest
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -1,24 +1,37 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"path/filepath"
|
||||
"server/internal/config"
|
||||
"server/internal/model/common"
|
||||
"server/internal/model/request"
|
||||
"server/internal/pkg/errs"
|
||||
"server/internal/pkg/httputil"
|
||||
"server/internal/pkg/safego"
|
||||
"server/internal/pkg/validator"
|
||||
"server/internal/router"
|
||||
"server/internal/service/admin"
|
||||
"strings"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
type FileHandler struct {
|
||||
service *admin.FileService
|
||||
logger *slog.Logger
|
||||
cfg *config.Config
|
||||
}
|
||||
|
||||
var _ router.Registrar = (*FileHandler)(nil)
|
||||
|
||||
func NewFileHandler(service *admin.FileService) *FileHandler {
|
||||
func NewFileHandler(service *admin.FileService, logger *slog.Logger, cfg *config.Config) *FileHandler {
|
||||
return &FileHandler{
|
||||
service: service,
|
||||
logger: logger,
|
||||
cfg: cfg,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,6 +39,7 @@ func (h *FileHandler) Register(r chi.Router) {
|
||||
r.Route("/files", func(r chi.Router) {
|
||||
r.Get("/", h.List)
|
||||
r.Post("/", h.Upload)
|
||||
r.Post("/sync-metadata", h.SyncMetadata)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -49,9 +63,18 @@ func (h *FileHandler) List(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (h *FileHandler) Upload(w http.ResponseWriter, r *http.Request) {
|
||||
// 限制上传大小(默认 10MB)
|
||||
maxSize := h.cfg.File.MaxUploadSize
|
||||
if maxSize <= 0 {
|
||||
maxSize = 10 << 20 // 10MB
|
||||
}
|
||||
r.Body = http.MaxBytesReader(w, r.Body, maxSize)
|
||||
|
||||
folder := r.FormValue("folder")
|
||||
if folder == "" {
|
||||
folder = "/"
|
||||
req := request.UploadFileRequest{Folder: folder}
|
||||
if err := validator.Struct(&req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
_, header, err := r.FormFile("file")
|
||||
@@ -60,6 +83,13 @@ func (h *FileHandler) Upload(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
// 扩展名白名单
|
||||
ext := strings.ToLower(filepath.Ext(header.Filename))
|
||||
if !request.IsAllowedUploadExt(ext) {
|
||||
httputil.Fail(w, errs.ErrFileTypeNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
file, err := h.service.Upload(r.Context(), folder, header)
|
||||
if err != nil {
|
||||
httputil.Fail(w, err)
|
||||
@@ -68,3 +98,13 @@ func (h *FileHandler) Upload(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
httputil.Ok(w, file)
|
||||
}
|
||||
|
||||
func (h *FileHandler) SyncMetadata(w http.ResponseWriter, r *http.Request) {
|
||||
safego.Go(func() {
|
||||
if err := h.service.SyncMetadata(context.Background()); err != nil {
|
||||
h.logger.Error("sync metadata failed", "error", err)
|
||||
}
|
||||
})
|
||||
|
||||
httputil.Ok(w)
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ func (h *MenuHandler) ListAll(w http.ResponseWriter, r *http.Request) {
|
||||
func (h *MenuHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.CreateMenuRequest
|
||||
|
||||
if err := httputil.BindJson(r, &req); err != nil {
|
||||
if err := httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -85,7 +85,7 @@ func (h *MenuHandler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -20,5 +20,6 @@ var Module = fx.Module("admin-handlers",
|
||||
router.AsRegistrar(router.AdminRoutes, NewTagHandler),
|
||||
router.AsRegistrar(router.AdminRoutes, NewUserHandler),
|
||||
router.AsRegistrar(router.AdminRoutes, NewSystemHandler),
|
||||
router.AsRegistrar(router.AdminRoutes, NewAccessLogHandler),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -37,6 +37,7 @@ func (h *PostHandler) List(w http.ResponseWriter, r *http.Request) {
|
||||
result, err := h.postService.List(r.Context(), pagination)
|
||||
if err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
resp := common.PageResponse{
|
||||
@@ -68,7 +69,7 @@ func (h *PostHandler) GetPostByID(w http.ResponseWriter, r *http.Request) {
|
||||
func (h *PostHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.CreatePostRequest
|
||||
|
||||
if err := httputil.BindJson(r, &req); err != nil {
|
||||
if err := httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -94,7 +95,7 @@ func (h *PostHandler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
var req request.UpdatePostRequest
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ func (h *RoleHandler) ListAll(w http.ResponseWriter, r *http.Request) {
|
||||
func (h *RoleHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.CreateRoleRequest
|
||||
|
||||
if err := httputil.BindJson(r, &req); err != nil {
|
||||
if err := httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -122,7 +122,7 @@ func (h *RoleHandler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -144,7 +144,7 @@ func (h *RoleHandler) SetRoleMenus(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -166,7 +166,7 @@ func (h *RoleHandler) SetRoleApis(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ func (h *TagHandler) ListAll(w http.ResponseWriter, r *http.Request) {
|
||||
func (h *TagHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.CreateTagRequest
|
||||
|
||||
if err := httputil.BindJson(r, &req); err != nil {
|
||||
if err := httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -86,7 +86,7 @@ func (h *TagHandler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
var req request.UpdateTagRequest
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -32,6 +32,8 @@ func (h *UserHandler) Register(r chi.Router) {
|
||||
r.Get("/me", h.GetCurrentUser)
|
||||
r.Get("/{id}/roles", h.ListRoles)
|
||||
r.Post("/", h.Create)
|
||||
r.Post("/{id}/logout-all", h.KickUser)
|
||||
r.Post("/logout-all", h.KickAllUsers)
|
||||
r.Patch("/{id}", h.Update)
|
||||
r.Put("/{id}/roles", h.SetRoles)
|
||||
r.Patch("/{id}/password", h.UpdatePassword)
|
||||
@@ -40,17 +42,14 @@ func (h *UserHandler) Register(r chi.Router) {
|
||||
}
|
||||
|
||||
func (h *UserHandler) GetCurrentUser(w http.ResponseWriter, r *http.Request) {
|
||||
claims, ok := middleware.GetClaims(r.Context())
|
||||
userCtx := middleware.GetUserContext(r.Context())
|
||||
|
||||
if !ok || claims.UserID == 0 {
|
||||
if userCtx == nil || userCtx.UserID == 0 {
|
||||
httputil.Fail(w, errs.ErrUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
isAdmin := middleware.IsAdmin(r.Context())
|
||||
uid := claims.UserID
|
||||
|
||||
user, err := h.userService.GetCurrentUser(r.Context(), uid, isAdmin)
|
||||
user, err := h.userService.GetCurrentUser(r.Context(), userCtx.UserID, userCtx.IsAdmin)
|
||||
if err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
@@ -102,7 +101,7 @@ func (h *UserHandler) ListRoles(w http.ResponseWriter, r *http.Request) {
|
||||
func (h *UserHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.CreateUserRequest
|
||||
|
||||
if err := httputil.BindJson(r, &req); err != nil {
|
||||
if err := httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -115,6 +114,32 @@ func (h *UserHandler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
httputil.Ok(w)
|
||||
}
|
||||
|
||||
func (h *UserHandler) KickUser(w http.ResponseWriter, r *http.Request) {
|
||||
id, err := httputil.URLParamInt32(r, "id")
|
||||
if err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
err = h.userService.KickUser(r.Context(), id)
|
||||
if err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
httputil.Ok(w)
|
||||
}
|
||||
|
||||
func (h *UserHandler) KickAllUsers(w http.ResponseWriter, r *http.Request) {
|
||||
err := h.userService.KickAllUsers(r.Context())
|
||||
if err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
httputil.Ok(w)
|
||||
}
|
||||
|
||||
func (h *UserHandler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
var req request.UpdateUserRequest
|
||||
|
||||
@@ -124,7 +149,7 @@ func (h *UserHandler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -146,7 +171,7 @@ func (h *UserHandler) SetRoles(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
@@ -169,7 +194,7 @@ func (h *UserHandler) UpdatePassword(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if err = httputil.BindJson(r, &req); err != nil {
|
||||
if err = httputil.BindJson(w, r, &req); err != nil {
|
||||
httputil.Fail(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user