From c9c52cf7f519756895208f76ce82abb7bd8fc01b Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 27 Nov 2024 02:07:08 +0800 Subject: [PATCH] update --- web/admin/__init__.py | 4 ++-- web/admin/common.py | 1 - web/admin/dashboard/dashboard.py | 1 - web/admin/dashboard/login.py | 4 ++-- web/admin/setting/secondary_verifiy.py | 2 -- web/admin/setting/temp_login.py | 2 -- web/admin/setting/timezone.py | 1 - web/admin/setup/option.py | 2 +- web/admin/setup/user.py | 2 -- web/admin/site/site.py | 1 - web/admin/system/upgrade.py | 2 -- web/admin/task/__init__.py | 2 -- 12 files changed, 5 insertions(+), 19 deletions(-) diff --git a/web/admin/__init__.py b/web/admin/__init__.py index 738fe5cfe..c11f3dd19 100644 --- a/web/admin/__init__.py +++ b/web/admin/__init__.py @@ -73,7 +73,7 @@ setup.init() # BASIC AUTH app.config['BASIC_AUTH_OPEN'] = False try: - basic_auth = model.getOptionByJson('basic_auth', default={'open':False}) + basic_auth = thisdb.getOptionByJson('basic_auth', default={'open':False}) if basic_auth['open']: app.config['BASIC_AUTH_OPEN'] = True except Exception as e: @@ -101,7 +101,7 @@ def requestCheck(): config.APP_START_TIME=time.time() # 自定义basic auth认证 if app.config['BASIC_AUTH_OPEN']: - basic_auth = model.getOptionByJson('basic_auth', default={'open':False}) + basic_auth = thisdb.getOptionByJson('basic_auth', default={'open':False}) if not basic_auth['open']: return diff --git a/web/admin/common.py b/web/admin/common.py index cc1be06db..235bbbdac 100644 --- a/web/admin/common.py +++ b/web/admin/common.py @@ -10,7 +10,6 @@ import time -# from admin import model from admin import session import thisdb diff --git a/web/admin/dashboard/dashboard.py b/web/admin/dashboard/dashboard.py index 0fd7b28d8..4fac21077 100644 --- a/web/admin/dashboard/dashboard.py +++ b/web/admin/dashboard/dashboard.py @@ -20,7 +20,6 @@ from flask import request,g from admin.common import isLogined from admin.user_login_check import panel_login_required from admin import cache,session -from admin.model import db,TempLogin,Users import core.mw as mw import thisdb diff --git a/web/admin/dashboard/login.py b/web/admin/dashboard/login.py index 746560ce2..f64837f9d 100644 --- a/web/admin/dashboard/login.py +++ b/web/admin/dashboard/login.py @@ -174,7 +174,7 @@ def do_login(): login_cache_limit = int(login_cache_limit) + 1 if login_cache_limit >= login_cache_count: - model.setOption('admin_close', 'yes') + thisdb.setOption('admin_close', 'yes') return mw.returnJson(False, '面板已经关闭!') cache.set('login_cache_limit', login_cache_limit, timeout=10000) @@ -195,7 +195,7 @@ def do_login(): login_cache_limit = int(login_cache_limit) + 1 if login_cache_limit >= login_cache_count: - model.setOption('admin_close', 'yes') + thisdb.setOption('admin_close', 'yes') return mw.returnData(False, '面板已经关闭!') cache.set('login_cache_limit', login_cache_limit, timeout=10000) diff --git a/web/admin/setting/secondary_verifiy.py b/web/admin/setting/secondary_verifiy.py index 2e170bf56..d7bf70feb 100644 --- a/web/admin/setting/secondary_verifiy.py +++ b/web/admin/setting/secondary_verifiy.py @@ -16,9 +16,7 @@ import time from flask import Blueprint, render_template from flask import request -from admin import model from admin import session -from admin.model import db,TempLogin from admin.user_login_check import panel_login_required import core.mw as mw diff --git a/web/admin/setting/temp_login.py b/web/admin/setting/temp_login.py index 95156b579..6aa7633af 100644 --- a/web/admin/setting/temp_login.py +++ b/web/admin/setting/temp_login.py @@ -16,9 +16,7 @@ import time from flask import Blueprint, render_template from flask import request -from admin import model from admin import session -from admin.model import db,TempLogin from admin.user_login_check import panel_login_required import core.mw as mw diff --git a/web/admin/setting/timezone.py b/web/admin/setting/timezone.py index 246b411c3..4b542d123 100644 --- a/web/admin/setting/timezone.py +++ b/web/admin/setting/timezone.py @@ -15,7 +15,6 @@ import os from flask import Blueprint, render_template from flask import request -from admin import model from admin.user_login_check import panel_login_required import core.mw as mw diff --git a/web/admin/setup/option.py b/web/admin/setup/option.py index 93a02551a..d6c8c87a5 100644 --- a/web/admin/setup/option.py +++ b/web/admin/setup/option.py @@ -39,7 +39,7 @@ def init_option(): thisdb.setOption('two_step_verification', json.dumps({'open':False})) # 开启后台任务 - # model.setOption('run_bg_task', 'close') + # thisdb.setOption('run_bg_task', 'close') # 首页展示初始化 thisdb.setOption('display_index', '[]') diff --git a/web/admin/setup/user.py b/web/admin/setup/user.py index 7c2092ace..1065ef0c1 100644 --- a/web/admin/setup/user.py +++ b/web/admin/setup/user.py @@ -10,8 +10,6 @@ from flask import request -from admin import model -from admin.model import db, Users import core.mw as mw import thisdb diff --git a/web/admin/site/site.py b/web/admin/site/site.py index b8e1a1bcc..7fc98afe7 100644 --- a/web/admin/site/site.py +++ b/web/admin/site/site.py @@ -13,7 +13,6 @@ import os from flask import Blueprint, render_template from flask import request -from admin.model import Sites from admin.user_login_check import panel_login_required from utils.plugin import plugin as MwPlugin diff --git a/web/admin/system/upgrade.py b/web/admin/system/upgrade.py index 82a00684d..cd8b29d38 100644 --- a/web/admin/system/upgrade.py +++ b/web/admin/system/upgrade.py @@ -14,8 +14,6 @@ from flask import request from admin.user_login_check import panel_login_required -from admin import model - import core.mw as mw import utils.system as sys diff --git a/web/admin/task/__init__.py b/web/admin/task/__init__.py index 92465b109..650d4f26e 100644 --- a/web/admin/task/__init__.py +++ b/web/admin/task/__init__.py @@ -14,8 +14,6 @@ import time from flask import Blueprint, render_template from flask import request -from admin import model -from admin.model import db,Tasks from admin.user_login_check import panel_login_required import core.mw as mw