This commit is contained in:
2025-06-17 11:16:24 +08:00
parent 6c3b4ec367
commit 759863f1aa
24 changed files with 103 additions and 92 deletions

View File

@@ -21,7 +21,7 @@ type Config struct {
}
func Routes(r chi.Router, cfg Config) {
app := NewApp(
app := newApp(
cfg.Log,
cfg.Sm,
cfg.Render,

View File

@@ -17,7 +17,7 @@ import (
"github.com/drhin/logger"
)
type App struct {
type app struct {
log *logger.Logger
sm session.Manager
render render.Renderer
@@ -26,15 +26,15 @@ type App struct {
departmentService v1.DepartmentService
}
func NewApp(
func newApp(
log *logger.Logger,
sm session.Manager,
render render.Renderer,
userService v1.UserService,
roleService v1.RoleService,
departmentService v1.DepartmentService,
) *App {
return &App{
) *app {
return &app{
log: log,
sm: sm,
render: render,
@@ -44,12 +44,12 @@ func NewApp(
}
}
func (a *App) add(w http.ResponseWriter, r *http.Request) {
func (a *app) add(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
a.render.Render(ctx, w, user.Edit(ctx, &systemmodel.User{HashedPassword: nil}))
}
func (a *App) edit(w http.ResponseWriter, r *http.Request) {
func (a *app) edit(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
vars := r.URL.Query()
id := convertor.QueryInt[int32](vars, "id", 0)
@@ -63,7 +63,7 @@ func (a *App) edit(w http.ResponseWriter, r *http.Request) {
a.render.Render(ctx, w, user.Edit(ctx, vm))
}
func (a *App) save(w http.ResponseWriter, r *http.Request) {
func (a *app) save(w http.ResponseWriter, r *http.Request) {
var req form.User
if err := binding.Form.Bind(r, &req); err != nil {
a.render.JSONErr(w, binding.ValidatorErrors(err))
@@ -103,7 +103,7 @@ func (a *App) save(w http.ResponseWriter, r *http.Request) {
}
}
func (a *App) list(w http.ResponseWriter, r *http.Request) {
func (a *app) list(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
ctx := r.Context()
@@ -135,14 +135,14 @@ func (a *App) list(w http.ResponseWriter, r *http.Request) {
}
}
func (a *App) profile(w http.ResponseWriter, r *http.Request) {
func (a *app) profile(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
u := mid.GetUser(ctx)
vm, _ := a.userService.Get(ctx, u.ID)
a.render.Render(ctx, w, user.Profile(ctx, vm))
}
func (a *App) data(w http.ResponseWriter, r *http.Request) {
func (a *app) data(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
t := vars.Get("type")
if t == "xm_select" {