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

aa

Browse Source
This commit is contained in:
suyl
2021-07-15 16:33:09 +08:00
parent 8324fd011b
commit c8af41d825
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dao/user_dao.go
View File

@@ -45,8 +45,7 @@ func GetUser(db *sqlx.DB, userID string) (user *model.User, err error) {
return users[0], err return users[0], err
} }
func GetUserForLogin(db *sqlx.DB, name, password string) (user *model.User, err error) { func GetUserForLogin(db *sqlx.DB, name, password string) (users []*model.User, err error) {
var users []*model.User
sql := ` sql := `
SELECT * SELECT *
FROM user FROM user
@@ -54,9 +53,9 @@ func GetUserForLogin(db *sqlx.DB, name, password string) (user *model.User, err
` `
sqlParams := []interface{}{name, password, utils.DefaultTimeValue} sqlParams := []interface{}{name, password, utils.DefaultTimeValue}
if err = db.Select(&users, sql, sqlParams...); err == nil { if err = db.Select(&users, sql, sqlParams...); err == nil {
return users[0], err return users, err
} }
return user, err return users, err
} }
func GetMenus(db *sqlx.DB) (menus []*model.Menu, err error) { func GetMenus(db *sqlx.DB) (menus []*model.Menu, err error) {

10
services/print.go
View File

@@ -51,11 +51,11 @@ func AddPrinters(c *gin.Context, tokenInfo *model.TokenInfo, appID int, printInf
AppID: appID, AppID: appID,
PrintNo: v.PrintNo, PrintNo: v.PrintNo,
Name: v.Name, Name: v.Name,
SIM: v.SIM, //SIM: v.SIM,
Status: model.PrinterStatusNormal, Status: model.PrinterStatusNormal,
IsOnline: model.PrinterOffline, IsOnline: model.PrinterOffline,
Sound: sounda, Sound: sounda,
Volume: 4, Volume: 4,
} }
if err = dao.Insert(db, printer); err != nil { if err = dao.Insert(db, printer); err != nil {
errs = append(errs, err) errs = append(errs, err)

6
services/user.go
View File

@@ -59,10 +59,10 @@ func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err
if users, _ := dao.GetUsers(db, "", name, ""); len(users) == 0 { if users, _ := dao.GetUsers(db, "", name, ""); len(users) == 0 {
return loginResult, fmt.Errorf("用户名不存在！") return loginResult, fmt.Errorf("用户名不存在！")
} }
if user, err = dao.GetUserForLogin(db, name, fmt.Sprintf("%x", md5.Sum([]byte(model.RegisterKey+password)))); err != nil { if users, err := dao.GetUserForLogin(db, name, fmt.Sprintf("%x", md5.Sum([]byte(model.RegisterKey+password)))); err != nil {
return loginResult, err return loginResult, err
} else if user == nil { } else if len(users) == 0 {
return loginResult, fmt.Errorf("密码错误！") return loginResult, fmt.Errorf("密码错误或用户不存在！")
} }
loginResult.User = *user loginResult.User = *user
//创建token //创建token