add

chatgpt-next-web/chat_proxy.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 import websocket
 import json
 import os

chatgpt-next-web/mail.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 import smtplib
 import os
 from email.mime.text import MIMEText

chatgpt-next-web/pay_package.py

@@ -1,10 +1,11 @@
+# coding=utf-8
 packages = [
     {
         'id': '1',
         'title': '基础套餐（推荐）',
         'basic_chat_limit': 10,
         'advanced_chat_limit': 10,
-        'price': 10,
+        'price': 1,  # 以分计算
         'expiration': -1
     },
     {
@@ -12,7 +13,7 @@ packages = [
         'title': '高级套餐',
         'basic_chat_limit': -1,  # -1 表示无限次
         'advanced_chat_limit': -1,
-        'price': 100,
+        'price': 100,   # 以分计算
         'expiration': -1
     }
 ]

chatgpt-next-web/requirements.txt

@@ -0,0 +1,8 @@
+Flask==2.3.2
+Flask-Cors==4.0.0
+openai==0.27.6
+openapi-schema-pydantic==1.2.4
+redis==4.5.5
+streamlit==1.21.0
+streamlit-chat==0.0.2.2
+pyJWT==2.4.0

chatgpt-next-web/run_server.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+gunicorn -b 0.0.0.0:5000 service:app

chatgpt-next-web/service.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 import json
 import random
 import string
@@ -6,6 +7,8 @@ import jwt
 import datetime
 import requests
 import os
+import hashlib
+import time
 from flask import Flask, request, jsonify, Request, Response
 from redis import Redis
 from utils import nowtime
@@ -18,10 +21,10 @@ SECERT_KEY = "8U2LL1"
 MY_OPENAI_API_KEY = os.environ.get('MY_OPENAI_API_KEY')
 
 app = Flask(__name__)
-cors = CORS(app)
-redis = Redis(host='192.168.3.229', port=6379, password='lizhen-redis')
+cors = CORS(app, origins=["http://localhost:3000", "http://127.0.0.1:5697"])
+# 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)
+redis = Redis(host='localhost', port=6379)
 
 
 # 生成验证码
@@ -190,27 +193,29 @@ def create_order():
     if not user_id:
         return jsonify({'code': 400, 'message': 'User not found'})
     # 创建订单
-    order_id = str(uuid.uuid4())
+    order_id = generate_order_id()
     order_data = {
         'order_id': order_id,
         'user_id': user_id,
-        'package_id': package_id,
-        'amount': package['price'],
+        'package_id': package['id'],
+        'title': package['title'],
+        'amount': int(package['price']),
         'status': 'pending',  # 订单状态设置为待支付
         'created_at': nowtime().strftime('%Y-%m-%d %H:%M:%S')  # 将时间转换为字符串格式保存
     }
     # 将订单信息存储到Redis，并设置过期时间为2小时
     order_key = f'order:{user_id}:{order_id}'
-    redis.hmset(order_key, order_data)
+    redis.hset(order_key, 'order_id', order_data['order_id'])
+    redis.hset(order_key, 'user_id', order_data['user_id'])
+    redis.hset(order_key, 'package_id', order_data['package_id'])
+    redis.hset(order_key, 'title', order_data['title'])
+    redis.hset(order_key, 'amount', order_data['amount'])
+    redis.hset(order_key, 'status', order_data['status'])
+    redis.hset(order_key, 'created_at', order_data['created_at'])
     redis.expire(order_key, datetime.timedelta(hours=2))
-    
+
     # 发起POST请求到http://localhost:8080/payPre获取codeUrl
-    payload = {
-        'order_id': order_id,
-        'amount': package['price'],
-        'user_id': user_id
-    }
-    response = requests.post('http://localhost:8080/payPre', json=payload)
+    response = requests.post('http://localhost:5697/payPre', json=order_data)
 
     if response.status_code == 200:
         data = response.json()
@@ -261,6 +266,28 @@ def order_center():
     })
 
 
+@app.route('/pay/notify', methods=['POST'])
+def handle_payment_notification():
+    # 获取POST请求中的JSON数据，这是微信支付发送的通知数据
+    notification_data = request.json
+
+    print("/pay/notify", notification_data)
+
+    # 假设你从通知数据中获取了订单信息，例如订单ID和用户ID
+    order_id = notification_data.get('order_id')
+    user_id = notification_data.get('user_id')
+
+    # 更新订单状态为已支付
+    order_key = f'order:{user_id}:{order_id}'
+    redis.hset(order_key, 'status', 'paid')
+
+    # 设置订单6个月后过期
+    redis.expire(order_key, datetime.timedelta(days=6*30).total_seconds())
+
+    # 返回一个响应，可以是一个简单的字符串或者JSON对象，告诉微信支付通知已经收到
+    return jsonify({'code': 0, 'message': 'Notification received'})
+
+
 def get_user_orders(user_id):
     # 从Redis中获取该用户的所有订单数据
     user_orders = []
@@ -268,7 +295,8 @@ def get_user_orders(user_id):
         order_data = redis.hgetall(key)
         # 将bytes类型的键和值转换为str类型
         order_data_str = {
-            k.decode('utf-8'): v.decode('utf-8') for k, v in order_data.items()
+            k.decode('utf-8'): int(v) if k == b'amount' else v.decode('utf-8')
+            for k, v in order_data.items()
         }
         user_orders.append(order_data_str)
     return user_orders
@@ -698,5 +726,17 @@ def get_free_count(user_id):
     return int(basic_chat_count)
 
 
+def generate_order_id():
+    timestamp = int(time.time() * 1000)  # 获取当前时间戳，精确到毫秒
+    rand_num = random.randint(0, 9999)  # 生成四位随机数
+    raw_order_id = f"{timestamp}-{rand_num}"
+
+    # 对订单号进行哈希处理，使用SHA-256算法（32字节长度）
+    hashed_order_id = hashlib.sha256(raw_order_id.encode()).hexdigest()[:32]
+
+    return hashed_order_id
+
+
 if __name__ == '__main__':
-    app.run(debug=True)
+    print("启动了")
+    app.run(host="0.0.0.0", port=5000)

chatgpt-next-web/utils.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 import datetime