添加username

handler/login.go

@@ -38,7 +38,7 @@ func (h *CodeLoginHandler) getResponse() interface{} {
 	return h.resp
 }
 func (h *CodeLoginHandler) run() {
-	token, err := service.LoginAuth.AuthCode(h.ctx, h.req.User, h.req.Password)
+	token,username, err := service.LoginAuth.AuthCode(h.ctx, h.req.User, h.req.Password)
 	if err != nil {
 		logrus.Errorf("[CodeLoginHandler] call AuthCode err:%+v\n", err)
 		util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, token)
@@ -47,7 +47,7 @@ func (h *CodeLoginHandler) run() {
 	}
 	data := http_model.CodeLoginData{}
 	data.Token = token
-	// h.resp.Message = "登陆成功"
+	data.Username = username
 	h.resp.Data = data
 }
 func (h *CodeLoginHandler) checkParam() error {

model/http_model/code_login.go

@@ -7,6 +7,7 @@ type CodeLoginRequest struct {
 
 type CodeLoginData struct {
 	Token string `json:"token"`
+	Username string `json:"username"`
 }
 
 func NewCodeLoginRequest() *CodeLoginRequest {

service/login_auth.go

@@ -47,18 +47,18 @@ func (l *loginAuth) AuthToken(ctx context.Context, token string) (*redis_model.A
 	return auth, nil
 }
 
-func (l *loginAuth) AuthCode(ctx context.Context, User string, password string) (string, error) {
+func (l *loginAuth) AuthCode(ctx context.Context, User string, password string) (string,string, error) {
 	user, err := db.GetUser(ctx, User)
 	if err != nil {
-		return "", err
+		return "","", err
 	} else if user == nil {
 		// 账号不存在
 		logrus.Debugf("[AuthCode] auth fail,User:%+v", User)
-		return "账号不存在", errors.New("auth fail")
+		return "账号不存在","", errors.New("auth fail")
 	} else if string(user.Role) != consts.BRole && string(user.Role) != consts.BRole2{
 		// 账号权限有误
 		logrus.Debugf("[AuthCode] auth fail,User:%+v", User)
-		return "权限错误，请登录管理账号", errors.New("auth fail")
+		return "权限错误，请登录管理账号","", errors.New("auth fail")
 	}
 	var token string
 	if user.Password == password{
@@ -75,10 +75,10 @@ func (l *loginAuth) AuthCode(ctx context.Context, User string, password string)
 		}
 		if err := l.setSession(ctx, user.User, auth); err != nil {
 			fmt.Printf("setSession error\n")
-			return "", err
+			return "", "",err
 		}
 	}
-	return token, nil
+	return token,user.Username,nil
 }
 
 func (l *loginAuth) setSession(ctx context.Context, user string, auth *redis_model.Auth) error {