From d7efb3c5578d983791bb144ca12eca394e266c83 Mon Sep 17 00:00:00 2001 From: hjdhnx Date: Mon, 19 Sep 2022 17:23:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98js=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=85=8D=E5=97=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/cms.py | 4 ++-- controllers/vod.py | 2 +- js/version.txt | 2 +- readme.md | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/controllers/cms.py b/controllers/cms.py index c846477..72dc87a 100644 --- a/controllers/cms.py +++ b/controllers/cms.py @@ -56,7 +56,7 @@ py_ctx = { # print(getCryptoJS()) class CMS: - def __init__(self, rule, db=None, RuleClass=None, PlayParse=None,new_conf=None): + def __init__(self, rule, db=None, RuleClass=None, PlayParse=None,new_conf=None,ext=''): if new_conf is None: new_conf = {} self.lsg = storage_service() @@ -104,7 +104,7 @@ class CMS: # print(play_url) if self.play_parse: # self.play_url = play_url + self.vod + '?play_url=' - self.play_url = f'{play_url}{self.vod}?rule={self.id}&play_url=' + self.play_url = f'{play_url}{self.vod}?rule={self.id}&ext={ext}&play_url=' # logger.info(f'cms重定向链接:{self.play_url}') else: self.play_url = '' diff --git a/controllers/vod.py b/controllers/vod.py index 9e67e73..4902db3 100644 --- a/controllers/vod.py +++ b/controllers/vod.py @@ -178,7 +178,7 @@ def vod_home(): logger.info(f'js装载耗时:{get_interval(t2)}毫秒') # print(ruleDict) # print(rule) - cms = CMS(ruleDict,db,RuleClass,PlayParse,cfg) + cms = CMS(ruleDict,db,RuleClass,PlayParse,cfg,ext) wd = getParmas('wd') quick = getParmas('quick') play = getParmas('play') # 类型为4的时候点击播放会带上来 diff --git a/js/version.txt b/js/version.txt index 37a142c..86f7d61 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.6.14 \ No newline at end of file +3.6.15 \ No newline at end of file diff --git a/readme.md b/readme.md index dcba818..9eb362a 100644 --- a/readme.md +++ b/readme.md @@ -48,6 +48,7 @@ [获取本地设备信息](https://m.jb51.net/article/140716.htm) ###### 2022/09/19 - [X] 1.增加20多个缓存源,需要在custom.conf文件自定义添加 +- [X] 2.修复缓存js播放免嗅问题 ###### 2022/09/17 - [X] 1.pluto1.5.1最新beta版支持drpy首页推荐点击跳drpy内部聚搜(原理同T4) - [X] 2.pluto1.5.1最新beta版支持searchable为2的源忽略参与聚搜,正常单一搜索 -- GitLab