diff --git a/base/rules.db b/base/rules.db index db56da22858677bc20c252b98e35d8bad1a645ef..e18c4804e3c3840bf98cb2a0322f66ff3c5e9841 100644 Binary files a/base/rules.db and b/base/rules.db differ diff --git a/controllers/admin.py b/controllers/admin.py index e89532795b524a935e37bfde9358785d4cc58f56..a6f924339d4958287ca74ec13d3c6fbaa2b5272e 100644 --- a/controllers/admin.py +++ b/controllers/admin.py @@ -15,7 +15,6 @@ from utils.web import getParmas from js.rules import getRules from utils.parser import runJScode from werkzeug.utils import secure_filename -import js2py from utils.web import md5 admin = Blueprint("admin", __name__) @@ -36,7 +35,7 @@ def admin_index(): # 管理员界面 lsg = storage_service() live_url = lsg.getItem('LIVE_URL') use_py = lsg.getItem('USE_PY') - print(f'live_url:', live_url) + # print(f'live_url:', live_url) return render_template('admin.html', pystate=use_py,rules=getRules('js'), ver=getLocalVer(), live_url=live_url) @admin.route('/settings') @@ -178,7 +177,6 @@ def upload_file(): check_to_run = before + upcode # print(check_to_run) try: - # js2py.eval_js(check_to_run) loader, _ = runJScode(check_to_run) rule = loader.eval('rule') if not rule: diff --git a/controllers/cms.py b/controllers/cms.py index 3755991db75bf5decd979b6009f388f55a794337..2bf9a287b7e10a56893e81045f25a0daeac47154 100644 --- a/controllers/cms.py +++ b/controllers/cms.py @@ -23,11 +23,24 @@ from flask import url_for,redirect from easydict import EasyDict as edict from controllers.service import storage_service +def setItem(key,value): + lsg = storage_service() + return lsg.setItem(key,value) + +def getItem(key,value=''): + lsg = storage_service() + return lsg.getItem(key,value) + +def clearItem(key): + lsg = storage_service() + return lsg.clearItem(key) + 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,'setDetail':setDetail,'join':join,'urljoin2':urljoin2, -'PC_UA':PC_UA,'MOBILE_UA':MOBILE_UA,'UC_UA':UC_UA,'IOS_UA':IOS_UA +'PC_UA':PC_UA,'MOBILE_UA':MOBILE_UA,'UC_UA':UC_UA,'IOS_UA':IOS_UA, +'setItem':setItem,'getItem':getItem,'clearItem':clearItem } # print(getCryptoJS()) diff --git a/controllers/home.py b/controllers/home.py index b28a3e7fccaeb9fd6bfae90325a10497c2a841ea..9c50ed70f134ea530f2d4f61a99051278bfd35f0 100644 --- a/controllers/home.py +++ b/controllers/home.py @@ -38,7 +38,7 @@ def favicon(): @home.route('/index') def index(): - sup_port = cfg.get('SUP_PORT', False) + sup_port = cfg.get('SUP_PORT', 9001) manager0 = ':'.join(getHost(0).split(':')[0:2]) manager1 = ':'.join(getHost(1).split(':')[0:2]) manager2 = ':'.join(getHost(2).split(':')[0:2]).replace('https','http') @@ -63,7 +63,11 @@ def random_pics(): # print(f'id:{id}') pics = getPics() # print(pics) - if not cfg.WALL_PAPER and len(pics) > 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 464997ca9dda60504b03d65b82f9449bc9ffe432..f0a6fb157e54ed14ea1856a7e2d5b19ba0cd53c4 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/models/rules.db b/models/rules.db deleted file mode 100644 index fd82c28ca2ca2db7f55d5a6ca635e52a2d218de8..0000000000000000000000000000000000000000 Binary files a/models/rules.db and /dev/null differ diff --git a/utils/system.py b/utils/system.py index 882a721a5357e76056e58c91850ddcea0c0f9289..6886cf9e88cdcb896301c49deb620263d40fd874 100644 --- a/utils/system.py +++ b/utils/system.py @@ -38,9 +38,9 @@ def getHost(mode=0,port=None): ip = REAL_IP host = f'http://{ip}:{port}' else: - # host = cfg.get('PLAY_URL','http://cms.nokia.press') from controllers.service import storage_service lsg = storage_service() + # print(cfg.PLAY_URL) # 可能会报错: 'EasyDict' object has no attribute 'xxx' host = lsg.getItem('PLAY_URL',cfg.get('PLAY_URL','')) # print(mode,host) return host diff --git a/utils/web.py b/utils/web.py index ca320a77f39df747e381af718d11c8cde3a088da..44c798faeb1ae8d361ac5e171fadf6914fb12f29 100644 --- a/utils/web.py +++ b/utils/web.py @@ -8,7 +8,7 @@ import os from flask import request import hashlib from time import time -from utils.cfg import cfg +# from utils.cfg import cfg from controllers.service import storage_service MOBILE_UA = 'Mozilla/5.0 (Linux; Android 11; M2007J3SC Build/RKQ1.200826.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045714 Mobile Safari/537.36'