修改package，与充值累加逻辑

chatgpt-next-web/pay_package.py

@@ -1,19 +1,20 @@
-packages = [{
-    'title': '基础套餐（推荐）',
-    'package_id': '1',
-    'basic_chat_limit': 10,
-    'advanced_chat_limit': 10,
-    'price': 10,
-    'expiration': -1
-},
+packages = [
     {
-        'title': '高级套餐（推荐）',
-        'package_id': '2',
+        'id': '1',
+        'title': '基础套餐（推荐）',
+        'basic_chat_limit': 10,
+        'advanced_chat_limit': 10,
+        'price': 10,
+        'expiration': -1
+    },
+    {
+        'id': '2',
+        'title': '高级套餐',
         'basic_chat_limit': -1,  # -1 表示无限次
         'advanced_chat_limit': -1,
         'price': 100,
         'expiration': -1
-}
+    }
 ]
 
 
@@ -74,6 +75,6 @@ test_packages = [{
 # 根据套餐ID获取套餐信息
 def get_package_by_id(package_id):
     for package in packages:
-        if package['package_id'] == package_id:
+        if package['id'] == package_id:
             return package
     return None

chatgpt-next-web/service.py

@@ -13,6 +13,7 @@ from utils import nowtime
 import pay_package
 from ApiResponse import ApiResponse
 from flask_cors import CORS
+from mail import MyEmail
 
 SECERT_KEY = "8U2LL1"
 MY_OPENAI_API_KEY = os.environ.get('MY_OPENAI_API_KEY')
@@ -32,7 +33,13 @@ def generate_verification_code():
 
 # 发送验证码到用户邮箱（这里只是模拟发送过程）
 def send_verification_code(email, code):
-    print(f'Sending verification code {code} to {email}...')
+    my = MyEmail()
+    my.user = "lizhen@huggingprompt.com"
+    my.passwd = "todo"
+    my.to_list = [email]
+    my.tag = "Chat注册验证码"
+    my.txt = f"【{code}】Chat邮箱注册验证码，您正在注册Chat账号，请勿泄露。"
+    my.send()
 
 
 # 用户请求发送验证码
@@ -333,7 +340,7 @@ def packageOnSales():
     response = ApiResponse(
         code=0,
         message='Login successful',
-        data=pay_package.test_packages)
+        data=pay_package.packages)
     return jsonify(response.to_json())
 
 
@@ -367,15 +374,18 @@ def generate_token(user_id, username):
 # 验证令牌
 def validate_token(token):
     try:
-        print(token)
+        print("validate_token", "token:", token)
         # 使用密钥进行解码
         payload = jwt.decode(token, SECERT_KEY, algorithms=['HS256'])
-        print(payload)
+        print("validate_token", "payload:", payload)
 
         # 检查令牌的过期时间
         if 'exp' in payload and nowtime() > datetime.datetime.fromtimestamp(payload['exp']):
             return False
 
+        if 'user_id' not in payload or 'username' not in payload:
+            return False
+        
         return True
     except (jwt.DecodeError, jwt.InvalidTokenError):
         return False
@@ -408,20 +418,20 @@ def get_user_id_by_username(username):
 # 存储用户套餐信息到Redis
 def store_user_package(user_id, package):
     current_package = get_user_package(user_id)
-    basic_chat_limit = 0
-    advanced_chat_limit = 0
-    if not current_package:
-        basic_chat_limit = int(package.get(b'basic_chat_limit', 0))
-        advanced_chat_limit = int(package.get(b'advanced_chat_limit', 0))
+    basic_chat_limit = package['basic_chat_limit']
+    advanced_chat_limit = package['advanced_chat_limit']
+    if current_package:
+        basic_chat_limit += int(current_package.get(b'basic_chat_limit', 0))
+        advanced_chat_limit += int(current_package.get(b'advanced_chat_limit', 0))
 
     user_package_key = f'user:{user_id}:package'
-    redis.hset(user_package_key, 'package_id', package['package_id'])
-    redis.hset(user_package_key, 'name', package['name'])
+    redis.hset(user_package_key, 'id', package['id'])
+    redis.hset(user_package_key, 'title', package['title'])
     redis.hset(user_package_key, 'basic_chat_limit', basic_chat_limit)
     redis.hset(user_package_key, 'advanced_chat_limit', advanced_chat_limit)
     # 设置套餐过期时间
-    expiration = int(time.time()) + package['expiration']
-    redis.expireat(user_package_key, expiration)
+    # expiration = int(time.time()) + package['expiration']
+    # redis.expireat(user_package_key, expiration)
 
 
 # 获取用户套餐信息
@@ -434,14 +444,14 @@ def get_user_package(user_id):
 # 检查用户是否已经支付过指定套餐
 def has_purchased_package(user_id, package_id):
     user_package_key = f'user:{user_id}:package'
-    purchased_package_id = redis.hget(user_package_key, 'package_id')
+    purchased_package_id = redis.hget(user_package_key, 'id')
     return purchased_package_id.decode('utf-8') == str(package_id)
 
 
 # 检查用户是否已经支付了高级套餐
 def has_purchased_advanced_package(user_id):
     user_package_key = f'user:{user_id}:package'
-    purchased_package_id = redis.hget(user_package_key, 'package_id')
+    purchased_package_id = redis.hget(user_package_key, 'id')
     return purchased_package_id.decode('utf-8') == '2'