From d687e71516ee51cda6f447094d1348e658fe7aa4 Mon Sep 17 00:00:00 2001 From: hjdhnx Date: Sun, 11 Sep 2022 14:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E5=86=97=E4=BD=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/rules.db | Bin 40960 -> 40960 bytes controllers/admin.py | 4 +--- controllers/cms.py | 15 ++++++++++++++- controllers/home.py | 13 ++++++++----- controllers/vod.py | 3 ++- logs/.gitkeep | 0 models/rules.db | Bin 40960 -> 0 bytes utils/system.py | 2 +- utils/web.py | 2 +- 9 files changed, 27 insertions(+), 12 deletions(-) delete mode 100644 logs/.gitkeep delete mode 100644 models/rules.db diff --git a/base/rules.db b/base/rules.db index db56da22858677bc20c252b98e35d8bad1a645ef..e18c4804e3c3840bf98cb2a0322f66ff3c5e9841 100644 GIT binary patch delta 94 zcmZoTz|?SnX@WH4iHS1Kj3+iGEU#y0;NQv@%RgZ=UqdV(W6S28J_$xc1_lNmS<3() u$H@3lWo8xzS!)P8$S0$uq`*pFKRLJ9P%ke(J2O$QpeVJtc=OhNZvg; 0: + new_conf = cfg + lsg = storage_service() + store_conf_dict = lsg.getStoreConfDict() + new_conf.update(store_conf_dict) + if not new_conf.WALL_PAPER and len(pics) > 0: if id and f'images/{id}.jpg' in pics: pic = f'images/{id}.jpg' else: @@ -73,7 +77,7 @@ def random_pics(): response.headers['Content-Type'] = 'image/jpeg' return response else: - return redirect(cfg.WALL_PAPER) + return redirect(new_conf.WALL_PAPER) @home.route('/clear') def clear_rule(): @@ -176,6 +180,7 @@ def config_render(mode): lsg = storage_service() store_conf_dict = lsg.getStoreConfDict() new_conf.update(store_conf_dict) + # print(type(new_conf),new_conf) host = getHost(mode) try: with open(customFile,'r',encoding='utf-8') as f: @@ -186,7 +191,6 @@ def config_render(mode): jxs = getJxs() lsg = storage_service() use_py = lsg.getItem('USE_PY') - # pys = getPys() if cfg.get('USE_PY') else [] pys = getPys() if use_py else [] # print(pys) alists = getAlist() @@ -211,7 +215,6 @@ def config_gen(): store_conf_dict = lsg.getStoreConfDict() new_conf.update(store_conf_dict) jxs = getJxs() - # pys = getPys() if cfg.get('USE_PY') else [] lsg = storage_service() use_py = lsg.getItem('USE_PY') pys = getPys() if use_py else False diff --git a/controllers/vod.py b/controllers/vod.py index 464997c..f0a6fb1 100644 --- a/controllers/vod.py +++ b/controllers/vod.py @@ -6,7 +6,8 @@ from flask import Blueprint,request,render_template,jsonify,make_response,redirect from time import time -from utils.web import getParmas,get_interval,cfg +from utils.web import getParmas,get_interval +from utils.cfg import cfg from js.rules import getRuleLists,getJxs from base.R import R from utils.log import logger diff --git a/logs/.gitkeep b/logs/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/models/rules.db b/models/rules.db deleted file mode 100644 index fd82c28ca2ca2db7f55d5a6ca635e52a2d218de8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40960 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