添加post请求application/x-www-form-urlencoded方式支持,修改stackoverflow数据获取
This commit is contained in:
parent
da3fb88562
commit
af6c4822e5
|
|
@ -3,9 +3,7 @@
|
||||||
<option name="myName" value="Project Default" />
|
<option name="myName" value="Project Default" />
|
||||||
<inspection_tool class="GoDfaErrorMayBeNotNil" enabled="true" level="WARNING" enabled_by_default="true">
|
<inspection_tool class="GoDfaErrorMayBeNotNil" enabled="true" level="WARNING" enabled_by_default="true">
|
||||||
<functions>
|
<functions>
|
||||||
<function importPath="StuAcaWorksAI/worker" name="GetGoogleAccessTokenByCode" />
|
<function importPath="net/http" name="NewRequest" />
|
||||||
<function importPath="StuAcaWorksAI/worker" name="GetFacebookAccessTokenByCode" />
|
|
||||||
<function importPath="StuAcaWorksAI/worker" name="GetStackoverflowAccessTokenByCode" />
|
|
||||||
</functions>
|
</functions>
|
||||||
</inspection_tool>
|
</inspection_tool>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
|
||||||
|
|
@ -612,6 +612,8 @@ func DoRequestToForeignServer(req *proto.OnlineServerReq) (proto.OutlineServerRe
|
||||||
err2, respBytes = worker.DoPostRequestJSON(req.Url, dataBytes, headers)
|
err2, respBytes = worker.DoPostRequestJSON(req.Url, dataBytes, headers)
|
||||||
} else if req.PostType == "form" {
|
} else if req.PostType == "form" {
|
||||||
err2, respBytes = worker.DoPostRequestForm(req.Url, dataBytes, headers)
|
err2, respBytes = worker.DoPostRequestForm(req.Url, dataBytes, headers)
|
||||||
|
} else if req.PostType == "form-url-encoded" {
|
||||||
|
err2, respBytes = worker.DoPostRequestFormUrlEncoded(req.Url, dataBytes, headers)
|
||||||
} else {
|
} else {
|
||||||
log.Println("DoRequestToForeignServer post type error:", req.PostType)
|
log.Println("DoRequestToForeignServer post type error:", req.PostType)
|
||||||
return resp, errors.New("request post type error")
|
return resp, errors.New("request post type error")
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"mime/multipart"
|
"mime/multipart"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
@ -196,6 +197,7 @@ func DoPostRequestJSON(url string, jsonData []byte, headers map[string]string) (
|
||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0")
|
||||||
//设置header
|
//设置header
|
||||||
for k, v := range headers {
|
for k, v := range headers {
|
||||||
req.Header.Set(k, v)
|
req.Header.Set(k, v)
|
||||||
|
|
@ -265,6 +267,7 @@ func DoPostRequestForm(url string, jsonData []byte, headers map[string]string) (
|
||||||
|
|
||||||
// 创建 POST 请求
|
// 创建 POST 请求
|
||||||
req, err := http.NewRequest("POST", url, body)
|
req, err := http.NewRequest("POST", url, body)
|
||||||
|
req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
|
|
@ -293,6 +296,73 @@ func DoPostRequestForm(url string, jsonData []byte, headers map[string]string) (
|
||||||
return nil, responseBod
|
return nil, responseBod
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func DoPostRequestFormUrlEncoded(url_ string, jsonData []byte, headers map[string]string) (error, []byte) {
|
||||||
|
httpClient := &http.Client{}
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
log.Println("SyncDataFromMasterReq2 error:", r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// 解析 JSON 数据
|
||||||
|
var data map[string]interface{}
|
||||||
|
err := json.Unmarshal(jsonData, &data)
|
||||||
|
if err != nil {
|
||||||
|
log.Println("do post json unmarshal error:", err)
|
||||||
|
return err, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建 url.Values 来存储请求参数
|
||||||
|
reqData := url.Values{}
|
||||||
|
for k, v := range data {
|
||||||
|
switch val := v.(type) {
|
||||||
|
case bool:
|
||||||
|
// 处理布尔类型的值
|
||||||
|
reqData.Set(k, strconv.FormatBool(val))
|
||||||
|
case string:
|
||||||
|
// 处理字符串类型的值
|
||||||
|
reqData.Set(k, val)
|
||||||
|
default:
|
||||||
|
// 其他类型可以根据需要扩展处理逻辑
|
||||||
|
log.Printf("Unsupported type for field %s: %T\n", k, v)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 将 url.Values 编码为 URL 编码的格式
|
||||||
|
encodedData := reqData.Encode()
|
||||||
|
|
||||||
|
// 创建 POST 请求
|
||||||
|
req, err := http.NewRequest("POST", url_, bytes.NewBufferString(encodedData))
|
||||||
|
if err != nil {
|
||||||
|
return err, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置请求头
|
||||||
|
req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0")
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
|
||||||
|
// 设置其他自定义请求头
|
||||||
|
for k, v := range headers {
|
||||||
|
req.Header.Set(k, v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 发送请求
|
||||||
|
resp, err := httpClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return err, nil
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
// 读取响应体
|
||||||
|
responseBod, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return err, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, responseBod
|
||||||
|
}
|
||||||
|
|
||||||
func DoGetRequest(url string, headers map[string]string) (error, []byte) {
|
func DoGetRequest(url string, headers map[string]string) (error, []byte) {
|
||||||
httpClient := &http.Client{}
|
httpClient := &http.Client{}
|
||||||
defer func() {
|
defer func() {
|
||||||
|
|
@ -303,6 +373,7 @@ func DoGetRequest(url string, headers map[string]string) (error, []byte) {
|
||||||
|
|
||||||
//从接口获取数据
|
//从接口获取数据
|
||||||
req, err := http.NewRequest("GET", url, nil)
|
req, err := http.NewRequest("GET", url, nil)
|
||||||
|
req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -394,7 +394,7 @@ func GetStackoverflowAccessTokenByCode(code string, redirectURI string, clientID
|
||||||
log.Println("GetFacebookAccessTokenByCode url:", url)
|
log.Println("GetFacebookAccessTokenByCode url:", url)
|
||||||
var onlineReq proto.OnlineServerReq
|
var onlineReq proto.OnlineServerReq
|
||||||
onlineReq.Type = "post"
|
onlineReq.Type = "post"
|
||||||
onlineReq.PostType = "form"
|
onlineReq.PostType = "form-url-encoded"
|
||||||
onlineReq.Url = url
|
onlineReq.Url = url
|
||||||
onlineReq.Data = req
|
onlineReq.Data = req
|
||||||
superTokens := GetRedisSetMembers("super_permission_tokens")
|
superTokens := GetRedisSetMembers("super_permission_tokens")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue