From 802320ff446db81f376987841d93e1a4711c8a20 Mon Sep 17 00:00:00 2001 From: aaron <> Date: Thu, 12 Jun 2025 11:16:01 +0800 Subject: [PATCH] update --- cryptoai/routes/user.py | 26 +++++++------------------- docker-compose.yml | 2 +- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/cryptoai/routes/user.py b/cryptoai/routes/user.py index 7038d9e..ea30ae0 100644 --- a/cryptoai/routes/user.py +++ b/cryptoai/routes/user.py @@ -302,15 +302,9 @@ async def login(loginData: UserLogin, session: Session = Depends(get_db)) -> Tok is_subscribed = False expire_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") - if user_subscription: - member_name = "VIP" - expire_time = user_subscription["expire_time"] - if expire_time > datetime.now(): - member_name = "SVIP" - is_subscribed = True - else: - member_name = "VIP" - is_subscribed = True + if user_subscription and user_subscription["expire_time"] > datetime.now(): + member_name = "SVIP会员" if user_subscription["time_type"] == 2 else "VIP会员" + is_subscribed = True else: member_name = "普通会员" @@ -356,17 +350,11 @@ async def get_user_info(current_user: Dict[str, Any] = Depends(get_current_user) user_subscription = user_subscription_manager.get_subscription_by_user_id(current_user["id"]) is_subscribed = False - expire_time = None + expire_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") - if user_subscription: - member_name = "VIP" - expire_time = user_subscription["expire_time"] - if expire_time > datetime.now(): - member_name = "SVIP" - is_subscribed = True - else: - member_name = "VIP" - is_subscribed = True + if user_subscription and user_subscription["expire_time"] > datetime.now(): + member_name = "SVIP会员" if user_subscription["time_type"] == 2 else "VIP会员" + is_subscribed = True else: member_name = "普通会员" diff --git a/docker-compose.yml b/docker-compose.yml index 87fed4a..e3b935a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: cryptoai-api: build: . container_name: cryptoai-api - image: cryptoai-api:0.2.4 + image: cryptoai-api:0.2.5 restart: always ports: - "8000:8000"