From b2c99d3019d1806ddde8acd30aaa1e00b10827c0 Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Wed, 21 Dec 2022 15:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A5=BD=E5=A4=9A=E6=B2=B9?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pt_site/UtilityTool.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py
index 9180c31..d590700 100644
--- a/pt_site/UtilityTool.py
+++ b/pt_site/UtilityTool.py
@@ -527,13 +527,12 @@ class PtSpider:
             url=site.url + site.page_sign_in.lstrip('/'),
             method=site.sign_in_method
         ).text.encode('utf8')
-        if isinstance(sign_res, int):
-            msg = '你还需要继续努力哦！此次签到，你获得了魔力奖励：{}'.format(sign_res)
-        else:
-            msg = sign_res
-        logger.info(msg)
-        return CommonResponse.success(
-            msg=msg
+        if sign_res.isdigit():
+            return CommonResponse.success(
+                msg='你还需要继续努力哦！此次签到，你获得了魔力奖励：{}'.format(sign_res)
+            )
+        return CommonResponse.error(
+            msg=f'签到失败！{sign_res}'
         )
 
     def sign_in_hd4fans(self, my_site: MySite):
@@ -1121,8 +1120,14 @@ class PtSpider:
                 # status = ''.join(self.parse(res, '//a[contains(@href,{})]/text()'.format(site.page_sign_in)))
                 # 检查是否签到成功！
                 # if '签到得魔力' in converter.convert(status):
-                haidan_sign_str = '<input type="submit" id="modalBtn" style="cursor: default;" disabled class="dt_button" value="已经打卡" />'
-                if haidan_sign_str in status or '(获得' in status or '签到已得' in status or '已签到' in status or '已经签到' in status or '签到成功' in status:
+                haidan_sign_str = '<input type="submit" id="modalBtn" ' \
+                                  'style="cursor: default;" disabled class="dt_button" value="已经打卡" />'
+                if haidan_sign_str in status \
+                        or '(获得' in status \
+                        or '签到已得' in status \
+                        or '已签到' in status \
+                        or '已经签到' in status \
+                        or '签到成功' in status:
                     pass
                 else:
                     return CommonResponse.error(msg='签到失败！')