ljydlv
/
saw-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加github第三方请求数据通过国外中继请求

This commit is contained in:
junleea 2025-04-29 13:02:00 +08:00
parent e64aa76456
commit 97ce265dab
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/toolService.go
View File

@ -207,7 +207,7 @@ func SetDashboardInfoToRedis() {
func DoGithubCallBack(state *proto.ThirdPartyLoginState, code string) { func DoGithubCallBack(state *proto.ThirdPartyLoginState, code string) {
//获取Access Token //获取Access Token
resp, err := worker.ExchangeCodeForAccessToken(proto.Config.GITHUB_CLIENT_ID, proto.Config.GITHUB_CLIENT_SECRET, code, "") resp, err := worker.ExchangeCodeForAccessTokenGithub(proto.Config.GITHUB_CLIENT_ID, proto.Config.GITHUB_CLIENT_SECRET, code, "")
if err != nil { if err != nil {
log.Println("get github access token error:", err) log.Println("get github access token error:", err)
return return
@ -218,7 +218,7 @@ func DoGithubCallBack(state *proto.ThirdPartyLoginState, code string) {
} }
log.Println("get github access token:", resp.AccessToken) log.Println("get github access token:", resp.AccessToken)
//获取用户信息 //获取用户信息
userInfo, err := worker.GetGitHubUserInfo(resp.AccessToken) userInfo, err := worker.GetGitHubUserInfoV2(resp.AccessToken)
if err != nil { if err != nil {
log.Println("get github user info error:", err) log.Println("get github user info error:", err)
return return

6
worker/thirdParty.go
View File

@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"io" "io"
"log"
"net/http" "net/http"
) )
@ -135,11 +136,13 @@ func ExchangeCodeForAccessTokenGithub(clientID, clientSecret, code, redirectURI
"token": superTokens[0], "token": superTokens[0],
"super_id": "1", "super_id": "1",
} }
log.Println("ExchangeCodeForAccessTokenGithub onlineReqBytes:", string(onlineReqBytes))
err, respBytes := DoPostRequestJSON("https://vis.ljsea.top/tool/online_server_request?super_id=1", onlineReqBytes, headers) err, respBytes := DoPostRequestJSON("https://vis.ljsea.top/tool/online_server_request?super_id=1", onlineReqBytes, headers)
if err != nil { if err != nil {
return githubOAuthResponse, err return githubOAuthResponse, err
} }
log.Println("ExchangeCodeForAccessTokenGithub respBytes:", string(respBytes))
var onlineResp proto.OutlineServerReqResp var onlineResp proto.OutlineServerReqResp
err = json.Unmarshal(respBytes, &onlineResp) err = json.Unmarshal(respBytes, &onlineResp)
if err != nil { if err != nil {
@ -191,8 +194,9 @@ func GetGitHubUserInfoV2(accessToken string) (proto.GitHubUserInfo, error) {
"token": superTokens[0], "token": superTokens[0],
"super_id": "1", "super_id": "1",
} }
log.Println("GetGitHubUserInfoV2 onlineReqBytes:", string(onlineReqBytes))
err, respBytes := DoPostRequestJSON("https://vis.ljsea.top/tool/online_server_request?super_id=1", onlineReqBytes, headers) err, respBytes := DoPostRequestJSON("https://vis.ljsea.top/tool/online_server_request?super_id=1", onlineReqBytes, headers)
log.Println("GetGitHubUserInfoV2 respBytes:", string(respBytes))
var onlineResp proto.OutlineServerReqResp var onlineResp proto.OutlineServerReqResp
var resp proto.GitHubUserInfo var resp proto.GitHubUserInfo
err = json.Unmarshal(respBytes, &onlineResp) err = json.Unmarshal(respBytes, &onlineResp)