From 1473014aca93582f9f79041bc4c653aa3f6c121f Mon Sep 17 00:00:00 2001
From: caiwx86 <caiwenxiu0806@163.com>
Date: Sat, 17 Dec 2022 00:44:35 +0800
Subject: [PATCH] fix

---
 utils/HtmlUtils.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/utils/HtmlUtils.py b/utils/HtmlUtils.py
index e152b3d..af94dfa 100644
--- a/utils/HtmlUtils.py
+++ b/utils/HtmlUtils.py
@@ -29,11 +29,9 @@ class htmlUtils:
             if count <= 10:
                 try:
                     print(f"请求地址：{curl}")
-                    res = s.get(curl,stream=True, headers=cls.headers, timeout=50)
+                    res = s.get(curl,stream=True, headers=cls.headers, timeout=180)
                     if type == "bytes":
-                        return res
-                    if type == "json":
-                        return res.json()
+                        url_text = res
                     else:
                         url_text = html.fromstring(res.text)
                 except:
@@ -56,7 +54,17 @@ class htmlUtils:
     
     @classmethod
     def getJSON(cls,curl):
-        cls.getHTML(curl, type="json")
+        count = 0
+        while count < 5:
+            try:
+                res = requests.get(curl, headers=cls.headers, timeout=180)
+                data_json = res.json()
+                return data_json
+            except:
+                ntfy.sendMsg(f"请求失败，重试中... {curl}")
+                count += 1
+                time.sleep(1)
+                cls.getJSON(curl)
      
     @classmethod
     def xpathData(cls,c_xpath,url=None,num=None,not_eq=None):