1

services/print_server/user.go

@@ -5,7 +5,6 @@ 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"
@@ -63,10 +62,9 @@ type LoginResult struct {
 
 func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err error) {
 	var (
-		db    = globals.GetDB()
-		now   = time.Now()
-		user  = &model.User{}
-		token string
+		db   = globals.GetDB()
+		now  = time.Now()
+		user = &model.User{}
 	)
 	loginResult = &LoginResult{}
 	if users, _ := dao.GetUsers(db, "", name, "", ""); len(users) == 0 {
@@ -80,9 +78,6 @@ func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err
 		user = users[0]
 	}
 	loginResult.User = *user
-	//创建token
-	token, err = controller.SetToken(user)
-	loginResult.Token = token
 	//更新登录时间和ip
 	user.LastLoginAt = &now
 	user.LastLoginIP = c.ClientIP()