kenneth/projectx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

statics file change

Browse Source
This commit is contained in:
kenneth
2025-06-16 16:17:18 +08:00
parent 90d1ef301d
commit a8bc73ae99
800 changed files with 105 additions and 4877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/erpserver/handler/common/captcha.go
View File

@@ -5,7 +5,6 @@ import (
"management/internal/erpserver/handler"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/render"
)
type CaptchaHandler struct {
@@ -44,5 +43,5 @@ func (h *CaptchaHandler) Captcha(w http.ResponseWriter, _ *http.Request) {
CaptchaLength: h.Config.Captcha.KeyLong,
OpenCaptcha: h.Config.Captcha.OpenCaptcha,
}
h.JSON(w, render.Response{Success: true, Message: "ok", Data: rsp})
h.JSONObj(w, "ok", rsp)
}

52
internal/erpserver/handler/handler.go
View File

@@ -2,13 +2,13 @@ package handler
import (
"context"
"encoding/json"
"fmt"
"net/http"
"management/internal/erpserver/model/dto"
"management/internal/pkg/config"
"management/internal/pkg/know"
"management/internal/pkg/render"
"management/internal/pkg/session"
"github.com/a-h/templ"
@@ -25,20 +25,17 @@ type Handler struct {
Log *logger.Logger
session session.Manager
render render.Render
}
func NewHandler(
config *config.Config,
log *logger.Logger,
session session.Manager,
render render.Render,
) *Handler {
return &Handler{
Config: config,
Log: log,
session: session,
render: render,
}
}
@@ -73,17 +70,56 @@ func (h *Handler) Render(ctx context.Context, w http.ResponseWriter, t templ.Com
}
func (h *Handler) JSON(w http.ResponseWriter, data any) {
h.render.JSON(w, data)
respond(w, data)
}
func (h *Handler) JSONObj(w http.ResponseWriter, message string, data any) {
h.render.JSONObj(w, message, data)
respond(w, Response{Success: true, Message: message, Data: data})
}
func (h *Handler) JSONOk(w http.ResponseWriter, message string) {
h.render.JSONOk(w, message)
respond(w, Response{Success: true, Message: message})
}
func (h *Handler) JSONErr(w http.ResponseWriter, message string) {
h.render.JSONErr(w, message)
respond(w, Response{Success: false, Message: message})
}
type Response struct {
Success bool `json:"success"`
Message string `json:"msg"`
Data any `json:"data"`
}
type ResponseTree struct {
Status ResponseTreeStatus `json:"status"`
Data any `json:"data"`
}
type ResponseTreeStatus struct {
Code int `json:"code"`
Message string `json:"message"`
}
type ResponseList struct {
Code int `json:"code"`
Message string `json:"msg"`
Count int64 `json:"count"`
Data any `json:"data"`
}
func respond(w http.ResponseWriter, data any) {
v, err := json.Marshal(data)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json; charset=utf-8")
w.WriteHeader(http.StatusOK)
_, err = w.Write(v)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
}

3
internal/erpserver/handler/system/audit.go
View File

@@ -8,7 +8,6 @@ import (
v1 "management/internal/erpserver/service/v1"
"management/internal/erpserver/templ/system/auditlog"
"management/internal/pkg/convertor"
"management/internal/pkg/render"
)
type AuditHandler struct {
@@ -41,7 +40,7 @@ func (h *AuditHandler) List(w http.ResponseWriter, r *http.Request) {
return
}
data := render.ResponseList{
data := handler.ResponseList{
Code: 0,
Message: "ok",
Count: count,

3
internal/erpserver/handler/system/config.go
View File

@@ -13,7 +13,6 @@ import (
"management/internal/erpserver/templ/system/config"
"management/internal/pkg/convertor"
"management/internal/pkg/database"
"management/internal/pkg/render"
)
type ConfigHandler struct {
@@ -46,7 +45,7 @@ func (h *ConfigHandler) List(w http.ResponseWriter, r *http.Request) {
return
}
data := render.ResponseList{
data := handler.ResponseList{
Code: 0,
Message: "ok",
Count: count,

3
internal/erpserver/handler/system/department.go
View File

@@ -11,7 +11,6 @@ import (
"management/internal/erpserver/templ/system/department"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/render"
)
type DepartmentHandler struct {
@@ -46,7 +45,7 @@ func (h *DepartmentHandler) List(w http.ResponseWriter, r *http.Request) {
return
}
data := render.ResponseList{
data := handler.ResponseList{
Code: 0,
Message: "ok",
Count: count,

3
internal/erpserver/handler/system/login_log.go
View File

@@ -8,7 +8,6 @@ import (
v1 "management/internal/erpserver/service/v1"
"management/internal/erpserver/templ/system/loginlog"
"management/internal/pkg/convertor"
"management/internal/pkg/render"
)
type LoginLogHandler struct {
@@ -40,7 +39,7 @@ func (h *LoginLogHandler) List(w http.ResponseWriter, r *http.Request) {
return
}
data := render.ResponseList{
data := handler.ResponseList{
Code: 0,
Message: "ok",
Count: count,

3
internal/erpserver/handler/system/menu.go
View File

@@ -12,7 +12,6 @@ import (
"management/internal/erpserver/templ/system/menu"
"management/internal/pkg/convertor"
"management/internal/pkg/database"
"management/internal/pkg/render"
"github.com/google/uuid"
)
@@ -55,7 +54,7 @@ func (h *MenuHandler) List(w http.ResponseWriter, r *http.Request) {
return
}
data := render.ResponseList{
data := handler.ResponseList{
Code: 0,
Message: "ok",
Count: 0,

3
internal/erpserver/handler/system/role.go
View File

@@ -13,7 +13,6 @@ import (
"management/internal/erpserver/templ/system/role"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/render"
)
type RoleHandler struct {
@@ -50,7 +49,7 @@ func (h *RoleHandler) List(w http.ResponseWriter, r *http.Request) {
return
}
data := render.ResponseList{
data := handler.ResponseList{
Code: 0,
Message: "ok",
Count: count,

3
internal/erpserver/handler/system/user.go
View File

@@ -14,7 +14,6 @@ import (
"management/internal/erpserver/templ/system/user"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/render"
)
type UserHandler struct {
@@ -120,7 +119,7 @@ func (h *UserHandler) List(w http.ResponseWriter, r *http.Request) {
return
}
data := render.ResponseList{
data := handler.ResponseList{
Code: 0,
Message: "ok",
Count: count,