update
This commit is contained in:
parent
f2f42a965c
commit
f0cfb51e40
@ -4,7 +4,6 @@ from sqlalchemy.orm import Session
|
||||
from app.models.database import get_db
|
||||
from app.models.user import UserDB, UserRole
|
||||
from app.core.security import verify_token
|
||||
from app.core.redis_client import redis_client
|
||||
|
||||
async def get_current_user(
|
||||
authorization: Optional[str] = Header(None),
|
||||
@ -26,19 +25,9 @@ async def get_current_user(
|
||||
if not sub:
|
||||
raise HTTPException(status_code=401, detail="Token已过期或无效")
|
||||
|
||||
# 读取 redis 缓存数据
|
||||
redis_key = f"user:{sub}"
|
||||
user_data = redis_client.get_client().get(redis_key)
|
||||
if user_data:
|
||||
user = UserDB.model_validate_json(user_data)
|
||||
else:
|
||||
user = db.query(UserDB).filter(UserDB.phone == sub).first()
|
||||
if user:
|
||||
redis_client.get_client().set(redis_key, user.model_dump_json())
|
||||
|
||||
user = db.query(UserDB).filter(UserDB.phone == sub).first()
|
||||
if not user:
|
||||
raise HTTPException(status_code=401, detail="用户未登录")
|
||||
|
||||
return user
|
||||
|
||||
async def get_admin_user(
|
||||
|
||||
@ -450,6 +450,8 @@ async def get_order_detail(
|
||||
delivery_time = f"今日 {order.time_period_name}"
|
||||
elif order.delivery_date == datetime.now().date() + timedelta(days=1):
|
||||
delivery_time = f"明日 {order.time_period_name}"
|
||||
elif order.delivery_date == datetime.now().date() - timedelta(days=1):
|
||||
delivery_time = f"昨日 {order.time_period_name}"
|
||||
else:
|
||||
delivery_time = f"{order.delivery_date} {order.time_period_name}"
|
||||
else:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user