update

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
 

web/admin/common.py

@@ -10,7 +10,6 @@
 
 import time
 
-# from admin import model
 from admin import session
 import thisdb
 

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

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)

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

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

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

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', '[]')

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

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

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
 

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