From af6c4822e54e20bb378da94ab5452e362c554bca Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Tue, 6 May 2025 12:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0post=E8=AF=B7=E6=B1=82applica?=
=?UTF-8?q?tion/x-www-form-urlencoded=E6=96=B9=E5=BC=8F=E6=94=AF=E6=8C=81,?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9stackoverflow=E6=95=B0=E6=8D=AE=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/inspectionProfiles/Project_Default.xml | 4 +-
service/toolService.go | 2 +
worker/req.go | 71 ++++++++++++++++++++
worker/thirdParty.go | 2 +-
4 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index ec3693b..3597a7e 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,9 +3,7 @@
-
-
-
+
diff --git a/service/toolService.go b/service/toolService.go
index 215bc86..be80d66 100644
--- a/service/toolService.go
+++ b/service/toolService.go
@@ -612,6 +612,8 @@ func DoRequestToForeignServer(req *proto.OnlineServerReq) (proto.OutlineServerRe
err2, respBytes = worker.DoPostRequestJSON(req.Url, dataBytes, headers)
} else if req.PostType == "form" {
err2, respBytes = worker.DoPostRequestForm(req.Url, dataBytes, headers)
+ } else if req.PostType == "form-url-encoded" {
+ err2, respBytes = worker.DoPostRequestFormUrlEncoded(req.Url, dataBytes, headers)
} else {
log.Println("DoRequestToForeignServer post type error:", req.PostType)
return resp, errors.New("request post type error")
diff --git a/worker/req.go b/worker/req.go
index 409a6d8..5308b9f 100644
--- a/worker/req.go
+++ b/worker/req.go
@@ -10,6 +10,7 @@ import (
"log"
"mime/multipart"
"net/http"
+ "net/url"
"strconv"
"strings"
)
@@ -196,6 +197,7 @@ func DoPostRequestJSON(url string, jsonData []byte, headers map[string]string) (
return err, nil
}
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
for k, v := range headers {
req.Header.Set(k, v)
@@ -265,6 +267,7 @@ func DoPostRequestForm(url string, jsonData []byte, headers map[string]string) (
// 创建 POST 请求
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 {
return err, nil
}
@@ -293,6 +296,73 @@ func DoPostRequestForm(url string, jsonData []byte, headers map[string]string) (
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) {
httpClient := &http.Client{}
defer func() {
@@ -303,6 +373,7 @@ func DoGetRequest(url string, headers map[string]string) (error, []byte) {
//从接口获取数据
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 {
return err, nil
}
diff --git a/worker/thirdParty.go b/worker/thirdParty.go
index 279b884..f1f7181 100644
--- a/worker/thirdParty.go
+++ b/worker/thirdParty.go
@@ -394,7 +394,7 @@ func GetStackoverflowAccessTokenByCode(code string, redirectURI string, clientID
log.Println("GetFacebookAccessTokenByCode url:", url)
var onlineReq proto.OnlineServerReq
onlineReq.Type = "post"
- onlineReq.PostType = "form"
+ onlineReq.PostType = "form-url-encoded"
onlineReq.Url = url
onlineReq.Data = req
superTokens := GetRedisSetMembers("super_permission_tokens")