diff --git a/service/toolService.go b/service/toolService.go index b939b5d..80fd713 100644 --- a/service/toolService.go +++ b/service/toolService.go @@ -507,7 +507,7 @@ func DoGoogleCallBack(state *proto.ThirdPartyLoginState, code string) { log.Println("get google user info error:", err) return } - log.Println("get github user info:", userInfo) + log.Println("get google user info:", userInfo) var thirdPartyLoginStatus proto.ThirdPartyLoginStatus thirdPartyLoginStatus.Type = state.Platform thirdPartyUserInfo := proto.ThirdPartyUserInfo{UserID: userInfo.ID, Name: userInfo.Name, Avatar: userInfo.Picture, Email: userInfo.Email} @@ -523,24 +523,24 @@ func DoFaceBookCallBack(state *proto.ThirdPartyLoginState, code string) { tokenResp, err := worker.GetFacebookAccessTokenByCode(code, "https://pm.ljsea.top/tool/third_party_callback", worker.FacebookClientID, worker.FacebookClientSecret) if tokenResp.AccessToken == "" { - log.Println("get google access token is empty") + log.Println("get facebook access token is empty") return } - log.Println("get google access token:", tokenResp) + log.Println("get facebook access token:", tokenResp) //获取用户信息 userInfo, err := worker.GetFaceBookUserInfo(tokenResp.AccessToken) if err != nil { - log.Println("get google user info error:", err) + log.Println("get facebook user info error:", err) return } - log.Println("get github user info:", userInfo) + log.Println("get facebook user info:", userInfo) var thirdPartyLoginStatus proto.ThirdPartyLoginStatus thirdPartyLoginStatus.Type = state.Platform thirdPartyUserInfo := proto.ThirdPartyUserInfo{UserID: userInfo.ID, Name: userInfo.Name, Avatar: "", Email: ""} HandleThirdPartyLoginStatusV2(state, &thirdPartyLoginStatus, &thirdPartyUserInfo) //更新redis中的第三方登录状态 thirdPartyLoginStatusStr, _ := json.Marshal(thirdPartyLoginStatus) - log.Println("do handle google callback success, third party login status:", string(thirdPartyLoginStatusStr)) + log.Println("do handle facebook callback success, third party login status:", string(thirdPartyLoginStatusStr)) worker.SetRedisWithExpire(state.UUID, string(thirdPartyLoginStatusStr), time.Minute*10) } diff --git a/worker/thirdParty.go b/worker/thirdParty.go index 64c49b9..aff2004 100644 --- a/worker/thirdParty.go +++ b/worker/thirdParty.go @@ -308,6 +308,7 @@ func GetFacebookAccessTokenByCode(code string, redirectURI string, clientID stri // Code: code, // RedirectURI: redirectURI, //} + log.Println("GetFacebookAccessTokenByCode url:", url) var onlineReq proto.OnlineServerReq onlineReq.Type = "get" onlineReq.Url = url