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

View File

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

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 {
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
} else if user == nil {
return loginResult, fmt.Errorf("密码错误!")
} else if len(users) == 0 {
return loginResult, fmt.Errorf("密码错误或用户不存在")
}
loginResult.User = *user
//创建token