From 795fd8c1685aa9fe3d2a396bbc3086c567af8705 Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Wed, 14 Sep 2022 10:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E8=BF=94=E5=9B=9E=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9C=89=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pt_site/UtilityTool.py             | 22 ++++++++++++++++++----
 templates/auto_pt/import_ptpp.html |  6 ++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py
index 33f8cb3..af09271 100644
--- a/pt_site/UtilityTool.py
+++ b/pt_site/UtilityTool.py
@@ -246,6 +246,8 @@ class PtSpider:
                 # print(domain, cookie_str)
                 cookies.append({
                     'url': data.get('url'),
+                    'host': host,
+                    'icon': info.get('icon'),
                     'info': info.get('user'),
                     'passkey': info.get('passkey'),
                     'cookies': cookie_str.rstrip(';'),
@@ -260,11 +262,17 @@ class PtSpider:
 
     def get_uid_and_passkey(self, cookie: dict):
         url = cookie.get('url')
-        site = Site.objects.filter(url__contains=url).first()
+        host = cookie.get('host')
+        site = Site.objects.filter(url__contains=host).first()
         # print('查询站点信息：',site)
         if not site:
             return CommonResponse.error(msg='尚未支持此站点：' + url)
-        my_site = MySite.objects.filter(site=site).first()
+        site.url = url
+        icon = cookie.get('icon')
+        if icon:
+            site.logo = icon
+        site.save()
+        # my_site = MySite.objects.filter(site=site).first()
         # print('查询我的站点：',my_site)
         # 如果有更新cookie，如果没有继续创建
         my_level_str = cookie.get('info').get('levelName')
@@ -278,9 +286,15 @@ class PtSpider:
             time_join = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time_stamp / 1000))
         else:
             time_join = None
+        passkey = cookie.get('passkey')
+        print('passkey:', passkey)
+        if not passkey:
+            msg = site.name + ' PassKey未填写，请手动添加此站点！'
+            print(msg)
+            return CommonResponse.error(msg=msg)
         result = MySite.objects.update_or_create(site=site, defaults={
             'cookie': cookie.get('cookies'),
-            'passkey': cookie.get('passkey'),
+            'passkey': passkey,
             'user_id': cookie.get('info').get('id'),
             'my_level': my_level if my_level else ' ',
             'time_join': time_join,
@@ -477,7 +491,7 @@ class PtSpider:
                         days = (int(bonus) - 10) / 2 + 1
                         signin_today.sign_in_today = True
                         message = '成功,已连续签到{}天,魔力值加{},明日继续签到可获取{}魔力值！'.format(days, bonus,
-                                                                              bonus + 2)
+                                                                                                      bonus + 2)
                         signin_today.sign_in_info = message
                         signin_today.save()
                         return CommonResponse.success(
diff --git a/templates/auto_pt/import_ptpp.html b/templates/auto_pt/import_ptpp.html
index 80adf48..ab2048d 100644
--- a/templates/auto_pt/import_ptpp.html
+++ b/templates/auto_pt/import_ptpp.html
@@ -183,7 +183,7 @@
                         message: '数据获取失败，请检查数据文件是否有误？？？'
                     });
                 }
-                this.$confirm('确认导入数据 ？', '提示', {
+                this.$confirm('确认导入数据？重复导入可能导致某些数据被覆盖！', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
@@ -220,7 +220,9 @@
                                 }, 200);
                             })
                             //清空PTPP
-                            this.ptpp = ''
+                            this.user.info = ''
+                            this.user.cookies = ''
+                            this.user.userdata = ''
                             this.zip = ''
                         } else {
                             this.$message({