diff --git a/classes/cms.py b/classes/cms.py index 88cfcf3e65ee1ab74ae7218b98cff081702aec3a..79a9ece86db2de88229049aee2c3ea34e8d53f60 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 0000000000000000000000000000000000000000..f81ed50e700e29b7b3a9588f62cf584afa30235d --- /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 Binary files a/models/rules.db and b/models/rules.db differ diff --git a/requirements.txt b/requirements.txt index 9b5a125e222e63ce878728664aec494fdfb888c0..90ca4834095ceddc7b415b1eda2b96608b16e754 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 117c66ec0e7ea1216ed989e63b7afa36bac14165..84d76fa5235a5f4c816bc118d133838130a12ac5 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()