From 5371f09440ad061a2c2ef3df9606f0bd22facdbf Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Tue, 4 Oct 2022 08:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AD=BE=E5=88=B0=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E7=AD=BE=E5=88=B0=E6=88=90=E5=8A=9F=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/ptools.iml       |  2 +-
 pt_site/UtilityTool.py | 14 +++++++++-----
 pt_site/admin.py       |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.idea/ptools.iml b/.idea/ptools.iml
index 8114c7e..6325a54 100644
--- a/.idea/ptools.iml
+++ b/.idea/ptools.iml
@@ -5,7 +5,7 @@
       <configuration>
         <option name="rootFolder" value="$MODULE_DIR$" />
         <option name="settingsModule" value="ptools/settings.py" />
-        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
+        <option name="manageScript" value="manage.py" />
         <option name="environment" value="&lt;map/&gt;" />
         <option name="doNotUseTestRunner" value="false" />
         <option name="trackFilePattern" value="migrations" />
diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py
index 0d324be..191af58 100644
--- a/pt_site/UtilityTool.py
+++ b/pt_site/UtilityTool.py
@@ -612,7 +612,8 @@ class PtSpider:
             message_list = message + message_list
         else:
             queryset = [my_site for my_site in queryset if my_site.cookie and my_site.site.sign_in_support
-                        and my_site.signin_set.filter(created_at__date__gte=datetime.today()).count() <= 0]
+                        and my_site.signin_set.filter(created_at__date__gte=datetime.today(),
+                                                      sign_in_today=True).count() <= 0]
         print(len(queryset))
         if len(queryset) <= 0:
             message_list = '> <font color="orange">已全部签到或无需签到！</font>  \n'
@@ -638,7 +639,7 @@ class PtSpider:
         site = my_site.site
         print(site.name + '开始签到')
         signin_today = my_site.signin_set.filter(created_at__date__gte=datetime.today()).first()
-
+        print(signin_today.sign_in_today is True)
         # 如果已有签到记录
         if signin_today and (signin_today.sign_in_today is True):
             # pass
@@ -800,13 +801,14 @@ class PtSpider:
                     return CommonResponse.success(msg='签到成功！')
                 else:
                     return CommonResponse.error(msg='签到失败！')
-                # print(res.text)
+            print(res.status_code, res.text)
             if res.status_code == 200:
                 status = converter.convert(res.content.decode('utf8'))
                 # status = ''.join(self.parse(res, '//a[contains(@href,{})]/text()'.format(site.page_sign_in)))
                 # 检查是否签到成功！
                 # if '签到得魔力' in converter.convert(status):
-                if '(获得' 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='签到失败！')
@@ -820,6 +822,8 @@ class PtSpider:
                 content = ''.join(content_parse).strip().replace('\n', '')
                 # print(content)
                 message = title + ',' + content
+                if len(message) <= 1:
+                    message = datetime.today().strftime('%Y-%m-%d %H:%M:%S') + '打卡成功！'
                 # message = ''.join(title).strip()
                 signin_today.sign_in_today = True
                 signin_today.sign_in_info = message
@@ -829,8 +833,8 @@ class PtSpider:
             else:
                 return CommonResponse.error(msg='请确认签到是否成功？？网页返回码：' + str(res.status_code))
         except Exception as e:
-            # raise
             self.send_text(site.name + '签到失败！原因：' + str(e))
+            raise
             return CommonResponse.error(msg='签到失败！' + str(e))
 
     @staticmethod
diff --git a/pt_site/admin.py b/pt_site/admin.py
index 1df71f0..0bf2468 100644
--- a/pt_site/admin.py
+++ b/pt_site/admin.py
@@ -408,7 +408,7 @@ class MySiteAdmin(ImportExportModelAdmin):  # instead of ModelAdmin
         start = time.time()
         queryset = [my_site for my_site in queryset if
                     my_site.cookie and my_site.passkey and my_site.site.sign_in_support and my_site.signin_set.filter(
-                        created_at__date__gte=datetime.today()).count() <= 0]
+                        created_at__date__gte=datetime.today(), sign_in_today=True).count() <= 0]
         if len(queryset) <= 0:
             messages.add_message(request, messages.SUCCESS, '已签到或无需签到！')
         results = pool.map(pt_spider.sign_in, queryset)