From 15679fc0ff9f02c29ed3b2878f301b0dac80b840 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Thu, 25 Aug 2022 12:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90pdfh=E7=B3=BB=E5=88=97?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/cms.py       | 5 +++--
 utils/htmlParser.py | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/models/cms.py b/models/cms.py
index a8e7de9..be17985 100644
--- a/models/cms.py
+++ b/models/cms.py
@@ -91,7 +91,7 @@ class CMS:
         # params = '-'.join(urlParams)
         # print(params)
         # url = self.url + '/{0}.html'.format(params)
-        pg = str(fypage)
+        fypage = str(fypage)
         url = self.url.replace('fyclass',fyclass).replace('fypage',fypage)
         print(url)
         headers = {'user-agent': self.ua}
@@ -101,6 +101,7 @@ class CMS:
         pdfh = jsp.pdfh
         pdfa = jsp.pdfa
         pd = jsp.pd
+        print(pdfh(r.text,p[0]))
 
         items = pdfa(r.text, p[0])
         videos = []
@@ -120,7 +121,7 @@ class CMS:
                 "vod_content": content,
             })
         result['list'] = videos
-        result['page'] = pg
+        result['page'] = fypage
         result['pagecount'] = 9999
         result['limit'] = 90
         result['total'] = 999999
diff --git a/utils/htmlParser.py b/utils/htmlParser.py
index f15e697..e2cd308 100644
--- a/utils/htmlParser.py
+++ b/utils/htmlParser.py
@@ -29,7 +29,9 @@ class jsoup:
                 if pd and option in ['url','src','href','data-original']:
                     ret = urljoin(self.MY_URL,ret)
         else:
-            ret = ret('fisrt').html()
+            ret = ret.next()
+            print(ret)
+            ret = str(ret('fisrt'))
         return ret
 
     def pdfa(self,html,parse):
-- 
GitLab