diff --git a/business/auth2/authprovider/alipay/alipay.go b/business/auth2/authprovider/alipay/alipay.go index 64c60f144..0abbf75e6 100644 --- a/business/auth2/authprovider/alipay/alipay.go +++ b/business/auth2/authprovider/alipay/alipay.go @@ -1,9 +1,11 @@ package alipay import ( + "encoding/json" "git.rosy.net.cn/baseapi/platformapi/alipayapi" "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/auth2/authprovider" + "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -29,15 +31,26 @@ func (a *Auther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, globals.SugarLogger.Debugf("VerifySecret dummy:%s, code:%s", dummy, code) tokenInfo, err := api.AliPayAPI.SystemAuthToken(alipayapi.GrantTypeCode, code, "") if err == nil { - userInfo, err2 := api.AliPayAPI.UserInfoShare(tokenInfo.AccessToken) - if err = err2; err == nil { - if authBindEx, err = a.UnionFindAuthBind(AuthType, api.AliPayAPI.GetAppID(), nil, userInfo.UserID, "", userInfo); err == nil { - authBindEx.UserHint = &auth2.UserBasic{ - Name: userInfo.NickName, - Avatar: userInfo.Avatar, - } - } + //userInfo, err2 := api.AliPayAPI.UserInfoShare(tokenInfo.AccessToken) + //if err = err2; err == nil { + //if authBindEx, err = a.UnionFindAuthBind(AuthType, api.AliPayAPI.GetAppID(), nil, userInfo.UserID, "", userInfo); err == nil { + // authBindEx.UserHint = &auth2.UserBasic{ + // Name: userInfo.NickName, + // Avatar: userInfo.Avatar, + // } + //} + //} + authBindEx = &auth2.AuthBindEx{} + authBindEx.Type = AuthType + authBindEx.TypeID = globals.AliKey + authBindEx.AuthID = tokenInfo.UserID + authBindEx.AuthID2 = tokenInfo.AlipayUserID + authBindEx.Status = model.YES + if data, err2 := json.Marshal(tokenInfo); err2 == nil { + authBindEx.DetailData = string(data) } + authBindEx.AuthSecret = tokenInfo.AccessToken + authBindEx.AuthSecret2 = tokenInfo.RefreshToken } return authBindEx, err }