diff --git a/base/rules.db b/base/rules.db index 1a109acc00b598bdd69066225c1e62d12b722f06..c1165040d8fe43fbb3ac57c82de6e6d59729ced2 100644 Binary files a/base/rules.db and b/base/rules.db differ diff --git a/controllers/layui.py b/controllers/layui.py index 8ccbe205dade29f9037bdccfc4cfb14000549a1f..eb7c5131de954b96bf375246cd1a7e4346ffabcf 100644 --- a/controllers/layui.py +++ b/controllers/layui.py @@ -7,7 +7,7 @@ from flask import Blueprint,request,render_template,jsonify,make_response,redirect from utils.web import getParmas,get_interval,layuiBack,verfy_token from utils.cfg import cfg -from controllers.service import storage_service +from controllers.service import storage_service,rules_service from utils.system import getHost from utils.files import getCustonDict,custom_merge from utils.encode import parseText @@ -48,7 +48,22 @@ def layui_rule_list(): alists_str='[]', live_url=live_url, config=new_conf) merged_config = custom_merge(parseText(html), customConfig) sites = merged_config['sites'] + rules = rules_service() + rule_list = rules.query_all() + rule_names = list(map(lambda x:x['name'],rule_list)) + # print(rule_list) + # print(rule_names) for i in range(len(sites)): sites[i]['id'] = i+1 + site_name = sites[i]['api'].split('rule=')[1].split('&')[0] if 'rule=' in sites[i]['api'] else sites[i]['key'] + # print(site_name) + if site_name in rule_names: + site_rule = rule_list[rule_names.index(site_name)] + sites[i]['state'] = 1 if site_rule['state'] is None else site_rule['state'] + else: + sites[i]['state'] = 1 + sites[i]['site_name'] = site_name + new_sites = sites[(page-1)*limit:page*limit] + # print(new_sites) return layuiBack('获取成功',new_sites,count=len(sites)) diff --git a/templates/layui_list.html b/templates/layui_list.html index 6e400cda01ff578b875ce86bff4fda0352436f2c..b8919fb75d807dfa863441dda925f3a9bd0b207c 100644 --- a/templates/layui_list.html +++ b/templates/layui_list.html @@ -18,6 +18,10 @@ @@ -52,11 +53,14 @@ + +