liulei/jx-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改打印模板

Browse Source
This commit is contained in:
邹宗楠
2022-07-26 17:24:41 +08:00
parent ecdb628231
commit d038f31e87
35 changed files with 2586 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/print_server/user.go
View File

@@ -5,22 +5,16 @@ import (
"encoding/json"
"fmt"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/controllers/controller"
"git.rosy.net.cn/jx-print/dao"
"git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/model"
putils "git.rosy.net.cn/jx-print/putils"
"github.com/gin-gonic/gin"
"github.com/jmoiron/sqlx"
"strings"
"time"
)
const (
TokenHeader = "TOKEN"
TokenVer = "V2"
TokenTypeSep = "."
)
type UserService struct {
C *gin.Context
DB *sqlx.DB
@@ -40,7 +34,7 @@ func InitHandler(handler UserServiceInterface) {
}
func (c *UserService) GetUsers(name, mobile, userID string) (users []*model.User, err error) {
return dao.GetUsers(globals.GetDB(), userID, name, mobile)
return dao.GetUsers(globals.GetDB(), userID, name, mobile, "")
}
func RegisterUser(c *gin.Context, name, password string) (err error) {
@@ -49,7 +43,7 @@ func RegisterUser(c *gin.Context, name, password string) (err error) {
user = &model.User{}
now = time.Now()
)
if users, _ := dao.GetUsers(db, "", name, ""); len(users) > 0 {
if users, _ := dao.GetUsers(db, "", name, "", ""); len(users) > 0 {
return fmt.Errorf("用户名重复！")
}
user.UserID = utils.GetUUID()
@@ -75,7 +69,7 @@ func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err
token string
)
loginResult = &LoginResult{}
if users, _ := dao.GetUsers(db, "", name, ""); len(users) == 0 {
if users, _ := dao.GetUsers(db, "", name, "", ""); len(users) == 0 {
return loginResult, fmt.Errorf("用户名不存在！")
}
if users, err := dao.GetUserForLogin(db, name, fmt.Sprintf("%x", md5.Sum([]byte(model.RegisterKey+password)))); err != nil {
@@ -87,7 +81,7 @@ func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err
}
loginResult.User = *user
//创建token
token, err = setToken(user)
token, err = controller.SetToken(user)
loginResult.Token = token
//更新登录时间和ip
user.LastLoginAt = &now
@@ -96,23 +90,6 @@ func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err
return loginResult, err
}
func setToken(user *model.User) (token string, err error) {
token = createToken(user)
err = putils.SetKey(token, user, putils.DefTokenDuration)
return token, err
}
func createToken(user *model.User) (token string) {
return strings.Join([]string{
TokenHeader,
TokenVer,
user.UserID,
time.Now().Format("20060102-150405"),
utils.GetUUID(),
user.Name,
}, TokenTypeSep)
}
func Logout(c *gin.Context, token string) (err error) {
return putils.DelKey(token)
}
@@ -129,7 +106,7 @@ func UpdateUser(c *gin.Context, payload string) (err error) {
if userp.ID == 0 || userp.UserID == "" {
return fmt.Errorf("id 和 user_id 必传！")
}
if users, err := dao.GetUsers(db, userp.UserID, "", ""); err != nil {
if users, err := dao.GetUsers(db, userp.UserID, "", "", ""); err != nil {
return err
} else {
user = users[0]