优化后台业务
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -3,7 +3,7 @@
|
||||
"""
|
||||
from functools import wraps
|
||||
|
||||
from flask import request, redirect, url_for, session, jsonify
|
||||
from flask import request, redirect, url_for, session, jsonify, g
|
||||
|
||||
from utils.db import get_db
|
||||
|
||||
@@ -13,15 +13,22 @@ def is_session_user_valid():
|
||||
uid = session.get('user_id')
|
||||
if not uid:
|
||||
return False
|
||||
cached_user = getattr(g, '_current_user_row', None)
|
||||
if cached_user and cached_user.get('id') == uid:
|
||||
return True
|
||||
try:
|
||||
conn = get_db()
|
||||
with conn.cursor() as cur:
|
||||
cur.execute("SELECT id FROM users WHERE id = %s", (uid,))
|
||||
cur.execute(
|
||||
"SELECT id, username, is_admin, role, created_by_id FROM users WHERE id = %s",
|
||||
(uid,)
|
||||
)
|
||||
row = cur.fetchone()
|
||||
conn.close()
|
||||
if not row:
|
||||
session.clear()
|
||||
return False
|
||||
g._current_user_row = row
|
||||
return True
|
||||
except Exception:
|
||||
session.clear()
|
||||
@@ -34,16 +41,19 @@ def get_current_admin_role():
|
||||
if not uid:
|
||||
return None, None
|
||||
try:
|
||||
conn = get_db()
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"SELECT id, username, is_admin, role, created_by_id FROM users WHERE id = %s",
|
||||
(uid,)
|
||||
)
|
||||
row = cur.fetchone()
|
||||
conn.close()
|
||||
row = getattr(g, '_current_user_row', None)
|
||||
if not row or row.get('id') != uid:
|
||||
conn = get_db()
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"SELECT id, username, is_admin, role, created_by_id FROM users WHERE id = %s",
|
||||
(uid,)
|
||||
)
|
||||
row = cur.fetchone()
|
||||
conn.close()
|
||||
if not row:
|
||||
return None, None
|
||||
g._current_user_row = row
|
||||
role = (row.get('role') or '').strip().lower()
|
||||
if not role:
|
||||
role = 'super_admin' if row.get('is_admin') and row.get('created_by_id') is None else (
|
||||
|
||||
@@ -6,12 +6,20 @@ import pymysql
|
||||
from werkzeug.security import generate_password_hash
|
||||
|
||||
try:
|
||||
from config import mysql_host, mysql_user, mysql_password, mysql_database
|
||||
from config import mysql_host as config_mysql_host
|
||||
from config import mysql_user as config_mysql_user
|
||||
from config import mysql_password as config_mysql_password
|
||||
from config import mysql_database as config_mysql_database
|
||||
except ImportError:
|
||||
mysql_host = os.environ.get('MYSQL_HOST', 'localhost')
|
||||
mysql_user = os.environ.get('MYSQL_USER', 'root')
|
||||
mysql_password = os.environ.get('MYSQL_PASSWORD', '')
|
||||
mysql_database = os.environ.get('MYSQL_DATABASE', 'maixiang_ai')
|
||||
config_mysql_host = 'localhost'
|
||||
config_mysql_user = 'root'
|
||||
config_mysql_password = ''
|
||||
config_mysql_database = 'maixiang_ai'
|
||||
|
||||
mysql_host = os.environ.get('MYSQL_HOST', config_mysql_host)
|
||||
mysql_user = os.environ.get('MYSQL_USER', config_mysql_user)
|
||||
mysql_password = os.environ.get('MYSQL_PASSWORD', config_mysql_password)
|
||||
mysql_database = os.environ.get('MYSQL_DATABASE', config_mysql_database)
|
||||
|
||||
|
||||
def get_db():
|
||||
|
||||
Reference in New Issue
Block a user