diff --git a/controllers/admin.py b/controllers/admin.py index 8d00f3b2c2e190250869e41c2f2eb829011cd0ed..45d42ae77b6aa12190114ee69a2e6e40f9acad07 100644 --- a/controllers/admin.py +++ b/controllers/admin.py @@ -88,7 +88,8 @@ def admin_view_rule(name): rurl = burl.replace(oldsrc, newsrc) if burl != rurl: jscode = parser.getJs(name, 'js') - rjscode = render_template_string(jscode, env=env) + # rjscode = render_template_string(jscode, env=env) + rjscode = render_template_string(jscode, **env) if rjscode.strip() == jscode.strip(): # 无需渲染才代理 return redirect(rurl) else: diff --git a/controllers/vod.py b/controllers/vod.py index 06d3b7ed4ff7cdef3d829f3150eb24b09ac6e256..bee6d1691c5ff94b8854226911b2cfc56d5d92c7 100644 --- a/controllers/vod.py +++ b/controllers/vod.py @@ -57,6 +57,9 @@ def search_one(rule, wd, before: str = ''): try: with open(js_path, encoding='utf-8') as f2: jscode = f2.read() + env = get_env() + if env: + jscode = render_template_string(jscode, **env) jscode = before + jscode + end_code # print(jscode) ctx.eval(jscode) @@ -240,7 +243,7 @@ def vod_home(): jscode = f2.read() env = get_env() if env: - jscode = render_template_string(jscode,env=env) + jscode = render_template_string(jscode,**env) # print(jscode) jscode = before + jscode + end_code # print(jscode) diff --git "a/js/007\345\275\261\350\247\206.js" "b/js/007\345\275\261\350\247\206.js" index 31e24ea8d7fafb01bf008950f53abb423cf96653..26b08cacad138e56894e3fa15e812e97a85fd1a3 100644 --- "a/js/007\345\275\261\350\247\206.js" +++ "b/js/007\345\275\261\350\247\206.js" @@ -1,7 +1,7 @@ muban.首图2.二级.tabs = '.nav-tabs.dpplay&&li'; var rule = Object.assign(muban.首图2,{ title:'007影视', - ali_token:'{{env.ali_token}}', + ali_token:'{{ali_token}}', host:'https://www.007ts.me', url:'/channel/fyclass-fypage.html', searchUrl:'/search/**----------fypage---.html', diff --git a/utils/env.py b/utils/env.py index af79b035045028ab6aaad21ba1bd98e36b21d361..a0b703f61cf12e00a53c9bd21411dfd1d09c810a 100644 --- a/utils/env.py +++ b/utils/env.py @@ -15,6 +15,7 @@ def get_env(): # print(new_conf) env = { 'ali_token': new_conf.ALI_TOKEN, - 'js_proxy':new_conf.JS_PROXY + 'js_proxy':new_conf.JS_PROXY, + 'fl':'{{fl}}' # 防止被依赖代理 } return env \ No newline at end of file diff --git a/utils/parser.py b/utils/parser.py index 0b43ab00451330945533535a8eafd189ddbfd26d..8e0b33c9b71819181f3dbfb9c75e5ff931ee8738 100644 --- a/utils/parser.py +++ b/utils/parser.py @@ -86,7 +86,8 @@ def toJs(jsPath,jsRoot='cache',env=None): with open(js_path, 'r', encoding='UTF-8') as fp: js = fp.read() if env: - js = render_template_string(js,env=env) + # js = render_template_string(js,env=env) + js = render_template_string(js,**env) response = make_response(js) response.headers['Content-Type'] = 'text/javascript; charset=utf-8' return response