aa

dao/user_dao.go

@@ -45,8 +45,7 @@ func GetUser(db *sqlx.DB, userID string) (user *model.User, err error) {
 	return users[0], err
 }
 
-func GetUserForLogin(db *sqlx.DB, name, password string) (user *model.User, err error) {
-	var users []*model.User
+func GetUserForLogin(db *sqlx.DB, name, password string) (users []*model.User, err error) {
 	sql := `
 		SELECT * 
 		  FROM user 
@@ -54,9 +53,9 @@ func GetUserForLogin(db *sqlx.DB, name, password string) (user *model.User, err
 	`
 	sqlParams := []interface{}{name, password, utils.DefaultTimeValue}
 	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) {

services/print.go

@@ -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)

services/user.go

@@ -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