- jxcontext.New

business/auth2/auth2.go

@@ -86,7 +86,6 @@ var (
 
 var (
 	ErrInternalErrror         = errors.New("内部错误")
-	ErrTokenIsInvalid         = errors.New("Token非法")
 	ErrUserAlreadyExist       = errors.New("用户已经存在")
 	ErrUserMobileAlreadyExist = errors.New("用户手机已经存在")
 	ErrUserID2AlreadyExist    = errors.New("用户标识已经存在")
@@ -114,7 +113,6 @@ func RegisterAuther(authType string, handler IAuther) {
 func CreateAuthInfo(user IUser, authBindInfo *model.AuthBind, userData interface{}) (authInfo *AuthInfo) {
 	token, tokenType := createToken(user)
 	authInfo = &AuthInfo{
-		IUser:        user,
 		AuthBindInfo: authBindInfo,
 
 		LoginTime: time.Now(),
@@ -124,6 +122,7 @@ func CreateAuthInfo(user IUser, authBindInfo *model.AuthBind, userData interface
 		UserData:  userData,
 	}
 	if user != nil {
+		authInfo.UpdateByIUser(user)
 		globals.SugarLogger.Debugf("CreateAuthInfo id:%s, id2:%s, authInfo:%s", authInfo.GetID(), authInfo.GetID2(), authInfo.GetMobile(), utils.Format4Output(authInfo, true))
 	} else {
 		globals.SugarLogger.Debugf("CreateAuthInfo authInfo:%s", utils.Format4Output(authInfo, true))
@@ -215,7 +214,7 @@ func BindUser(inauthInfo *AuthInfo, user IUser) (outauthInfo *AuthInfo, err erro
 	if inauthInfo == nil || user == nil {
 		return nil, ErrInternalErrror
 	}
-	if inauthInfo.IUser != nil {
+	if !inauthInfo.IsUserEmpty() {
 		return nil, ErrUserAlreadyExist
 	}
 	if handler := authers[inauthInfo.AuthBindInfo.Type]; handler != nil {
@@ -235,7 +234,7 @@ func AddAuthBind(authInfo *AuthInfo, newAuthInfo *AuthInfo) (err error) {
 	if authInfo == nil || newAuthInfo == nil {
 		return ErrInternalErrror
 	}
-	if newAuthInfo.IUser != nil {
+	if !newAuthInfo.IsUserEmpty() {
 		return ErrAuthTypeAlreadyExist
 	}
 	RemoveUserInfo(newAuthInfo.Token)
@@ -279,7 +278,7 @@ func GetTokenInfo(token string) (authInfo *AuthInfo, err error) {
 	if err = api.Cacher.GetAs(token, authInfo); err == nil {
 		return authInfo, nil
 	}
-	return nil, ErrTokenIsInvalid
+	return nil, model.ErrTokenIsInvalid
 }
 
 func SetUserInfo(token string, authInfo *AuthInfo, duration time.Duration) {