From 19ebc76515e68dcf6aecc3210d9c25c4dfb36a9d Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Sun, 25 Sep 2022 20:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AB=99=E7=82=B9=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main_pt_site_site.json | 98 ++++++++++++++++++++---------------------
 pt_site/UtilityTool.py | 99 ++++++++++++++++++++----------------------
 2 files changed, 95 insertions(+), 102 deletions(-)

diff --git a/main_pt_site_site.json b/main_pt_site_site.json
index adc1bb5..3c30fcf 100644
--- a/main_pt_site_site.json
+++ b/main_pt_site_site.json
@@ -5,7 +5,7 @@
     "updated_at": "2022-09-14 15:59:14.182000",
     "name": "阿童木",
     "url": "https://hdatmos.club/",
-    "logo": "favicon.ico",
+    "logo": "https://hdatmos.club/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -80,7 +80,7 @@
     "updated_at": "2022-09-21 09:07:10.231375",
     "name": "猪猪网",
     "url": "https://piggo.me/",
-    "logo": "http://favicon.ico",
+    "logo": "https://piggo.me/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -155,7 +155,7 @@
     "updated_at": "2022-09-20 12:51:45.624521",
     "name": "BT学校",
     "url": "https://pt.btschool.club/",
-    "logo": "favicon.ico",
+    "logo": "https://pt.btschool.club/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 0,
     "get_userinfo_support": 1,
@@ -230,7 +230,7 @@
     "updated_at": "2022-09-21 09:08:43.934984",
     "name": "1PT",
     "url": "https://1ptba.com/",
-    "logo": "http://favicon.ico",
+    "logo": "https://1ptba.com/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -305,7 +305,7 @@
     "updated_at": "2022-09-14 15:59:19.738000",
     "name": "CarPT",
     "url": "https://carpt.net/",
-    "logo": "favicon.ico",
+    "logo": "https://carpt.net/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -380,7 +380,7 @@
     "updated_at": "2022-09-14 15:59:16.396000",
     "name": "HDArea",
     "url": "https://www.hdarea.co/",
-    "logo": "favicon.ico",
+    "logo": "https://www.hdarea.co/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -455,7 +455,7 @@
     "updated_at": "2022-09-14 15:59:17.795000",
     "name": "红豆饭",
     "url": "https://hdfans.org/",
-    "logo": "http://favicon.ico",
+    "logo": "https://hdfans.org/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -530,7 +530,7 @@
     "updated_at": "2022-09-14 15:59:19.591000",
     "name": "天空",
     "url": "https://hdsky.me/",
-    "logo": "favicon.ico",
+    "logo": "https://hdsky.me/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -605,7 +605,7 @@
     "updated_at": "2022-09-14 15:59:18.558000",
     "name": "时光",
     "url": "https://hdtime.org/",
-    "logo": "favicon.ico",
+    "logo": "https://hdtime.org/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -680,7 +680,7 @@
     "updated_at": "2022-09-14 15:59:19.137000",
     "name": "Zone",
     "url": "https://hdzone.me/",
-    "logo": "favicon.ico",
+    "logo": "https://hdzone.me/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -830,7 +830,7 @@
     "updated_at": "2022-09-21 08:59:12.042216",
     "name": "蚂蚁",
     "url": "http://hdmayi.com/",
-    "logo": "http://favicon.ico",
+    "logo": "http://hdmayi.com/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -905,7 +905,7 @@
     "updated_at": "2022-09-21 09:05:30.063747",
     "name": "农场",
     "url": "https://pt.0ff.cc/",
-    "logo": "http://favicon.ico",
+    "logo": "https://pt.0ff.cc/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -980,7 +980,7 @@
     "updated_at": "2022-09-14 15:59:19.587000",
     "name": "铂金学院",
     "url": "https://ptchina.org/",
-    "logo": "favicon.ico",
+    "logo": "https://ptchina.org/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1055,7 +1055,7 @@
     "updated_at": "2022-09-14 15:59:14.985000",
     "name": "马杀鸡",
     "url": "https://pt.msg.vg/",
-    "logo": "favicon.ico",
+    "logo": "https://pt.msg.vg/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1130,7 +1130,7 @@
     "updated_at": "2022-09-20 13:17:23.216293",
     "name": "时间",
     "url": "https://www.pttime.org/",
-    "logo": "http://favicon.ico",
+    "logo": "https://www.pttime.org/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1205,7 +1205,7 @@
     "updated_at": "2022-09-14 15:59:19.434000",
     "name": "欧申",
     "url": "http://www.oshen.win/",
-    "logo": "favicon.ico",
+    "logo": "http://www.oshen.win/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1280,7 +1280,7 @@
     "updated_at": "2022-09-14 15:59:19.839000",
     "name": "海棠",
     "url": "https://www.htpt.cc/",
-    "logo": "http://favicon.ico",
+    "logo": "https://www.htpt.cc/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1355,7 +1355,7 @@
     "updated_at": "2022-09-14 15:59:20.079000",
     "name": "烧包",
     "url": "https://ptsbao.club/",
-    "logo": "favicon.ico",
+    "logo": "https://ptsbao.club/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1430,7 +1430,7 @@
     "updated_at": "2022-09-14 15:59:17.525000",
     "name": "百川",
     "url": "https://www.hitpt.com/",
-    "logo": "favicon.ico",
+    "logo": "https://www.hitpt.com/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1505,7 +1505,7 @@
     "updated_at": "2022-09-14 15:59:16.114000",
     "name": "聆音",
     "url": "https://pt.soulvoice.club/",
-    "logo": "favicon.ico",
+    "logo": "https://pt.soulvoice.club/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1580,7 +1580,7 @@
     "updated_at": "2022-09-14 15:59:19.942000",
     "name": "备胎",
     "url": "https://www.beitai.pt/",
-    "logo": "favicon.ico",
+    "logo": "https://www.beitai.pt/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1655,7 +1655,7 @@
     "updated_at": "2022-09-14 15:59:18.180000",
     "name": "观众",
     "url": "https://audiences.me/",
-    "logo": "http://favicon.ico",
+    "logo": "https://audiences.me/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1730,7 +1730,7 @@
     "updated_at": "2022-09-14 15:59:19.331000",
     "name": "丐帮",
     "url": "https://gainbound.net/",
-    "logo": "favicon.ico",
+    "logo": "https://gainbound.net/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1805,7 +1805,7 @@
     "updated_at": "2022-09-14 15:59:18.980000",
     "name": "海胆",
     "url": "https://www.haidan.video/",
-    "logo": "favicon.ico",
+    "logo": "https://www.haidan.video/public/pic/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 0,
     "get_userinfo_support": 1,
@@ -1880,7 +1880,7 @@
     "updated_at": "2022-09-14 18:14:43.203000",
     "name": "HD杜比",
     "url": "https://www.hddolby.com/",
-    "logo": "http://favicon.ico",
+    "logo": "https://www.hddolby.com/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -1955,7 +1955,7 @@
     "updated_at": "2022-09-14 15:59:17.256000",
     "name": "海带",
     "url": "https://www.hd.ai/",
-    "logo": "favicon.ico",
+    "logo": "https://www.hd.ai/favicon.png",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -2030,7 +2030,7 @@
     "updated_at": "2022-09-14 15:59:18.394000",
     "name": "MTeam",
     "url": "https://kp.m-team.cc/",
-    "logo": "favicon.ico",
+    "logo": "https://kp.m-team.cc/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -2105,7 +2105,7 @@
     "updated_at": "2022-09-15 01:18:44.589000",
     "name": "芒果",
     "url": "https://www.3wmg.com/",
-    "logo": "http://favicon.ico",
+    "logo": "https://www.3wmg.com/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 0,
     "get_userinfo_support": 1,
@@ -2180,7 +2180,7 @@
     "updated_at": "2022-09-14 15:59:20.183000",
     "name": "海豹GPW",
     "url": "https://greatposterwall.com/",
-    "logo": "favicon.ico",
+    "logo": "https://greatposterwall.com/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 0,
     "get_userinfo_support": 0,
@@ -2255,7 +2255,7 @@
     "updated_at": "2022-09-14 15:59:18.161000",
     "name": "白兔hares",
     "url": "https://club.hares.top/",
-    "logo": "http://favicon.ico",
+    "logo": "https://club.hares.top/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -2330,7 +2330,7 @@
     "updated_at": "2022-09-21 08:56:32.640159",
     "name": "老师",
     "url": "https://www.nicept.net/",
-    "logo": "http://favicon.ico",
+    "logo": "https://www.nicept.net/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -2405,7 +2405,7 @@
     "updated_at": "2022-09-21 09:29:33.480597",
     "name": "明教",
     "url": "https://hdpt.xyz/",
-    "logo": "http://favicon.ico",
+    "logo": "https://hdpt.xyz/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -2705,7 +2705,7 @@
     "updated_at": "2022-09-20 13:24:16.003720",
     "name": "HD城市",
     "url": "https://hdcity.city/",
-    "logo": "http://favicon.ico",
+    "logo": "https://hdcity.city/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -2855,7 +2855,7 @@
     "updated_at": "2022-09-21 09:42:12.450782",
     "name": "月月Frds",
     "url": "https://pt.keepfrds.com/",
-    "logo": "https://pt.keepfrds.com/static/favicon-64x64.png",
+    "logo": "https://pt.keepfrds.com/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -2930,7 +2930,7 @@
     "updated_at": "2022-09-20 15:44:21.934917",
     "name": "U2",
     "url": "https://u2.dmhy.org/",
-    "logo": "http://favor.ico",
+    "logo": "https://u2.dmhy.org/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -3005,7 +3005,7 @@
     "updated_at": "2022-09-20 10:39:27.109242",
     "name": "TTG",
     "url": "https://totheglory.im/",
-    "logo": "http://favicon.ico",
+    "logo": "https://totheglory.im/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -3080,7 +3080,7 @@
     "updated_at": "2022-09-20 12:49:15.948867",
     "name": "蝶粉",
     "url": "https://discfan.net/",
-    "logo": "http://favicon.ico",
+    "logo": "https://discfan.net/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -3155,7 +3155,7 @@
     "updated_at": "2022-09-20 12:42:28.689254",
     "name": "joyhd",
     "url": "https://www.joyhd.net/",
-    "logo": "http://favicon.ico",
+    "logo": "https://www.joyhd.net/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -3230,7 +3230,7 @@
     "updated_at": "2022-09-14 10:07:34.209000",
     "name": "彩虹岛",
     "url": "https://chdbits.co/",
-    "logo": "http://favicon.ico",
+    "logo": "https://chdbits.co/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 0,
     "get_userinfo_support": 1,
@@ -3305,7 +3305,7 @@
     "updated_at": "2022-09-14 10:07:34.225000",
     "name": "好多油",
     "url": "https://pt.hdupt.com/",
-    "logo": "http://favicon.ico",
+    "logo": "https://pt.hdupt.com/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 0,
     "get_userinfo_support": 1,
@@ -3380,7 +3380,7 @@
     "updated_at": "2022-09-14 10:07:34.236000",
     "name": "我堡",
     "url": "https://ourbits.club/",
-    "logo": "http://favicon.ico",
+    "logo": "https://ourbits.club/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 0,
     "get_userinfo_support": 1,
@@ -3455,7 +3455,7 @@
     "updated_at": "2022-09-21 08:54:15.936834",
     "name": "家园",
     "url": "https://hdhome.org/",
-    "logo": "http://favicon.ico",
+    "logo": "https://hdhome.org/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -3530,7 +3530,7 @@
     "updated_at": "2022-09-14 10:07:34.257000",
     "name": "不可说",
     "url": "https://springsunday.net/",
-    "logo": "http://favicon.ico",
+    "logo": "https://springsunday.net/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 0,
     "get_userinfo_support": 0,
@@ -3605,7 +3605,7 @@
     "updated_at": "2022-09-14 10:07:34.268000",
     "name": "OpenCD",
     "url": "https://open.cd/",
-    "logo": "http://favicon.ico",
+    "logo": "https://open.cd/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 0,
     "get_userinfo_support": 0,
@@ -3680,7 +3680,7 @@
     "updated_at": "2022-09-14 10:07:34.279000",
     "name": "这是猫站",
     "url": "https://pterclub.com/",
-    "logo": "http://favicon.ico",
+    "logo": "https://pterclub.com/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 0,
     "get_userinfo_support": 0,
@@ -3755,7 +3755,7 @@
     "updated_at": "2022-09-14 10:07:34.289000",
     "name": "柠檬",
     "url": "https://lemonhd.org/",
-    "logo": "http://favicon.ico",
+    "logo": "https://lemonhd.org/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -3830,7 +3830,7 @@
     "updated_at": "2022-09-16 15:18:48.934457",
     "name": "南洋",
     "url": "https://nanyangpt.com/",
-    "logo": "http://favicon.ico",
+    "logo": "https://nanyangpt.com/favicon.ico",
     "sign_in_support": 1,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -3905,7 +3905,7 @@
     "updated_at": "2022-09-21 09:22:20.962848",
     "name": "吐鲁番",
     "url": "https://pt.eastgame.org/",
-    "logo": "http://favicon.ico",
+    "logo": "https://pt.eastgame.org/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
@@ -4055,7 +4055,7 @@
     "updated_at": "2022-09-14 00:05:07.652000",
     "name": "艾薇",
     "url": "http://avgv.cc/",
-    "logo": "http://favicon.ico",
+    "logo": "http://avgv.cc/favicon.ico",
     "sign_in_support": 0,
     "get_torrent_support": 1,
     "get_userinfo_support": 1,
diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py
index b15f12b..30f23a2 100644
--- a/pt_site/UtilityTool.py
+++ b/pt_site/UtilityTool.py
@@ -445,58 +445,51 @@ class PtSpider:
 
     def sign_in_u2(self, my_site: MySite):
         site = my_site.site
-        try:
-            url = site.url + site.page_sign_in.lstrip('/')
-            result = self.send_request(
-                my_site=my_site,
-                url=url,
-            )
-            sign_str = ''.join(self.parse(result, '//a[@href="showup.php"]/text()'))
-            print(site.name, sign_str)
-            if '已签到' in converter.convert(sign_str):
-                return CommonResponse.success(msg=site.name + '已签到，请勿重复操作！！')
-            req = self.parse(result, '//form//td/input[@name="req"]/@value')
-            hash_str = self.parse(result, '//form//td/input[@name="hash"]/@value')
-            form = self.parse(result, '//form//td/input[@name="form"]/@value')
-            submit_name = self.parse(result, '//form//td/input[@type="submit"]/@name')
-            submit_value = self.parse(result, '//form//td/input[@type="submit"]/@value')
-            message = site.sign_in_params if len(site.sign_in_params) >= 5 else '天空飘来五个字儿,幼儿园里没有事儿'
-            print(submit_name)
-            print(submit_value)
-            headers = {
-                "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"
-            }
-            param = []
-            for name, value in zip(submit_name, submit_value):
-                param.append({
-                    name: value
-                })
-            data = {
-                'req': req[0],
-                'hash': hash_str[0],
-                'form': form[0],
-                'message': message,
-            }
-            data.update(param[random.randint(0, 3)])
-            print(data)
-            response = self.send_request(
-                my_site,
-                url=site.url + site.page_sign_in.lstrip('/') + '?action=show',
-                method=site.sign_in_method,
-                headers=headers,
-                data=data,
-            )
-            print(response.content.decode('utf8'))
-            if "window.location.href = 'showup.php';" in response.content.decode('utf8'):
-                return CommonResponse.success(msg='低保签到成功！')
-            else:
-                return CommonResponse.error(msg='签到失败！')
-        except Exception as e:
-            raise
-            return CommonResponse.error(
-                status=StatusCodeEnum.WEB_CONNECT_ERR,
-                msg=site.name + str(e)
-            )
+        url = site.url + site.page_sign_in.lstrip('/')
+        result = self.send_request(
+            my_site=my_site,
+            url=url,
+        )
+        sign_str = ''.join(self.parse(result, '//a[@href="showup.php"]/text()'))
+        print(site.name, sign_str)
+        if '已签到' in converter.convert(sign_str):
+            return CommonResponse.success(msg=site.name + '已签到，请勿重复操作！！')
+        req = self.parse(result, '//form//td/input[@name="req"]/@value')
+        hash_str = self.parse(result, '//form//td/input[@name="hash"]/@value')
+        form = self.parse(result, '//form//td/input[@name="form"]/@value')
+        submit_name = self.parse(result, '//form//td/input[@type="submit"]/@name')
+        submit_value = self.parse(result, '//form//td/input[@type="submit"]/@value')
+        message = site.sign_in_params if len(site.sign_in_params) >= 5 else '天空飘来五个字儿,幼儿园里没有事儿'
+        print(submit_name)
+        print(submit_value)
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"
+        }
+        param = []
+        for name, value in zip(submit_name, submit_value):
+            param.append({
+                name: value
+            })
+        data = {
+            'req': req[0],
+            'hash': hash_str[0],
+            'form': form[0],
+            'message': message,
+        }
+        data.update(param[random.randint(0, 3)])
+        print(data)
+        response = self.send_request(
+            my_site,
+            url=site.url + site.page_sign_in.lstrip('/') + '?action=show',
+            method=site.sign_in_method,
+            headers=headers,
+            data=data,
+        )
+        print(response.content.decode('utf8'))
+        if "window.location.href = 'showup.php';" in response.content.decode('utf8'):
+            return CommonResponse.success(msg='低保签到成功！')
+        else:
+            return CommonResponse.error(msg='签到失败！')
 
     def sign_in_hdsky(self, my_site: MySite, captcha=False):
         """HDSKY签到"""
@@ -813,7 +806,7 @@ class PtSpider:
             else:
                 return CommonResponse.error(msg='请确认签到是否成功？？网页返回码：' + str(res.status_code))
         except Exception as e:
-            raise
+            # raise
             self.send_text(site.name + '签到失败！原因：' + str(e))
             return CommonResponse.error(msg='签到失败！' + str(e))