Merge branch 'master' of http://git.jojo21.top/shawenguan/MitmProxy

addons/elife/OfpayGrab.py

@@ -529,12 +529,12 @@ class OfpayGrabber:
             print("请求活动描述发生错误");
         return None;
 
-    def get_request(self, url, params=None):
-        response = requests.get(url, headers=self.headers, params=params, cookies=self.cookies);
+    def get_request(self, url, params=None, timeout=3):
+        response = requests.get(url, headers=self.headers, params=params, cookies=self.cookies, timeout=timeout);
         return response;
 
-    def post_request(self, url, data):
-        response = requests.post(url, data=data, headers=self.headers, cookies=self.cookies);
+    def post_request(self, url, data, timeout=3):
+        response = requests.post(url, data=data, headers=self.headers, cookies=self.cookies, timeout=timeout);
         return response;
 
 def init_data_pre_excute():