From 789affa5cb3ecf3d3f72bb4893f8c87333c14919 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Fri, 9 Sep 2022 14:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96fetch,post,request=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/encode.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/utils/encode.py b/utils/encode.py
index 40137e9..31b6b4c 100644
--- a/utils/encode.py
+++ b/utils/encode.py
@@ -140,6 +140,8 @@ def dealObj(obj=None):
         obj = {}
     encoding = obj.get('encoding') or 'utf-8'
     encoding = str(encoding).replace("'", "")
+    method = obj.get('method') or 'get'
+    method = str(method).replace("'", "")
     # print(type(url),url)
     # headers = dict(obj.get('headers')) if obj.get('headers') else {}
     # headers = obj.get('headers').to_dict() if obj.get('headers') else {}
@@ -161,13 +163,16 @@ def dealObj(obj=None):
         'headers':new_headers,
         'timeout':timeout,
         'body': new_body,
+        'method':method
     }
 
-def base_request(url,obj,method=None):
+def base_request(url,obj):
     # verify=False 关闭证书验证
     url = str(url).replace("'", "")
+    method = obj.get('method') or ''
     if not method:
         method = 'get'
+        obj['method'] = 'method'
     # print(obj)
     print(f'{method}:{url}')
     try:
@@ -186,28 +191,24 @@ def base_request(url,obj,method=None):
         print(f'{method}请求发生错误:{e}')
         return ''
 
-def fetch(url,obj,method=None):
-    if not method:
-        method = 'get'
+def fetch(url,obj):
     obj = dealObj(obj)
-    # print(f'{method}:{url}')
     if not obj.get('headers') or not obj['headers'].get('User-Agent'):
         obj['headers']['User-Agent'] = PC_UA
-    return base_request(url,obj,method)
+    return base_request(url,obj)
 
 def post(url,obj):
     obj = dealObj(obj)
-    return base_request(url,obj,'post')
+    obj['method'] = 'post'
+    return base_request(url,obj)
 
-def request(url,obj,method=None):
-    if not method:
-        method = 'get'
+def request(url,obj):
     obj = dealObj(obj)
     # print(f'{method}:{url}')
     if not obj.get('headers') or not obj['headers'].get('User-Agent'):
         obj['headers']['User-Agent'] = UC_UA
 
-    return base_request(url, obj, method)
+    return base_request(url, obj)
 
 def buildUrl(url,obj=None):
     url = str(url).replace("'", "")
-- 
GitLab