From ce69e2d58fce787cd377789c344ded1a0f1f5d0f Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Wed, 31 Aug 2022 00:22:32 +0800
Subject: [PATCH] =?UTF-8?q?ddddocr=E6=9C=AC=E5=9C=B0=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=8D=E4=BA=86,=E5=8F=AA=E8=83=BD=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BA=86,=E5=85=B6=E4=BB=96=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/cms.py                                |   6 ++++--
 ...35\345\205\211\345\275\261\351\231\242.js" |   7 +++++++
 models/rules.db                               | Bin 32768 -> 32768 bytes
 requirements.txt                              |   3 ++-
 utils/encode.py                               |   3 ++-
 5 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 "js/\350\223\235\345\205\211\345\275\261\351\231\242.js"

diff --git a/classes/cms.py b/classes/cms.py
index 88cfcf3..79a9ece 100644
--- a/classes/cms.py
+++ b/classes/cms.py
@@ -11,7 +11,8 @@ from utils.web import *
 from models import *
 from utils.config import config
 from utils.log import logger
-from utils.encode import base64Encode,baseDecode,fetch,post,request,getCryptoJS,getPreJs,buildUrl,getHome,verifyCode
+from utils.encode import base64Encode,baseDecode,fetch,post,request,getCryptoJS,getPreJs,buildUrl,getHome
+from utils.encode import verifyCode
 from utils.safePython import safePython
 from utils.parser import runPy,runJScode
 from utils.htmlParser import jsoup
@@ -23,7 +24,7 @@ from easydict import EasyDict as edict
 py_ctx = {
 'requests':requests,'print':print,'base64Encode':base64Encode,'baseDecode':baseDecode,
 'log':logger.info,'fetch':fetch,'post':post,'request':request,'getCryptoJS':getCryptoJS,
-'buildUrl':buildUrl,'getHome':getHome,'verifyCode':verifyCode
+'buildUrl':buildUrl,'getHome':getHome
 }
 # print(getCryptoJS())
 
@@ -678,6 +679,7 @@ class CMS:
             # print(html)
             if html.find('输入验证码') > -1:
                 cookie = verifyCode(url,self.headers,self.timeout,self.retry_count)
+                # cookie = ''
                 if not cookie:
                     return {
                         'list': videos
diff --git "a/js/\350\223\235\345\205\211\345\275\261\351\231\242.js" "b/js/\350\223\235\345\205\211\345\275\261\351\231\242.js"
new file mode 100644
index 0000000..f81ed50
--- /dev/null
+++ "b/js/\350\223\235\345\205\211\345\275\261\351\231\242.js"
@@ -0,0 +1,7 @@
+var rule = Object.assign(muban.mxpro,{
+title:'蓝光影院',
+host:'https://lgyy.cc',
+url:'/vodshow/fyclass--------fypage---.html',
+    searchUrl:'/vodsearch/**-------------.html',
+    class_parse:'.navbar-items li:gt(1):lt(6);a&&Text;a&&href;.*/(.*?).html',
+});
\ No newline at end of file
diff --git a/models/rules.db b/models/rules.db
index e71680741cff6767c1310bae59f052da15f017ce..00295f738a693f4df850591aee0f43477b568894 100644
GIT binary patch
delta 106
zcmZo@U}|V!njp>SJ5k1&(RX9QGJXz5W`1j4A5O;2d;*_2IC5Co7*ylcLnrT(cTx%P
z2nco!4)%1hO-U@yF*Q$2Nh~tXHndF6GBe4~%t}uxF-qK=FL{88iGTZMLzy;a76t|e
K&&|8#T@wH!L>`g=

delta 59
zcmZo@U}|V!njp>SGf~Ew(Pv}AGJcMHW`1j4AO7u|`2;?5Oq`InIbZSs6B7f&W<!}a
PW)^o=R))>H<y{j16qXT9

diff --git a/requirements.txt b/requirements.txt
index 9b5a125..90ca483 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,4 +9,5 @@ gevent ; python_version < '3.9'
 supervisor ; sys_platform != 'win32' and python_version < '3.9'
 func_timeout
 easydict
-ddddocr
\ No newline at end of file
+ddddocr==1.1.0 ; sys_platform == 'win32'
+ddddocr==1.0.8 ; sys_platform != 'win32'
\ No newline at end of file
diff --git a/utils/encode.py b/utils/encode.py
index 117c66e..84d76fa 100644
--- a/utils/encode.py
+++ b/utils/encode.py
@@ -10,7 +10,7 @@ import requests.utils
 from time import sleep
 import os
 from utils.web import UC_UA,PC_UA
-import ddddocr
+# import ddddocr
 
 def getPreJs():
     base_path = os.path.dirname(os.path.abspath(os.path.dirname(__file__)))  # 上级目
@@ -43,6 +43,7 @@ def verifyCode(url,headers,timeout=5,total_cnt=3):
         headers['Referer'] = host
     print(f'开始自动过验证,请求头:{headers}')
     cnt = 0
+    import ddddocr
     ocr = ddddocr.DdddOcr()
     while cnt < total_cnt:
         s = requests.session()
-- 
GitLab