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

v3_1

Browse Source
This commit is contained in:
kenneth
2025-04-01 17:57:35 +08:00
parent 7857015405
commit a5caa734c3
36 changed files with 1503 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,13 @@
package system
import (
"fmt"
"net/http"
"time"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
"management/internal/erpserver/model/form"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/tpl"
)
@@ -95,61 +95,22 @@ func (h *departmentHandler) Edit(w http.ResponseWriter, r *http.Request) {
}
func (h *departmentHandler) Save(w http.ResponseWriter, r *http.Request) {
id := convertor.ConvertInt[int32](r.PostFormValue("ID"), 0)
ParentID := convertor.ConvertInt[int32](r.PostFormValue("ParentID"), 0)
name := r.PostFormValue("Name")
sort := convertor.ConvertInt[int32](r.PostFormValue("Sort"), 6666)
status := convertor.ConvertInt[int32](r.PostFormValue("Status"), 9999)
ctx := r.Context()
var parent *db.SysDepartment
if ParentID > 0 {
var err error
parent, err = h.biz.SystemV1().DepartmentBiz().Get(ctx, ParentID)
if err != nil {
h.render.JSONERR(w, "父级节点错误")
return
}
var req form.Department
if err := binding.Form.Bind(r, &req); err != nil {
h.render.JSONERR(w, binding.ValidatorErrors(err))
return
}
if id == 0 {
arg := db.CreateSysDepartmentParams{
Name: name,
ParentID: ParentID,
ParentPath: fmt.Sprintf("%s,%d,", parent.ParentPath, parent.ID),
Status: status,
Sort: sort,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
_, err := h.biz.SystemV1().DepartmentBiz().Create(ctx, &arg)
ctx := r.Context()
if *req.ID == 0 {
err := h.biz.SystemV1().DepartmentBiz().Create(ctx, &req)
if err != nil {
if db.IsUniqueViolation(err) {
h.render.JSONERR(w, "部门名称已存在")
return
}
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "添加成功")
} else {
res, err := h.biz.SystemV1().DepartmentBiz().Get(ctx, id)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
arg := &db.UpdateSysDepartmentParams{
ID: res.ID,
Name: name,
ParentID: ParentID,
ParentPath: fmt.Sprintf("%s,%d,", parent.ParentPath, parent.ID),
Status: status,
Sort: sort,
UpdatedAt: time.Now(),
}
_, err = h.biz.SystemV1().DepartmentBiz().Update(ctx, arg)
err := h.biz.SystemV1().DepartmentBiz().Update(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return

11
internal/erpserver/handler/system/home.go Normal file
View File

@@ -0,0 +1,11 @@
package system
import "net/http"
func (h *systemHandler) Home(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "home/home.tmpl", nil)
}
func (h *systemHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "home/dashboard.tmpl", nil)
}

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

@@ -1,14 +1,14 @@
package system
import (
"fmt"
"net/http"
"strings"
"time"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
"management/internal/erpserver/model/form"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/tpl"
)
@@ -98,69 +98,22 @@ func (h *roleHandler) Edit(w http.ResponseWriter, r *http.Request) {
}
func (h *roleHandler) Save(w http.ResponseWriter, r *http.Request) {
id := convertor.ConvertInt[int32](r.PostFormValue("ID"), 0)
name := r.PostFormValue("Name")
parentID := convertor.ConvertInt[int32](r.PostFormValue("ParentID"), 0)
displayName := r.PostFormValue("DisplayName")
sort := convertor.ConvertInt[int32](r.PostFormValue("Sort"), 6666)
status := convertor.ConvertInt[int32](r.PostFormValue("Status"), 0)
ctx := r.Context()
var parent *db.SysRole
if parentID > 0 {
var err error
parent, err = h.biz.SystemV1().RoleBiz().Get(ctx, parentID)
if err != nil {
h.render.JSONERR(w, "父级节点错误")
return
}
} else {
parent = &db.SysRole{
ID: 0,
ParentID: 0,
ParentPath: ",0,",
}
var req form.Role
if err := binding.Form.Bind(r, &req); err != nil {
h.render.JSONERR(w, binding.ValidatorErrors(err))
return
}
if id == 0 {
arg := &db.CreateSysRoleParams{
Name: name,
DisplayName: displayName,
Vip: false,
ParentID: parent.ID,
ParentPath: fmt.Sprintf("%s,%d,", parent.ParentPath, parent.ID),
Status: status,
Sort: sort,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
_, err := h.biz.SystemV1().RoleBiz().Create(ctx, arg)
ctx := r.Context()
if *req.ID == 0 {
err := h.biz.SystemV1().RoleBiz().Create(ctx, &req)
if err != nil {
if db.IsUniqueViolation(err) {
h.render.JSONERR(w, "角色名称已存在")
return
}
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "添加成功")
} else {
res, err := h.biz.SystemV1().RoleBiz().Get(ctx, id)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
arg := &db.UpdateSysRoleParams{
ID: res.ID,
DisplayName: displayName,
Status: status,
ParentID: parent.ID,
ParentPath: fmt.Sprintf("%s,%d,", parent.ParentPath, parent.ID),
Sort: sort,
UpdatedAt: time.Now(),
}
_, err = h.biz.SystemV1().RoleBiz().Update(ctx, arg)
err := h.biz.SystemV1().RoleBiz().Update(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return

5
internal/erpserver/handler/system/system.go
View File

@@ -12,6 +12,7 @@ import (
type SystemHandler interface {
Home(w http.ResponseWriter, req *http.Request)
Dashboard(w http.ResponseWriter, req *http.Request)
UserHandler() UserHandler
MenuHandler() MenuHandler
RoleHandler() RoleHandler
@@ -42,10 +43,6 @@ func NewSystemHandler(render tpl.Renderer, redis redis.IRedis, session session.I
}
}
func (h *systemHandler) Home(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "home/home.tmpl", nil)
}
func (h *systemHandler) UserHandler() UserHandler {
return NewUserHandler(h.render, h.session, h.biz, h.mi)
}

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

@@ -3,23 +3,19 @@ package system
import (
"encoding/json"
"net/http"
"strings"
"time"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
"management/internal/erpserver/model/req"
"management/internal/erpserver/model/form"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/crypto"
"management/internal/pkg/know"
"management/internal/pkg/middleware"
"management/internal/pkg/rand"
"management/internal/pkg/session"
"management/internal/pkg/tpl"
"management/internal/pkg/tpl/html"
"github.com/google/uuid"
"github.com/zhang2092/browser"
)
@@ -74,7 +70,7 @@ func (h *userHandler) Edit(w http.ResponseWriter, r *http.Request) {
if id > 0 {
ctx := r.Context()
if user, err := h.biz.SystemV1().UserBiz().Get(ctx, id); err == nil {
user.HashedPassword = nil
user.HashedPassword = []byte("********")
sysUser = user
}
}
@@ -84,109 +80,36 @@ func (h *userHandler) Edit(w http.ResponseWriter, r *http.Request) {
}
func (h *userHandler) Save(w http.ResponseWriter, r *http.Request) {
id := convertor.ConvertInt[int32](r.PostFormValue("ID"), 0)
email := r.PostFormValue("Email")
username := r.PostFormValue("Username")
password := r.PostFormValue("Password")
changePassword := r.PostFormValue("ChangePassword")
gender := convertor.ConvertInt[int32](r.PostFormValue("Gender"), 0)
avatar := r.PostFormValue("File")
status := convertor.ConvertInt[int32](r.PostFormValue("Status"), 0)
var req form.User
if err := binding.Form.Bind(r, &req); err != nil {
h.render.JSONERR(w, binding.ValidatorErrors(err))
return
}
ctx := r.Context()
departmentID := convertor.ConvertInt[int32](r.PostFormValue("DepartmentID"), 0)
var department *db.SysDepartment
var err error
if departmentID > 0 {
department, err = h.biz.SystemV1().DepartmentBiz().Get(ctx, departmentID)
if err != nil {
if req.DepartmentID > 0 {
if _, err := h.biz.SystemV1().DepartmentBiz().Get(ctx, req.DepartmentID); err != nil {
h.render.JSONERR(w, "部门数据错误")
return
}
}
var role *db.SysRole
roleID := convertor.ConvertInt[int32](r.PostFormValue("RoleID"), 0)
if roleID > 0 {
role, err = h.biz.SystemV1().RoleBiz().Get(ctx, roleID)
if err != nil {
if req.RoleID > 0 {
if _, err := h.biz.SystemV1().RoleBiz().Get(ctx, req.RoleID); err != nil {
h.render.JSONERR(w, "角色数据错误")
return
}
}
if id == 0 {
salt, err := rand.String(10)
if *req.ID == 0 {
err := h.biz.SystemV1().UserBiz().Create(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
hashedPassword, err := crypto.BcryptHashPassword(password + salt)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
initTime, err := time.ParseInLocation(time.DateTime, "0001-01-01 00:00:00", time.Local)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
arg := &db.CreateSysUserParams{
Uuid: uuid.Must(uuid.NewV7()),
Email: email,
Username: username,
HashedPassword: hashedPassword,
Salt: salt,
Avatar: avatar,
Gender: gender,
DepartmentID: department.ID,
RoleID: role.ID,
Status: status,
ChangePasswordAt: initTime,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
_, err = h.biz.SystemV1().UserBiz().Create(ctx, arg)
if err != nil {
if db.IsUniqueViolation(err) {
h.render.JSONERR(w, "数据已存在")
return
}
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "添加成功")
} else {
res, err := h.biz.SystemV1().UserBiz().Get(ctx, id)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
arg := &db.UpdateSysUserParams{
ID: res.ID,
Username: username,
HashedPassword: res.HashedPassword,
Avatar: avatar,
Gender: int32(gender),
DepartmentID: department.ID,
RoleID: role.ID,
Status: int32(status),
ChangePasswordAt: res.ChangePasswordAt,
UpdatedAt: time.Now(),
}
if changePassword == "on" {
hashedPassword, err := crypto.BcryptHashPassword(password + res.Salt)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
arg.HashedPassword = hashedPassword
arg.ChangePasswordAt = time.Now()
}
_, err = h.biz.SystemV1().UserBiz().Update(ctx, arg)
err := h.biz.SystemV1().UserBiz().Update(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -261,7 +184,7 @@ func (h *userHandler) Login(w http.ResponseWriter, r *http.Request) {
var user dto.AuthorizeUser
u := h.session.GetBytes(ctx, know.StoreName)
if err := json.Unmarshal(u, &user); err == nil {
// 判断租户是否一致, 一致则刷新令牌，跳转到首页
// 判断用户是否登陆, 已经登陆则刷新令牌，跳转到首页
if err := h.session.RenewToken(ctx); err == nil {
h.session.Put(ctx, know.StoreName, u)
http.Redirect(w, r, "/home.html", http.StatusFound)
@@ -271,30 +194,16 @@ func (h *userHandler) Login(w http.ResponseWriter, r *http.Request) {
h.session.Destroy(ctx)
h.render.HTML(w, r, "oauth/login.tmpl", nil)
case http.MethodPost:
req := &req.Login{
Email: strings.TrimSpace(r.PostFormValue("email")),
Password: strings.TrimSpace(r.PostFormValue("password")),
CaptchaID: strings.TrimSpace(r.PostFormValue("captcha_id")),
Captcha: strings.TrimSpace(r.PostFormValue("captcha")),
Ip: r.RemoteAddr,
Referrer: r.Header.Get("Referer"),
Url: r.URL.RequestURI(),
defer r.Body.Close()
var req form.Login
if err := binding.Form.Bind(r, &req); err != nil {
e := binding.ValidatorErrors(err)
h.render.JSONERR(w, e)
return
}
if len(req.Email) == 0 {
h.render.JSON(w, tpl.Response{Success: false, Message: "请填写邮箱"})
return
}
if len(req.Password) == 0 {
h.render.JSON(w, tpl.Response{Success: false, Message: "请填写密码"})
return
}
if len(req.Captcha) == 0 {
h.render.JSON(w, tpl.Response{Success: false, Message: "请填写验证码"})
return
}
if !h.biz.CommonV1().CaptchaBiz().Verify(req.CaptchaID, req.Captcha, true) {
h.render.JSON(w, tpl.Response{Success: false, Message: "验证码错误"})
h.render.JSONERR(w, "验证码错误")
return
}
@@ -304,9 +213,12 @@ func (h *userHandler) Login(w http.ResponseWriter, r *http.Request) {
return
}
req.Ip = r.RemoteAddr
req.Referrer = r.Header.Get("Referer")
req.Url = r.URL.RequestURI()
req.Os = br.Platform().Name()
req.Browser = br.Name()
err = h.biz.SystemV1().UserBiz().Login(ctx, req)
err = h.biz.SystemV1().UserBiz().Login(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return