封装api response，支持跨域，添加package api。

.gitignore

@@ -1,2 +1,3 @@
 .chroma/
-.inner/
+.inner/
+__pycache__

chatgpt-next-web/ApiResponse.py

@@ -0,0 +1,12 @@
+class ApiResponse:
+    def __init__(self, code, message, data=None):
+        self.code = code
+        self.message = message
+        self.data = data
+
+    def to_json(self):
+        return {
+            'code': self.code,
+            'message': self.message,
+            'data': self.data
+        }

chatgpt-next-web/pay_package.py

@@ -0,0 +1,79 @@
+packages = [{
+    'title': '基础套餐（推荐）',
+    'package_id': '1',
+    'basic_chat_limit': 10,
+    'advanced_chat_limit': 10,
+    'price': 10,
+    'expiration': -1
+},
+    {
+        'title': '高级套餐（推荐）',
+        'package_id': '2',
+        'basic_chat_limit': -1,  # -1 表示无限次
+        'advanced_chat_limit': -1,
+        'price': 100,
+        'expiration': -1
+}
+]
+
+
+test_packages = [{
+    "id": 8,
+    "uuid": "3a07df99-e0d7-4855-835d-ff957e118946",
+    "title": "李振超级无敌套餐",
+    "subTitle": "",
+                "tokens": -1,
+                "chatCount": -1,
+                "advancedChatCount": -1,
+                "drawCount": -1,
+                "days": 99999,
+                "state": 10,
+                "calcTypeId": 2,
+                "calcType": "Daily",
+                "price": 9999.00,
+                "top": 0,
+                "createTime": "2023-07-03 22:54:22",
+                "updateTime": "2023-07-03 22:54:27"
+}, {
+    "id": 9,
+    "uuid": "b2cadc5e-0a18-4aef-99c5-8375f5867534",
+    "title": "X套餐",
+    "subTitle": "",
+                "tokens": 10000,
+                "chatCount": 0,
+                "advancedChatCount": 0,
+                "drawCount": 0,
+                "days": 30,
+                "state": 10,
+                "calcTypeId": 1,
+                "calcType": "Total",
+                "price": 10.00,
+                "top": 0,
+                "createTime": "2023-07-14 22:01:54",
+                "updateTime": "2023-07-14 22:02:07"
+}, {
+    "id": 10,
+    "uuid": "e1623644-caf0-43a2-a298-9894a68290a3",
+    "title": "小时套餐",
+    "subTitle": "小时套餐",
+                "tokens": 0,
+                "chatCount": 2,
+                "advancedChatCount": 0,
+                "drawCount": 0,
+                "days": 31,
+                "state": 10,
+                "calcTypeId": 4,
+                "calcType": "ThreeHourly",
+                "price": 0.01,
+                "top": 0,
+                "createTime": "2023-07-23 12:55:30",
+                "updateTime": "2023-07-23 12:55:33"
+}]
+
+
+# 根据套餐ID获取套餐信息
+def get_package_by_id(package_id):
+    for package in packages:
+        if package['package_id'] == package_id:
+            return package
+    return None

chatgpt-next-web/service.py

@@ -10,13 +10,17 @@ import os
 from flask import Flask, request, jsonify, Request, Response
 from redis import Redis
 from utils import nowtime
+import pay_package
+from ApiResponse import ApiResponse
+from flask_cors import CORS
 
 SECERT_KEY = "8U2LL1"
 MY_OPENAI_API_KEY = os.environ.get('MY_OPENAI_API_KEY')
 
 app = Flask(__name__)
-# redis = Redis(host='192.168.3.229', port=6379, password='lizhen-redis')
-redis = Redis(host='10.254.13.87', port=6379)
+cors = CORS(app)
+redis = Redis(host='192.168.3.229', port=6379, password='lizhen-redis')
+# redis = Redis(host='10.254.13.87', port=6379)
 # redis = Redis(host='localhost', port=6379)
 
 
@@ -171,7 +175,7 @@ def purchase():
         return jsonify({'code': 401, 'message': 'Invalid token'})
 
     # 根据套餐ID获取套餐信息
-    package = get_package_by_id(package_id)
+    package = pay_package.get_package_by_id(package_id)
     if not package:
         return jsonify({'code': 400, 'message': 'Invalid package ID'})
 
@@ -314,6 +318,25 @@ def handle_pick_up_free_chat_count():
         return {'message': '您今天已经领取了'}
 
 
+@app.route('/package/onSales', methods=['POST'])
+def packageOnSales():
+    token = parse_token(request)
+
+    # 验证令牌
+    if not validate_token(token):
+        return jsonify({'code': 401, 'message': 'Invalid token'})
+
+    user_id = get_user_id_from_token(token)
+
+    if not user_id:
+        return jsonify({'code': 400, 'message': 'User not found'})
+    response = ApiResponse(
+        code=0,
+        message='Login successful',
+        data=pay_package.test_packages)
+    return jsonify(response.to_json())
+
+
 def parse_token(request: Request):
     token_with_bearer = request.headers.get('Authorization')
 
@@ -382,39 +405,20 @@ def get_user_id_by_username(username):
     return None
 
 
-# 根据套餐ID获取套餐信息
-def get_package_by_id(package_id):
-    packages = {
-        '1': {
-            'package_id': '1',
-            'name': 'Package 1',
-            'basic_chat_limit': 10,
-            'advanced_chat_limit': 10,
-            'price': 10,
-            'expiration': 30 * 24 * 60 * 60  # 过期时间为30天（以秒为单位）
-        },
-        '2': {
-            'package_id': '2',
-            'name': 'Package 2',
-            'basic_chat_limit': -1,  # -1 表示无限次
-            'advanced_chat_limit': -1,
-            'price': 100,
-            'expiration': 30 * 24 * 60 * 60  # 过期时间为30天（以秒为单位）
-        }
-    }
-
-    return packages.get(package_id)
-
-
 # 存储用户套餐信息到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))
+
     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, 'basic_chat_limit',
-               package['basic_chat_limit'])
-    redis.hset(user_package_key, 'advanced_chat_limit',
-               package['advanced_chat_limit'])
+    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)