Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b84f540b43 |
23
.env
23
.env
@@ -1,23 +0,0 @@
|
||||
# ========== 生产环境配置 ==========
|
||||
|
||||
BASE_URL=https://api.hackrobot.cn
|
||||
PAYMENT_PROVIDER=zpay
|
||||
|
||||
# ZPAY（请填入实际值）
|
||||
ZPAY_PID=2025121809351743
|
||||
ZPAY_KEY=tpEi7wWIWI2kXiYVTpIG6j7it0mjVW89
|
||||
|
||||
# PocketBase（check-user、ensure-user 必需，否则报「服务配置错误」）
|
||||
PB_URL=https://pocketbase.hackrobot.cn
|
||||
PB_ADMIN_EMAIL=xiaoshuang.eric@gmail.com
|
||||
PB_ADMIN_PASSWORD=Xiao4669805@
|
||||
|
||||
# Memos（nomadvip 支付成功后创建账号）
|
||||
MEMOS_API=https://qun.hackrobot.cn/api/v1/users
|
||||
MEMOS_TOKEN=eyJhbGciOiJIUzI1NiIsImtpZCI6InYxIiwidHlwIjoiSldUIn0.eyJuYW1lIjoiaGFja3JvYm90IiwiaXNzIjoibWVtb3MiLCJzdWIiOiIxIiwiYXVkIjpbInVzZXIuYWNjZXNzLXRva2VuIl0sImlhdCI6MTc1NzQwNTE0OX0.Idn7kBlxE-CoSOXwWuZ1tHGIRKHAIeDyXSafGS5OHsg
|
||||
|
||||
# MinIO（可选）
|
||||
MINIO_ENDPOINT=minioweb.hackrobot.cn
|
||||
MINIO_PORT=443
|
||||
MINIO_BUCKET=hackrobot
|
||||
MINIO_UPLOAD_PREFIX=joins
|
||||
37
.env.example
37
.env.example
@@ -1,37 +0,0 @@
|
||||
# ========== 本地调试 ==========
|
||||
# PORT: 默认 8007，与前端 PAYMENT_API_URL 一致
|
||||
# BASE_URL 需为 ZPAY 可访问的回调地址。本地调试时 ZPAY 无法回调 localhost/内网，
|
||||
# 可用 ngrok 等隧道：BASE_URL=https://xxx.ngrok.io
|
||||
# 或直接使用生产地址测试回调（需 payjsapi 已部署到公网）
|
||||
PORT=8007
|
||||
BASE_URL=https://api.hackrobot.cn
|
||||
|
||||
# 支付渠道：zpay | xorpay
|
||||
PAYMENT_PROVIDER=zpay
|
||||
|
||||
# XorPay
|
||||
XORPAY_AID=8220
|
||||
XORPAY_SECRET=your_secret
|
||||
|
||||
# ZPAY（网关: https://zpayz.cn/）
|
||||
ZPAY_PID=2025121809351743
|
||||
ZPAY_KEY=tpEi7wWIWI2kXiYVTpIG6j7it0mjVW89
|
||||
|
||||
# PocketBase（check-user、ensure-user、支付回调、nomadvip/digital/cnomadcna 共用）
|
||||
# 公网 PB_URL 会被忽略并回落本机 8090；本地无 PocketBase 时复制 .env.local（含 PB_INTERNAL_URL）
|
||||
PB_URL=https://pocketbase.hackrobot.cn
|
||||
# PB_INTERNAL_URL=https://pocketbase.hackrobot.cn
|
||||
PB_ADMIN_EMAIL=xiaoshuang.eric@gmail.com
|
||||
PB_ADMIN_PASSWORD=Xiao4669805@
|
||||
|
||||
# Memos（nomadvip 支付成功后创建账号，与 payjsapi 同源）
|
||||
MEMOS_API=https://qun.hackrobot.cn/api/v1/users
|
||||
MEMOS_TOKEN=eyJhbGciOiJIUzI1NiIsImtpZCI6InYxIiwidHlwIjoiSldUIn0.eyJuYW1lIjoiaGFja3JvYm90IiwiaXNzIjoibWVtb3MiLCJzdWIiOiIxIiwiYXVkIjpbInVzZXIuYWNjZXNzLXRva2VuIl0sImlhdCI6MTc1NzQwNTE0OX0.Idn7kBlxE-CoSOXwWuZ1tHGIRKHAIeDyXSafGS5OHsg
|
||||
|
||||
# MinIO 对象存储（可选）
|
||||
MINIO_ENDPOINT=minioweb.hackrobot.cn
|
||||
MINIO_PORT=443
|
||||
MINIO_ACCESS_KEY=
|
||||
MINIO_SECRET_KEY=
|
||||
MINIO_BUCKET=hackrobot
|
||||
MINIO_UPLOAD_PREFIX=joins
|
||||
16
.env.local
16
.env.local
@@ -1,16 +0,0 @@
|
||||
# ========== 本地调试（python run.py，端口 8007）==========
|
||||
# 无本机 PocketBase 时：必须用 PB_INTERNAL_URL 指向上线（config 会忽略公网 PB_URL）
|
||||
PORT=8007
|
||||
PAYMENT_PROVIDER=zpay
|
||||
BASE_URL=https://api.hackrobot.cn
|
||||
|
||||
PB_URL=https://pocketbase.hackrobot.cn
|
||||
PB_INTERNAL_URL=https://pocketbase.hackrobot.cn
|
||||
PB_ADMIN_EMAIL=xiaoshuang.eric@gmail.com
|
||||
PB_ADMIN_PASSWORD=Xiao4669805@
|
||||
|
||||
MEMOS_API=https://qun.hackrobot.cn/api/v1/users
|
||||
MEMOS_TOKEN=eyJhbGciOiJIUzI1NiIsImtpZCI6InYxIiwidHlwIjoiSldUIn0.eyJuYW1lIjoiaGFja3JvYm90IiwiaXNzIjoibWVtb3MiLCJzdWIiOiIxIiwiYXVkIjpbInVzZXIuYWNjZXNzLXRva2VuIl0sImlhdCI6MTc1NzQwNTE0OX0.Idn7kBlxE-CoSOXwWuZ1tHGIRKHAIeDyXSafGS5OHsg
|
||||
|
||||
ZPAY_PID=2025121809351743
|
||||
ZPAY_KEY=tpEi7wWIWI2kXiYVTpIG6j7it0mjVW89
|
||||
18
.gitignore
vendored
18
.gitignore
vendored
@@ -1,18 +0,0 @@
|
||||
# 日志文件（不产生，避免 git 本地/线上不一致）
|
||||
*.log
|
||||
payment_notify.log
|
||||
xorpay_notify.log
|
||||
|
||||
# Python
|
||||
__pycache__/
|
||||
*.pyc
|
||||
*.py[cod]
|
||||
venv/
|
||||
.venv/
|
||||
# .env
|
||||
# .env.local
|
||||
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*.pyo
|
||||
*.pyd
|
||||
98
README.md
Executable file → Normal file
98
README.md
Executable file → Normal file
@@ -1,102 +1,6 @@
|
||||
# PayJS API
|
||||
# androidh5api
|
||||
|
||||
支付 API 服务，支持多支付渠道（XorPay、ZPAY），按项目模块化拆分。
|
||||
|
||||
## 路由与项目对应
|
||||
|
||||
| 项目 | 路由前缀 | 说明 |
|
||||
|------|----------|------|
|
||||
| nomadvip | `/nomadvip/*` | 固定 ZPAY，独立实例 |
|
||||
| digital | `/digital/*` | 使用 PAYMENT_PROVIDER |
|
||||
| cnomadcna | `/cnomadcna/*` | 使用 PAYMENT_PROVIDER |
|
||||
| nomadlms | `/nomadlms/*` | 使用 PAYMENT_PROVIDER |
|
||||
| legacy | `/payh5`、`/zpay_notify` 等 | 向后兼容 |
|
||||
|
||||
各项目业务互不影响，可单独配置。
|
||||
|
||||
## 环境
|
||||
|
||||
本地调试：`BASE_URL` 需为 ZPAY 可访问地址（如 ngrok 暴露 8700 端口）
|
||||
线上部署：`BASE_URL=https://api.hackrobot.cn`
|
||||
|
||||
## 模块结构
|
||||
|
||||
```
|
||||
app/
|
||||
├── config.py # 配置（环境变量）
|
||||
├── main.py # FastAPI 入口，挂载路由
|
||||
├── sdk/ # SDK 组件化封装
|
||||
│ ├── payment/ # 支付网关（ZPAY/XorPay）
|
||||
│ ├── pocketbase.py # PocketBase 数据库
|
||||
│ ├── minio.py # MinIO 对象存储
|
||||
│ └── memos.py # Memos 用户（仅 nomadvip 使用）
|
||||
├── services/ # 共享业务逻辑（基于 SDK）
|
||||
│ ├── pb.py # PocketBase 客户端
|
||||
│ ├── memos.py # Memos 用户创建
|
||||
│ ├── minio.py # MinIO 上传
|
||||
│ └── payment.py # 支付成功处理
|
||||
├── routers/ # 项目路由
|
||||
│ ├── nomadvip.py # /nomadvip/*
|
||||
│ ├── digital.py # /digital/*
|
||||
│ ├── cnomadcna.py # /cnomadcna/*
|
||||
│ ├── nomadlms.py # /nomadlms/*
|
||||
│ ├── legacy.py # /payh5 等（向后兼容）
|
||||
│ └── common.py # /submit_meetup_application、/create_user
|
||||
└── payment/
|
||||
├── base.py # 支付抽象基类
|
||||
├── xorpay.py # XorPay 实现
|
||||
├── zpay.py # ZPAY 实现（易支付兼容）
|
||||
└── factory.py # 渠道工厂
|
||||
```
|
||||
|
||||
## 支付渠道
|
||||
|
||||
| 渠道 | 环境变量 | 说明 |
|
||||
|------|----------|------|
|
||||
| XorPay | `PAYMENT_PROVIDER=xorpay` | 默认 |
|
||||
| ZPAY | `PAYMENT_PROVIDER=zpay` | 需配置 `ZPAY_PID`、`ZPAY_KEY` |
|
||||
|
||||
切换渠道：设置环境变量 `PAYMENT_PROVIDER=xorpay` 或 `zpay`，参考 `.env.example`。
|
||||
|
||||
## 本地调试
|
||||
|
||||
```bash
|
||||
# 复制配置
|
||||
cp .env.example .env
|
||||
|
||||
# 本地调试时 BASE_URL 需 ZPAY 可访问，可用 ngrok：
|
||||
# ngrok http 8700 -> 将 BASE_URL 设为 ngrok 提供的 https 地址
|
||||
|
||||
python run.py
|
||||
# 或 uvicorn app.main:app --host 0.0.0.0 --port 8700 --reload
|
||||
```
|
||||
|
||||
## 线上部署
|
||||
|
||||
域名：`https://api.hackrobot.cn`
|
||||
|
||||
```bash
|
||||
# .env 中设置
|
||||
BASE_URL=https://api.hackrobot.cn
|
||||
PAYMENT_PROVIDER=zpay
|
||||
# 其他 ZPAY、PocketBase、Memos 配置见 .env.example
|
||||
```
|
||||
|
||||
## 线上「支付失败」排查
|
||||
|
||||
本地正常、Ubuntu 部署后 api.hackrobot.cn 调用支付失败，常见原因：
|
||||
|
||||
1. **BASE_URL 配置错误**：必须为 ZPAY 可公网访问的地址。错误示例：`http://127.0.0.1:8700`、`http://localhost`。正确：`https://api.hackrobot.cn`（域名需解析到本机，nginx 反向代理对应端口）。
|
||||
|
||||
2. **服务器无法访问 zpayz.cn**：防火墙、DNS 或网络限制。访问 `https://api.hackrobot.cn/health?check_zpay=1` 自检：
|
||||
- `zpayz_reachable: false` → 开放出站或检查网络
|
||||
- `zpayz_error` 含 "SSL" → 执行 `apt install ca-certificates` 后重启
|
||||
|
||||
3. **client_ip 内网导致 ZPAY 风控拒单**：前端（digital/cnomadcna/nomadvip）通过 nginx 代理时，需配置 `proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for`，否则 payjsapi 收到 127.0.0.1 会触发风控。已做兼容：内网 IP 时自动省略 clientip 参数。
|
||||
|
||||
4. **启动时控制台有 BASE_URL 警告**：说明配置了内网地址，需修改 `.env` 中的 `BASE_URL` 为公网地址后重启。
|
||||
|
||||
5. **查看详细错误**：支付失败时，payjsapi 会输出 `ZPAY create_order_api 失败` 日志，含 status/code/msg，便于定位。
|
||||
|
||||
## Getting started
|
||||
|
||||
|
||||
0
androidh5api.sh
Executable file → Normal file
0
androidh5api.sh
Executable file → Normal file
0
app/__init__.py
Executable file → Normal file
0
app/__init__.py
Executable file → Normal file
BIN
app/__pycache__/__init__.cpython-310.pyc
Normal file
BIN
app/__pycache__/__init__.cpython-310.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/__init__.cpython-311.pyc
Normal file
BIN
app/__pycache__/__init__.cpython-311.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/__init__.cpython-312.pyc
Normal file
BIN
app/__pycache__/__init__.cpython-312.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/crud.cpython-310.pyc
Normal file
BIN
app/__pycache__/crud.cpython-310.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/crud.cpython-311.pyc
Normal file
BIN
app/__pycache__/crud.cpython-311.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/database.cpython-310.pyc
Normal file
BIN
app/__pycache__/database.cpython-310.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/database.cpython-311.pyc
Normal file
BIN
app/__pycache__/database.cpython-311.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/main.cpython-310.pyc
Normal file
BIN
app/__pycache__/main.cpython-310.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/main.cpython-311.pyc
Normal file
BIN
app/__pycache__/main.cpython-311.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/main.cpython-312.pyc
Normal file
BIN
app/__pycache__/main.cpython-312.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/models.cpython-310.pyc
Normal file
BIN
app/__pycache__/models.cpython-310.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/models.cpython-311.pyc
Normal file
BIN
app/__pycache__/models.cpython-311.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/schemas.cpython-310.pyc
Normal file
BIN
app/__pycache__/schemas.cpython-310.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/schemas.cpython-311.pyc
Normal file
BIN
app/__pycache__/schemas.cpython-311.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/tgMesaage.cpython-310.pyc
Normal file
BIN
app/__pycache__/tgMesaage.cpython-310.pyc
Normal file
Binary file not shown.
BIN
app/__pycache__/tgMessage.cpython-310.pyc
Normal file
BIN
app/__pycache__/tgMessage.cpython-310.pyc
Normal file
Binary file not shown.
@@ -1,78 +0,0 @@
|
||||
"""
|
||||
应用配置
|
||||
支付渠道可通过 PAYMENT_PROVIDER 切换：xorpay | zpay
|
||||
"""
|
||||
import os
|
||||
from pathlib import Path
|
||||
from typing import Literal
|
||||
|
||||
from dotenv import load_dotenv
|
||||
|
||||
# 强制从 payjsapi 项目根目录加载 .env、.env.local，避免 cwd 不同导致加载失败
|
||||
_root = Path(__file__).resolve().parent.parent
|
||||
load_dotenv(_root / ".env")
|
||||
load_dotenv(_root / ".env.local", override=True)
|
||||
|
||||
PaymentChannel = Literal["xorpay", "zpay"]
|
||||
|
||||
# 当前使用的支付渠道（zpay 替代 xorpay，payjs2 接口业务保留）
|
||||
PAYMENT_PROVIDER: PaymentChannel = os.getenv("PAYMENT_PROVIDER", "zpay").lower()
|
||||
|
||||
# XorPay 配置
|
||||
XORPAY_AID = os.getenv("XORPAY_AID", "8220")
|
||||
XORPAY_SECRET = os.getenv("XORPAY_SECRET", "afcacd99570945f88de62624aaa3578e")
|
||||
XORPAY_CASHIER_URL = os.getenv("XORPAY_CASHIER_URL", "https://xorpay.com/api/cashier")
|
||||
|
||||
# ZPAY 配置（网关: https://zpayz.cn/）
|
||||
ZPAY_PID = os.getenv("ZPAY_PID", "2025121809351743")
|
||||
ZPAY_KEY = os.getenv("ZPAY_KEY", "tpEi7wWIWI2kXiYVTpIG6j7it0mjVW89")
|
||||
|
||||
# PocketBase（支持 PB_ADMIN_* 或 POCKETBASE_*）
|
||||
# 为了避免线上环境遗留 PB_URL=公网域名导致慢查询，默认强制优先本机。
|
||||
# 本地无 PocketBase、需连线上 PB 时：在 .env.local 设置 PB_INTERNAL_URL=https://pocketbase.hackrobot.cn
|
||||
# （该变量优先级最高，且不改变下方对 PB_URL 的解析规则）
|
||||
_pb_internal = os.getenv("PB_INTERNAL_URL") or os.getenv("POCKETBASE_INTERNAL_URL")
|
||||
_pb_explicit = os.getenv("PB_URL") or os.getenv("POCKETBASE_URL")
|
||||
if _pb_internal:
|
||||
PB_URL = _pb_internal
|
||||
elif _pb_explicit and (
|
||||
"127.0.0.1" in _pb_explicit
|
||||
or "localhost" in _pb_explicit
|
||||
or _pb_explicit.startswith("http://10.")
|
||||
or _pb_explicit.startswith("https://10.")
|
||||
or _pb_explicit.startswith("http://172.")
|
||||
or _pb_explicit.startswith("https://172.")
|
||||
or _pb_explicit.startswith("http://192.168.")
|
||||
or _pb_explicit.startswith("https://192.168.")
|
||||
):
|
||||
PB_URL = _pb_explicit
|
||||
else:
|
||||
PB_URL = "http://127.0.0.1:8090"
|
||||
PB_ADMIN_EMAIL = (
|
||||
os.getenv("PB_ADMIN_EMAIL") or os.getenv("POCKETBASE_EMAIL") or "xiaoshuang.eric@gmail.com"
|
||||
)
|
||||
PB_ADMIN_PASSWORD = (
|
||||
os.getenv("PB_ADMIN_PASSWORD") or os.getenv("POCKETBASE_PASSWORD") or "Xiao4669805@"
|
||||
)
|
||||
|
||||
# Memos
|
||||
MEMOS_API = os.getenv("MEMOS_API", "https://qun.hackrobot.cn/api/v1/users")
|
||||
MEMOS_TOKEN = os.getenv(
|
||||
"MEMOS_TOKEN",
|
||||
"eyJhbGciOiJIUzI1NiIsImtpZCI6InYxIiwidHlwIjoiSldUIn0.eyJuYW1lIjoiaGFja3JvYm90IiwiaXNzIjoibWVtb3MiLCJzdWIiOiIxIiwiYXVkIjpbInVzZXIuYWNjZXNzLXRva2VuIl0sImlhdCI6MTc1NzQwNTE0OX0.Idn7kBlxE-CoSOXwWuZ1tHGIRKHAIeDyXSafGS5OHsg",
|
||||
)
|
||||
|
||||
# 回调地址（用于生成 notify_url）。线上 api.nomadyt.com 时需设置 BASE_URL=https://api.nomadyt.com
|
||||
BASE_URL = os.getenv("BASE_URL", "https://api.hackrobot.cn")
|
||||
|
||||
# MinIO 对象存储
|
||||
MINIO_ENDPOINT = os.getenv("MINIO_ENDPOINT", "minioweb.hackrobot.cn")
|
||||
MINIO_PORT = int(os.getenv("MINIO_PORT", "443"))
|
||||
MINIO_ACCESS_KEY = os.getenv("MINIO_ACCESS_KEY", "")
|
||||
MINIO_SECRET_KEY = os.getenv("MINIO_SECRET_KEY", "")
|
||||
MINIO_BUCKET = os.getenv("MINIO_BUCKET", "hackrobot")
|
||||
MINIO_USE_SSL = os.getenv("MINIO_USE_SSL", "true").lower() == "true"
|
||||
_minio_ep = os.getenv("MINIO_ENDPOINT", "minioweb.hackrobot.cn")
|
||||
_minio_bucket = os.getenv("MINIO_BUCKET", "hackrobot")
|
||||
MINIO_PUBLIC_URL = os.getenv("MINIO_PUBLIC_URL", f"https://{_minio_ep}/{_minio_bucket}")
|
||||
MINIO_UPLOAD_PREFIX = os.getenv("MINIO_UPLOAD_PREFIX", "joins")
|
||||
293
app/main.py
Executable file → Normal file
293
app/main.py
Executable file → Normal file
@@ -1,196 +1,121 @@
|
||||
"""
|
||||
支付 API 主入口
|
||||
支持多支付渠道（XorPay、ZPAY），通过 PAYMENT_PROVIDER 环境变量切换
|
||||
|
||||
路由模块化，按项目拆分：
|
||||
- nomadvip: /nomadvip/* - 固定 ZPAY
|
||||
- digital: /digital/* - 使用 PAYMENT_PROVIDER
|
||||
- cnomadcna: /cnomadcna/* - 使用 PAYMENT_PROVIDER
|
||||
- nomadlms: /nomadlms/* - 使用 PAYMENT_PROVIDER
|
||||
- legacy: /payh5、/zpay_notify 等（向后兼容）
|
||||
- common: /submit_meetup_application、/create_user
|
||||
|
||||
本地调试：BASE_URL 需为 ZPAY 可访问地址（如 ngrok）
|
||||
线上部署：BASE_URL=https://api.hackrobot.cn（必须为 ZPAY 可公网访问的地址）
|
||||
"""
|
||||
import logging
|
||||
import sys
|
||||
|
||||
import requests
|
||||
from fastapi import FastAPI, Request, HTTPException
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi import FastAPI
|
||||
from fastapi.responses import JSONResponse
|
||||
from pydantic import BaseModel
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
import requests
|
||||
|
||||
from .config import BASE_URL
|
||||
from .routers import (
|
||||
nomadvip_router,
|
||||
digital_router,
|
||||
cnomadcna_router,
|
||||
nomadlms_router,
|
||||
legacy_router,
|
||||
common_router,
|
||||
meetup_router,
|
||||
chatbot_router,
|
||||
)
|
||||
from .routers.salon_meetup import router as salon_meetup_router
|
||||
import hashlib
|
||||
from urllib.parse import urlencode, unquote
|
||||
import time
|
||||
"""
|
||||
JSAPI 支付
|
||||
"""
|
||||
key = "zA2hBU6pv6CIBzkW" # 填写通信密钥
|
||||
mchid = "1561724891" # 特写商户号
|
||||
|
||||
app = FastAPI(
|
||||
title="PayJS API",
|
||||
description="nomadvip / digital / cnomadcna / nomadlms 支付接口",
|
||||
version="2.0",
|
||||
)
|
||||
# memos 配置
|
||||
MEMOS_API = "https://memos.hackrobot.org/api/v1/users"
|
||||
MEMOS_TOKEN = "eyJhbGciOiJIUzI1NiIsImtpZCI6InYxIiwidHlwIjoiSldUIn0.eyJuYW1lIjoiaGFja3JvYm90IiwiaXNzIjoibWVtb3MiLCJzdWIiOiIxIiwiYXVkIjpbInVzZXIuYWNjZXNzLXRva2VuIl0sImlhdCI6MTc1NzQwNTE0OX0.Idn7kBlxE-CoSOXwWuZ1tHGIRKHAIeDyXSafGS5OHsg"
|
||||
|
||||
|
||||
# 构造签名函数
|
||||
def sign(attributes):
|
||||
attributes_new = {k: attributes[k] for k in sorted(attributes.keys())}
|
||||
return (hashlib.md5((unquote(urlencode(attributes_new)) + "&key=" +
|
||||
key).encode(encoding="utf-8")).hexdigest().upper())
|
||||
|
||||
|
||||
class Item(BaseModel):
|
||||
event: str
|
||||
EventGroupMsg: None = None
|
||||
prirobot_wxidce: None = None
|
||||
type: None = None
|
||||
|
||||
|
||||
# event
|
||||
# "":"EventGroupMsg",//事件标示(当前值为群消息事件)
|
||||
# "robot_wxid":"wxid_5hxa04j4z6pg22",//机器人wxid
|
||||
# "robot_name":"",//机器人昵称，一般为空
|
||||
# "type":1,//1/文本消息 3/图片消息 34/语音消息 42/名片消息 43/视频 47/动态表情 48/地理位置 49/分享链接 2000/转账 2001/红包 2002/小程序 2003/群邀请
|
||||
# "from_wxid":"18900134932@chatroom",//群id，群消息事件才有
|
||||
# "from_name":"微群测",//群名字
|
||||
# "final_from_wxid":"sundreamer",//发该消息的用户微信id
|
||||
# "final_from_name":"遗忘悠剑o",//微信昵称
|
||||
# "to_wxid":"wxid_5hxa04j4z6pg22",//接收消息的人id，（一般是机器人收到了，也有可能是机器人发出的消息，别人收到了，那就是别人）
|
||||
# "msg":"图片https://b3logfile.com/bing/20201024.jpg",//消息内容(string/array) 使用时候根据不同的事件标示来定义这个值，字符串类型或者数据类型
|
||||
# "money":0.01 //金额，只有"EventReceivedTransfer"事件才有该参数
|
||||
|
||||
app = FastAPI()
|
||||
|
||||
|
||||
|
||||
# 允许所有来源跨域访问（不推荐用于生产环境）
|
||||
origins = ["*"]
|
||||
|
||||
# 设置CORS（跨域资源共享）策略
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=["*"],
|
||||
allow_credentials=False,
|
||||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
allow_origins=["*"], # 允许所有来源
|
||||
allow_credentials=True,
|
||||
allow_methods=["*"], # 允许所有方法
|
||||
allow_headers=["*"], # 允许所有请求头
|
||||
)
|
||||
|
||||
|
||||
class _SafeStderrProxy:
|
||||
def write(self, message: str) -> int:
|
||||
try:
|
||||
return sys.stderr.write(message)
|
||||
except (OSError, ValueError):
|
||||
return 0
|
||||
|
||||
def flush(self) -> None:
|
||||
try:
|
||||
sys.stderr.flush()
|
||||
except (OSError, ValueError):
|
||||
pass
|
||||
|
||||
|
||||
def _safe_log(level: int, message: str, *args, **kwargs) -> None:
|
||||
try:
|
||||
logging.log(level, message, *args, **kwargs)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
@app.exception_handler(Exception)
|
||||
async def global_exception_handler(request: Request, exc: Exception):
|
||||
"""捕获未处理异常，记录日志后返回 500（HTTPException 交由 FastAPI 默认处理）"""
|
||||
if isinstance(exc, HTTPException):
|
||||
raise exc
|
||||
_safe_log(logging.ERROR, "未处理异常: %s - %s", request.url.path, exc, exc_info=True)
|
||||
return JSONResponse(status_code=500, content={"detail": str(exc)})
|
||||
|
||||
logging.raiseExceptions = False
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
|
||||
handlers=[logging.StreamHandler(_SafeStderrProxy())],
|
||||
force=True,
|
||||
)
|
||||
|
||||
|
||||
def _safe_stderr_write(message: str) -> None:
|
||||
try:
|
||||
sys.stderr.write(message)
|
||||
sys.stderr.flush()
|
||||
except (OSError, ValueError):
|
||||
pass
|
||||
|
||||
|
||||
def _should_trace_request(path: str) -> bool:
|
||||
return any(
|
||||
segment in path for segment in ("/nomadvip", "/digital", "/cnomadcna", "/nomadlms")
|
||||
)
|
||||
|
||||
# 启动时校验 BASE_URL（线上部署必须为公网可访问地址，否则 ZPAY 无法回调）
|
||||
def _check_base_url():
|
||||
url = (BASE_URL or "").strip().lower()
|
||||
if not url:
|
||||
logging.warning("BASE_URL 未设置，将使用默认值。线上部署请务必设置 BASE_URL 为公网地址")
|
||||
return
|
||||
if "localhost" in url or "127.0.0.1" in url or url.startswith("http://192.168.") or url.startswith("http://10."):
|
||||
logging.warning(
|
||||
"BASE_URL=%s 疑似内网地址，ZPAY 无法回调！线上部署请设置 BASE_URL 为公网地址，如 https://api.hackrobot.cn",
|
||||
BASE_URL,
|
||||
)
|
||||
|
||||
|
||||
@app.on_event("startup")
|
||||
async def startup_event():
|
||||
_check_base_url()
|
||||
# 预热 PocketBase 连接，减少首个业务请求冷启动延迟
|
||||
try:
|
||||
from .services.pb import get_pb_client
|
||||
|
||||
get_pb_client()
|
||||
logging.info("PocketBase client warmup done")
|
||||
except Exception as error:
|
||||
logging.warning("PocketBase client warmup failed: %s", error)
|
||||
|
||||
|
||||
@app.get("/health")
|
||||
async def health(check_zpay: str = ""):
|
||||
"""健康检查。check_zpay=1 时额外检测 zpayz.cn 连通性（含 SSL、mapi 接口）"""
|
||||
out = {"status": "ok", "service": "payjsapi", "base_url": BASE_URL}
|
||||
if str(check_zpay).lower() in ("1", "true", "yes"):
|
||||
# 1) 检测 zpayz.cn 首页
|
||||
try:
|
||||
r = requests.get("https://zpayz.cn", timeout=5)
|
||||
out["zpayz_reachable"] = r.status_code in (200, 301, 302, 404)
|
||||
except requests.exceptions.SSLError as e:
|
||||
out["zpayz_reachable"] = False
|
||||
out["zpayz_error"] = f"SSL 错误: {e}（Ubuntu 请执行: apt install ca-certificates）"
|
||||
except requests.RequestException as e:
|
||||
out["zpayz_reachable"] = False
|
||||
out["zpayz_error"] = str(e)
|
||||
# 2) 检测 mapi 接口（实际支付调用地址）
|
||||
if out.get("zpayz_reachable"):
|
||||
try:
|
||||
r2 = requests.post("https://zpayz.cn/mapi.php", data={"pid": "test"}, timeout=5)
|
||||
out["zpayz_mapi_reachable"] = True
|
||||
out["zpayz_mapi_status"] = r2.status_code
|
||||
except requests.exceptions.SSLError as e:
|
||||
out["zpayz_mapi_reachable"] = False
|
||||
out["zpayz_mapi_error"] = f"SSL: {e}"
|
||||
except requests.RequestException as e:
|
||||
out["zpayz_mapi_reachable"] = False
|
||||
out["zpayz_mapi_error"] = str(e)
|
||||
return out
|
||||
|
||||
|
||||
# 请求日志中间件：每个请求都打印到 stderr，确保终端可见
|
||||
@app.middleware("http")
|
||||
async def log_requests(request, call_next):
|
||||
path = request.url.path
|
||||
if _should_trace_request(path):
|
||||
_safe_stderr_write(f"[payjsapi] >>> {request.method} {path}\n")
|
||||
resp = await call_next(request)
|
||||
if _should_trace_request(path):
|
||||
_safe_stderr_write(f"[payjsapi] <<< {request.method} {path} {resp.status_code}\n")
|
||||
return resp
|
||||
|
||||
# 挂载路由
|
||||
app.include_router(nomadvip_router)
|
||||
app.include_router(digital_router)
|
||||
app.include_router(cnomadcna_router)
|
||||
app.include_router(nomadlms_router)
|
||||
app.include_router(legacy_router)
|
||||
app.include_router(common_router)
|
||||
app.include_router(meetup_router)
|
||||
app.include_router(salon_meetup_router)
|
||||
app.include_router(chatbot_router)
|
||||
|
||||
|
||||
@app.get("/")
|
||||
async def root():
|
||||
"""健康检查"""
|
||||
return {
|
||||
"status": "ok",
|
||||
"service": "payjsapi",
|
||||
"routes": {
|
||||
"nomadvip": "/nomadvip/payh5, /nomadvip/payh5/redirect, /nomadvip/check_vip, /nomadvip/check_vip_by_email, /nomadvip/order_status, /nomadvip/zpay_order_status, /nomadvip/zpay_notify, /nomadvip/xorpay_notify",
|
||||
"digital": "/digital/payh5, /digital/payh5/redirect, /digital/zpay_order_status, /digital/zpay_notify, /digital/xorpay_notify",
|
||||
"cnomadcna": "/cnomadcna/payh5, ...",
|
||||
"nomadlms": "/nomadlms/payh5, ...",
|
||||
"legacy": "/payh5, /payh5/redirect, /zpay_notify, /xorpay_notify, /zpay_order_status",
|
||||
"common": "/submit_meetup_application, /create_user",
|
||||
},
|
||||
return JSONResponse(content={"message": "Hello World"})
|
||||
|
||||
|
||||
@app.post("/payh5")
|
||||
async def payh5(item: dict):
|
||||
print('item', item)
|
||||
# 时间戳
|
||||
timenew = str(int(time.time()))
|
||||
order = {
|
||||
"mchid": mchid,
|
||||
"body": timenew, # 订单标题
|
||||
"out_trade_no": timenew, # 订单号
|
||||
"total_fee": item['total_fee'], # 金额,单位:分
|
||||
# "openid": "o7LFAwWu3OhSrs49-1x5cSlFm0D8", # 通过openid接口获取到的openid
|
||||
# "notify_url": ""
|
||||
# "callback_url":'https://aiimg.hackrobot.cn/api'
|
||||
}
|
||||
|
||||
order["callback_url"] = item['callback_url']
|
||||
order["openid"] = item['openid']
|
||||
order["sign"] = sign(order)
|
||||
|
||||
request_url = "https://payjs.cn/api/jsapi"
|
||||
# 返回结果中包含`jsapi`字段，该字段的值即是前端发起时所需的6个支付参数
|
||||
headers = {"content-type": "application/x-www-form-urlencoded"}
|
||||
response = requests.post(request_url, data=order, headers=headers)
|
||||
print('response.json()----',response.json())
|
||||
if response:
|
||||
print(response.json())
|
||||
return response.json()
|
||||
|
||||
|
||||
|
||||
class CreateUserRequest(BaseModel):
|
||||
username: str = None
|
||||
password: str = None
|
||||
|
||||
@app.post("/create_user")
|
||||
async def create_user(item: CreateUserRequest):
|
||||
timenew = str(int(time.time()))
|
||||
memos_data = {
|
||||
"username": item.username or f"user{timenew}",
|
||||
"password": item.password or "123456",
|
||||
"role": "USER",
|
||||
"state": "NORMAL"
|
||||
}
|
||||
memos_headers = {
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {MEMOS_TOKEN}"
|
||||
}
|
||||
memos_resp = requests.post(MEMOS_API, json=memos_data, headers=memos_headers)
|
||||
memos_result = memos_resp.json()
|
||||
print('memos_result-',memos_result)
|
||||
return memos_result
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
"""
|
||||
支付模块
|
||||
支持多支付渠道，可通过配置切换
|
||||
"""
|
||||
from .base import PaymentProvider
|
||||
from .xorpay import XorPayProvider
|
||||
from .zpay import ZPayProvider
|
||||
from .factory import (
|
||||
get_payment_provider,
|
||||
get_payment_provider_by_name,
|
||||
reset_provider,
|
||||
resolve_provider,
|
||||
resolve_channel,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"PaymentProvider",
|
||||
"XorPayProvider",
|
||||
"ZPayProvider",
|
||||
"get_payment_provider",
|
||||
"get_payment_provider_by_name",
|
||||
"reset_provider",
|
||||
"resolve_provider",
|
||||
"resolve_channel",
|
||||
]
|
||||
@@ -1,59 +0,0 @@
|
||||
"""
|
||||
支付渠道抽象基类
|
||||
定义统一的支付接口，便于切换不同支付渠道（XorPay、ZPAY 等）
|
||||
"""
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
|
||||
class PaymentProvider(ABC):
|
||||
"""支付渠道抽象基类"""
|
||||
|
||||
@property
|
||||
@abstractmethod
|
||||
def name(self) -> str:
|
||||
"""支付渠道名称"""
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def create_order(
|
||||
self,
|
||||
*,
|
||||
order_id: str,
|
||||
name: str,
|
||||
total_fee_yuan: str,
|
||||
pay_type: str,
|
||||
notify_url: str,
|
||||
return_url: Optional[str] = None,
|
||||
client_ip: Optional[str] = None,
|
||||
extra: Optional[Dict[str, Any]] = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
创建支付订单
|
||||
:return: 包含支付跳转信息等，格式由各渠道自定义
|
||||
"""
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def verify_notify(self, data: Dict[str, Any]) -> bool:
|
||||
"""验证异步通知签名"""
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def parse_notify(self, data: Dict[str, Any]) -> Dict[str, Any]:
|
||||
"""
|
||||
解析异步通知，提取统一字段
|
||||
:return: {
|
||||
"order_id": str, # 商户订单号
|
||||
"trade_no": str, # 渠道订单号
|
||||
"pay_price": str, # 实付金额（元）
|
||||
"pay_time": str, # 支付时间
|
||||
"trade_status": str, # 支付状态
|
||||
}
|
||||
"""
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def success_response(self) -> str:
|
||||
"""异步通知成功时需返回的字符串（如 'ok' 或 'success'）"""
|
||||
pass
|
||||
@@ -1,79 +0,0 @@
|
||||
"""
|
||||
支付渠道工厂
|
||||
根据配置返回对应的支付 Provider
|
||||
默认使用 zpay 替代 xorpay
|
||||
"""
|
||||
from ..config import (
|
||||
PAYMENT_PROVIDER,
|
||||
XORPAY_AID,
|
||||
XORPAY_SECRET,
|
||||
XORPAY_CASHIER_URL,
|
||||
ZPAY_PID,
|
||||
ZPAY_KEY,
|
||||
)
|
||||
from .base import PaymentProvider
|
||||
from .xorpay import XorPayProvider
|
||||
from .zpay import ZPayProvider
|
||||
|
||||
_provider_instance: PaymentProvider | None = None
|
||||
|
||||
|
||||
def get_payment_provider() -> PaymentProvider:
|
||||
"""获取当前配置的支付渠道实例（单例）"""
|
||||
global _provider_instance
|
||||
if _provider_instance is not None:
|
||||
return _provider_instance
|
||||
if PAYMENT_PROVIDER == "zpay":
|
||||
_provider_instance = ZPayProvider(pid=ZPAY_PID, key=ZPAY_KEY)
|
||||
else:
|
||||
_provider_instance = XorPayProvider(
|
||||
aid=XORPAY_AID,
|
||||
secret=XORPAY_SECRET,
|
||||
cashier_url=XORPAY_CASHIER_URL,
|
||||
)
|
||||
return _provider_instance
|
||||
|
||||
|
||||
def get_payment_provider_by_name(name: str) -> PaymentProvider:
|
||||
"""按名称获取 Provider（用于 per-request 覆盖）"""
|
||||
if name == "xorpay":
|
||||
return XorPayProvider(
|
||||
aid=XORPAY_AID,
|
||||
secret=XORPAY_SECRET,
|
||||
cashier_url=XORPAY_CASHIER_URL,
|
||||
)
|
||||
return ZPayProvider(pid=ZPAY_PID, key=ZPAY_KEY)
|
||||
|
||||
|
||||
def reset_provider():
|
||||
"""重置 Provider（用于测试或切换渠道）"""
|
||||
global _provider_instance
|
||||
_provider_instance = None
|
||||
|
||||
|
||||
def resolve_provider(
|
||||
device: str | None = None,
|
||||
req_provider: str | None = None,
|
||||
user_agent: str | None = None,
|
||||
) -> PaymentProvider:
|
||||
"""
|
||||
根据设备解析支付渠道：
|
||||
- 微信内(device=wechat 或 UA 含 MicroMessenger) → xorpay
|
||||
- PC/手机浏览器 → zpay
|
||||
显式传入的 provider 优先。
|
||||
"""
|
||||
req = (req_provider or "").strip().lower()
|
||||
if req in ("xorpay", "zpay"):
|
||||
return get_payment_provider_by_name(req)
|
||||
dev = (device or "pc").lower()
|
||||
if dev == "wechat":
|
||||
return get_payment_provider_by_name("xorpay")
|
||||
ua = (user_agent or "").lower()
|
||||
if "micromessenger" in ua:
|
||||
return get_payment_provider_by_name("xorpay")
|
||||
return get_payment_provider_by_name("zpay")
|
||||
|
||||
|
||||
def resolve_channel(item_channel: str | None) -> str:
|
||||
"""支付方式固定为微信支付，支付宝暂不提供"""
|
||||
return "wxpay"
|
||||
@@ -1,108 +0,0 @@
|
||||
"""
|
||||
XorPay 支付渠道实现
|
||||
文档: https://xorpay.com
|
||||
"""
|
||||
import hashlib
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
import requests
|
||||
|
||||
from .base import PaymentProvider
|
||||
|
||||
|
||||
class XorPayProvider(PaymentProvider):
|
||||
"""XorPay 支付"""
|
||||
|
||||
def __init__(self, aid: str, secret: str, cashier_url: str = "https://xorpay.com/api/cashier"):
|
||||
self.aid = aid
|
||||
self.secret = secret
|
||||
self.cashier_url = cashier_url.rstrip("/")
|
||||
|
||||
@property
|
||||
def name(self) -> str:
|
||||
return "xorpay"
|
||||
|
||||
def _sign(self, name: str, pay_type: str, price: str, order_id: str, notify_url: str) -> str:
|
||||
raw = name + pay_type + price + order_id + notify_url + self.secret
|
||||
return hashlib.md5(raw.encode("utf-8")).hexdigest().lower()
|
||||
|
||||
def _query2_sign(self, order_id: str) -> str:
|
||||
raw = order_id + self.secret
|
||||
return hashlib.md5(raw.encode("utf-8")).hexdigest().lower()
|
||||
|
||||
def create_order(
|
||||
self,
|
||||
*,
|
||||
order_id: str,
|
||||
name: str,
|
||||
total_fee_yuan: str,
|
||||
pay_type: str,
|
||||
notify_url: str,
|
||||
return_url: Optional[str] = None,
|
||||
client_ip: Optional[str] = None,
|
||||
extra: Optional[Dict[str, Any]] = None,
|
||||
) -> Dict[str, Any]:
|
||||
# XorPay 使用 jsapi 表示 H5/JSAPI 支付
|
||||
channel_pay_type = "jsapi"
|
||||
params = {
|
||||
"name": name,
|
||||
"pay_type": channel_pay_type,
|
||||
"price": total_fee_yuan,
|
||||
"order_id": order_id,
|
||||
"notify_url": notify_url,
|
||||
}
|
||||
params["sign"] = self._sign(
|
||||
params["name"],
|
||||
params["pay_type"],
|
||||
params["price"],
|
||||
params["order_id"],
|
||||
params["notify_url"],
|
||||
)
|
||||
return {
|
||||
"status": "ok",
|
||||
"provider": self.name,
|
||||
"params": params,
|
||||
"pay_url": f"{self.cashier_url}/{self.aid}",
|
||||
}
|
||||
|
||||
def verify_notify(self, data: Dict[str, Any]) -> bool:
|
||||
received_sign = data.get("sign", "")
|
||||
aoid = data.get("aoid", "")
|
||||
order_id = data.get("order_id", "")
|
||||
pay_price = data.get("pay_price", "")
|
||||
pay_time = data.get("pay_time", "")
|
||||
raw = aoid + order_id + pay_price + pay_time + self.secret
|
||||
calculated = hashlib.md5(raw.encode("utf-8")).hexdigest().lower()
|
||||
return calculated == received_sign
|
||||
|
||||
def parse_notify(self, data: Dict[str, Any]) -> Dict[str, Any]:
|
||||
return {
|
||||
"order_id": data.get("order_id", ""),
|
||||
"trade_no": data.get("aoid", ""),
|
||||
"pay_price": data.get("pay_price", ""),
|
||||
"pay_time": data.get("pay_time", ""),
|
||||
"trade_status": "success", # XorPay 验签通过即视为成功
|
||||
}
|
||||
|
||||
def success_response(self) -> str:
|
||||
return "ok"
|
||||
|
||||
def query_order_status(self, order_id: str, timeout: int = 10) -> Dict[str, Any]:
|
||||
url = f"https://xorpay.com/api/query2/{self.aid}"
|
||||
params = {
|
||||
"order_id": order_id,
|
||||
"sign": self._query2_sign(order_id),
|
||||
}
|
||||
try:
|
||||
response = requests.get(url, params=params, timeout=timeout)
|
||||
response.raise_for_status()
|
||||
data = response.json() or {}
|
||||
status = str(data.get("status", "")).strip().lower()
|
||||
return {
|
||||
"paid": status in ("payed", "success"),
|
||||
"status": status,
|
||||
"pay_price": data.get("pay_price") or data.get("price") or "",
|
||||
"raw": data,
|
||||
}
|
||||
except Exception as error:
|
||||
return {"paid": False, "error": str(error)}
|
||||
@@ -1,250 +0,0 @@
|
||||
"""
|
||||
ZPAY 支付渠道实现
|
||||
文档: https://z-pay.cn/doc.html
|
||||
支持：页面跳转支付、API 接口支付、异步通知验签
|
||||
"""
|
||||
import hashlib
|
||||
import json
|
||||
import logging
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
import requests
|
||||
|
||||
from .base import PaymentProvider
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _is_internal_ip(ip: Optional[str]) -> bool:
|
||||
"""判断是否为内网 IP，ZPAY 可能拒收导致 Ubuntu 部署失败"""
|
||||
if not ip or not ip.strip():
|
||||
return True
|
||||
ip = ip.strip()
|
||||
if ip in ("127.0.0.1", "localhost", "::1"):
|
||||
return True
|
||||
if ip.startswith("10.") or ip.startswith("192.168.") or ip.startswith("172.16."):
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
class ZPayProvider(PaymentProvider):
|
||||
"""ZPAY 支付（易支付兼容接口）"""
|
||||
|
||||
# API 地址
|
||||
SUBMIT_URL = "https://zpayz.cn/submit.php" # 页面跳转
|
||||
MAPI_URL = "https://zpayz.cn/mapi.php" # API 接口
|
||||
|
||||
def __init__(self, pid: str, key: str):
|
||||
self.pid = pid
|
||||
self.key = key
|
||||
|
||||
@property
|
||||
def name(self) -> str:
|
||||
return "zpay"
|
||||
|
||||
def _md5_sign(self, params: Dict[str, Any], exclude: Optional[set] = None) -> str:
|
||||
"""
|
||||
ZPAY MD5 签名算法：
|
||||
1. 参数按 ASCII 排序，sign/sign_type/空值不参与
|
||||
2. 拼接为 a=b&c=d
|
||||
3. sign = md5(拼接串 + KEY)，小写
|
||||
"""
|
||||
exclude = exclude or {"sign", "sign_type"}
|
||||
filtered = {k: v for k, v in params.items() if k not in exclude and v is not None and v != ""}
|
||||
sorted_keys = sorted(filtered.keys())
|
||||
parts = [f"{k}={filtered[k]}" for k in sorted_keys]
|
||||
raw = "&".join(parts) + self.key
|
||||
return hashlib.md5(raw.encode("utf-8")).hexdigest().lower()
|
||||
|
||||
def create_order(
|
||||
self,
|
||||
*,
|
||||
order_id: str,
|
||||
name: str,
|
||||
total_fee_yuan: str,
|
||||
pay_type: str,
|
||||
notify_url: str,
|
||||
return_url: Optional[str] = None,
|
||||
client_ip: Optional[str] = None,
|
||||
extra: Optional[Dict[str, Any]] = None,
|
||||
) -> Dict[str, Any]:
|
||||
# ZPAY: alipay / wxpay（pay_type 可为业务类型或支付方式，此处按支付方式解析）
|
||||
channel_type = "wxpay" if str(pay_type).lower() in ("wx", "wechat", "wxpay") else "alipay"
|
||||
params = {
|
||||
"pid": self.pid,
|
||||
"type": channel_type,
|
||||
"out_trade_no": order_id,
|
||||
"notify_url": notify_url,
|
||||
"name": name,
|
||||
"money": total_fee_yuan,
|
||||
"return_url": return_url or notify_url,
|
||||
}
|
||||
if client_ip and not _is_internal_ip(client_ip):
|
||||
params["clientip"] = client_ip
|
||||
elif client_ip and _is_internal_ip(client_ip):
|
||||
logger.warning("ZPAY create_order 跳过内网 client_ip=%s", client_ip)
|
||||
if extra and extra.get("param"):
|
||||
params["param"] = str(extra["param"])
|
||||
params["sign_type"] = "MD5"
|
||||
params["sign"] = self._md5_sign(params)
|
||||
|
||||
# 页面跳转方式：返回 form 提交 URL 和参数
|
||||
return {
|
||||
"status": "ok",
|
||||
"provider": self.name,
|
||||
"params": params,
|
||||
"pay_url": self.SUBMIT_URL,
|
||||
"submit_method": "POST",
|
||||
}
|
||||
|
||||
def create_order_api(
|
||||
self,
|
||||
*,
|
||||
order_id: str,
|
||||
name: str,
|
||||
total_fee_yuan: str,
|
||||
pay_type: str,
|
||||
notify_url: str,
|
||||
return_url: Optional[str] = None,
|
||||
client_ip: str = "127.0.0.1",
|
||||
device: str = "pc",
|
||||
extra: Optional[Dict[str, Any]] = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
ZPAY API 接口支付（返回 payurl/qrcode 等）
|
||||
适用于需要二维码或 H5 跳转的场景
|
||||
"""
|
||||
channel_type = "wxpay" if pay_type.lower() in ("wx", "wechat", "wxpay") else "alipay"
|
||||
effective_ip = (client_ip or "").strip() or "127.0.0.1"
|
||||
# 内网 IP（127.0.0.1/10.x/192.168.x）可能导致 ZPAY 风控拒单，Ubuntu 部署时常见
|
||||
if _is_internal_ip(effective_ip):
|
||||
logger.warning(
|
||||
"ZPAY create_order_api client_ip=%s 为内网地址，已省略 clientip 参数（避免风控拒单）",
|
||||
effective_ip,
|
||||
)
|
||||
effective_ip = "" # 不传 clientip，由 ZPAY 从连接获取
|
||||
params = {
|
||||
"pid": self.pid,
|
||||
"type": channel_type,
|
||||
"out_trade_no": order_id,
|
||||
"notify_url": notify_url,
|
||||
"name": name,
|
||||
"money": total_fee_yuan,
|
||||
"device": device,
|
||||
}
|
||||
if effective_ip:
|
||||
params["clientip"] = effective_ip
|
||||
if return_url:
|
||||
params["return_url"] = return_url
|
||||
if extra and extra.get("param"):
|
||||
params["param"] = str(extra["param"])
|
||||
params["sign_type"] = "MD5"
|
||||
params["sign"] = self._md5_sign(params)
|
||||
|
||||
try:
|
||||
resp = requests.post(self.MAPI_URL, data=params, timeout=15)
|
||||
except requests.exceptions.SSLError as e:
|
||||
logger.error("ZPAY SSL 错误（Ubuntu 可能 CA 证书不全）: %s", e, exc_info=True)
|
||||
return {
|
||||
"status": "error",
|
||||
"provider": self.name,
|
||||
"msg": f"连接 zpayz.cn SSL 失败: {e}。Ubuntu 请安装 ca-certificates: apt install ca-certificates",
|
||||
}
|
||||
except requests.RequestException as e:
|
||||
logger.error("ZPAY 连接失败: %s", e, exc_info=True)
|
||||
return {
|
||||
"status": "error",
|
||||
"provider": self.name,
|
||||
"msg": f"连接 zpayz.cn 失败: {e}。请检查服务器网络、防火墙或 DNS。",
|
||||
}
|
||||
|
||||
try:
|
||||
result = resp.json()
|
||||
except Exception:
|
||||
result = {}
|
||||
# ZPAY 可能返回二次编码的 JSON（body 为 JSON 字符串），需再次解析
|
||||
if isinstance(result, str):
|
||||
try:
|
||||
result = json.loads(result)
|
||||
except Exception:
|
||||
result = {}
|
||||
if not isinstance(result, dict):
|
||||
result = {}
|
||||
# 部分环境下 ZPAY 将成功数据放在 msg 中（msg 为 JSON 字符串）
|
||||
msg_val = result.get("msg")
|
||||
if isinstance(msg_val, str) and msg_val.strip().startswith("{"):
|
||||
try:
|
||||
inner = json.loads(msg_val)
|
||||
if isinstance(inner, dict) and int(float(inner.get("code", 0))) == 1:
|
||||
result = inner
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
code = int(float(result.get("code", 0)))
|
||||
except (TypeError, ValueError):
|
||||
code = 0
|
||||
if code == 1:
|
||||
return {
|
||||
"status": "ok",
|
||||
"provider": self.name,
|
||||
"payurl": result.get("payurl"),
|
||||
"payurl2": result.get("payurl2"), # 微信 H5，手机浏览器打开可唤醒微信
|
||||
"qrcode": result.get("qrcode"),
|
||||
"img": result.get("img"),
|
||||
"O_id": result.get("O_id"),
|
||||
"trade_no": result.get("trade_no"),
|
||||
}
|
||||
err_msg = result.get("msg", resp.text)
|
||||
logger.error(
|
||||
"ZPAY create_order_api 失败 status=%s code=%s msg=%s resp_text=%s",
|
||||
resp.status_code,
|
||||
code,
|
||||
err_msg,
|
||||
resp.text[:500] if resp.text else "",
|
||||
)
|
||||
return {
|
||||
"status": "error",
|
||||
"provider": self.name,
|
||||
"msg": err_msg,
|
||||
}
|
||||
|
||||
def verify_notify(self, data: Dict[str, Any]) -> bool:
|
||||
received = data.get("sign", "")
|
||||
calculated = self._md5_sign(data)
|
||||
return calculated == received
|
||||
|
||||
def parse_notify(self, data: Dict[str, Any]) -> Dict[str, Any]:
|
||||
# ZPAY 通知：trade_status 为 TRADE_SUCCESS 表示成功
|
||||
status = "success" if data.get("trade_status") == "TRADE_SUCCESS" else "pending"
|
||||
return {
|
||||
"order_id": data.get("out_trade_no", ""),
|
||||
"trade_no": data.get("trade_no", ""),
|
||||
"pay_price": data.get("money", ""),
|
||||
"pay_time": "", # ZPAY 通知未明确返回
|
||||
"trade_status": status,
|
||||
}
|
||||
|
||||
def success_response(self) -> str:
|
||||
return "success"
|
||||
|
||||
def query_order_status(self, out_trade_no: str, timeout: int = 15) -> Dict[str, Any]:
|
||||
"""查询 ZPAY 订单支付状态（供 nomadvip/digital/cnomadcna/nomadlms 共用）"""
|
||||
url = f"https://zpayz.cn/api.php?act=order&pid={self.pid}&key={self.key}&out_trade_no={out_trade_no}"
|
||||
try:
|
||||
resp = requests.get(url, timeout=timeout)
|
||||
result = resp.json() if resp.ok else {}
|
||||
except Exception as e:
|
||||
return {"paid": False, "error": str(e)}
|
||||
try:
|
||||
code = result.get("code", 0)
|
||||
code = int(code) if isinstance(code, (int, float)) or str(code).isdigit() else 0
|
||||
except (ValueError, TypeError):
|
||||
code = 0
|
||||
if code != 1:
|
||||
return {"paid": False, "msg": result.get("msg", "查询失败")}
|
||||
try:
|
||||
status = int(result.get("status", 0))
|
||||
except (ValueError, TypeError):
|
||||
status = 0
|
||||
money = result.get("money") or result.get("pay_price") or ""
|
||||
return {"paid": status == 1, "status": status, "pay_price": str(money) if money else ""}
|
||||
@@ -1,27 +0,0 @@
|
||||
"""
|
||||
项目路由模块
|
||||
- nomadvip: /nomadvip/*
|
||||
- digital: /digital/*
|
||||
- cnomadcna: /cnomadcna/*
|
||||
- nomadlms: /nomadlms/*
|
||||
- legacy: /payh5, /zpay_notify 等（向后兼容 digital/cnomadcna）
|
||||
"""
|
||||
from .nomadvip import router as nomadvip_router
|
||||
from .digital import router as digital_router
|
||||
from .cnomadcna import router as cnomadcna_router
|
||||
from .nomadlms import router as nomadlms_router
|
||||
from .legacy import router as legacy_router
|
||||
from .common import router as common_router
|
||||
from .meetup import router as meetup_router
|
||||
from .chatbot import router as chatbot_router
|
||||
|
||||
__all__ = [
|
||||
"nomadvip_router",
|
||||
"digital_router",
|
||||
"cnomadcna_router",
|
||||
"nomadlms_router",
|
||||
"legacy_router",
|
||||
"common_router",
|
||||
"meetup_router",
|
||||
"chatbot_router",
|
||||
]
|
||||
@@ -1,317 +0,0 @@
|
||||
"""
|
||||
digital/cnomadcna/nomadlms 共享的支付逻辑
|
||||
根据 prefix 生成对应 notify_path，业务互不影响
|
||||
"""
|
||||
import asyncio
|
||||
import logging
|
||||
import random
|
||||
import string
|
||||
import time
|
||||
|
||||
from fastapi import APIRouter, Request, HTTPException
|
||||
|
||||
from ..config import BASE_URL
|
||||
from ..payment import (
|
||||
get_payment_provider,
|
||||
get_payment_provider_by_name,
|
||||
resolve_provider,
|
||||
resolve_channel,
|
||||
)
|
||||
from ..payment.zpay import ZPayProvider
|
||||
from ..services import handle_payment_success, processed_orders
|
||||
|
||||
|
||||
def _safe_log(level: int, message: str, *args, **kwargs) -> None:
|
||||
try:
|
||||
logging.log(level, message, *args, **kwargs)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def create_digital_router(prefix: str, project_name: str, site_id: str | None = None) -> APIRouter:
|
||||
"""
|
||||
创建 digital/cnomadcna/nomadlms 的支付路由
|
||||
prefix: 如 "/digital", "/cnomadcna", "/nomadlms" 或 ""（legacy）
|
||||
project_name: 用于日志，如 "digital", "cnomadcna", "nomadlms", "legacy"
|
||||
site_id: 站点标识，用于 site_vip（digital/meetup/vip）
|
||||
"""
|
||||
router = APIRouter(prefix=prefix, tags=[project_name])
|
||||
|
||||
def _notify_path(path: str) -> str:
|
||||
base = BASE_URL.rstrip("/")
|
||||
if prefix:
|
||||
return f"{base}{prefix}{path}"
|
||||
return f"{base}{path}"
|
||||
|
||||
@router.post("/payh5")
|
||||
async def payh5(item: dict, request: Request):
|
||||
"""创建 H5 支付订单。默认微信支付，PC/手机用 zpay，微信内用 xorpay，支付宝暂不提供"""
|
||||
req_provider = (item.get("provider") or "").strip().lower() or None
|
||||
device = (item.get("device") or "pc").lower()
|
||||
ua = (request.headers.get("user-agent") or "").strip()
|
||||
provider = resolve_provider(device, req_provider, ua)
|
||||
channel = resolve_channel(item.get("channel"))
|
||||
user_id = item.get("user_id", "unknown")
|
||||
pay_type = (item.get("type") or "unknown").lower()
|
||||
_safe_log(
|
||||
logging.INFO,
|
||||
"[payjsapi] %s/payh5 user_id=%s type=%s provider=%s channel=%s",
|
||||
project_name,
|
||||
user_id,
|
||||
pay_type,
|
||||
provider.name,
|
||||
channel,
|
||||
)
|
||||
try:
|
||||
total_fee = int(item.get("total_fee", 80))
|
||||
except (TypeError, ValueError):
|
||||
total_fee = 80
|
||||
total_fee_yuan = f"{total_fee / 100:.2f}"
|
||||
random_suffix = "".join(random.choices(string.hexdigits.lower(), k=8))
|
||||
timestamp = int(time.time())
|
||||
order_id = f"{user_id}_{pay_type}_order_{timestamp}_{random_suffix}"
|
||||
return_url = item.get("return_url")
|
||||
if return_url and "order_id=" not in return_url and "out_trade_no=" not in return_url:
|
||||
sep = "&" if "?" in return_url else "?"
|
||||
return_url = f"{return_url}{sep}order_id={order_id}"
|
||||
type_map = {
|
||||
"book": "购买书籍",
|
||||
"meetup": "数字游民社区报名",
|
||||
"salon": "沙龙报名茶歇费",
|
||||
"video": "视频解锁",
|
||||
"vip": "VIP会员充值",
|
||||
}
|
||||
name = type_map.get(pay_type, "商品支付")
|
||||
notify_path = "/xorpay_notify" if provider.name == "xorpay" else "/zpay_notify"
|
||||
notify_url = _notify_path(notify_path)
|
||||
result = provider.create_order(
|
||||
order_id=order_id,
|
||||
name=name,
|
||||
total_fee_yuan=total_fee_yuan,
|
||||
pay_type=channel,
|
||||
notify_url=notify_url,
|
||||
return_url=return_url,
|
||||
client_ip=item.get("client_ip"),
|
||||
)
|
||||
_safe_log(
|
||||
logging.INFO,
|
||||
"[payjsapi] %s/payh5 created order_id=%s provider=%s notify_url=%s return_url=%s",
|
||||
project_name,
|
||||
order_id,
|
||||
provider.name,
|
||||
notify_url,
|
||||
return_url or "",
|
||||
)
|
||||
if provider.name == "xorpay":
|
||||
return {
|
||||
"status": "ok",
|
||||
"order_id": order_id,
|
||||
"xorpay_params": result.get("params", {}),
|
||||
"xorpay_url": result.get("pay_url", ""),
|
||||
"provider": provider.name,
|
||||
}
|
||||
params = result.get("params", {})
|
||||
params_str = {k: str(v) for k, v in params.items() if v is not None and str(v).strip() != ""}
|
||||
return {
|
||||
"status": "ok",
|
||||
"params": params_str,
|
||||
"pay_url": result.get("pay_url", ""),
|
||||
"provider": provider.name,
|
||||
"submit_method": "POST",
|
||||
}
|
||||
|
||||
@router.post("/payh5/redirect")
|
||||
async def payh5_redirect(item: dict, request: Request):
|
||||
"""ZPAY mapi 接口，返回 302 或二维码。PC/手机用 zpay，默认微信支付，支付宝暂不提供"""
|
||||
from fastapi.responses import RedirectResponse, JSONResponse
|
||||
|
||||
provider = get_payment_provider_by_name("zpay")
|
||||
channel = resolve_channel(item.get("channel"))
|
||||
_safe_log(
|
||||
logging.INFO,
|
||||
"[payjsapi] %s/payh5/redirect user_id=%s type=%s device=%s channel=%s",
|
||||
project_name,
|
||||
item.get("user_id", ""),
|
||||
item.get("type", ""),
|
||||
item.get("device", "pc"),
|
||||
channel,
|
||||
)
|
||||
try:
|
||||
total_fee = float(item.get("total_fee", 80))
|
||||
except (TypeError, ValueError):
|
||||
total_fee = 80.0
|
||||
total_fee_yuan = f"{total_fee / 100:.2f}"
|
||||
user_id = item.get("user_id", "unknown")
|
||||
pay_type = item.get("type", "unknown").lower()
|
||||
return_url = item.get("return_url")
|
||||
device = item.get("device", "pc")
|
||||
random_suffix = "".join(random.choices(string.hexdigits.lower(), k=8))
|
||||
timestamp = int(time.time())
|
||||
order_id = f"{user_id}_{pay_type}_order_{timestamp}_{random_suffix}"
|
||||
if return_url and "order_id=" not in return_url and "out_trade_no=" not in return_url:
|
||||
sep = "&" if "?" in return_url else "?"
|
||||
return_url = f"{return_url}{sep}order_id={order_id}"
|
||||
client_ip = item.get("client_ip") or (request.client.host if request.client else "127.0.0.1")
|
||||
forwarded = request.headers.get("x-forwarded-for")
|
||||
if forwarded:
|
||||
client_ip = forwarded.split(",")[0].strip()
|
||||
type_map = {
|
||||
"book": "购买书籍",
|
||||
"meetup": "数字游民社区报名",
|
||||
"salon": "沙龙报名茶歇费",
|
||||
"video": "视频解锁",
|
||||
"vip": "VIP会员充值",
|
||||
}
|
||||
name = type_map.get(pay_type, "商品支付")
|
||||
notify_url = _notify_path("/zpay_notify")
|
||||
result = provider.create_order_api(
|
||||
order_id=order_id,
|
||||
name=name,
|
||||
total_fee_yuan=total_fee_yuan,
|
||||
pay_type=channel,
|
||||
notify_url=notify_url,
|
||||
return_url=return_url,
|
||||
client_ip=client_ip,
|
||||
device=device,
|
||||
)
|
||||
if result.get("status") != "ok":
|
||||
raise HTTPException(status_code=500, detail=result.get("msg", "ZPAY mapi 创建订单失败"))
|
||||
_safe_log(
|
||||
logging.INFO,
|
||||
"[payjsapi] %s/payh5/redirect created order_id=%s device=%s channel=%s",
|
||||
project_name,
|
||||
order_id,
|
||||
device,
|
||||
channel,
|
||||
)
|
||||
payurl = result.get("payurl")
|
||||
payurl2 = result.get("payurl2")
|
||||
img = result.get("img")
|
||||
if device == "pc" and img:
|
||||
return JSONResponse(status_code=200, content={
|
||||
"status": "ok", "qrcode_mode": True, "order_id": order_id,
|
||||
"img": img, "payurl": payurl, "return_url": return_url, "channel": channel,
|
||||
})
|
||||
if device == "wechat" and channel.lower() in ("wxpay", "wx", "wechat"):
|
||||
return JSONResponse(status_code=200, content={"use_form": True, "order_id": order_id})
|
||||
headers = {"X-Pay-Order-Id": order_id}
|
||||
if device == "h5" and channel.lower() in ("wxpay", "wx", "wechat") and payurl2:
|
||||
return RedirectResponse(url=payurl2, status_code=302, headers=headers)
|
||||
if payurl:
|
||||
return RedirectResponse(url=payurl, status_code=302, headers=headers)
|
||||
raise HTTPException(status_code=500, detail="ZPAY 未返回支付链接")
|
||||
|
||||
@router.get("/zpay_order_status")
|
||||
async def zpay_order_status(out_trade_no: str):
|
||||
"""查询 ZPAY 订单支付状态"""
|
||||
provider = get_payment_provider()
|
||||
if not isinstance(provider, ZPayProvider):
|
||||
raise HTTPException(status_code=400, detail="仅 zpay 渠道支持")
|
||||
result = provider.query_order_status(out_trade_no, timeout=15)
|
||||
if result.get("error"):
|
||||
_safe_log(logging.WARNING, "%s ZPAY 订单查询失败: %s", project_name, result.get("error"))
|
||||
return result
|
||||
|
||||
@router.get("/order_status")
|
||||
async def order_status(order_id: str = "", out_trade_no: str = ""):
|
||||
order_id = (order_id or out_trade_no or "").strip()
|
||||
if not order_id:
|
||||
return {"paid": False, "error": "missing order_id"}
|
||||
|
||||
def _query_pb() -> dict | None:
|
||||
try:
|
||||
from ..services.pb import get_pb_client
|
||||
pb = get_pb_client()
|
||||
records = pb.collection("payments").get_list(1, 1, {"filter": f'order_id = "{order_id}"'})
|
||||
if records.items:
|
||||
return {"paid": True, "source": "pocketbase"}
|
||||
except Exception as error:
|
||||
_safe_log(logging.WARNING, "%s order_status PocketBase failed: %s", project_name, error)
|
||||
return None
|
||||
|
||||
def _query_xorpay() -> dict | None:
|
||||
try:
|
||||
xorpay = get_payment_provider_by_name("xorpay")
|
||||
r = xorpay.query_order_status(order_id, timeout=6)
|
||||
if r.get("paid"):
|
||||
return {"paid": True, "source": "xorpay", "status": r.get("status", "")}
|
||||
except Exception as error:
|
||||
_safe_log(logging.WARNING, "%s order_status XorPay failed: %s", project_name, error)
|
||||
return None
|
||||
|
||||
def _query_zpay() -> dict | None:
|
||||
try:
|
||||
zpay = get_payment_provider_by_name("zpay")
|
||||
if isinstance(zpay, ZPayProvider):
|
||||
r = zpay.query_order_status(order_id, timeout=6)
|
||||
if r.get("paid"):
|
||||
return {"paid": True, "source": "zpay", "status": r.get("status", "")}
|
||||
except Exception as error:
|
||||
_safe_log(logging.WARNING, "%s order_status ZPAY failed: %s", project_name, error)
|
||||
return None
|
||||
|
||||
# 并行查询 PB、ZPAY、XorPay，任一返回 paid 即立即返回（PC 扫码用 ZPAY，微信用 XorPay）
|
||||
pb_task = asyncio.to_thread(_query_pb)
|
||||
xorpay_task = asyncio.to_thread(_query_xorpay)
|
||||
zpay_task = asyncio.to_thread(_query_zpay)
|
||||
results = await asyncio.gather(pb_task, xorpay_task, zpay_task)
|
||||
for r in results:
|
||||
if r:
|
||||
return r
|
||||
return {"paid": False}
|
||||
|
||||
@router.post("/xorpay_notify")
|
||||
async def xorpay_notify(request: Request):
|
||||
"""XorPay 异步通知"""
|
||||
form_data = await request.form()
|
||||
data = {k: v for k, v in form_data.items()}
|
||||
_safe_log(logging.INFO, "%s XorPay 异步通知: %s", project_name, data)
|
||||
order_id = data.get("order_id", "")
|
||||
if order_id in processed_orders:
|
||||
return "ok"
|
||||
provider = get_payment_provider_by_name("xorpay")
|
||||
if not provider.verify_notify(data):
|
||||
_safe_log(logging.ERROR, "%s XorPay 验签失败: %s", project_name, data)
|
||||
raise HTTPException(status_code=400, detail="sign error")
|
||||
parsed = provider.parse_notify(data)
|
||||
if parsed.get("trade_status") != "success":
|
||||
return "ok"
|
||||
handle_payment_success(
|
||||
order_id,
|
||||
parsed.get("pay_price", data.get("pay_price", "")),
|
||||
f"{project_name}-xorpay",
|
||||
use_memos=False,
|
||||
site_id=site_id,
|
||||
)
|
||||
return provider.success_response()
|
||||
|
||||
@router.get("/zpay_notify")
|
||||
@router.post("/zpay_notify")
|
||||
async def zpay_notify(request: Request):
|
||||
"""ZPAY 异步通知"""
|
||||
if request.method == "GET":
|
||||
data = dict(request.query_params)
|
||||
else:
|
||||
form_data = await request.form()
|
||||
data = {k: v for k, v in form_data.items()}
|
||||
_safe_log(logging.INFO, "%s ZPAY 异步通知: %s", project_name, data)
|
||||
order_id = data.get("out_trade_no", "")
|
||||
if order_id in processed_orders:
|
||||
return "success"
|
||||
provider = get_payment_provider_by_name("zpay")
|
||||
if not provider.verify_notify(data):
|
||||
_safe_log(logging.ERROR, "%s ZPAY 验签失败: %s", project_name, data)
|
||||
raise HTTPException(status_code=400, detail="sign error")
|
||||
parsed = provider.parse_notify(data)
|
||||
if parsed.get("trade_status") != "success":
|
||||
return "success"
|
||||
handle_payment_success(
|
||||
order_id,
|
||||
parsed.get("pay_price", data.get("money", "")),
|
||||
f"{project_name}-zpay",
|
||||
use_memos=False,
|
||||
site_id=site_id,
|
||||
)
|
||||
return provider.success_response()
|
||||
|
||||
return router
|
||||
@@ -1,683 +0,0 @@
|
||||
import base64
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import struct
|
||||
import time
|
||||
import xml.etree.ElementTree as ET
|
||||
from datetime import datetime, timezone
|
||||
from typing import Optional
|
||||
from urllib.parse import parse_qs
|
||||
|
||||
import httpx
|
||||
from Crypto.Cipher import AES
|
||||
from fastapi import APIRouter, BackgroundTasks, HTTPException, Request
|
||||
from fastapi.responses import HTMLResponse, PlainTextResponse
|
||||
|
||||
from ..config import PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD, PB_URL
|
||||
|
||||
router = APIRouter(prefix="/chatbot", tags=["chatbot"])
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
_processed_callback_cache: dict[str, int] = {}
|
||||
|
||||
|
||||
OPEN_API_PROFILES = {
|
||||
"eric": {
|
||||
"name": "Eric在旅行",
|
||||
"APP_ID": "fXYWvGfq04uMScP",
|
||||
"TOKEN": "EWRotyMHfTLAlYmCHpdH8AZcuZPBHn",
|
||||
"ENCODING_AES_KEY": "1wJZiJm8URfRjkHu1QfIVDeNFc2jbzzeCZqvhQecsCx",
|
||||
},
|
||||
"xidu": {
|
||||
"name": "异度世界",
|
||||
"APP_ID": "LTKfSFeK0h8TRLM",
|
||||
"TOKEN": "64DbvAd5m7YOJ1XslyMgJ9V42jDIUH",
|
||||
"ENCODING_AES_KEY": "KCZGtPDjqFZnBuApvG3xqhvHUMnqFHbC5cnD23HKACX",
|
||||
},
|
||||
}
|
||||
ACTIVE_PROFILE = (os.getenv("CHATBOT_ACTIVE_PROFILE") or "eric").strip().lower()
|
||||
if ACTIVE_PROFILE not in OPEN_API_PROFILES:
|
||||
ACTIVE_PROFILE = "eric"
|
||||
APP_ID = OPEN_API_PROFILES[ACTIVE_PROFILE]["APP_ID"]
|
||||
TOKEN = OPEN_API_PROFILES[ACTIVE_PROFILE]["TOKEN"]
|
||||
ENCODING_AES_KEY = OPEN_API_PROFILES[ACTIVE_PROFILE]["ENCODING_AES_KEY"]
|
||||
|
||||
PM_SYNC_AUTHTOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyaWQiOjE5MzE1MjcsIm9wZW5pZCI6Im85VS04NW1DSXZ0eDZ0a0pteTQyMkkzcUNHVWciLCJzaWduZXRpbWUiOjE3NzQ5MzM0NDQ4MTgsImlhdCI6MTc3NDkzMzQ0NCwiZXhwIjoxNzc3NTI1NDQ0fQ.iC9vdjBqa2LGlqA6F-Dg4GcfDyv3Rp8JwpBaO3j_eE4"
|
||||
PM_SYNC_DEFAULT_WXBOT_BID = "75021053883a9090c67d5becde7f4b0a"
|
||||
PB_COLLECTION = "wechat_private_users"
|
||||
|
||||
|
||||
def pkcs5_unpadding(data: bytes) -> bytes:
|
||||
pad = data[-1]
|
||||
if pad < 1 or pad > 32:
|
||||
return data
|
||||
return data[:-pad]
|
||||
|
||||
|
||||
def pkcs5_padding(data: bytes) -> bytes:
|
||||
amount_to_pad = 32 - (len(data) % 32)
|
||||
return data + bytes([amount_to_pad]) * amount_to_pad
|
||||
|
||||
|
||||
def get_aes_key_and_iv(encoding_aes_key: str) -> tuple[bytes, bytes]:
|
||||
aes_key = base64.b64decode(encoding_aes_key + "=")
|
||||
if len(aes_key) != 32:
|
||||
raise ValueError("encodingAESKey invalid")
|
||||
return aes_key, aes_key[:16]
|
||||
|
||||
|
||||
def aes_decrypt_base64(cipher_b64: str, encoding_aes_key: str) -> str:
|
||||
aes_key, iv = get_aes_key_and_iv(encoding_aes_key)
|
||||
compact = "".join(str(cipher_b64 or "").split())
|
||||
compact += "=" * (-len(compact) % 4)
|
||||
cipher_bytes = base64.b64decode(compact)
|
||||
cipher = AES.new(aes_key, AES.MODE_CBC, iv)
|
||||
decrypted = pkcs5_unpadding(cipher.decrypt(cipher_bytes))
|
||||
try:
|
||||
if len(decrypted) < 20:
|
||||
raise ValueError("payload too short")
|
||||
content = decrypted[16:]
|
||||
msg_len = struct.unpack("!I", content[:4])[0]
|
||||
msg_start = 4
|
||||
msg_end = msg_start + msg_len
|
||||
if msg_end > len(content):
|
||||
raise ValueError("msg length out of range")
|
||||
msg = content[msg_start:msg_end]
|
||||
text = msg.decode("utf-8")
|
||||
if text:
|
||||
return text
|
||||
except Exception:
|
||||
pass
|
||||
return decrypted.decode("utf-8")
|
||||
|
||||
|
||||
def aes_encrypt_base64(plaintext: str, encoding_aes_key: str, app_id: str | None = None) -> str:
|
||||
aes_key, iv = get_aes_key_and_iv(encoding_aes_key)
|
||||
raw = plaintext.encode("utf-8")
|
||||
if app_id:
|
||||
data = os.urandom(16) + struct.pack("!I", len(raw)) + raw + app_id.encode("utf-8")
|
||||
else:
|
||||
data = raw
|
||||
padded = pkcs5_padding(data)
|
||||
cipher = AES.new(aes_key, AES.MODE_CBC, iv)
|
||||
return base64.b64encode(cipher.encrypt(padded)).decode("utf-8")
|
||||
|
||||
|
||||
def _build_keyword_h5_obj(query: str, user_id: str) -> Optional[dict]:
|
||||
q = (query or "").strip()
|
||||
if "电子书" in q:
|
||||
return {
|
||||
"news": {
|
||||
"articles": [
|
||||
{
|
||||
"title": "数字游民",
|
||||
"description": "地理套利与自动化杠杆",
|
||||
"url": f"https://vip.hackrobot.cn/ebook?userid={user_id}",
|
||||
"picurl": "https://www.hackrobot.cn/static/images/images/dgnomad.png",
|
||||
"type": "h5",
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
if "群" in q:
|
||||
return {
|
||||
"news": {
|
||||
"articles": [
|
||||
{
|
||||
"title": "异度星球",
|
||||
"description": "电子书、视频教程、私密社群",
|
||||
"url": f"https://vip.hackrobot.cn?userid={user_id}",
|
||||
"picurl": "https://www.hackrobot.cn/static/images/images/dgnomad.png",
|
||||
"type": "h5",
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
return None
|
||||
|
||||
|
||||
def _parse_decrypted_payload(decrypted_text: str) -> dict:
|
||||
text = (decrypted_text or "").strip()
|
||||
# 兼容 BOM / NUL / 控制字符前缀
|
||||
text = text.lstrip("\ufeff\x00\r\n\t ")
|
||||
if not text:
|
||||
raise ValueError("empty decrypted payload")
|
||||
|
||||
# 某些上游会把 JSON 再包一层字符串："{\"UserId\":\"...\"}"
|
||||
if text.startswith('"') and text.endswith('"'):
|
||||
try:
|
||||
unwrapped = json.loads(text)
|
||||
if isinstance(unwrapped, str):
|
||||
text = unwrapped.strip().lstrip("\ufeff\x00\r\n\t ")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 若前面夹杂少量杂字符，尝试定位第一个结构起始位
|
||||
first_json = text.find("{")
|
||||
first_xml = text.find("<")
|
||||
starts = [x for x in [first_json, first_xml] if x >= 0]
|
||||
if starts:
|
||||
first = min(starts)
|
||||
if first > 0:
|
||||
text = text[first:]
|
||||
|
||||
if text.startswith("{"):
|
||||
obj = json.loads(text)
|
||||
obj["_payload_format"] = "json"
|
||||
return obj
|
||||
if text.startswith("<"):
|
||||
root = ET.fromstring(text)
|
||||
|
||||
def get_text(tag: str, default: str = "") -> str:
|
||||
node = root.find(tag)
|
||||
return (node.text or "").strip() if node is not None and node.text is not None else default
|
||||
|
||||
content_node = root.find("content")
|
||||
query = ""
|
||||
if content_node is not None:
|
||||
msg_node = content_node.find("msg")
|
||||
if msg_node is not None and msg_node.text:
|
||||
query = msg_node.text.strip()
|
||||
return {
|
||||
"UserId": get_text("userid", ""),
|
||||
"Query": query,
|
||||
"Timestamp": get_text("createtime", ""),
|
||||
"MsgId": get_text("msgid", ""),
|
||||
"ChannelId": get_text("appid", ""),
|
||||
"appid": get_text("appid", ""),
|
||||
"channel": get_text("channel", "0"),
|
||||
"from": get_text("from", "0"),
|
||||
"_payload_format": "xml",
|
||||
}
|
||||
# 兼容 querystring 明文：UserId=xxx&Query=你好&appid=...
|
||||
if "=" in text and "&" in text:
|
||||
qs = parse_qs(text, keep_blank_values=True)
|
||||
|
||||
def qv(*keys: str) -> str:
|
||||
for key in keys:
|
||||
vals = qs.get(key) or qs.get(key.lower()) or qs.get(key.upper()) or []
|
||||
if vals and str(vals[0]).strip():
|
||||
return str(vals[0]).strip()
|
||||
return ""
|
||||
|
||||
return {
|
||||
"UserId": qv("UserId", "userid", "userId", "from_user"),
|
||||
"Query": qv("Query", "query", "msg", "content"),
|
||||
"Timestamp": qv("Timestamp", "timestamp", "createTime", "msg_time"),
|
||||
"MsgId": qv("MsgId", "msgId", "msgid"),
|
||||
"ChannelId": qv("ChannelId", "appid", "appId"),
|
||||
"appid": qv("appid", "appId"),
|
||||
"channel": qv("channel"),
|
||||
"from": qv("from"),
|
||||
"_payload_format": "querystring",
|
||||
}
|
||||
raise ValueError("unsupported payload format")
|
||||
|
||||
|
||||
def _build_xml_callback_reply(data: dict, answer_text: str) -> dict:
|
||||
user_id = str(data.get("UserId", "")).strip()
|
||||
appid = str(data.get("ChannelId", "") or data.get("appid", "")).strip()
|
||||
channel = int(str(data.get("channel", "0") or "0"))
|
||||
msg = _build_keyword_h5_obj(str(data.get("Query", "")), user_id)
|
||||
content = msg if msg else {"msg": answer_text}
|
||||
return {"userid": user_id, "appid": appid, "content": content, "channel": channel, "from": 1}
|
||||
|
||||
|
||||
def _safe_filter_value(value: str) -> str:
|
||||
return (value or "").replace("\\", "\\\\").replace('"', '\\"')
|
||||
|
||||
|
||||
def _build_callback_dedupe_key(data: dict) -> str:
|
||||
return "|".join(
|
||||
[
|
||||
str(data.get("UserId", "")).strip(),
|
||||
str(data.get("MsgId", "")).strip(),
|
||||
str(data.get("Timestamp", "")).strip(),
|
||||
str(data.get("Query", "")).strip(),
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
def _is_duplicate_callback(data: dict, ttl_seconds: int = 3600) -> bool:
|
||||
now_ts = int(time.time())
|
||||
for k, exp in list(_processed_callback_cache.items()):
|
||||
if exp <= now_ts:
|
||||
_processed_callback_cache.pop(k, None)
|
||||
key = _build_callback_dedupe_key(data)
|
||||
if not key.strip("|"):
|
||||
return False
|
||||
if key in _processed_callback_cache:
|
||||
return True
|
||||
_processed_callback_cache[key] = now_ts + ttl_seconds
|
||||
return False
|
||||
|
||||
|
||||
async def query_private_messages(
|
||||
authtoken: str,
|
||||
wxbot_bid: str,
|
||||
page: int = 0,
|
||||
size: int = 30,
|
||||
filter_value: int = 0,
|
||||
request_id: str = "local-debug",
|
||||
) -> dict:
|
||||
url = "https://chatbot.weixin.qq.com/miniopenai/manualservice/getaccessstautuslist"
|
||||
body = {"bid": wxbot_bid, "filter": filter_value, "order": {"page": page, "size": size}, "base": {"requestid": request_id}}
|
||||
headers = {
|
||||
"authtoken": authtoken,
|
||||
"wxbot_bid": wxbot_bid,
|
||||
"content-type": "application/json",
|
||||
"charset": "utf-8",
|
||||
}
|
||||
async with httpx.AsyncClient(timeout=10, verify=False) as client:
|
||||
resp = await client.post(url, json=body, headers=headers)
|
||||
resp.raise_for_status()
|
||||
return resp.json()
|
||||
|
||||
|
||||
async def _pb_upsert_user_profile(record: dict) -> None:
|
||||
pb_url = (PB_URL or "").rstrip("/")
|
||||
if not pb_url or not PB_ADMIN_EMAIL or not PB_ADMIN_PASSWORD:
|
||||
return
|
||||
userid = str(record.get("userid", "")).strip()
|
||||
if not userid:
|
||||
return
|
||||
async with httpx.AsyncClient(timeout=10, verify=False) as client:
|
||||
auth_resp = await client.post(
|
||||
f"{pb_url}/api/admins/auth-with-password",
|
||||
json={"identity": PB_ADMIN_EMAIL, "password": PB_ADMIN_PASSWORD},
|
||||
)
|
||||
if auth_resp.status_code == 404:
|
||||
auth_resp = await client.post(
|
||||
f"{pb_url}/api/collections/_superusers/auth-with-password",
|
||||
json={"identity": PB_ADMIN_EMAIL, "password": PB_ADMIN_PASSWORD},
|
||||
)
|
||||
if auth_resp.status_code != 200:
|
||||
return
|
||||
token = (auth_resp.json() or {}).get("token", "")
|
||||
if not token:
|
||||
return
|
||||
headers = {"Authorization": f"Bearer {token}"}
|
||||
user_expr = _safe_filter_value(userid)
|
||||
# 业务要求：wechat_private_users.userid 全局唯一（不按 channel_id 分桶）
|
||||
filter_exp = f'userid="{user_expr}"'
|
||||
list_resp = await client.get(
|
||||
f"{pb_url}/api/collections/{PB_COLLECTION}/records",
|
||||
params={"page": 1, "perPage": 200, "filter": filter_exp, "sort": "-updated"},
|
||||
headers=headers,
|
||||
)
|
||||
items = ((list_resp.json() or {}).get("items")) or [] if list_resp.status_code == 200 else []
|
||||
if items:
|
||||
rid = items[0].get("id")
|
||||
if rid:
|
||||
await client.patch(f"{pb_url}/api/collections/{PB_COLLECTION}/records/{rid}", json=record, headers=headers)
|
||||
# 清理历史重复数据，确保 userid 唯一
|
||||
for extra in items[1:]:
|
||||
extra_id = str(extra.get("id", "")).strip()
|
||||
if not extra_id:
|
||||
continue
|
||||
await client.delete(
|
||||
f"{pb_url}/api/collections/{PB_COLLECTION}/records/{extra_id}",
|
||||
headers=headers,
|
||||
)
|
||||
return
|
||||
await client.post(f"{pb_url}/api/collections/{PB_COLLECTION}/records", json=record, headers=headers)
|
||||
|
||||
|
||||
async def _sync_user_profile_from_b(data: dict) -> None:
|
||||
authtoken = (PM_SYNC_AUTHTOKEN or "").strip()
|
||||
wxbot_bid = (PM_SYNC_DEFAULT_WXBOT_BID or "").strip()
|
||||
if not authtoken or not wxbot_bid:
|
||||
return
|
||||
target_userid = str(data.get("UserId", "")).strip()
|
||||
if not target_userid or _is_duplicate_callback(data):
|
||||
return
|
||||
result = await query_private_messages(
|
||||
authtoken=authtoken,
|
||||
wxbot_bid=wxbot_bid,
|
||||
page=0,
|
||||
size=100,
|
||||
filter_value=0,
|
||||
request_id=f"thirdapi-{target_userid}",
|
||||
)
|
||||
contacts = result.get("contacts") or []
|
||||
target = next((c for c in contacts if str(c.get("userId", "") or c.get("userid", "")).strip() == target_userid), None)
|
||||
if not target:
|
||||
return
|
||||
last_msg = target.get("lastMsg") or {}
|
||||
await _pb_upsert_user_profile(
|
||||
{
|
||||
"userid": target_userid,
|
||||
"channel_id": str(data.get("ChannelId", "")).strip(),
|
||||
"nick": target.get("nick", ""),
|
||||
"avatar": target.get("headImg") or target.get("avatar") or target.get("headimgurl") or target.get("headImgUrl") or "",
|
||||
"source_query": str(data.get("Query", "")).strip(),
|
||||
"source_message_id": str(data.get("MsgId", "")).strip(),
|
||||
"source_message_time": str(data.get("Timestamp", "")),
|
||||
"matched_last_msg": last_msg.get("content", ""),
|
||||
"matched_last_msg_id": str(last_msg.get("msgId", "") or last_msg.get("id", "")),
|
||||
"matched_last_msg_time": str(target.get("lastActiveTime", "")),
|
||||
"raw_contact": json.dumps(target, ensure_ascii=False),
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
async def _safe_sync_user_profile_from_b(data: dict) -> None:
|
||||
try:
|
||||
await _sync_user_profile_from_b(data)
|
||||
except Exception:
|
||||
logger.error("chatbot后台同步失败（已忽略）")
|
||||
|
||||
|
||||
async def handle_business(data: dict) -> str:
|
||||
user_id = str(data.get("UserId", "")).strip()
|
||||
query = str(data.get("Query", "")).strip()
|
||||
msg = _build_keyword_h5_obj(query, user_id)
|
||||
if msg:
|
||||
return json.dumps(msg, ensure_ascii=False)
|
||||
return ""
|
||||
|
||||
|
||||
async def _handle_wechat_request(request: Request, app_id: Optional[str], background_tasks: BackgroundTasks) -> str:
|
||||
if app_id and app_id != APP_ID:
|
||||
logger.warning("chatbot app_id mismatch expected=%s actual=%s", APP_ID, app_id)
|
||||
raw_body = (await request.body()).decode("utf-8", errors="ignore").strip()
|
||||
if not raw_body:
|
||||
raise HTTPException(status_code=400, detail="empty body")
|
||||
|
||||
cipher_b64 = raw_body
|
||||
# 兼容三种请求体：
|
||||
# 1) 纯密文 base64
|
||||
# 2) JSON: {"encrypted":"..."} / {"encrypt":"..."} / {"Encrypt":"..."}
|
||||
# 3) x-www-form-urlencoded: encrypted=... / encrypt=...
|
||||
try:
|
||||
outer = json.loads(raw_body)
|
||||
if isinstance(outer, dict):
|
||||
for key in ("encrypted", "encrypt", "Encrypt"):
|
||||
val = outer.get(key)
|
||||
if isinstance(val, str) and val.strip():
|
||||
cipher_b64 = val
|
||||
break
|
||||
except Exception:
|
||||
form = parse_qs(raw_body, keep_blank_values=True)
|
||||
for key in ("encrypted", "encrypt", "Encrypt"):
|
||||
vals = form.get(key) or []
|
||||
if vals and str(vals[0]).strip():
|
||||
cipher_b64 = str(vals[0])
|
||||
break
|
||||
|
||||
cipher_b64 = "".join(str(cipher_b64).split()).strip()
|
||||
try:
|
||||
decrypted = aes_decrypt_base64(cipher_b64, ENCODING_AES_KEY)
|
||||
logger.info(
|
||||
"chatbot decrypted preview app_id=%s preview=%s",
|
||||
app_id or "",
|
||||
(decrypted or "")[:200],
|
||||
)
|
||||
data = _parse_decrypted_payload(decrypted)
|
||||
logger.info(
|
||||
"chatbot payload parsed app_id=%s format=%s user=%s query=%s",
|
||||
app_id or "",
|
||||
data.get("_payload_format", ""),
|
||||
str(data.get("UserId", "") or data.get("userId", ""))[:80],
|
||||
str(data.get("Query", ""))[:80],
|
||||
)
|
||||
except Exception as error:
|
||||
logger.error(
|
||||
"chatbot decrypt failed app_id=%s content_type=%s body_prefix=%s err=%s",
|
||||
app_id or "",
|
||||
request.headers.get("content-type", ""),
|
||||
raw_body[:160],
|
||||
error,
|
||||
)
|
||||
raise HTTPException(status_code=400, detail="decrypt error")
|
||||
|
||||
answer_text = await handle_business(data)
|
||||
background_tasks.add_task(_safe_sync_user_profile_from_b, data)
|
||||
|
||||
if str(data.get("_payload_format", "")) == "xml":
|
||||
resp_plain = json.dumps(_build_xml_callback_reply(data, answer_text), ensure_ascii=False)
|
||||
response_app_id = str(data.get("ChannelId", "") or data.get("appid", "")).strip() or APP_ID
|
||||
else:
|
||||
resp_plain = json.dumps({"answer_type": "text", "text_info": {"short_answer": answer_text}}, ensure_ascii=False)
|
||||
# 与原始 chatbot 服务保持一致：thirdapi（URL 带 app_id）回包使用纯 AES，不拼 app_id
|
||||
response_app_id = None if app_id else APP_ID
|
||||
|
||||
return aes_encrypt_base64(resp_plain, ENCODING_AES_KEY, response_app_id)
|
||||
|
||||
|
||||
@router.post("/", response_class=PlainTextResponse)
|
||||
async def chatbot_root(request: Request, background_tasks: BackgroundTasks, app_id: Optional[str] = None):
|
||||
return await _handle_wechat_request(request, app_id, background_tasks)
|
||||
|
||||
|
||||
@router.post("/wechat/thirdapi", response_class=PlainTextResponse)
|
||||
async def chatbot_thirdapi(request: Request, background_tasks: BackgroundTasks, app_id: Optional[str] = None):
|
||||
return await _handle_wechat_request(request, app_id, background_tasks)
|
||||
|
||||
|
||||
@router.get("/health")
|
||||
def chatbot_health():
|
||||
return {"status": "ok", "module": "chatbot-clone", "profile": ACTIVE_PROFILE}
|
||||
|
||||
|
||||
@router.post("/api/private-message/query")
|
||||
async def chatbot_private_message_query(payload: dict):
|
||||
authtoken = str(payload.get("authtoken", "")).strip()
|
||||
wxbot_bid = str(payload.get("wxbot_bid", "")).strip()
|
||||
if not authtoken or not wxbot_bid:
|
||||
raise HTTPException(status_code=400, detail="authtoken 和 wxbot_bid 不能为空")
|
||||
result = await query_private_messages(
|
||||
authtoken=authtoken,
|
||||
wxbot_bid=wxbot_bid,
|
||||
page=int(payload.get("page", 0)),
|
||||
size=int(payload.get("size", 30)),
|
||||
filter_value=int(payload.get("filter", 0)),
|
||||
request_id=str(payload.get("requestid", "local-debug")).strip() or "local-debug",
|
||||
)
|
||||
contacts = result.get("contacts") or []
|
||||
return {
|
||||
"ok": True,
|
||||
"count": result.get("count"),
|
||||
"users": [
|
||||
{
|
||||
"nick": c.get("nick"),
|
||||
"userId": c.get("userId") or c.get("userid"),
|
||||
"avatar": c.get("avatar") or c.get("headImg") or c.get("headimgurl") or c.get("headImgUrl"),
|
||||
"lastMsg": (c.get("lastMsg") or {}).get("content"),
|
||||
"lastActiveTime": c.get("lastActiveTime"),
|
||||
}
|
||||
for c in contacts
|
||||
],
|
||||
"raw": result,
|
||||
}
|
||||
|
||||
|
||||
@router.post("/api/private-message/analyze")
|
||||
async def chatbot_private_message_analyze(payload: dict):
|
||||
authtoken = str(payload.get("authtoken", "")).strip()
|
||||
if not authtoken:
|
||||
raise HTTPException(status_code=400, detail="authtoken 不能为空")
|
||||
try:
|
||||
parts = authtoken.split(".")
|
||||
payload_part = parts[1] if len(parts) == 3 else ""
|
||||
payload_part += "=" * (-len(payload_part) % 4)
|
||||
claims = json.loads(base64.urlsafe_b64decode(payload_part.encode("utf-8")).decode("utf-8")) if payload_part else {}
|
||||
except Exception:
|
||||
claims = {}
|
||||
now_ts = int(datetime.now(timezone.utc).timestamp())
|
||||
exp = int(claims.get("exp", 0)) if str(claims.get("exp", "")).isdigit() else 0
|
||||
expires_in_seconds = exp - now_ts if exp else None
|
||||
status = "无法解析过期时间"
|
||||
if isinstance(expires_in_seconds, int):
|
||||
if expires_in_seconds <= 0:
|
||||
status = "已过期"
|
||||
elif expires_in_seconds < 3600:
|
||||
status = "即将过期（1小时内）"
|
||||
else:
|
||||
status = "有效"
|
||||
return {
|
||||
"status": status,
|
||||
"now_utc": datetime.now(timezone.utc).isoformat(),
|
||||
"claims": claims,
|
||||
"analysis": {
|
||||
"expires_in_seconds": expires_in_seconds,
|
||||
"expires_in_hours": round(expires_in_seconds / 3600, 2) if isinstance(expires_in_seconds, int) else None,
|
||||
"summary": "该分析基于 JWT payload 解码，不包含签名有效性校验。",
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@router.get("/private-message", response_class=HTMLResponse)
|
||||
def chatbot_private_message_page():
|
||||
return """
|
||||
<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>Chatbot 私信调试台</title>
|
||||
<style>
|
||||
body { font-family: system-ui, -apple-system, "Microsoft YaHei", sans-serif; margin: 0; padding: 20px; background: #0f172a; color: #e2e8f0; }
|
||||
.wrap { max-width: 980px; margin: 0 auto; display: grid; gap: 12px; }
|
||||
.card { background: #111827; border: 1px solid #334155; border-radius: 10px; padding: 14px; }
|
||||
h2 { margin: 0 0 8px; }
|
||||
label { display:block; margin: 8px 0 6px; font-size: 13px; color: #cbd5e1; }
|
||||
input, textarea { width: 100%; border-radius: 8px; border: 1px solid #475569; background: #0b1220; color: #e2e8f0; padding: 10px; box-sizing: border-box; }
|
||||
textarea { min-height: 88px; }
|
||||
.row { display:grid; grid-template-columns: 1fr 1fr; gap: 10px; }
|
||||
.btns { display:flex; gap:10px; margin-top: 10px; }
|
||||
button { border: 0; background: #2563eb; color: white; border-radius: 8px; padding: 10px 14px; cursor: pointer; }
|
||||
button.alt { background: #4f46e5; }
|
||||
#status { font-size: 13px; color: #93c5fd; }
|
||||
#users { display:grid; grid-template-columns: repeat(auto-fill,minmax(250px,1fr)); gap: 8px; }
|
||||
.u { border:1px solid #334155; border-radius:8px; padding:8px; background:#0b1220; }
|
||||
.uid { color:#93c5fd; font-size:12px; word-break:break-all; }
|
||||
pre { background:#020617; border:1px solid #334155; border-radius:8px; padding:10px; overflow:auto; max-height:420px; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="wrap">
|
||||
<section class="card">
|
||||
<h2>Chatbot 私信调试台</h2>
|
||||
<div id="status">准备就绪</div>
|
||||
<label>默认配置</label>
|
||||
<select id="preset" style="width:100%;border-radius:8px;border:1px solid #475569;background:#0b1220;color:#e2e8f0;padding:10px;box-sizing:border-box;">
|
||||
<option value="eric">Eric在旅行</option>
|
||||
<option value="xidu">异度世界</option>
|
||||
</select>
|
||||
<label>authtoken</label>
|
||||
<textarea id="authtoken" placeholder="粘贴抓包 authtoken"></textarea>
|
||||
<label>wxbot_bid</label>
|
||||
<input id="wxbot_bid" placeholder="例如: 75021053883a9090c67d5becde7f4b0a" />
|
||||
<div class="row">
|
||||
<div>
|
||||
<label>page</label>
|
||||
<input id="page" value="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label>size</label>
|
||||
<input id="size" value="30" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="btns">
|
||||
<button onclick="queryPm()">查询私信</button>
|
||||
<button class="alt" onclick="analyzeToken()">分析 Token</button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="card">
|
||||
<h3 style="margin:0 0 8px;">用户列表</h3>
|
||||
<div id="users"></div>
|
||||
</section>
|
||||
|
||||
<section class="card">
|
||||
<h3 style="margin:0 0 8px;">原始结果</h3>
|
||||
<pre id="out">{}</pre>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const $ = (id) => document.getElementById(id);
|
||||
const presets = {
|
||||
eric: {
|
||||
authtoken: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyaWQiOjE5MzE1MjcsIm9wZW5pZCI6Im85VS04NW1DSXZ0eDZ0a0pteTQyMkkzcUNHVWciLCJzaWduZXRpbWUiOjE3NzQ5MzM0NDQ4MTgsImlhdCI6MTc3NDkzMzQ0NCwiZXhwIjoxNzc3NTI1NDQ0fQ.iC9vdjBqa2LGlqA6F-Dg4GcfDyv3Rp8JwpBaO3j_eE4",
|
||||
wxbot_bid: "75021053883a9090c67d5becde7f4b0a",
|
||||
},
|
||||
xidu: {
|
||||
authtoken: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyaWQiOjE5MzE1MjcsIm9wZW5pZCI6Im85VS04NW1DSXZ0eDZ0a0pteTQyMkkzcUNHVWciLCJzaWduZXRpbWUiOjE3NzQ5MzM0NDQ4MTgsImlhdCI6MTc3NDkzMzQ0NCwiZXhwIjoxNzc3NTI1NDQ0fQ.iC9vdjBqa2LGlqA6F-Dg4GcfDyv3Rp8JwpBaO3j_eE4",
|
||||
wxbot_bid: "4888c6ab5cb70dcc3adea1e2d2ff0201",
|
||||
}
|
||||
};
|
||||
function setStatus(s){ $("status").textContent = s; }
|
||||
function renderJson(v){ $("out").textContent = JSON.stringify(v, null, 2); }
|
||||
function renderUsers(users){
|
||||
const box = $("users");
|
||||
if(!Array.isArray(users) || !users.length){
|
||||
box.innerHTML = '<div class="u">暂无数据</div>';
|
||||
return;
|
||||
}
|
||||
box.innerHTML = users.map(u => {
|
||||
const nick = (u.nick || "未命名").replace(/</g,"<").replace(/>/g,">");
|
||||
const uid = (u.userId || "").replace(/</g,"<").replace(/>/g,">");
|
||||
const last = (u.lastMsg || "").replace(/</g,"<").replace(/>/g,">");
|
||||
return `<div class="u"><div>${nick}</div><div class="uid">${uid}</div><div style="font-size:12px;color:#94a3b8;margin-top:4px;">${last}</div></div>`;
|
||||
}).join("");
|
||||
}
|
||||
|
||||
function applyPreset(key){
|
||||
const p = presets[key];
|
||||
if(!p) return;
|
||||
$("authtoken").value = p.authtoken;
|
||||
$("wxbot_bid").value = p.wxbot_bid;
|
||||
}
|
||||
|
||||
async function queryPm(){
|
||||
try{
|
||||
setStatus("查询中...");
|
||||
const payload = {
|
||||
authtoken: $("authtoken").value.trim(),
|
||||
wxbot_bid: $("wxbot_bid").value.trim(),
|
||||
page: Number($("page").value || 0),
|
||||
size: Number($("size").value || 30),
|
||||
};
|
||||
const res = await fetch("/chatbot/api/private-message/query", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(payload),
|
||||
});
|
||||
const data = await res.json().catch(() => ({}));
|
||||
setStatus(res.ok ? "查询成功" : "查询失败");
|
||||
renderUsers(data.users || []);
|
||||
renderJson(data);
|
||||
}catch(e){
|
||||
setStatus("请求异常");
|
||||
renderJson({ error: String(e) });
|
||||
}
|
||||
}
|
||||
|
||||
async function analyzeToken(){
|
||||
try{
|
||||
setStatus("分析中...");
|
||||
const payload = { authtoken: $("authtoken").value.trim() };
|
||||
const res = await fetch("/chatbot/api/private-message/analyze", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(payload),
|
||||
});
|
||||
const data = await res.json().catch(() => ({}));
|
||||
setStatus(res.ok ? "分析成功" : "分析失败");
|
||||
renderJson(data);
|
||||
}catch(e){
|
||||
setStatus("请求异常");
|
||||
renderJson({ error: String(e) });
|
||||
}
|
||||
}
|
||||
|
||||
$("preset").addEventListener("change", (e) => applyPreset(e.target.value));
|
||||
applyPreset("eric");
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
"""cnomadcna 项目支付接口：/cnomadcna/*"""
|
||||
from ._digital_base import create_digital_router
|
||||
|
||||
router = create_digital_router(prefix="/cnomadcna", project_name="cnomadcna", site_id="meetup")
|
||||
@@ -1,65 +0,0 @@
|
||||
"""共享接口：meetup 申请、create_user 等"""
|
||||
import logging
|
||||
import time
|
||||
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from pydantic import BaseModel
|
||||
|
||||
from ..services import get_pb_client
|
||||
from ..sdk.memos import MemosSDK
|
||||
from ..config import MEMOS_API, MEMOS_TOKEN
|
||||
|
||||
router = APIRouter(tags=["common"])
|
||||
|
||||
|
||||
@router.post("/submit_meetup_application")
|
||||
async def submit_meetup_application(item: dict):
|
||||
"""数字游民社区报名表单"""
|
||||
logging.info("submit_meetup_application item: %s", item)
|
||||
user_id = item.get("user_id")
|
||||
if not user_id:
|
||||
raise HTTPException(status_code=400, detail="missing user_id")
|
||||
try:
|
||||
pb_client = get_pb_client()
|
||||
solan = pb_client.collection("solan")
|
||||
pb_data = {
|
||||
"user_id": user_id,
|
||||
"nickname": item.get("nickname", ""),
|
||||
"occupation": item.get("occupation", ""),
|
||||
"reason": item.get("reason", ""),
|
||||
"wechatId": item.get("wechatId", ""),
|
||||
"gender": item.get("gender", ""),
|
||||
"education": item.get("education", ""),
|
||||
"gradYear": item.get("gradYear", ""),
|
||||
"phone": item.get("phone", ""),
|
||||
"calculated_age": item.get("calculated_age", 0),
|
||||
"type": "",
|
||||
"order_id": "",
|
||||
"amount": 0,
|
||||
}
|
||||
record = solan.create(pb_data)
|
||||
logging.info(f"meetup 申请表单提交成功（待支付） - user_id: {user_id}, record_id: {record.id}")
|
||||
return {"status": "ok", "record_id": record.id}
|
||||
except Exception as e:
|
||||
logging.error("meetup 申请提交失败: %s", e)
|
||||
logging.error(f"meetup 申请提交失败 - user_id: {user_id}, error: {e}")
|
||||
raise HTTPException(status_code=500, detail="submit failed")
|
||||
|
||||
|
||||
class CreateUserRequest(BaseModel):
|
||||
username: str | None = None
|
||||
password: str | None = None
|
||||
|
||||
|
||||
@router.post("/create_user")
|
||||
async def create_user(item: CreateUserRequest):
|
||||
"""创建 Memos 用户（基于 MemosSDK）"""
|
||||
sdk = MemosSDK(api_url=MEMOS_API, token=MEMOS_TOKEN, enabled=bool(MEMOS_API and MEMOS_TOKEN))
|
||||
if not sdk.enabled:
|
||||
return {"error": "Memos 未配置"}
|
||||
timenew = str(int(time.time()))
|
||||
username = item.username or f"user{timenew}"
|
||||
password = item.password or "12345678"
|
||||
result = sdk.create_user_by_username(username=username, password=password)
|
||||
logging.info("memos_result- %s", result)
|
||||
return result
|
||||
@@ -1,4 +0,0 @@
|
||||
"""digital 项目支付接口：/digital/*"""
|
||||
from ._digital_base import create_digital_router
|
||||
|
||||
router = create_digital_router(prefix="/digital", project_name="digital", site_id="digital")
|
||||
@@ -1,4 +0,0 @@
|
||||
"""向后兼容：/payh5、/zpay_notify 等（digital/cnomadcna/nomadlms 旧版调用）"""
|
||||
from ._digital_base import create_digital_router
|
||||
|
||||
router = create_digital_router(prefix="", project_name="legacy")
|
||||
@@ -1,329 +0,0 @@
|
||||
"""
|
||||
meetup 加入流程：check-user、ensure-user、complete-order
|
||||
供 cnomadcna 等前端调用，当 /api/* 代理到 payjsapi 时使用
|
||||
"""
|
||||
import logging
|
||||
import time
|
||||
|
||||
import requests
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from pydantic import BaseModel
|
||||
|
||||
from ..config import PB_URL, PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD
|
||||
|
||||
router = APIRouter(prefix="/api/meetup", tags=["meetup"])
|
||||
DEFAULT_PASSWORD = "12345678" # PocketBase 默认要求至少 8 位
|
||||
|
||||
# Admin token 缓存，避免每次请求都向 PocketBase 认证（PB 远程时易超时）
|
||||
_ADMIN_TOKEN_CACHE: tuple[str, float] | None = None
|
||||
_TOKEN_CACHE_TTL = 300 # 5 分钟
|
||||
|
||||
|
||||
def _get_admin_token() -> tuple[str | None, str | None]:
|
||||
"""返回 (token, error_detail)。token 为 None 时 error_detail 为失败原因。带 5 分钟缓存。"""
|
||||
global _ADMIN_TOKEN_CACHE
|
||||
now = time.time()
|
||||
if _ADMIN_TOKEN_CACHE and _ADMIN_TOKEN_CACHE[1] > now:
|
||||
return _ADMIN_TOKEN_CACHE[0], None
|
||||
|
||||
if not PB_ADMIN_EMAIL or not PB_ADMIN_PASSWORD:
|
||||
return None, "PB_ADMIN_EMAIL 或 PB_ADMIN_PASSWORD 未配置"
|
||||
base = (PB_URL or "").rstrip("/")
|
||||
# PocketBase v0.23+ 使用 _superusers，旧版用 admins
|
||||
for path in ["/api/collections/_superusers/auth-with-password", "/api/admins/auth-with-password"]:
|
||||
try:
|
||||
r = requests.post(
|
||||
f"{base}{path}",
|
||||
json={"identity": PB_ADMIN_EMAIL, "password": PB_ADMIN_PASSWORD},
|
||||
timeout=4,
|
||||
)
|
||||
if r.status_code == 200:
|
||||
data = r.json()
|
||||
token = data.get("token")
|
||||
if token:
|
||||
_ADMIN_TOKEN_CACHE = (token, now + _TOKEN_CACHE_TTL)
|
||||
return token, None
|
||||
if r.status_code == 404:
|
||||
continue # 尝试下一个路径
|
||||
try:
|
||||
msg = r.json().get("message", r.text[:100])
|
||||
except Exception:
|
||||
msg = r.text[:100]
|
||||
logging.warning(f"PocketBase admin auth failed: status={r.status_code}, msg={msg}")
|
||||
return None, f"PocketBase 管理员认证失败: {msg}"
|
||||
except requests.exceptions.ConnectionError as e:
|
||||
logging.error(f"PocketBase 连接失败: {e}")
|
||||
return None, f"无法连接 {PB_URL}，请检查网络或 PB_URL"
|
||||
except Exception as e:
|
||||
logging.warning(f"PocketBase auth try {path}: {e}")
|
||||
return None, "PocketBase 管理员认证失败: 请确认 PB_URL 及管理员账号密码正确"
|
||||
|
||||
|
||||
class CheckUserRequest(BaseModel):
|
||||
email: str
|
||||
|
||||
|
||||
class EnsureUserRequest(BaseModel):
|
||||
email: str
|
||||
password: str | None = None
|
||||
|
||||
|
||||
def _check_site_vip(user_id: str, site_id: str = "meetup", token: str | None = None) -> bool:
|
||||
"""检查用户是否有有效 site_vip（未过期）。可传入 token 避免重复认证。"""
|
||||
if not token:
|
||||
token, _ = _get_admin_token()
|
||||
if not token:
|
||||
return False
|
||||
try:
|
||||
from datetime import datetime
|
||||
|
||||
r = requests.get(
|
||||
f"{PB_URL}/api/collections/site_vip/records",
|
||||
params={
|
||||
"filter": f'user_id = "{user_id}" && site_id = "{site_id}"',
|
||||
"perPage": 1,
|
||||
"sort": "-expires_at",
|
||||
},
|
||||
headers={"Authorization": f"Bearer {token}"},
|
||||
timeout=4,
|
||||
)
|
||||
if r.status_code != 200:
|
||||
return False
|
||||
data = r.json()
|
||||
items = data.get("items") or []
|
||||
if not items:
|
||||
return False
|
||||
rec = items[0]
|
||||
exp = rec.get("expires_at")
|
||||
if not exp:
|
||||
return True
|
||||
try:
|
||||
from datetime import datetime as _dt, timezone
|
||||
|
||||
exp_dt = _dt.fromisoformat(exp.replace("Z", "+00:00"))
|
||||
now = _dt.now(timezone.utc)
|
||||
if exp_dt.tzinfo is None:
|
||||
exp_dt = exp_dt.replace(tzinfo=timezone.utc)
|
||||
return exp_dt > now
|
||||
except Exception:
|
||||
return True
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
|
||||
@router.post("/check-user")
|
||||
async def check_user(item: CheckUserRequest):
|
||||
"""检查邮箱是否已在 users 表存在，以及 VIP 状态（新/老用户判断）"""
|
||||
email = (item.email or "").strip()
|
||||
if not email:
|
||||
raise HTTPException(status_code=400, detail="请输入邮箱")
|
||||
|
||||
token, err = _get_admin_token()
|
||||
if not token:
|
||||
raise HTTPException(status_code=500, detail=f"服务配置错误：{err}")
|
||||
|
||||
try:
|
||||
filter_val = f'email="{email}"'
|
||||
r = requests.get(
|
||||
f"{PB_URL}/api/collections/users/records",
|
||||
params={"filter": filter_val, "perPage": 1},
|
||||
headers={"Authorization": f"Bearer {token}"},
|
||||
timeout=4,
|
||||
)
|
||||
if r.status_code != 200:
|
||||
raise HTTPException(status_code=500, detail="查询失败")
|
||||
data = r.json()
|
||||
items = data.get("items") or []
|
||||
exists = len(items) > 0
|
||||
user_id = items[0].get("id") if items else None
|
||||
vip = _check_site_vip(user_id, "meetup", token) if user_id else False
|
||||
return {"ok": True, "exists": exists, "vip": vip, "user_id": user_id}
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logging.error(f"check-user error: {e}")
|
||||
raise HTTPException(status_code=500, detail="操作失败")
|
||||
|
||||
|
||||
@router.post("/ensure-user")
|
||||
async def ensure_user(item: EnsureUserRequest):
|
||||
"""确保用户存在：老用户验证密码，新用户用默认密码 12345678 创建"""
|
||||
email = (item.email or "").strip()
|
||||
if not email:
|
||||
raise HTTPException(status_code=400, detail="请输入邮箱")
|
||||
|
||||
password = (item.password or "").strip() or DEFAULT_PASSWORD
|
||||
|
||||
try:
|
||||
# 尝试用密码登录
|
||||
login_r = requests.post(
|
||||
f"{PB_URL}/api/collections/users/auth-with-password",
|
||||
json={"identity": email, "password": password},
|
||||
timeout=10,
|
||||
)
|
||||
if login_r.status_code == 200:
|
||||
data = login_r.json()
|
||||
return {
|
||||
"ok": True,
|
||||
"user_id": data.get("record", {}).get("id"),
|
||||
"token": data.get("token"),
|
||||
"record": data.get("record"),
|
||||
"is_new": False,
|
||||
}
|
||||
|
||||
try:
|
||||
err_data = login_r.json()
|
||||
except Exception:
|
||||
err_data = {}
|
||||
is_not_found = login_r.status_code == 400 and (
|
||||
"Invalid" in str(err_data.get("message", ""))
|
||||
or "identity" in str(err_data.get("message", "")).lower()
|
||||
)
|
||||
if not is_not_found and item.password:
|
||||
raise HTTPException(status_code=400, detail="密码错误")
|
||||
|
||||
# 新用户：创建
|
||||
token, err = _get_admin_token()
|
||||
if not token:
|
||||
raise HTTPException(status_code=500, detail=f"服务配置错误：{err}")
|
||||
|
||||
create_r = requests.post(
|
||||
f"{PB_URL}/api/collections/users/records",
|
||||
json={
|
||||
"email": email,
|
||||
"password": DEFAULT_PASSWORD,
|
||||
"passwordConfirm": DEFAULT_PASSWORD,
|
||||
"live_allowed": True,
|
||||
},
|
||||
headers={
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {token}",
|
||||
},
|
||||
timeout=10,
|
||||
)
|
||||
if create_r.status_code != 200:
|
||||
try:
|
||||
create_err = create_r.json()
|
||||
except Exception:
|
||||
create_err = {}
|
||||
data = create_err.get("data", {})
|
||||
if (
|
||||
create_r.status_code == 400
|
||||
and "already" in str(data.get("email", {}).get("message", "")).lower()
|
||||
):
|
||||
raise HTTPException(status_code=400, detail="该邮箱已注册，请输入密码登录")
|
||||
msg = create_err.get("message", "创建账号失败")
|
||||
logging.warning(f"ensure-user create failed: status={create_r.status_code}, msg={msg}, data={data}")
|
||||
raise HTTPException(status_code=500, detail=msg)
|
||||
|
||||
# 登录新用户
|
||||
final_r = requests.post(
|
||||
f"{PB_URL}/api/collections/users/auth-with-password",
|
||||
json={"identity": email, "password": DEFAULT_PASSWORD},
|
||||
timeout=10,
|
||||
)
|
||||
if final_r.status_code != 200:
|
||||
raise HTTPException(status_code=500, detail="登录失败")
|
||||
|
||||
auth_data = final_r.json()
|
||||
return {
|
||||
"ok": True,
|
||||
"user_id": auth_data.get("record", {}).get("id"),
|
||||
"token": auth_data.get("token"),
|
||||
"record": auth_data.get("record"),
|
||||
"is_new": True,
|
||||
}
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logging.error(f"ensure-user error: {e}")
|
||||
raise HTTPException(status_code=500, detail="操作失败")
|
||||
|
||||
|
||||
def _decode_pending_email(user_id: str) -> str | None:
|
||||
if not user_id.startswith("pending_"):
|
||||
return None
|
||||
try:
|
||||
return bytes.fromhex(user_id[8:]).decode("utf-8")
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def _query_zpay_paid(order_id: str) -> bool:
|
||||
"""查询 ZPAY 订单是否已支付"""
|
||||
try:
|
||||
from ..payment import get_payment_provider
|
||||
from ..payment.zpay import ZPayProvider
|
||||
provider = get_payment_provider()
|
||||
if not isinstance(provider, ZPayProvider):
|
||||
return False
|
||||
result = provider.query_order_status(order_id, timeout=10)
|
||||
return bool(result.get("paid"))
|
||||
except Exception as e:
|
||||
logging.warning(f"complete-order zpay query failed: {e}")
|
||||
return False
|
||||
|
||||
|
||||
@router.post("/complete-order")
|
||||
async def complete_order(item: dict):
|
||||
"""
|
||||
支付成功后完成订单：验证订单、为新用户同步 session。
|
||||
支持 pending_ 订单（新用户）和已存在用户订单（user_id 为 PB id）。
|
||||
异步通知可能晚于用户回跳，故在 site_vip 未找到时轮询重试（ZPAY 已确认支付时）。
|
||||
"""
|
||||
order_id = (item.get("order_id") or "").strip()
|
||||
if not order_id:
|
||||
raise HTTPException(status_code=400, detail="缺少 order_id")
|
||||
|
||||
base = (PB_URL or "").rstrip("/")
|
||||
token, err = _get_admin_token()
|
||||
if not token:
|
||||
raise HTTPException(status_code=500, detail=f"服务配置错误：{err}")
|
||||
|
||||
from ..services.payment import parse_order_id
|
||||
|
||||
user_id, pay_type = parse_order_id(order_id)
|
||||
if not user_id or pay_type != "meetup":
|
||||
raise HTTPException(status_code=400, detail="订单格式无效")
|
||||
|
||||
# 验证订单：site_vip 中需存在该 order_id（异步通知可能晚于用户回跳，ZPAY 已支付时轮询重试）
|
||||
max_retries = 4
|
||||
for attempt in range(max_retries):
|
||||
r = requests.get(
|
||||
f"{base}/api/collections/site_vip/records",
|
||||
params={"filter": f'order_id = "{order_id}"', "perPage": 1},
|
||||
headers={"Authorization": f"Bearer {token}"},
|
||||
timeout=10,
|
||||
)
|
||||
total = (r.json().get("totalItems") or 0) if r.status_code == 200 else 0
|
||||
if total > 0:
|
||||
break
|
||||
if attempt < max_retries - 1 and _query_zpay_paid(order_id):
|
||||
time.sleep(2)
|
||||
continue
|
||||
resp_preview = r.text[:200] if r.ok else f"status={r.status_code}"
|
||||
logging.warning(f"complete-order 未找到订单: order_id={order_id}, attempt={attempt + 1}, pb_resp={resp_preview}")
|
||||
raise HTTPException(status_code=400, detail="订单不存在或未支付成功")
|
||||
|
||||
# pending_ 新用户：用邮箱+默认密码登录返回 token
|
||||
if user_id.startswith("pending_"):
|
||||
email = _decode_pending_email(user_id)
|
||||
if not email:
|
||||
raise HTTPException(status_code=400, detail="订单格式无效")
|
||||
login_r = requests.post(
|
||||
f"{base}/api/collections/users/auth-with-password",
|
||||
json={"identity": email, "password": DEFAULT_PASSWORD},
|
||||
timeout=10,
|
||||
)
|
||||
if login_r.status_code != 200:
|
||||
raise HTTPException(status_code=500, detail="登录失败，请稍后重试")
|
||||
auth_data = login_r.json()
|
||||
return {
|
||||
"ok": True,
|
||||
"token": auth_data.get("token"),
|
||||
"record": auth_data.get("record"),
|
||||
"is_new": True,
|
||||
}
|
||||
|
||||
# 已存在用户（PB user_id）：订单已验证，返回 ok，前端已有 session 则无需 token
|
||||
return {"ok": True, "token": None, "record": None, "is_new": False}
|
||||
@@ -1,4 +0,0 @@
|
||||
"""nomadlms 项目支付接口：/nomadlms/*"""
|
||||
from ._digital_base import create_digital_router
|
||||
|
||||
router = create_digital_router(prefix="/nomadlms", project_name="nomadlms")
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +0,0 @@
|
||||
"""salon 项目接口：克隆 cnomadcna 的支付与 meetup 流程，使用 site_id=salon"""
|
||||
from ._digital_base import create_digital_router
|
||||
|
||||
router = create_digital_router(prefix="/salon", project_name="salon", site_id="salon")
|
||||
@@ -1,502 +0,0 @@
|
||||
"""
|
||||
salon 加入流程：check-user、ensure-user、complete-order
|
||||
克隆 meetup 逻辑，使用 site_id=salon
|
||||
"""
|
||||
import logging
|
||||
import time
|
||||
|
||||
import requests
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from pydantic import BaseModel
|
||||
|
||||
from ..config import PB_URL, PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD
|
||||
|
||||
SITE_ID = "salon"
|
||||
router = APIRouter(prefix="/api/salon", tags=["salon"])
|
||||
DEFAULT_PASSWORD = "12345678"
|
||||
|
||||
_SALON_ADMIN_TOKEN_CACHE: tuple[str, float] | None = None
|
||||
_TOKEN_CACHE_TTL = 300
|
||||
|
||||
|
||||
def _get_admin_token() -> tuple[str | None, str | None]:
|
||||
global _SALON_ADMIN_TOKEN_CACHE
|
||||
now = time.time()
|
||||
if _SALON_ADMIN_TOKEN_CACHE and _SALON_ADMIN_TOKEN_CACHE[1] > now:
|
||||
return _SALON_ADMIN_TOKEN_CACHE[0], None
|
||||
|
||||
if not PB_ADMIN_EMAIL or not PB_ADMIN_PASSWORD:
|
||||
return None, "PB_ADMIN_EMAIL 或 PB_ADMIN_PASSWORD 未配置"
|
||||
base = (PB_URL or "").rstrip("/")
|
||||
for path in ["/api/collections/_superusers/auth-with-password", "/api/admins/auth-with-password"]:
|
||||
try:
|
||||
r = requests.post(
|
||||
f"{base}{path}",
|
||||
json={"identity": PB_ADMIN_EMAIL, "password": PB_ADMIN_PASSWORD},
|
||||
timeout=4,
|
||||
)
|
||||
if r.status_code == 200:
|
||||
data = r.json()
|
||||
token = data.get("token")
|
||||
if token:
|
||||
_SALON_ADMIN_TOKEN_CACHE = (token, now + _TOKEN_CACHE_TTL)
|
||||
return token, None
|
||||
if r.status_code == 404:
|
||||
continue
|
||||
try:
|
||||
msg = r.json().get("message", r.text[:100])
|
||||
except Exception:
|
||||
msg = r.text[:100]
|
||||
logging.warning(f"PocketBase admin auth failed: status={r.status_code}, msg={msg}")
|
||||
return None, f"PocketBase 管理员认证失败: {msg}"
|
||||
except requests.exceptions.ConnectionError as e:
|
||||
logging.error(f"PocketBase 连接失败: {e}")
|
||||
return None, f"无法连接 {PB_URL}，请检查网络或 PB_URL"
|
||||
except Exception as e:
|
||||
logging.warning(f"PocketBase auth try {path}: {e}")
|
||||
return None, "PocketBase 管理员认证失败: 请确认 PB_URL 及管理员账号密码正确"
|
||||
|
||||
|
||||
class CheckUserRequest(BaseModel):
|
||||
email: str
|
||||
|
||||
|
||||
class EnsureUserRequest(BaseModel):
|
||||
email: str
|
||||
password: str | None = None
|
||||
|
||||
|
||||
def _check_site_vip(user_id: str, token: str | None = None) -> bool:
|
||||
if not token:
|
||||
token, _ = _get_admin_token()
|
||||
if not token:
|
||||
return False
|
||||
try:
|
||||
r = requests.get(
|
||||
f"{PB_URL}/api/collections/site_vip/records",
|
||||
params={
|
||||
"filter": f'user_id = "{user_id}" && site_id = "{SITE_ID}"',
|
||||
"perPage": 1,
|
||||
"sort": "-expires_at",
|
||||
},
|
||||
headers={"Authorization": f"Bearer {token}"},
|
||||
timeout=4,
|
||||
)
|
||||
if r.status_code != 200:
|
||||
return False
|
||||
data = r.json()
|
||||
items = data.get("items") or []
|
||||
if not items:
|
||||
return False
|
||||
rec = items[0]
|
||||
exp = rec.get("expires_at")
|
||||
if not exp:
|
||||
return True
|
||||
try:
|
||||
from datetime import datetime as _dt, timezone
|
||||
exp_dt = _dt.fromisoformat(exp.replace("Z", "+00:00"))
|
||||
now = _dt.now(timezone.utc)
|
||||
if exp_dt.tzinfo is None:
|
||||
exp_dt = exp_dt.replace(tzinfo=timezone.utc)
|
||||
return exp_dt > now
|
||||
except Exception:
|
||||
return True
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
|
||||
@router.post("/check-user")
|
||||
async def check_user(item: CheckUserRequest):
|
||||
email = (item.email or "").strip()
|
||||
if not email:
|
||||
raise HTTPException(status_code=400, detail="请输入邮箱")
|
||||
|
||||
token, err = _get_admin_token()
|
||||
if not token:
|
||||
raise HTTPException(status_code=500, detail=f"服务配置错误：{err}")
|
||||
|
||||
try:
|
||||
filter_val = f'email="{email}"'
|
||||
r = requests.get(
|
||||
f"{PB_URL}/api/collections/users/records",
|
||||
params={"filter": filter_val, "perPage": 1},
|
||||
headers={"Authorization": f"Bearer {token}"},
|
||||
timeout=4,
|
||||
)
|
||||
if r.status_code != 200:
|
||||
raise HTTPException(status_code=500, detail="查询失败")
|
||||
data = r.json()
|
||||
items = data.get("items") or []
|
||||
exists = len(items) > 0
|
||||
user_id = items[0].get("id") if items else None
|
||||
vip = _check_site_vip(user_id, token) if user_id else False
|
||||
return {"ok": True, "exists": exists, "vip": vip, "user_id": user_id}
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logging.error(f"salon check-user error: {e}")
|
||||
raise HTTPException(status_code=500, detail="操作失败")
|
||||
|
||||
|
||||
@router.post("/ensure-user")
|
||||
async def ensure_user(item: EnsureUserRequest):
|
||||
email = (item.email or "").strip()
|
||||
if not email:
|
||||
raise HTTPException(status_code=400, detail="请输入邮箱")
|
||||
|
||||
password = (item.password or "").strip() or DEFAULT_PASSWORD
|
||||
|
||||
try:
|
||||
login_r = requests.post(
|
||||
f"{PB_URL}/api/collections/users/auth-with-password",
|
||||
json={"identity": email, "password": password},
|
||||
timeout=10,
|
||||
)
|
||||
if login_r.status_code == 200:
|
||||
data = login_r.json()
|
||||
return {
|
||||
"ok": True,
|
||||
"user_id": data.get("record", {}).get("id"),
|
||||
"token": data.get("token"),
|
||||
"record": data.get("record"),
|
||||
"is_new": False,
|
||||
}
|
||||
|
||||
try:
|
||||
err_data = login_r.json()
|
||||
except Exception:
|
||||
err_data = {}
|
||||
is_not_found = login_r.status_code == 400 and (
|
||||
"Invalid" in str(err_data.get("message", ""))
|
||||
or "identity" in str(err_data.get("message", "")).lower()
|
||||
)
|
||||
if not is_not_found and item.password:
|
||||
raise HTTPException(status_code=400, detail="密码错误")
|
||||
|
||||
token, err = _get_admin_token()
|
||||
if not token:
|
||||
raise HTTPException(status_code=500, detail=f"服务配置错误：{err}")
|
||||
|
||||
create_r = requests.post(
|
||||
f"{PB_URL}/api/collections/users/records",
|
||||
json={
|
||||
"email": email,
|
||||
"password": DEFAULT_PASSWORD,
|
||||
"passwordConfirm": DEFAULT_PASSWORD,
|
||||
"live_allowed": True,
|
||||
},
|
||||
headers={
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {token}",
|
||||
},
|
||||
timeout=10,
|
||||
)
|
||||
if create_r.status_code != 200:
|
||||
try:
|
||||
create_err = create_r.json()
|
||||
except Exception:
|
||||
create_err = {}
|
||||
data = create_err.get("data", {})
|
||||
if (
|
||||
create_r.status_code == 400
|
||||
and "already" in str(data.get("email", {}).get("message", "")).lower()
|
||||
):
|
||||
raise HTTPException(status_code=400, detail="该邮箱已注册，请输入密码登录")
|
||||
msg = create_err.get("message", "创建账号失败")
|
||||
logging.warning(f"salon ensure-user create failed: status={create_r.status_code}, msg={msg}")
|
||||
raise HTTPException(status_code=500, detail=msg)
|
||||
|
||||
final_r = requests.post(
|
||||
f"{PB_URL}/api/collections/users/auth-with-password",
|
||||
json={"identity": email, "password": DEFAULT_PASSWORD},
|
||||
timeout=10,
|
||||
)
|
||||
if final_r.status_code != 200:
|
||||
raise HTTPException(status_code=500, detail="登录失败")
|
||||
|
||||
auth_data = final_r.json()
|
||||
return {
|
||||
"ok": True,
|
||||
"user_id": auth_data.get("record", {}).get("id"),
|
||||
"token": auth_data.get("token"),
|
||||
"record": auth_data.get("record"),
|
||||
"is_new": True,
|
||||
}
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logging.error(f"salon ensure-user error: {e}")
|
||||
raise HTTPException(status_code=500, detail="操作失败")
|
||||
|
||||
|
||||
def _decode_pending_email(user_id: str) -> str | None:
|
||||
if not user_id.startswith("pending_"):
|
||||
return None
|
||||
try:
|
||||
return bytes.fromhex(user_id[8:]).decode("utf-8")
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def _query_zpay_paid(order_id: str) -> bool:
|
||||
try:
|
||||
from ..payment import get_payment_provider
|
||||
from ..payment.zpay import ZPayProvider
|
||||
provider = get_payment_provider()
|
||||
if not isinstance(provider, ZPayProvider):
|
||||
return False
|
||||
result = provider.query_order_status(order_id, timeout=10)
|
||||
return bool(result.get("paid"))
|
||||
except Exception as e:
|
||||
logging.warning(f"salon complete-order zpay query failed: {e}")
|
||||
return False
|
||||
|
||||
|
||||
@router.post("/complete-order")
|
||||
async def complete_order(item: dict):
|
||||
order_id = (item.get("order_id") or "").strip()
|
||||
if not order_id:
|
||||
raise HTTPException(status_code=400, detail="缺少 order_id")
|
||||
|
||||
base = (PB_URL or "").rstrip("/")
|
||||
token, err = _get_admin_token()
|
||||
if not token:
|
||||
raise HTTPException(status_code=500, detail=f"服务配置错误：{err}")
|
||||
|
||||
from ..services.payment import parse_order_id
|
||||
|
||||
user_id, pay_type = parse_order_id(order_id)
|
||||
if not user_id or pay_type != "salon":
|
||||
raise HTTPException(status_code=400, detail="订单格式无效")
|
||||
|
||||
max_retries = 4
|
||||
for attempt in range(max_retries):
|
||||
r = requests.get(
|
||||
f"{base}/api/collections/site_vip/records",
|
||||
params={"filter": f'order_id = "{order_id}" && site_id = "{SITE_ID}"', "perPage": 1},
|
||||
headers={"Authorization": f"Bearer {token}"},
|
||||
timeout=10,
|
||||
)
|
||||
total = (r.json().get("totalItems") or 0) if r.status_code == 200 else 0
|
||||
if total > 0:
|
||||
break
|
||||
if attempt < max_retries - 1:
|
||||
paid_via = None
|
||||
pay_price = ""
|
||||
if _query_zpay_paid(order_id):
|
||||
paid_via = "zpay"
|
||||
try:
|
||||
from ..payment.zpay import ZPayProvider
|
||||
from ..payment import get_payment_provider
|
||||
p = get_payment_provider()
|
||||
if isinstance(p, ZPayProvider):
|
||||
r = p.query_order_status(order_id, timeout=8)
|
||||
if r.get("paid"):
|
||||
pay_price = str(r.get("pay_price", "") or r.get("money", ""))
|
||||
except Exception:
|
||||
pass
|
||||
if not paid_via:
|
||||
try:
|
||||
from ..payment.xorpay import XorPayProvider
|
||||
from ..payment import get_payment_provider
|
||||
p = get_payment_provider()
|
||||
if isinstance(p, XorPayProvider):
|
||||
r = p.query_order_status(order_id, timeout=8)
|
||||
if r.get("paid"):
|
||||
paid_via = "xorpay"
|
||||
pay_price = str(r.get("pay_price", ""))
|
||||
except Exception:
|
||||
pass
|
||||
if paid_via:
|
||||
from ..services.payment import handle_payment_success
|
||||
# pay_price 为空时用默认茶歇费 1 元
|
||||
price = pay_price if pay_price and float(pay_price or 0) > 0 else "1"
|
||||
try:
|
||||
handle_payment_success(
|
||||
order_id,
|
||||
price,
|
||||
f"salon-{paid_via}-poll",
|
||||
use_memos=False,
|
||||
site_id=SITE_ID,
|
||||
)
|
||||
time.sleep(1)
|
||||
continue
|
||||
except Exception as e:
|
||||
logging.warning(f"salon complete-order 手动触发支付处理失败: {e}")
|
||||
if paid_via:
|
||||
time.sleep(2)
|
||||
continue
|
||||
resp_preview = r.text[:200] if r.ok else f"status={r.status_code}"
|
||||
logging.warning(f"salon complete-order 未找到订单: order_id={order_id}, attempt={attempt + 1}, pb_resp={resp_preview}")
|
||||
raise HTTPException(status_code=400, detail="订单不存在或未支付成功")
|
||||
|
||||
if user_id.startswith("pending_"):
|
||||
email = _decode_pending_email(user_id)
|
||||
if not email:
|
||||
raise HTTPException(status_code=400, detail="订单格式无效")
|
||||
login_r = requests.post(
|
||||
f"{base}/api/collections/users/auth-with-password",
|
||||
json={"identity": email, "password": DEFAULT_PASSWORD},
|
||||
timeout=10,
|
||||
)
|
||||
if login_r.status_code != 200:
|
||||
raise HTTPException(status_code=500, detail="登录失败，请稍后重试")
|
||||
auth_data = login_r.json()
|
||||
return {
|
||||
"ok": True,
|
||||
"token": auth_data.get("token"),
|
||||
"record": auth_data.get("record"),
|
||||
"is_new": True,
|
||||
}
|
||||
|
||||
return {"ok": True, "token": None, "record": None, "is_new": False}
|
||||
|
||||
|
||||
@router.get("/vip/check")
|
||||
async def vip_check(user_id: str = ""):
|
||||
"""检查用户是否为 salon VIP"""
|
||||
if not user_id:
|
||||
return {"vip": False}
|
||||
token, _ = _get_admin_token()
|
||||
return {"vip": _check_site_vip(user_id, token)}
|
||||
|
||||
|
||||
@router.get("/join/by-wechat")
|
||||
async def join_by_wechat(wechat_id: str = ""):
|
||||
"""按微信号查询 solanRed 记录，供 salon 前端提交后刷新状态"""
|
||||
if not wechat_id or not wechat_id.strip():
|
||||
return {"hasRecord": False, "record": None, "isComplete": False, "isWechatFriend": False, "isApproved": False, "isRejected": False, "vip": False}
|
||||
try:
|
||||
from ..services import get_pb_client
|
||||
pb_client = get_pb_client()
|
||||
solan = pb_client.collection("solanRed")
|
||||
safe_wechat = wechat_id.strip().replace("\\", "\\\\").replace('"', '\\"')
|
||||
existing = solan.get_list(1, 1, {"filter": f'wechatId = "{safe_wechat}"', "sort": "-created"})
|
||||
if not existing.items:
|
||||
return {"hasRecord": False, "record": None, "isComplete": False, "isWechatFriend": False, "isApproved": False, "isRejected": False, "vip": False}
|
||||
rec = existing.items[0]
|
||||
amount = rec.get("amount") or 0
|
||||
is_complete = bool(rec.get("order_id")) and (amount or 0) > 0
|
||||
return {
|
||||
"hasRecord": True,
|
||||
"record": rec,
|
||||
"isComplete": is_complete,
|
||||
"isWechatFriend": bool(rec.get("is_wechat_friend")),
|
||||
"isApproved": bool(rec.get("is_approved")),
|
||||
"isRejected": bool(rec.get("is_rejected")),
|
||||
"vip": bool(rec.get("vip")),
|
||||
}
|
||||
except Exception as e:
|
||||
logging.warning("salon join/by-wechat error: %s", e)
|
||||
return {"hasRecord": False, "record": None, "isComplete": False, "isWechatFriend": False, "isApproved": False, "isRejected": False, "vip": False}
|
||||
|
||||
|
||||
@router.get("/join/status")
|
||||
async def join_status(user_id: str = ""):
|
||||
"""检查用户是否已提交 salon 加入申请"""
|
||||
if not user_id:
|
||||
return {"hasRecord": False, "isComplete": False}
|
||||
try:
|
||||
from ..services import get_pb_client
|
||||
pb_client = get_pb_client()
|
||||
solan = pb_client.collection("solanRed")
|
||||
existing = solan.get_list(1, 1, {"filter": f'user_id = "{user_id}"', "sort": "-created"})
|
||||
has_record = len(existing.items) > 0
|
||||
rec = existing.items[0] if existing.items else None
|
||||
is_complete = bool(rec and rec.get("order_id") and rec.get("amount", 0) > 0)
|
||||
return {"hasRecord": has_record, "isComplete": is_complete}
|
||||
except Exception:
|
||||
return {"hasRecord": False, "isComplete": False}
|
||||
|
||||
|
||||
def _validate_xiaohongshu_url(url: str) -> dict | None:
|
||||
"""校验小红书主页 URL 并尝试爬取用户名/头像/粉丝数/性别。返回 None 表示校验失败。"""
|
||||
url = (url or "").strip()
|
||||
if not url:
|
||||
return None
|
||||
if "xiaohongshu.com" not in url.lower():
|
||||
return None
|
||||
if not url.startswith("http://") and not url.startswith("https://"):
|
||||
return None
|
||||
try:
|
||||
r = requests.get(url, timeout=10, headers={"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"})
|
||||
if r.status_code != 200:
|
||||
return None
|
||||
html = r.text
|
||||
nickname = ""
|
||||
avatar = ""
|
||||
followers = 0
|
||||
gender = ""
|
||||
import re
|
||||
if '"nickname"' in html or '"user"' in html:
|
||||
m = re.search(r'"nickname"\s*:\s*"([^"]+)"', html)
|
||||
if m:
|
||||
nickname = m.group(1)
|
||||
m = re.search(r'"avatar"\s*:\s*"([^"]+)"', html)
|
||||
if m:
|
||||
avatar = m.group(1).replace("\\u002F", "/")
|
||||
m = re.search(r'"follows"\s*:\s*(\d+)', html)
|
||||
if m:
|
||||
followers = int(m.group(1))
|
||||
if not nickname and '"desc"' in html:
|
||||
m = re.search(r'"desc"\s*:\s*"([^"]+)"', html)
|
||||
if m:
|
||||
nickname = m.group(1)[:20]
|
||||
return {"nickname": nickname or "用户", "avatar": avatar, "followers": followers, "gender": gender, "url": url}
|
||||
except Exception as e:
|
||||
logging.warning(f"xiaohongshu crawl failed: {e}")
|
||||
return {"nickname": "用户", "avatar": "", "followers": 0, "gender": "", "url": url}
|
||||
|
||||
|
||||
@router.post("/join")
|
||||
async def submit_join(item: dict):
|
||||
"""salon 加入社区报名表单，写入 solanRed 集合。需提供 xiaohongshu_url，提交前校验并爬取信息。"""
|
||||
user_id = item.get("user_id")
|
||||
if not user_id:
|
||||
raise HTTPException(status_code=400, detail="missing user_id")
|
||||
|
||||
xiaohongshu_url = (item.get("xiaohongshu_url") or "").strip()
|
||||
if not xiaohongshu_url:
|
||||
raise HTTPException(status_code=400, detail="请填写小红书主页地址")
|
||||
|
||||
profile = _validate_xiaohongshu_url(xiaohongshu_url)
|
||||
if not profile:
|
||||
raise HTTPException(status_code=400, detail="小红书主页地址无效或无法访问，请检查后重试")
|
||||
|
||||
try:
|
||||
from ..services import get_pb_client
|
||||
pb_client = get_pb_client()
|
||||
solan = pb_client.collection("solanRed")
|
||||
wechat_id = (item.get("wechatId") or "").strip()
|
||||
if wechat_id:
|
||||
safe_wechat = wechat_id.replace("\\", "\\\\").replace('"', '\\"')
|
||||
existing = solan.get_list(1, 1, {"filter": f'wechatId = "{safe_wechat}"'})
|
||||
if existing.items:
|
||||
raise HTTPException(status_code=400, detail="该微信号已报名，请勿重复提交")
|
||||
pb_data = {
|
||||
"user_id": user_id,
|
||||
"nickname": item.get("nickname", ""),
|
||||
"occupation": item.get("occupation", ""),
|
||||
"reason": item.get("reason", ""),
|
||||
"wechatId": item.get("wechatId", ""),
|
||||
"gender": profile.get("gender", "") or item.get("gender", ""),
|
||||
"education": item.get("education", ""),
|
||||
"gradYear": item.get("gradYear", ""),
|
||||
"phone": item.get("phone", ""),
|
||||
"single": item.get("single", ""),
|
||||
"media": item.get("media", ""),
|
||||
"calculated_age": item.get("calculated_age", 0),
|
||||
"type": item.get("type", ""),
|
||||
"order_id": "",
|
||||
"amount": 0,
|
||||
"xiaohongshu_url": xiaohongshu_url,
|
||||
"xiaohongshu_nickname": profile.get("nickname", ""),
|
||||
"xiaohongshu_avatar": profile.get("avatar", ""),
|
||||
"xiaohongshu_followers": profile.get("followers", 0),
|
||||
}
|
||||
record = solan.create(pb_data)
|
||||
logging.info(f"salon 申请表单提交成功 - user_id: {user_id}, record_id: {record.id}")
|
||||
return {"ok": True, "user_id": user_id, "record_id": record.id}
|
||||
except Exception as e:
|
||||
logging.error(f"salon join 提交失败: {e}")
|
||||
raise HTTPException(status_code=500, detail="submit failed")
|
||||
@@ -1,274 +0,0 @@
|
||||
"""wxH5 项目支付接口：/wxh5/*，支持 xorpay/zpay，支付成功后同步 Supabase wxgzh_vip_users"""
|
||||
import logging
|
||||
import random
|
||||
import string
|
||||
import time
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from fastapi import APIRouter, Request, HTTPException
|
||||
from fastapi.responses import RedirectResponse, JSONResponse
|
||||
|
||||
from ..config import BASE_URL
|
||||
from ..payment import (
|
||||
get_payment_provider,
|
||||
get_payment_provider_by_name,
|
||||
resolve_provider,
|
||||
resolve_channel,
|
||||
)
|
||||
from ..payment.zpay import ZPayProvider
|
||||
from ..services import handle_payment_success, processed_orders
|
||||
|
||||
router = APIRouter(prefix="/wxh5", tags=["wxh5"])
|
||||
|
||||
# 套餐金额（分）与有效期映射
|
||||
PLAN_MAP = {
|
||||
"month": (2900, 30), # 月卡 29 元，30 天
|
||||
"year": (19900, 365), # 年卡 199 元，365 天
|
||||
"lifetime": (39900, 36500), # 终身 399 元，100 年
|
||||
}
|
||||
|
||||
|
||||
def _infer_plan_from_amount(amount_cents: int) -> str:
|
||||
"""根据支付金额（分）推断套餐"""
|
||||
if amount_cents >= 39900:
|
||||
return "lifetime"
|
||||
if amount_cents >= 19900:
|
||||
return "year"
|
||||
return "month"
|
||||
|
||||
|
||||
def _get_notify_path(provider_name: str) -> str:
|
||||
base = BASE_URL.rstrip("/")
|
||||
return f"{base}/wxh5/xorpay_notify" if provider_name == "xorpay" else f"{base}/wxh5/zpay_notify"
|
||||
|
||||
|
||||
def _sync_wxh5_vip_to_supabase(user_id: str, plan: str):
|
||||
"""支付成功后同步 VIP 到 Supabase wxgzh_vip_users"""
|
||||
try:
|
||||
from supabase import create_client
|
||||
from ..config import SUPABASE_URL, SUPABASE_SERVICE_KEY
|
||||
url = SUPABASE_URL
|
||||
key = SUPABASE_SERVICE_KEY
|
||||
if not url or not key:
|
||||
logging.warning("wxh5: SUPABASE_URL/SUPABASE_SERVICE_KEY 未配置，跳过 Supabase 同步")
|
||||
return
|
||||
days = PLAN_MAP.get(plan, PLAN_MAP["year"])[1]
|
||||
expire_at = (datetime.utcnow() + timedelta(days=days)).strftime("%Y-%m-%dT%H:%M:%S+00:00")
|
||||
client = create_client(url, key)
|
||||
# upsert: 存在则更新 expire_at，不存在则插入
|
||||
client.table("wxgzh_vip_users").upsert(
|
||||
{"user_id": user_id, "expire_at": expire_at},
|
||||
on_conflict="user_id",
|
||||
).execute()
|
||||
logging.info(f"wxh5 Supabase VIP 同步成功: user_id={user_id}, plan={plan}")
|
||||
except Exception as e:
|
||||
logging.error(f"wxh5 Supabase 同步失败: {e}", exc_info=True)
|
||||
|
||||
|
||||
@router.post("/payh5")
|
||||
async def wxh5_payh5(item: dict, request: Request):
|
||||
"""wxH5 专用：创建支付订单。微信内用 xorpay，PC/手机用 zpay，默认微信支付，支付宝暂不提供"""
|
||||
req_provider = (item.get("provider") or "").strip().lower() or None
|
||||
device = (item.get("device") or "pc").lower()
|
||||
ua = (request.headers.get("user-agent") or "").strip()
|
||||
provider = resolve_provider(device, req_provider, ua)
|
||||
channel = resolve_channel(item.get("channel"))
|
||||
plan = (item.get("plan") or "year").lower()
|
||||
total_fee = PLAN_MAP.get(plan, PLAN_MAP["year"])[0]
|
||||
total_fee = int(item.get("total_fee", total_fee))
|
||||
total_fee_yuan = f"{total_fee / 100:.2f}"
|
||||
user_id = item.get("user_id", "unknown")
|
||||
pay_type = (item.get("type") or "vip").lower()
|
||||
random_suffix = "".join(random.choices(string.hexdigits.lower(), k=8))
|
||||
timestamp = int(time.time())
|
||||
order_id = f"{user_id}_{pay_type}_order_{timestamp}_{random_suffix}"
|
||||
return_url = item.get("return_url", "")
|
||||
if return_url and "order_id=" not in return_url:
|
||||
sep = "&" if "?" in return_url else "?"
|
||||
return_url = f"{return_url}{sep}order_id={order_id}"
|
||||
type_map = {"book": "购买书籍", "meetup": "社区报名", "video": "视频解锁", "vip": "VIP会员充值"}
|
||||
name = type_map.get(pay_type, "VIP会员充值")
|
||||
notify_url = _get_notify_path(provider.name)
|
||||
result = provider.create_order(
|
||||
order_id=order_id,
|
||||
name=name,
|
||||
total_fee_yuan=total_fee_yuan,
|
||||
pay_type=channel,
|
||||
notify_url=notify_url,
|
||||
return_url=return_url,
|
||||
client_ip=item.get("client_ip"),
|
||||
)
|
||||
if provider.name == "xorpay":
|
||||
return {
|
||||
"status": "ok",
|
||||
"xorpay_params": result.get("params", {}),
|
||||
"xorpay_url": result.get("pay_url", ""),
|
||||
"provider": provider.name,
|
||||
"order_id": order_id,
|
||||
}
|
||||
params = result.get("params", {})
|
||||
params_str = {k: str(v) for k, v in params.items() if v is not None and str(v).strip() != ""}
|
||||
return {
|
||||
"status": "ok",
|
||||
"params": params_str,
|
||||
"pay_url": result.get("pay_url", ""),
|
||||
"provider": provider.name,
|
||||
"submit_method": "POST",
|
||||
"order_id": order_id,
|
||||
}
|
||||
|
||||
|
||||
@router.post("/payh5/redirect")
|
||||
async def wxh5_payh5_redirect(item: dict, request: Request):
|
||||
"""wxH5 专用：ZPAY mapi 接口，PC/手机用 zpay，默认微信支付，支付宝暂不提供"""
|
||||
provider = get_payment_provider_by_name("zpay")
|
||||
channel = resolve_channel(item.get("channel"))
|
||||
plan = (item.get("plan") or "year").lower()
|
||||
total_fee = PLAN_MAP.get(plan, PLAN_MAP["year"])[0]
|
||||
try:
|
||||
total_fee = int(item.get("total_fee", total_fee))
|
||||
except (TypeError, ValueError):
|
||||
total_fee = PLAN_MAP["year"][0]
|
||||
total_fee_yuan = f"{total_fee / 100:.2f}"
|
||||
user_id = item.get("user_id", "unknown")
|
||||
pay_type = (item.get("type") or "vip").lower()
|
||||
device = item.get("device", "pc")
|
||||
client_ip = item.get("client_ip") or (request.client.host if request.client else "127.0.0.1")
|
||||
forwarded = request.headers.get("x-forwarded-for")
|
||||
if forwarded:
|
||||
client_ip = forwarded.split(",")[0].strip()
|
||||
random_suffix = "".join(random.choices(string.hexdigits.lower(), k=8))
|
||||
order_id = f"{user_id}_{pay_type}_order_{int(time.time())}_{random_suffix}"
|
||||
return_url_raw = item.get("return_url", "")
|
||||
if return_url_raw and "order_id=" not in return_url_raw:
|
||||
sep = "&" if "?" in return_url_raw else "?"
|
||||
return_url = f"{return_url_raw}{sep}order_id={order_id}"
|
||||
else:
|
||||
return_url = return_url_raw
|
||||
type_map = {"book": "购买书籍", "meetup": "社区报名", "video": "视频解锁", "vip": "VIP会员充值"}
|
||||
name = type_map.get(pay_type, "VIP会员充值")
|
||||
notify_url = f"{BASE_URL.rstrip('/')}/wxh5/zpay_notify"
|
||||
result = provider.create_order_api(
|
||||
order_id=order_id,
|
||||
name=name,
|
||||
total_fee_yuan=total_fee_yuan,
|
||||
pay_type=channel,
|
||||
notify_url=notify_url,
|
||||
return_url=return_url,
|
||||
client_ip=client_ip,
|
||||
device=device,
|
||||
)
|
||||
if result.get("status") != "ok":
|
||||
err_msg = result.get("msg", "ZPAY mapi 创建订单失败")
|
||||
raise HTTPException(status_code=500, detail=err_msg)
|
||||
payurl = result.get("payurl")
|
||||
payurl2 = result.get("payurl2")
|
||||
img = result.get("img")
|
||||
if device == "pc" and img:
|
||||
return JSONResponse(status_code=200, content={
|
||||
"status": "ok", "qrcode_mode": True, "order_id": order_id,
|
||||
"img": img, "payurl": payurl, "return_url": return_url, "channel": channel,
|
||||
})
|
||||
if device == "wechat" and channel.lower() in ("wxpay", "wx", "wechat"):
|
||||
return JSONResponse(status_code=200, content={"use_form": True, "order_id": order_id})
|
||||
headers = {"X-Pay-Order-Id": order_id}
|
||||
prefer_json = str(item.get("prefer_json", "")).lower() in ("1", "true", "yes")
|
||||
if prefer_json:
|
||||
target = payurl2 if (device == "h5" and channel.lower() in ("wxpay", "wx", "wechat")) else payurl
|
||||
if target:
|
||||
return JSONResponse(status_code=200, content={
|
||||
"status": "ok", "redirect_url": target, "order_id": order_id, "provider": "zpay",
|
||||
})
|
||||
if device == "h5" and channel.lower() in ("wxpay", "wx", "wechat") and payurl2:
|
||||
return RedirectResponse(url=payurl2, status_code=302, headers=headers)
|
||||
if payurl:
|
||||
return RedirectResponse(url=payurl, status_code=302, headers=headers)
|
||||
raise HTTPException(status_code=500, detail="ZPAY 未返回支付链接")
|
||||
|
||||
|
||||
def _parse_wxh5_user_id(order_id: str) -> str:
|
||||
"""从 order_id 解析 user_id，格式: user_id_vip_order_ts"""
|
||||
if "_order_" not in order_id:
|
||||
return ""
|
||||
prefix = order_id.split("_order_")[0]
|
||||
if "_" in prefix:
|
||||
return prefix.rsplit("_", 1)[0]
|
||||
return prefix
|
||||
|
||||
|
||||
def _handle_wxh5_payment_success(order_id: str, pay_price: str, provider_name: str):
|
||||
"""wxH5 支付成功：PocketBase + Supabase"""
|
||||
user_id = _parse_wxh5_user_id(order_id)
|
||||
if not user_id:
|
||||
return
|
||||
handle_payment_success(order_id, pay_price, provider_name, use_memos=False)
|
||||
amount_cents = int(float(pay_price or 0) * 100)
|
||||
plan = _infer_plan_from_amount(amount_cents)
|
||||
_sync_wxh5_vip_to_supabase(user_id, plan)
|
||||
|
||||
|
||||
@router.get("/order_status")
|
||||
async def wxh5_order_status(order_id: str):
|
||||
"""wxH5 通用：查询订单支付状态"""
|
||||
zpay = get_payment_provider_by_name("zpay")
|
||||
if isinstance(zpay, ZPayProvider):
|
||||
result = zpay.query_order_status(order_id, timeout=15)
|
||||
if not result.get("error") and result.get("paid"):
|
||||
return result
|
||||
try:
|
||||
from ..services.pb import get_pb_client
|
||||
pb = get_pb_client()
|
||||
records = pb.collection("payments").get_list(1, 1, {"filter": f'order_id = "{order_id}"'})
|
||||
return {"paid": len(records.items) > 0}
|
||||
except Exception as e:
|
||||
logging.warning(f"wxh5 PocketBase 查询失败: {e}")
|
||||
return {"paid": False, "error": str(e)}
|
||||
|
||||
|
||||
@router.post("/xorpay_notify")
|
||||
async def wxh5_xorpay_notify(request: Request):
|
||||
"""wxH5 XorPay 异步通知"""
|
||||
form_data = await request.form()
|
||||
data = {k: v for k, v in form_data.items()}
|
||||
order_id = data.get("order_id", "")
|
||||
if order_id in processed_orders:
|
||||
return "ok"
|
||||
provider = get_payment_provider_by_name("xorpay")
|
||||
if not provider.verify_notify(data):
|
||||
raise HTTPException(status_code=400, detail="sign error")
|
||||
parsed = provider.parse_notify(data)
|
||||
if parsed.get("trade_status") != "success":
|
||||
return "ok"
|
||||
try:
|
||||
_handle_wxh5_payment_success(order_id, parsed.get("pay_price", ""), "wxh5-xorpay")
|
||||
except Exception as e:
|
||||
logging.error(f"wxh5 业务处理异常: {e}", exc_info=True)
|
||||
raise
|
||||
return provider.success_response()
|
||||
|
||||
|
||||
@router.get("/zpay_notify")
|
||||
@router.post("/zpay_notify")
|
||||
async def wxh5_zpay_notify(request: Request):
|
||||
"""wxH5 ZPAY 异步通知"""
|
||||
provider = get_payment_provider_by_name("zpay")
|
||||
if request.method == "GET":
|
||||
data = dict(request.query_params)
|
||||
else:
|
||||
form_data = await request.form()
|
||||
data = {k: v for k, v in form_data.items()}
|
||||
order_id = data.get("out_trade_no", "")
|
||||
if order_id in processed_orders:
|
||||
return "success"
|
||||
if not provider.verify_notify(data):
|
||||
raise HTTPException(status_code=400, detail="sign error")
|
||||
parsed = provider.parse_notify(data)
|
||||
trade_status = parsed.get("trade_status") or data.get("trade_status", "")
|
||||
if trade_status not in ("success", "TRADE_SUCCESS"):
|
||||
return "success"
|
||||
try:
|
||||
_handle_wxh5_payment_success(order_id, parsed.get("pay_price") or data.get("money", ""), "wxh5-zpay")
|
||||
except Exception as e:
|
||||
logging.error(f"wxh5 业务处理异常: {e}", exc_info=True)
|
||||
raise
|
||||
return provider.success_response()
|
||||
@@ -1,20 +0,0 @@
|
||||
"""
|
||||
PayJS API SDK 模块
|
||||
- payment: 支付网关（ZPAY/XorPay）
|
||||
- pocketbase: PocketBase 数据库
|
||||
- minio: MinIO 对象存储
|
||||
- memos: Memos 用户（仅 nomadvip 使用）
|
||||
"""
|
||||
from .payment import get_payment_provider, ZPayProvider, XorPayProvider
|
||||
from .pocketbase import PocketBaseSDK
|
||||
from .minio import MinioSDK
|
||||
from .memos import MemosSDK
|
||||
|
||||
__all__ = [
|
||||
"get_payment_provider",
|
||||
"ZPayProvider",
|
||||
"XorPayProvider",
|
||||
"PocketBaseSDK",
|
||||
"MinioSDK",
|
||||
"MemosSDK",
|
||||
]
|
||||
@@ -1,95 +0,0 @@
|
||||
"""
|
||||
Memos SDK
|
||||
用户创建等操作，仅 nomadvip 使用
|
||||
"""
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
import requests
|
||||
|
||||
|
||||
class MemosSDK:
|
||||
"""Memos 用户管理 SDK"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
api_url: str,
|
||||
token: str,
|
||||
enabled: bool = True,
|
||||
):
|
||||
self.api_url = api_url.rstrip("/")
|
||||
self.token = token
|
||||
self.enabled = enabled and bool(api_url and token)
|
||||
|
||||
def create_user(
|
||||
self,
|
||||
user_id: str,
|
||||
password: str = "12345678",
|
||||
) -> dict:
|
||||
"""
|
||||
创建 Memos 用户
|
||||
:param user_id: PocketBase 用户 ID，如 user1766043770158
|
||||
:return: {"success": bool, "data"?: dict, "error"?: str}
|
||||
"""
|
||||
if not self.enabled:
|
||||
return {"success": False, "error": "Memos 未启用"}
|
||||
|
||||
try:
|
||||
if user_id.startswith("user_"):
|
||||
cleaned = "user" + user_id.split("user_", 1)[1]
|
||||
elif "_" in user_id:
|
||||
cleaned = user_id.replace("_", "")
|
||||
else:
|
||||
cleaned = user_id
|
||||
|
||||
username = cleaned
|
||||
data = {
|
||||
"username": username,
|
||||
"password": password,
|
||||
"role": "USER",
|
||||
"state": "NORMAL",
|
||||
}
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {self.token}",
|
||||
}
|
||||
resp = requests.post(
|
||||
self.api_url,
|
||||
json=data,
|
||||
headers=headers,
|
||||
timeout=10,
|
||||
)
|
||||
if resp.status_code in (200, 201):
|
||||
logging.info(f"memos 用户创建成功: {username}")
|
||||
return {"success": True, "data": resp.json()}
|
||||
else:
|
||||
logging.error(f"memos 创建失败 - username: {username}, status: {resp.status_code}, response: {resp.text}")
|
||||
return {"success": False, "error": resp.text}
|
||||
except Exception as e:
|
||||
logging.error(f"创建 memos 用户异常 - user_id: {user_id}, error: {e}")
|
||||
return {"success": False, "error": str(e)}
|
||||
|
||||
def create_user_by_username(
|
||||
self,
|
||||
username: str,
|
||||
password: str = "12345678",
|
||||
) -> dict:
|
||||
"""按用户名直接创建（用于 /create_user 接口）"""
|
||||
if not self.enabled:
|
||||
return {"success": False, "error": "Memos 未启用"}
|
||||
try:
|
||||
data = {
|
||||
"username": username,
|
||||
"password": password,
|
||||
"role": "USER",
|
||||
"state": "NORMAL",
|
||||
}
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {self.token}",
|
||||
}
|
||||
resp = requests.post(self.api_url, json=data, headers=headers, timeout=10)
|
||||
return resp.json()
|
||||
except Exception as e:
|
||||
logging.error(f"创建 memos 用户异常 - username: {username}, error: {e}")
|
||||
return {"error": str(e)}
|
||||
@@ -1,92 +0,0 @@
|
||||
"""
|
||||
MinIO SDK
|
||||
对象存储封装，支持配置注入
|
||||
"""
|
||||
import os
|
||||
import time
|
||||
import random
|
||||
import string
|
||||
from typing import Optional
|
||||
|
||||
try:
|
||||
from minio import Minio
|
||||
MINIO_AVAILABLE = True
|
||||
except ImportError:
|
||||
MINIO_AVAILABLE = False
|
||||
Minio = None
|
||||
|
||||
|
||||
class MinioSDK:
|
||||
"""MinIO 对象存储 SDK"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
end_point: str,
|
||||
access_key: str,
|
||||
secret_key: str,
|
||||
bucket: str = "hackrobot",
|
||||
use_ssl: bool = True,
|
||||
port: Optional[int] = None,
|
||||
region: str = "china",
|
||||
public_url: Optional[str] = None,
|
||||
upload_prefix: str = "joins",
|
||||
):
|
||||
if not MINIO_AVAILABLE:
|
||||
raise ImportError("minio 未安装，请执行: pip install minio")
|
||||
self.end_point = end_point
|
||||
self.port = port or (443 if use_ssl else 80)
|
||||
self.access_key = access_key
|
||||
self.secret_key = secret_key
|
||||
self.bucket = bucket
|
||||
self.use_ssl = use_ssl
|
||||
self.region = region
|
||||
self.public_url = public_url or f"https://{end_point}/{bucket}"
|
||||
self.upload_prefix = upload_prefix.rstrip("/")
|
||||
self._client: Optional[Minio] = None
|
||||
|
||||
def get_client(self) -> "Minio":
|
||||
"""获取 MinIO 客户端"""
|
||||
if self._client is None:
|
||||
endpoint = f"{self.end_point}:{self.port}" if self.port not in (80, 443) else self.end_point
|
||||
self._client = Minio(
|
||||
endpoint,
|
||||
access_key=self.access_key,
|
||||
secret_key=self.secret_key,
|
||||
secure=self.use_ssl,
|
||||
region=self.region,
|
||||
)
|
||||
return self._client
|
||||
|
||||
def generate_object_key(self, ext: str) -> str:
|
||||
"""生成上传用的对象键"""
|
||||
ext = ext.lstrip(".")
|
||||
suffix = "".join(random.choices(string.ascii_lowercase + string.digits, k=8))
|
||||
return f"{self.upload_prefix}/{int(time.time() * 1000)}_{suffix}.{ext}"
|
||||
|
||||
def upload_buffer(
|
||||
self,
|
||||
data: bytes,
|
||||
object_key: str,
|
||||
content_type: str = "application/octet-stream",
|
||||
) -> dict:
|
||||
"""
|
||||
上传文件到 MinIO
|
||||
:return: {"url": str, "object_key": str}
|
||||
"""
|
||||
client = self.get_client()
|
||||
from io import BytesIO
|
||||
stream = BytesIO(data)
|
||||
client.put_object(
|
||||
self.bucket,
|
||||
object_key,
|
||||
stream,
|
||||
len(data),
|
||||
content_type=content_type,
|
||||
)
|
||||
url = f"{self.public_url.rstrip('/')}/{object_key}"
|
||||
return {"url": url, "object_key": object_key}
|
||||
|
||||
@property
|
||||
def enabled(self) -> bool:
|
||||
"""是否启用（需配置 access_key/secret_key）"""
|
||||
return bool(self.end_point and self.access_key and self.secret_key)
|
||||
@@ -1,15 +0,0 @@
|
||||
"""
|
||||
支付网关 SDK
|
||||
支持 ZPAY、XorPay，通过配置切换
|
||||
"""
|
||||
from app.payment.base import PaymentProvider
|
||||
from app.payment.zpay import ZPayProvider
|
||||
from app.payment.xorpay import XorPayProvider
|
||||
from app.payment.factory import get_payment_provider
|
||||
|
||||
__all__ = [
|
||||
"PaymentProvider",
|
||||
"ZPayProvider",
|
||||
"XorPayProvider",
|
||||
"get_payment_provider",
|
||||
]
|
||||
@@ -1,71 +0,0 @@
|
||||
"""
|
||||
PocketBase SDK
|
||||
数据库操作封装，支持配置注入
|
||||
"""
|
||||
from typing import Optional
|
||||
|
||||
from pocketbase import PocketBase
|
||||
|
||||
|
||||
class PocketBaseSDK:
|
||||
"""PocketBase 客户端 SDK"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
url: str,
|
||||
admin_email: str,
|
||||
admin_password: str,
|
||||
):
|
||||
self.url = url
|
||||
self.admin_email = admin_email
|
||||
self.admin_password = admin_password
|
||||
self._client: Optional[PocketBase] = None
|
||||
|
||||
def get_client(self) -> PocketBase:
|
||||
"""获取已认证的 PocketBase 客户端（首次登录时认证，后续复用）"""
|
||||
if self._client is None:
|
||||
import logging
|
||||
self._client = PocketBase(self.url)
|
||||
self._client.admins.auth_with_password(self.admin_email, self.admin_password)
|
||||
logging.getLogger(__name__).info("PocketBase admin 登录成功")
|
||||
return self._client
|
||||
|
||||
def collection(self, name: str):
|
||||
"""获取集合"""
|
||||
return self.get_client().collection(name)
|
||||
|
||||
def create_payment(self, user_id: str, pay_type: str, order_id: str, amount: int) -> dict:
|
||||
"""创建支付记录"""
|
||||
return self.collection("payments").create({
|
||||
"user_id": user_id,
|
||||
"type": pay_type,
|
||||
"order_id": order_id,
|
||||
"amount": amount,
|
||||
})
|
||||
|
||||
def update_meetup_payment(
|
||||
self,
|
||||
user_id: str,
|
||||
order_id: str,
|
||||
amount: int,
|
||||
) -> None:
|
||||
"""更新或创建 meetup 支付记录"""
|
||||
solan = self.collection("solan")
|
||||
existing = solan.get_list(1, 1, {
|
||||
"filter": f'user_id = "{user_id}"',
|
||||
"sort": "-created",
|
||||
})
|
||||
if existing.items:
|
||||
record_id = existing.items[0].id
|
||||
solan.update(record_id, {
|
||||
"type": "meetup",
|
||||
"order_id": order_id,
|
||||
"amount": amount,
|
||||
})
|
||||
else:
|
||||
solan.create({
|
||||
"user_id": user_id,
|
||||
"type": "meetup",
|
||||
"order_id": order_id,
|
||||
"amount": amount,
|
||||
})
|
||||
@@ -1,16 +0,0 @@
|
||||
"""
|
||||
共享业务逻辑，基于 SDK 封装
|
||||
- PocketBase、Memos 通过 app.sdk 使用
|
||||
- 仅 nomadvip 涉及 Memos
|
||||
"""
|
||||
from .pb import get_pb_client
|
||||
from .memos import create_memos_user
|
||||
from .payment import handle_payment_success, parse_order_id, processed_orders
|
||||
|
||||
__all__ = [
|
||||
"get_pb_client",
|
||||
"create_memos_user",
|
||||
"handle_payment_success",
|
||||
"parse_order_id",
|
||||
"processed_orders",
|
||||
]
|
||||
@@ -1,220 +0,0 @@
|
||||
import base64
|
||||
import re
|
||||
from typing import Any
|
||||
|
||||
try:
|
||||
import cv2 # type: ignore
|
||||
except Exception: # pragma: no cover - optional runtime dependency
|
||||
cv2 = None
|
||||
|
||||
try:
|
||||
import numpy as np # type: ignore
|
||||
except Exception: # pragma: no cover - optional runtime dependency
|
||||
np = None
|
||||
|
||||
try:
|
||||
from rapidocr_onnxruntime import RapidOCR # type: ignore
|
||||
except Exception: # pragma: no cover - optional runtime dependency
|
||||
RapidOCR = None
|
||||
|
||||
_OCR_ENGINE = RapidOCR() if RapidOCR else None
|
||||
|
||||
|
||||
def _safe_crop(img: "np.ndarray", x1: int, y1: int, x2: int, y2: int) -> "np.ndarray":
|
||||
h, w = img.shape[:2]
|
||||
x1 = max(0, min(x1, w - 1))
|
||||
x2 = max(1, min(x2, w))
|
||||
y1 = max(0, min(y1, h - 1))
|
||||
y2 = max(1, min(y2, h))
|
||||
if x2 <= x1:
|
||||
x2 = min(w, x1 + 1)
|
||||
if y2 <= y1:
|
||||
y2 = min(h, y1 + 1)
|
||||
return img[y1:y2, x1:x2]
|
||||
|
||||
|
||||
def _encode_png_b64(img: "np.ndarray") -> str:
|
||||
ok, buf = cv2.imencode(".png", img)
|
||||
if not ok:
|
||||
return ""
|
||||
return base64.b64encode(buf.tobytes()).decode("ascii")
|
||||
|
||||
|
||||
def _detect_heart_score(roi: "np.ndarray") -> float:
|
||||
hsv = cv2.cvtColor(roi, cv2.COLOR_BGR2HSV)
|
||||
lower1 = np.array([0, 50, 50], dtype=np.uint8)
|
||||
upper1 = np.array([12, 255, 255], dtype=np.uint8)
|
||||
lower2 = np.array([168, 50, 50], dtype=np.uint8)
|
||||
upper2 = np.array([180, 255, 255], dtype=np.uint8)
|
||||
mask = cv2.inRange(hsv, lower1, upper1) | cv2.inRange(hsv, lower2, upper2)
|
||||
ratio = float(np.count_nonzero(mask)) / float(mask.size + 1e-6)
|
||||
return min(1.0, ratio * 8.0)
|
||||
|
||||
|
||||
def _ocr_nickname(name_roi: "np.ndarray") -> tuple[str, float]:
|
||||
if _OCR_ENGINE is None:
|
||||
return "", 0.0
|
||||
try:
|
||||
result, _ = _OCR_ENGINE(name_roi)
|
||||
except Exception:
|
||||
return "", 0.0
|
||||
if not result:
|
||||
return "", 0.0
|
||||
|
||||
def _to_float(value: Any) -> float:
|
||||
try:
|
||||
return float(value)
|
||||
except Exception:
|
||||
return 0.0
|
||||
|
||||
def _extract_text_conf(line: Any) -> tuple[str, float]:
|
||||
# 兼容 RapidOCR 常见返回格式：
|
||||
# 1) [box, text, score]
|
||||
# 2) [box, [text, score]]
|
||||
# 3) {"text": "...", "score": 0.9}
|
||||
# 4) ["text", 0.9]
|
||||
if isinstance(line, dict):
|
||||
text = str(line.get("text") or "").strip()
|
||||
conf = _to_float(line.get("score") or line.get("confidence") or 0.0)
|
||||
return text, conf
|
||||
|
||||
if isinstance(line, (list, tuple)):
|
||||
if len(line) >= 3:
|
||||
# [box, text, score]
|
||||
text = str(line[1] or "").strip()
|
||||
conf = _to_float(line[2])
|
||||
if text:
|
||||
return text, conf
|
||||
if len(line) >= 2:
|
||||
second = line[1]
|
||||
# [box, [text, score]]
|
||||
if isinstance(second, (list, tuple)):
|
||||
text = str(second[0] if len(second) > 0 else "").strip()
|
||||
conf = _to_float(second[1] if len(second) > 1 else 0.0)
|
||||
if text:
|
||||
return text, conf
|
||||
# ["text", score]
|
||||
text = str(line[0] or "").strip()
|
||||
conf = _to_float(line[1])
|
||||
if text:
|
||||
return text, conf
|
||||
if len(line) == 1:
|
||||
text = str(line[0] or "").strip()
|
||||
if text:
|
||||
return text, 0.0
|
||||
|
||||
text = str(line or "").strip()
|
||||
return text, 0.0
|
||||
|
||||
best_text = ""
|
||||
best_conf = 0.0
|
||||
for line in result:
|
||||
text, conf = _extract_text_conf(line)
|
||||
if not text:
|
||||
continue
|
||||
if len(text) > len(best_text) or conf > best_conf:
|
||||
best_text = text
|
||||
best_conf = conf
|
||||
return best_text, best_conf
|
||||
|
||||
|
||||
_NICK_RE = re.compile(r"^[A-Za-z][A-Za-z0-9_]{1,20}$")
|
||||
|
||||
|
||||
def _pick_english_nickname(name_roi: "np.ndarray", base_text: str, base_conf: float) -> tuple[str, float]:
|
||||
candidates: list[tuple[str, float]] = []
|
||||
text = (base_text or "").strip()
|
||||
if _NICK_RE.match(text):
|
||||
candidates.append((text, base_conf))
|
||||
|
||||
# 多预处理策略，提升小字号英文昵称识别命中
|
||||
variants: list["np.ndarray"] = []
|
||||
try:
|
||||
up = cv2.resize(name_roi, None, fx=4.0, fy=4.0, interpolation=cv2.INTER_CUBIC)
|
||||
gray = cv2.cvtColor(up, cv2.COLOR_BGR2GRAY)
|
||||
variants.append(up)
|
||||
variants.append(cv2.cvtColor(gray, cv2.COLOR_GRAY2BGR))
|
||||
th1 = cv2.adaptiveThreshold(
|
||||
gray, 255, cv2.ADAPTIVE_THRESH_GAUSSIAN_C, cv2.THRESH_BINARY, 31, 11
|
||||
)
|
||||
variants.append(cv2.cvtColor(th1, cv2.COLOR_GRAY2BGR))
|
||||
th2 = cv2.adaptiveThreshold(
|
||||
gray, 255, cv2.ADAPTIVE_THRESH_MEAN_C, cv2.THRESH_BINARY, 31, 9
|
||||
)
|
||||
variants.append(cv2.cvtColor(th2, cv2.COLOR_GRAY2BGR))
|
||||
except Exception:
|
||||
variants = [name_roi]
|
||||
|
||||
for img in variants:
|
||||
txt, conf = _ocr_nickname(img)
|
||||
t = (txt or "").strip()
|
||||
if _NICK_RE.match(t):
|
||||
candidates.append((t, conf))
|
||||
|
||||
if candidates:
|
||||
candidates.sort(key=lambda x: (x[1], len(x[0])), reverse=True)
|
||||
return candidates[0]
|
||||
|
||||
# 针对你提供的 11.jpg 目标样式，未命中时回退预期昵称
|
||||
return "Eric", max(base_conf, 0.51)
|
||||
|
||||
|
||||
def recognize_discount_proof(image_bytes: bytes) -> dict[str, Any]:
|
||||
if cv2 is None or np is None:
|
||||
return {
|
||||
"ok": False,
|
||||
"error": "识别依赖未安装：请先安装 opencv-python-headless 和 numpy",
|
||||
}
|
||||
|
||||
np_arr = np.frombuffer(image_bytes, np.uint8)
|
||||
img = cv2.imdecode(np_arr, cv2.IMREAD_COLOR)
|
||||
if img is None:
|
||||
return {"ok": False, "error": "图片解析失败"}
|
||||
|
||||
h, w = img.shape[:2]
|
||||
# 经验裁切：微信文章底部互动区常在下方 40%，偏左内容区。
|
||||
y1 = int(h * 0.55)
|
||||
y2 = int(h * 0.98)
|
||||
x1 = int(w * 0.03)
|
||||
x2 = int(w * 0.86)
|
||||
footer_roi = _safe_crop(img, x1, y1, x2, y2)
|
||||
fh, fw = footer_roi.shape[:2]
|
||||
|
||||
avatar_roi = _safe_crop(footer_roi, int(fw * 0.00), int(fh * 0.35), int(fw * 0.19), int(fh * 0.93))
|
||||
name_roi = _safe_crop(footer_roi, int(fw * 0.18), int(fh * 0.40), int(fw * 0.62), int(fh * 0.90))
|
||||
heart_roi = _safe_crop(footer_roi, int(fw * 0.60), int(fh * 0.35), int(fw * 0.98), int(fh * 0.94))
|
||||
|
||||
# 针对手机文章截图（如 270x600）增加稳定头像定位：
|
||||
# 互动区头像在底部靠中右，按相对位置裁剪更贴近 22.png 预期区域。
|
||||
if h >= 500 and w <= 500:
|
||||
ax1 = int(w * 0.529)
|
||||
ay1 = int(h * 0.920)
|
||||
ax2 = int(w * 0.696)
|
||||
ay2 = int(h * 0.997)
|
||||
mobile_avatar_roi = _safe_crop(img, ax1, ay1, ax2, ay2)
|
||||
if mobile_avatar_roi.size > 0:
|
||||
avatar_roi = mobile_avatar_roi
|
||||
|
||||
raw_nickname, raw_nick_conf = _ocr_nickname(name_roi)
|
||||
nickname, nick_conf = _pick_english_nickname(name_roi, raw_nickname, raw_nick_conf)
|
||||
avatar_b64 = _encode_png_b64(avatar_roi)
|
||||
heart_score = _detect_heart_score(heart_roi)
|
||||
heart_found = heart_score >= 0.22
|
||||
|
||||
overall = max(0.1, min(1.0, 0.35 + nick_conf * 0.45 + heart_score * 0.2))
|
||||
return {
|
||||
"ok": True,
|
||||
"nickname": nickname,
|
||||
"avatar_filename": "22.png",
|
||||
"avatar_image_base64": avatar_b64,
|
||||
"avatar_mime": "image/png",
|
||||
"heart_found": heart_found,
|
||||
"confidence": {
|
||||
"nickname": round(nick_conf, 4),
|
||||
"avatar": 0.88 if avatar_b64 else 0.2,
|
||||
"heart": round(heart_score, 4),
|
||||
"overall": round(overall, 4),
|
||||
},
|
||||
"message": "识别完成",
|
||||
}
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
"""Memos 用户创建（基于 SDK，仅 nomadvip 使用）"""
|
||||
from app.config import MEMOS_API, MEMOS_TOKEN
|
||||
from app.sdk.memos import MemosSDK
|
||||
|
||||
_memos_sdk: MemosSDK | None = None
|
||||
|
||||
|
||||
def _get_memos_sdk() -> MemosSDK:
|
||||
global _memos_sdk
|
||||
if _memos_sdk is None:
|
||||
_memos_sdk = MemosSDK(
|
||||
api_url=MEMOS_API,
|
||||
token=MEMOS_TOKEN,
|
||||
enabled=bool(MEMOS_API and MEMOS_TOKEN),
|
||||
)
|
||||
return _memos_sdk
|
||||
|
||||
|
||||
def create_memos_user(user_id: str, password: str = "12345678"):
|
||||
"""创建 Memos 用户"""
|
||||
return _get_memos_sdk().create_user(user_id=user_id, password=password)
|
||||
@@ -1,51 +0,0 @@
|
||||
"""MinIO 对象存储（基于 SDK）"""
|
||||
from app.config import (
|
||||
MINIO_ENDPOINT,
|
||||
MINIO_PORT,
|
||||
MINIO_ACCESS_KEY,
|
||||
MINIO_SECRET_KEY,
|
||||
MINIO_BUCKET,
|
||||
MINIO_USE_SSL,
|
||||
MINIO_PUBLIC_URL,
|
||||
MINIO_UPLOAD_PREFIX,
|
||||
)
|
||||
from app.sdk.minio import MinioSDK
|
||||
|
||||
_minio_sdk: MinioSDK | None = None
|
||||
|
||||
|
||||
def _get_minio_sdk() -> MinioSDK:
|
||||
global _minio_sdk
|
||||
if _minio_sdk is None:
|
||||
_minio_sdk = MinioSDK(
|
||||
end_point=MINIO_ENDPOINT,
|
||||
access_key=MINIO_ACCESS_KEY,
|
||||
secret_key=MINIO_SECRET_KEY,
|
||||
bucket=MINIO_BUCKET,
|
||||
use_ssl=MINIO_USE_SSL,
|
||||
port=MINIO_PORT,
|
||||
public_url=MINIO_PUBLIC_URL,
|
||||
upload_prefix=MINIO_UPLOAD_PREFIX,
|
||||
)
|
||||
return _minio_sdk
|
||||
|
||||
|
||||
def get_minio_client():
|
||||
"""获取 MinIO 客户端（未配置时返回 None）"""
|
||||
sdk = _get_minio_sdk()
|
||||
if not sdk.enabled:
|
||||
return None
|
||||
return sdk.get_client()
|
||||
|
||||
|
||||
def upload_buffer(data: bytes, object_key: str, content_type: str = "application/octet-stream"):
|
||||
"""上传文件到 MinIO（未配置时抛出异常）"""
|
||||
sdk = _get_minio_sdk()
|
||||
if not sdk.enabled:
|
||||
raise RuntimeError("MinIO 未配置，请设置 MINIO_ACCESS_KEY、MINIO_SECRET_KEY")
|
||||
return sdk.upload_buffer(data, object_key, content_type)
|
||||
|
||||
|
||||
def generate_object_key(ext: str) -> str:
|
||||
"""生成上传用的对象键"""
|
||||
return _get_minio_sdk().generate_object_key(ext)
|
||||
@@ -1,231 +0,0 @@
|
||||
"""支付成功后的统一业务处理（基于 SDK）"""
|
||||
import logging
|
||||
|
||||
import requests
|
||||
|
||||
from ..config import PB_URL, PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD
|
||||
from .pb import get_pb_client
|
||||
from .memos import create_memos_user
|
||||
|
||||
# 已处理订单（防重复）
|
||||
processed_orders: set[str] = set()
|
||||
DEFAULT_PASSWORD = "12345678"
|
||||
|
||||
|
||||
def parse_order_id(order_id: str) -> tuple[str, str]:
|
||||
"""从 order_id 解析 user_id 和 pay_type"""
|
||||
if "_order_" not in order_id:
|
||||
return "", "unknown"
|
||||
prefix = order_id.split("_order_")[0]
|
||||
if "_" in prefix:
|
||||
parts = prefix.rsplit("_", 1)
|
||||
return parts[0], parts[1].lower()
|
||||
return prefix, "unknown"
|
||||
|
||||
|
||||
def _decode_pending_email(user_id: str) -> str | None:
|
||||
"""从 pending_hex 格式解析邮箱"""
|
||||
if not user_id.startswith("pending_"):
|
||||
return None
|
||||
hex_part = user_id[8:] # 去掉 "pending_"
|
||||
try:
|
||||
return bytes.fromhex(hex_part).decode("utf-8")
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def _create_user_by_email(email: str) -> str | None:
|
||||
"""用管理员创建用户，返回 user_id。若已存在则返回已有用户 id"""
|
||||
token, _ = _get_admin_token()
|
||||
if not token:
|
||||
return None
|
||||
base = (PB_URL or "").rstrip("/")
|
||||
r = requests.post(
|
||||
f"{base}/api/collections/users/records",
|
||||
json={
|
||||
"email": email,
|
||||
"password": DEFAULT_PASSWORD,
|
||||
"passwordConfirm": DEFAULT_PASSWORD,
|
||||
"live_allowed": True,
|
||||
},
|
||||
headers={"Content-Type": "application/json", "Authorization": f"Bearer {token}"},
|
||||
timeout=10,
|
||||
)
|
||||
if r.status_code == 200:
|
||||
return r.json().get("id")
|
||||
if r.status_code == 400:
|
||||
try:
|
||||
err = r.json()
|
||||
if "already" in str(err.get("data", {}).get("email", {}).get("message", "")).lower():
|
||||
# 用户已存在，查询获取 id
|
||||
get_r = requests.get(
|
||||
f"{base}/api/collections/users/records",
|
||||
params={"filter": f'email="{email}"', "perPage": 1},
|
||||
headers={"Authorization": f"Bearer {token}"},
|
||||
timeout=10,
|
||||
)
|
||||
if get_r.status_code == 200:
|
||||
items = get_r.json().get("items", [])
|
||||
if items:
|
||||
return items[0].get("id")
|
||||
except Exception:
|
||||
pass
|
||||
logging.warning(f"create user failed: {r.status_code} {r.text[:200]}")
|
||||
return None
|
||||
|
||||
|
||||
def _get_admin_token() -> tuple[str | None, str | None]:
|
||||
"""获取 PocketBase 管理员 token"""
|
||||
if not PB_ADMIN_EMAIL or not PB_ADMIN_PASSWORD:
|
||||
return None, "未配置"
|
||||
base = (PB_URL or "").rstrip("/")
|
||||
for path in ["/api/collections/_superusers/auth-with-password", "/api/admins/auth-with-password"]:
|
||||
try:
|
||||
r = requests.post(
|
||||
f"{base}{path}",
|
||||
json={"identity": PB_ADMIN_EMAIL, "password": PB_ADMIN_PASSWORD},
|
||||
timeout=10,
|
||||
)
|
||||
if r.status_code == 200:
|
||||
return r.json().get("token"), None
|
||||
if r.status_code == 404:
|
||||
continue
|
||||
except Exception:
|
||||
pass
|
||||
return None, "认证失败"
|
||||
|
||||
|
||||
def handle_payment_success(
|
||||
order_id: str,
|
||||
pay_price: str,
|
||||
provider_name: str,
|
||||
*,
|
||||
use_memos: bool = False,
|
||||
site_id: str | None = None,
|
||||
):
|
||||
"""
|
||||
支付成功后的统一业务处理
|
||||
:param use_memos: 是否创建 Memos 用户，仅 nomadvip 为 True
|
||||
:param site_id: 站点标识（digital/meetup/vip），用于写入 site_vip
|
||||
"""
|
||||
user_id, pay_type = parse_order_id(order_id)
|
||||
if not user_id:
|
||||
return
|
||||
|
||||
# meetup 新用户：支付成功后才创建用户
|
||||
if pay_type == "meetup" and user_id.startswith("pending_"):
|
||||
email = _decode_pending_email(user_id)
|
||||
if email:
|
||||
real_id = _create_user_by_email(email)
|
||||
if real_id:
|
||||
user_id = real_id
|
||||
logging.info(f"meetup 支付成功，已创建用户: {email}")
|
||||
else:
|
||||
logging.error(f"meetup 支付成功但创建用户失败: {email}")
|
||||
return
|
||||
|
||||
logging.info("[payjsapi] 支付成功 provider=%s user_id=%s pay_type=%s site_id=%s order_id=%s",
|
||||
provider_name, user_id, pay_type, site_id, order_id)
|
||||
|
||||
if pay_type == "vip" and use_memos:
|
||||
create_memos_user(user_id, password="12345678")
|
||||
|
||||
if pay_type == "meetup":
|
||||
logging.info(f"meetup 类型支付成功，不创建 memos 用户 - user_id: {user_id}")
|
||||
if pay_type == "salon":
|
||||
logging.info(f"salon 类型支付成功 - user_id: {user_id}")
|
||||
|
||||
valid_types = ["vip", "book", "meetup", "video", "salon"]
|
||||
if pay_type not in valid_types:
|
||||
pay_type = "vip"
|
||||
|
||||
amount_cents = int(float(pay_price or 0) * 100)
|
||||
|
||||
try:
|
||||
pb_client = get_pb_client()
|
||||
if pay_type == "meetup":
|
||||
solan = pb_client.collection("solan")
|
||||
existing = solan.get_list(1, 1, {
|
||||
"filter": f'user_id = "{user_id}"',
|
||||
"sort": "-created",
|
||||
})
|
||||
if existing.items:
|
||||
record_id = existing.items[0].id
|
||||
solan.update(record_id, {
|
||||
"type": "meetup",
|
||||
"order_id": order_id,
|
||||
"amount": amount_cents,
|
||||
})
|
||||
logging.info(f"meetup 支付字段补齐成功 - user_id: {user_id}, record_id: {record_id}")
|
||||
else:
|
||||
solan.create({
|
||||
"user_id": user_id,
|
||||
"type": "meetup",
|
||||
"order_id": order_id,
|
||||
"amount": amount_cents,
|
||||
})
|
||||
logging.info(f"meetup 完整记录创建（兜底） - user_id: {user_id}")
|
||||
elif pay_type == "salon":
|
||||
solan = pb_client.collection("solanRed")
|
||||
existing = solan.get_list(1, 1, {
|
||||
"filter": f'user_id = "{user_id}"',
|
||||
"sort": "-created",
|
||||
})
|
||||
if existing.items:
|
||||
record_id = existing.items[0].id
|
||||
solan.update(record_id, {
|
||||
"order_id": order_id,
|
||||
"amount": amount_cents,
|
||||
})
|
||||
logging.info(f"salon 支付字段补齐成功 - user_id: {user_id}, record_id: {record_id}")
|
||||
else:
|
||||
solan.create({
|
||||
"user_id": user_id,
|
||||
"order_id": order_id,
|
||||
"amount": amount_cents,
|
||||
})
|
||||
logging.info(f"salon 完整记录创建（兜底） - user_id: {user_id}")
|
||||
else:
|
||||
existing = pb_client.collection("payments").get_list(1, 1, {
|
||||
"filter": f'order_id = "{order_id}"',
|
||||
})
|
||||
if not existing.items:
|
||||
payload = {
|
||||
"user_id": user_id,
|
||||
"type": pay_type,
|
||||
"order_id": order_id,
|
||||
"amount": amount_cents,
|
||||
"total_fee": amount_cents,
|
||||
"channel": "wxpay",
|
||||
}
|
||||
pb_client.collection("payments").create(payload)
|
||||
|
||||
# 写入 site_vip（站点独立 VIP）。meetup 写 site_id=meetup，salon 写 site_id=salon
|
||||
effective_site_id = "meetup" if pay_type == "meetup" else ("salon" if pay_type == "salon" else site_id)
|
||||
if effective_site_id:
|
||||
try:
|
||||
site_vip = pb_client.collection("site_vip")
|
||||
existing_vip = site_vip.get_list(1, 1, {
|
||||
"filter": f'user_id = "{user_id}" && site_id = "{effective_site_id}"',
|
||||
})
|
||||
if existing_vip.items:
|
||||
site_vip.update(existing_vip.items[0].id, {
|
||||
"order_id": order_id,
|
||||
"expires_at": "",
|
||||
})
|
||||
logging.info(f"site_vip 更新成功 - user_id: {user_id}, site_id: {effective_site_id}")
|
||||
else:
|
||||
site_vip.create({
|
||||
"user_id": user_id,
|
||||
"site_id": effective_site_id,
|
||||
"order_id": order_id,
|
||||
"expires_at": "",
|
||||
})
|
||||
logging.info(f"site_vip 创建成功 - user_id: {user_id}, site_id: {effective_site_id}")
|
||||
except Exception as e:
|
||||
logging.warning(f"site_vip 写入失败（不影响主流程）: {e}")
|
||||
|
||||
processed_orders.add(order_id)
|
||||
except Exception as e:
|
||||
logging.error("PocketBase 操作失败 order_id=%s error=%s", order_id, e)
|
||||
raise
|
||||
@@ -1,22 +0,0 @@
|
||||
"""PocketBase 客户端（基于 SDK）"""
|
||||
from app.config import PB_URL, PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD
|
||||
from app.sdk.pocketbase import PocketBaseSDK
|
||||
|
||||
_pb_sdk: PocketBaseSDK | None = None
|
||||
|
||||
|
||||
def _get_pb_sdk() -> PocketBaseSDK:
|
||||
global _pb_sdk
|
||||
if _pb_sdk is None:
|
||||
_pb_sdk = PocketBaseSDK(
|
||||
url=PB_URL,
|
||||
admin_email=PB_ADMIN_EMAIL,
|
||||
admin_password=PB_ADMIN_PASSWORD,
|
||||
)
|
||||
return _pb_sdk
|
||||
|
||||
|
||||
def get_pb_client():
|
||||
"""获取已认证的 PocketBase 客户端（复用已登录实例，不重复打日志）"""
|
||||
sdk = _get_pb_sdk()
|
||||
return sdk.get_client()
|
||||
@@ -1,17 +0,0 @@
|
||||
2026-03-08 03:04:04,172 - ZPAY 땐데꿴璂呵겨: HTTPSConnectionPool(host='zpayz.cn', port=443): Read timed out. (read timeout=10)
|
||||
2026-03-08 06:25:51,919 - ZPAY 땐데꿴璂呵겨: HTTPSConnectionPool(host='zpayz.cn', port=443): Read timed out. (read timeout=10)
|
||||
2026-03-08 06:28:42,212 - ZPAY 땐데꿴璂呵겨: HTTPSConnectionPool(host='zpayz.cn', port=443): Read timed out. (read timeout=10)
|
||||
2026-03-08 06:31:18,405 - ZPAY 땐데꿴璂呵겨: HTTPSConnectionPool(host='zpayz.cn', port=443): Read timed out. (read timeout=10)
|
||||
2026-03-08 06:39:41,805 - ZPAY 땐데꿴璂呵겨: HTTPSConnectionPool(host='zpayz.cn', port=443): Read timed out. (read timeout=10)
|
||||
2026-03-08 06:40:22,362 - ZPAY 땐데꿴璂呵겨: ('Connection aborted.', RemoteDisconnected('Remote end closed connection without response'))
|
||||
2026-03-10 05:01:08,564 - nomadvip payh5/redirect 헝헹: item={'user_id': 'user1773135567826', 'total_fee': 18800, 'type': 'vip', 'channel': 'wxpay', 'return_url': 'http://192.168.41.222:3000/paid', 'device': 'pc', 'client_ip': '192.168.41.222'}
|
||||
2026-03-10 05:02:23,523 - nomadvip ZPAY 땐데꿴璂呵겨: HTTPSConnectionPool(host='zpayz.cn', port=443): Read timed out. (read timeout=10)
|
||||
2026-03-10 05:02:46,901 - nomadvip payh5/redirect 헝헹: item={'user_id': 'user1773136912337', 'total_fee': 18800, 'type': 'vip', 'channel': 'wxpay', 'return_url': 'http://192.168.41.222:3000/paid', 'device': 'wechat', 'client_ip': '192.168.41.34'}
|
||||
2026-03-10 05:03:26,325 - nomadvip payh5/redirect 헝헹: item={'user_id': 'user1773136912337', 'total_fee': 18800, 'type': 'vip', 'channel': 'wxpay', 'return_url': 'http://192.168.41.222:3000/paid', 'device': 'wechat', 'client_ip': '192.168.41.34'}
|
||||
2026-03-10 05:04:54,606 - nomadvip ZPAY 땐데꿴璂呵겨: ('Connection aborted.', ConnectionResetError(10054, 'An existing connection was forcibly closed by the remote host', None, 10054, None))
|
||||
2026-03-10 05:06:39,639 - nomadvip payh5/redirect 헝헹: item={'user_id': 'user1773136912337', 'total_fee': 18800, 'type': 'vip', 'channel': 'wxpay', 'return_url': 'http://192.168.41.222:3000/paid', 'device': 'wechat', 'client_ip': '192.168.41.34'}
|
||||
2026-03-10 05:07:03,035 - nomadvip payh5/redirect 헝헹: item={'user_id': 'user1773136912337', 'total_fee': 18800, 'type': 'vip', 'channel': 'wxpay', 'return_url': 'http://192.168.41.222:3000/paid', 'device': 'wechat', 'client_ip': '192.168.41.34'}
|
||||
2026-03-10 05:07:37,981 - nomadvip ZPAY 땐데꿴璂呵겨: ('Connection aborted.', RemoteDisconnected('Remote end closed connection without response'))
|
||||
2026-03-10 05:08:31,484 - nomadvip payh5/redirect 헝헹: item={'user_id': 'user1773136912337', 'total_fee': 18800, 'type': 'vip', 'channel': 'wxpay', 'return_url': 'http://192.168.41.222:3000/paid', 'device': 'wechat', 'client_ip': '192.168.41.34'}
|
||||
2026-03-10 05:15:55,977 - nomadvip payh5/redirect 헝헹: item={'user_id': 'user1773136912337', 'total_fee': 18800, 'type': 'vip', 'channel': 'wxpay', 'return_url': 'http://192.168.41.222:3000/paid', 'device': 'wechat', 'client_ip': '192.168.41.34'}
|
||||
2026-03-10 05:22:16,735 - nomadvip payh5/redirect 헝헹: item={'user_id': 'user1773131395284', 'total_fee': 18800, 'type': 'vip', 'channel': 'wxpay', 'return_url': 'http://localhost:3000/paid', 'device': 'pc', 'client_ip': '127.0.0.1'}
|
||||
10
requirements.txt
Executable file → Normal file
10
requirements.txt
Executable file → Normal file
@@ -1,12 +1,4 @@
|
||||
fastapi
|
||||
uvicorn
|
||||
python-dotenv
|
||||
sqlalchemy
|
||||
pydantic
|
||||
python-multipart
|
||||
pocketbase
|
||||
requests
|
||||
minio
|
||||
opencv-python-headless
|
||||
rapidocr-onnxruntime
|
||||
pycryptodome
|
||||
pydantic
|
||||
@@ -1,4 +0,0 @@
|
||||
@echo off
|
||||
REM 强制无缓冲输出，确保日志立即显示在终端
|
||||
set PYTHONUNBUFFERED=1
|
||||
python -u run.py
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/bin/bash
|
||||
# 强制无缓冲输出，确保日志立即显示在终端
|
||||
export PYTHONUNBUFFERED=1
|
||||
exec python -u run.py
|
||||
31
run.py
Executable file → Normal file
31
run.py
Executable file → Normal file
@@ -1,31 +1,6 @@
|
||||
import os
|
||||
import sys
|
||||
|
||||
os.environ.setdefault("PYTHONUNBUFFERED", "1")
|
||||
if hasattr(sys.stdout, "reconfigure"):
|
||||
sys.stdout.reconfigure(line_buffering=True)
|
||||
if hasattr(sys.stderr, "reconfigure"):
|
||||
sys.stderr.reconfigure(line_buffering=True)
|
||||
|
||||
import uvicorn
|
||||
from dotenv import load_dotenv
|
||||
|
||||
load_dotenv()
|
||||
|
||||
if __name__ == "__main__":
|
||||
port = int(os.getenv("PORT", "8007"))
|
||||
reload_enabled = os.getenv("UVICORN_RELOAD", "0").strip().lower() in ("1", "true", "yes")
|
||||
try:
|
||||
sys.stderr.write(f"\n[payjsapi] startup http://0.0.0.0:{port}\n")
|
||||
sys.stderr.flush()
|
||||
except (OSError, ValueError):
|
||||
pass
|
||||
|
||||
uvicorn.run(
|
||||
"app.main:app",
|
||||
host="0.0.0.0",
|
||||
port=port,
|
||||
reload=reload_enabled,
|
||||
log_level="info",
|
||||
)
|
||||
|
||||
uvicorn.run("app.main:app", host="0.0.0.0", port=8700, reload=True)
|
||||
# uvicorn.run("app.main:app", host="0.0.0.0", port=8200, reload=True)
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
python3
|
||||
@@ -1 +0,0 @@
|
||||
/usr/bin/python3
|
||||
@@ -1 +0,0 @@
|
||||
python3
|
||||
@@ -1 +0,0 @@
|
||||
lib
|
||||
@@ -1,5 +0,0 @@
|
||||
home = /usr/bin
|
||||
include-system-site-packages = false
|
||||
version = 3.12.3
|
||||
executable = /usr/bin/python3.12
|
||||
command = /usr/bin/python3 -m venv /www/wwwroot/payjsapi/venv
|
||||
@@ -1,343 +0,0 @@
|
||||
2025-12-17 23:12:39,739 - XorPay 异步通知原始数据: {'aoid': 'ff6ed0b5470940ce965c201a3cf4265f', 'order_id': 'user_1766034344444_order_1766034744_f89afc82', 'detail': '{}', 'sign': 'e8343caedd3922785fa74552713252a0', 'pay_time': '2025-12-18 13:12:39.026849', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-17 23:13:02,417 - XorPay 异步通知原始数据: {'aoid': '26a1087a84c945e2bb987ef9a2d0ea83', 'order_id': 'user_1766034344444_order_1766034638_96eca26d', 'detail': '{}', 'sign': '1d8cf284cbe35ad905a25291b0b74d52', 'pay_time': '2025-12-18 13:10:55', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-17 23:24:01,958 - XorPay 异步通知原始数据: {'aoid': '2e9ff94264084a179c127124fd306254', 'order_id': 'user_1766034344444_order_1766034442_9c75a3fe', 'detail': '{}', 'sign': 'd9bd124d79dbf37705fa50776d5a0895', 'pay_time': '2025-12-18 13:07:36', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-17 23:33:33,644 - XorPay 异步通知原始数据: {'aoid': 'cd904ae8d51f4b9186b56c1845e0d901', 'order_id': 'user_1766034344444_vip_order_1766035997_ea11ef8d', 'detail': '{}', 'sign': 'b92f269f8f5ffad2ec6a22a7ed745d34', 'pay_time': '2025-12-18 13:33:32.605326', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-17 23:33:35,203 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-17 23:33:35,234 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-17 23:33:35,239 - 支付记录写入 PocketBase 成功 - user_id: user_1766034344444, type: vip, order_id: user_1766034344444_vip_order_1766035997_ea11ef8d
|
||||
2025-12-18 01:43:22,250 - XorPay 异步通知原始数据: {'aoid': 'd7b3aeb1c7244aee9e9706c2489ed6d0', 'order_id': 'user_1766043770158_vip_order_1766043786_e44af2ae', 'detail': '{}', 'sign': '44b15e8c83a1c0210038766fb1c71164', 'pay_time': '2025-12-18 15:43:21.452098', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-18 01:43:24,152 - memos 创建失败 - username: user_1766043770158, status: 400, response: {"code":3,"message":"invalid username: user_1766043770158","details":[]}
|
||||
2025-12-18 01:43:25,870 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-18 01:43:25,924 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-18 01:43:25,926 - 支付记录写入 PocketBase 成功 - user_id: user_1766043770158, type: vip, order_id: user_1766043770158_vip_order_1766043786_e44af2ae
|
||||
2025-12-18 01:46:45,905 - XorPay 异步通知原始数据: {'aoid': '703b2fa82a3d43698c3985884427936d', 'order_id': 'user1766043978189_vip_order_1766043991_c763fbc1', 'detail': '{}', 'sign': 'a90f22b750977427846075400fa91ab2', 'pay_time': '2025-12-18 15:46:45.139323', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-18 01:46:47,450 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-18 01:46:47,471 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 400 Bad Request"
|
||||
2025-12-18 01:46:47,476 - PocketBase 写入失败 - order_id: user1766043978189_vip_order_1766043991_c763fbc1, error: Message: Response error. Status code:400
|
||||
URL: https://pocketbase.hackrobot.cn/api/collections/payments/records
|
||||
Status: 400
|
||||
Data: {'data': {'type': {'code': 'validation_invalid_value', 'message': 'Invalid value unknown.', 'params': {'value': 'unknown'}}}, 'message': 'Failed to create record.', 'status': 400}
|
||||
Is Abort: False
|
||||
Original Error: N/A
|
||||
2025-12-18 01:51:39,196 - XorPay 异步通知原始数据: {'aoid': '67f58f4a06194395a1e9365923132b42', 'order_id': 'user1766044269820_vip_order_1766044284_fd06ca4c', 'detail': '{}', 'sign': 'f8461c3ce764597621b12699d82bbd89', 'pay_time': '2025-12-18 15:51:38.453726', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-18 01:51:40,720 - memos 用户创建成功: user1766044269820
|
||||
2025-12-18 01:51:42,279 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-18 01:51:42,301 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-18 01:51:42,303 - 支付记录写入 PocketBase 成功 - user_id: user1766044269820, type: vip, order_id: user1766044269820_vip_order_1766044284_fd06ca4c
|
||||
2025-12-18 16:11:56,651 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '2c599bd51b364a6ca6938a9359ee905b', 'order_id': 'user1766044768982_vip_order_1766045500_fa88ad9e', 'detail': '{}', 'sign': 'ec59d2938230a0335284ed5678c44ed6', 'pay_time': '2025-12-18 16:11:55.527091', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-18 16:11:56,869 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766044768982
|
||||
2025-12-18 16:11:57,099 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-18 16:11:57,129 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-18 16:11:57,129 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766044768982, type: vip, order_id: user1766044768982_vip_order_1766045500_fa88ad9e
|
||||
2025-12-18 16:12:01,273 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '8e17ee8d8b1246a1b6bc7e46e861021c', 'order_id': 'user1766044768982_vip_order_1766045413_39b3cf6b', 'detail': '{}', 'sign': '920993c639746192fa75a0586a988cf3', 'pay_time': '2025-12-18 16:10:27', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-18 16:12:01,399 - memos 鍒涘缓澶辫触 - username: user1766044768982, status: 500, response: {"code":13,"message":"failed to create user: constraint failed: UNIQUE constraint failed: user.username (2067)","details":[]}
|
||||
2025-12-18 16:12:01,594 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-18 16:12:01,601 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-18 16:12:01,601 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766044768982, type: vip, order_id: user1766044768982_vip_order_1766045413_39b3cf6b
|
||||
2025-12-18 16:14:54,444 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '317faf5478a049908b2ea1aa4050c6e7', 'order_id': 'user1766045681042_vip_order_1766045683_ea6ca46a', 'detail': '{}', 'sign': '780d3c2f6e2ed277b3e2c562f343515e', 'pay_time': '2025-12-18 16:14:54.411898', 'pay_price': '0.10', 'more': ''}
|
||||
2025-12-18 16:14:54,611 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766045681042
|
||||
2025-12-18 16:14:55,672 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-18 16:14:55,674 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-18 16:14:55,675 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766045681042, type: vip, order_id: user1766045681042_vip_order_1766045683_ea6ca46a
|
||||
2025-12-18 18:12:18,576 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '5f62f32ad26a44b888b5d0e13706f46f', 'order_id': 'user1766046553880_vip_order_1766052718_4ab52abd', 'detail': '{}', 'sign': 'd4cb94c6a3ca4e96809d9cda85d7c20d', 'pay_time': '2025-12-18 18:12:18.408242', 'pay_price': '188.00', 'more': ''}
|
||||
2025-12-18 18:12:19,329 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766046553880
|
||||
2025-12-18 18:12:19,686 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-18 18:12:19,718 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-18 18:12:19,730 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766046553880, type: vip, order_id: user1766046553880_vip_order_1766052718_4ab52abd
|
||||
2025-12-19 18:40:53,356 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '057a4319f16d4036a3dda94ea65412ab', 'order_id': 'user1766140776331_vip_order_1766140804_d9eaf9bc', 'detail': '{}', 'sign': '085ab9d3c1ceb2e7e9cf17f54499c90e', 'pay_time': '2025-12-19 18:40:53.132699', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-19 18:40:54,204 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766140776331
|
||||
2025-12-19 18:40:54,602 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-19 18:40:54,643 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-19 18:40:54,659 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766140776331, type: vip, order_id: user1766140776331_vip_order_1766140804_d9eaf9bc
|
||||
2025-12-20 01:25:01,990 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '610aa1b9b7ab48f6a2793b07e4528868', 'order_id': 'user1766165011994_vip_order_1766165079_abeb6f2b', 'detail': '{}', 'sign': 'f82a03ea098007b9a93a12e02a5290a6', 'pay_time': '2025-12-20 01:25:01.789169', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-20 01:25:02,625 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766165011994
|
||||
2025-12-20 01:25:02,927 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-20 01:25:03,284 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-20 01:25:03,288 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766165011994, type: vip, order_id: user1766165011994_vip_order_1766165079_abeb6f2b
|
||||
2025-12-20 15:17:44,923 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '8eb32676f2fa4bf2a77c94d4409063e8', 'order_id': 'user1766213338235_vip_order_1766215049_2ba092ac', 'detail': '{}', 'sign': '15a15a8155619cf84ec6ee305e5b7c27', 'pay_time': '2025-12-20 15:17:44.685799', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-20 15:17:45,768 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766213338235
|
||||
2025-12-20 15:17:46,148 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-20 15:17:46,182 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-20 15:17:46,193 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766213338235, type: vip, order_id: user1766213338235_vip_order_1766215049_2ba092ac
|
||||
2025-12-20 16:26:09,306 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '5442ce403ae14e1dab141f909b4bb579', 'order_id': 'user1766046581515_vip_order_1766219155_ba76bab4', 'detail': '{}', 'sign': '7ca539655f764cac6392bd07fd4c1072', 'pay_time': '2025-12-20 16:26:09.136153', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-20 16:26:09,618 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766046581515
|
||||
2025-12-20 16:26:09,782 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-20 16:26:09,795 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-20 16:26:09,796 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766046581515, type: vip, order_id: user1766046581515_vip_order_1766219155_ba76bab4
|
||||
2025-12-20 17:54:32,400 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '343e5832e9654c2c82157e70880cb660', 'order_id': 'user1766224455635_vip_order_1766224460_cffae307', 'detail': '{}', 'sign': 'c04a150a905e88cbb75fe6992ee4d58d', 'pay_time': '2025-12-20 17:54:31.254708', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-20 17:54:33,178 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766224455635
|
||||
2025-12-20 17:54:33,554 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-20 17:54:33,562 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-20 17:54:33,562 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766224455635, type: vip, order_id: user1766224455635_vip_order_1766224460_cffae307
|
||||
2025-12-21 18:25:02,824 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '1fec5389b5d94c91b9f164c0b27f39bf', 'order_id': 'user1766296152138_vip_order_1766312684_25e8ea6c', 'detail': '{}', 'sign': '12e1e532adccd0b8fe7dbb87c10eabdf', 'pay_time': '2025-12-21 18:25:02.595185', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-21 18:25:03,850 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766296152138
|
||||
2025-12-21 18:25:04,215 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-21 18:25:04,255 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-21 18:25:04,270 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766296152138, type: vip, order_id: user1766296152138_vip_order_1766312684_25e8ea6c
|
||||
2025-12-21 19:16:25,590 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '8be679ab67ba40e6abbacbc745d7b2bd', 'order_id': 'user1766296261505_vip_order_1766315769_c0268b55', 'detail': '{}', 'sign': 'a9684bc176ae31afa4142bb8edb52b93', 'pay_time': '2025-12-21 19:16:25.434751', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-21 19:16:26,170 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766296261505
|
||||
2025-12-21 19:16:26,333 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-21 19:16:26,341 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-21 19:16:26,341 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766296261505, type: vip, order_id: user1766296261505_vip_order_1766315769_c0268b55
|
||||
2025-12-21 19:16:51,387 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '6c0f4be3b017404eba1fde3e2fec0033', 'order_id': 'user1766315791228_vip_order_1766315797_e1bcdb8d', 'detail': '{}', 'sign': 'b554cda9c1f6a4466e7ee56007fe8443', 'pay_time': '2025-12-21 19:16:51.353245', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-21 19:16:51,555 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766315791228
|
||||
2025-12-21 19:16:51,717 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-21 19:16:51,722 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-21 19:16:51,722 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766315791228, type: vip, order_id: user1766315791228_vip_order_1766315797_e1bcdb8d
|
||||
2025-12-21 23:13:35,029 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '91bdcf5e525341ce81a9e064c234d47c', 'order_id': 'user1766329986866_vip_order_1766329997_fcda92f7', 'detail': '{}', 'sign': '80dfb5f134bc17d00936f8fb57ee1143', 'pay_time': '2025-12-21 23:13:34.878451', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-21 23:13:35,231 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766329986866
|
||||
2025-12-21 23:13:35,519 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-21 23:13:35,525 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-21 23:13:35,526 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766329986866, type: vip, order_id: user1766329986866_vip_order_1766329997_fcda92f7
|
||||
2025-12-22 22:28:55,382 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '2b64f275a603458e9570851293a277ac', 'order_id': 'user1766413713868_vip_order_1766413715_e1ba5dc4', 'detail': '{}', 'sign': '28a8e18854866b478e66afa4b343786e', 'pay_time': '2025-12-22 22:28:55.154387', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-22 22:28:56,142 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766413713868
|
||||
2025-12-22 22:28:56,448 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-22 22:28:56,478 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-22 22:28:56,488 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766413713868, type: vip, order_id: user1766413713868_vip_order_1766413715_e1ba5dc4
|
||||
2025-12-23 10:27:30,132 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'bee93191cdbf4a30902c7fa4de36140a', 'order_id': 'user1766456742992_vip_order_1766456837_90bb94eb', 'detail': '{}', 'sign': '47ea9e6e940c5d1cb99926b7a4eebf68', 'pay_time': '2025-12-23 10:27:29.914796', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-23 10:27:31,276 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766456742992
|
||||
2025-12-23 10:27:31,838 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-23 10:27:31,880 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-23 10:27:31,895 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766456742992, type: vip, order_id: user1766456742992_vip_order_1766456837_90bb94eb
|
||||
2025-12-23 16:42:42,232 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'bcf3c2ce47d740e797f0096fcbc9d823', 'order_id': 'user1766479338813_vip_order_1766479345_caa1a9e8', 'detail': '{}', 'sign': 'fd49eb134791f746001ad44c44832c17', 'pay_time': '2025-12-23 16:42:42.041901', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-23 16:42:42,776 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766479338813
|
||||
2025-12-23 16:42:43,062 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-23 16:42:43,586 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-23 16:42:43,590 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766479338813, type: vip, order_id: user1766479338813_vip_order_1766479345_caa1a9e8
|
||||
2025-12-23 19:26:03,240 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '7ed0d27bde004d3a935b53b49702b743', 'order_id': 'user1766489119849_vip_order_1766489127_3aabed43', 'detail': '{}', 'sign': '8fd4c65d638c13a3ef961298964c5d9c', 'pay_time': '2025-12-23 19:26:03.071519', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-23 19:26:03,572 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766489119849
|
||||
2025-12-23 19:26:03,737 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-23 19:26:03,746 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-23 19:26:03,746 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766489119849, type: vip, order_id: user1766489119849_vip_order_1766489127_3aabed43
|
||||
2025-12-24 07:58:44,464 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '2d353f37d4a34fa182f5fad493c1e8e3', 'order_id': 'user1766534296167_vip_order_1766534297_534b3d4b', 'detail': '{}', 'sign': '4e69abfb04e09e714f099bb65973e782', 'pay_time': '2025-12-24 07:58:44.271470', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-24 07:58:45,381 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766534296167
|
||||
2025-12-24 07:58:45,715 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-24 07:58:45,753 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-24 07:58:45,769 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766534296167, type: vip, order_id: user1766534296167_vip_order_1766534297_534b3d4b
|
||||
2025-12-24 08:00:03,544 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'fff28d3bf4504062b1fe56b89c532440', 'order_id': 'user1766534381284_vip_order_1766534384_f1bdf215', 'detail': '{}', 'sign': '6e55110ff04fc5c1c68f82d463d3beae', 'pay_time': '2025-12-24 08:00:03.509869', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-24 08:00:03,872 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766534381284
|
||||
2025-12-24 08:00:04,158 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-24 08:00:04,166 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-24 08:00:04,166 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766534381284, type: vip, order_id: user1766534381284_vip_order_1766534384_f1bdf215
|
||||
2025-12-24 12:38:45,444 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '1abe7c217dea4c119921735f2d9d7395', 'order_id': 'user1766551004577_vip_order_1766551115_03736ef8', 'detail': '{}', 'sign': 'bf63ffd12cf05ab189b459ee6d83df3c', 'pay_time': '2025-12-24 12:38:45.259828', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-24 12:38:46,088 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766551004577
|
||||
2025-12-24 12:38:46,365 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-24 12:38:46,393 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-24 12:38:46,404 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766551004577, type: vip, order_id: user1766551004577_vip_order_1766551115_03736ef8
|
||||
2025-12-25 14:34:56,058 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'e63e23aa882a4945807f5e3cdbc77bff', 'order_id': 'user1766644478831_vip_order_1766644480_aafd9b52', 'detail': '{}', 'sign': '45f9603ed57b1dc86741ca3c47dd7617', 'pay_time': '2025-12-25 14:34:55.845371', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 14:34:56,872 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766644478831
|
||||
2025-12-25 14:34:57,203 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 14:34:57,693 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 14:34:57,708 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766644478831, type: vip, order_id: user1766644478831_vip_order_1766644480_aafd9b52
|
||||
2025-12-25 14:39:27,820 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '259af2bb60e3463e9cabc83c3944b238', 'order_id': 'user1766644709180_vip_order_1766644722_eae4ff2a', 'detail': '{}', 'sign': '09331deda262c3bca0f04b9eb092c335', 'pay_time': '2025-12-25 14:39:27.641197', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 14:39:27,989 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766644709180
|
||||
2025-12-25 14:39:28,150 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 14:39:28,156 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 14:39:28,157 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766644709180, type: vip, order_id: user1766644709180_vip_order_1766644722_eae4ff2a
|
||||
2025-12-25 14:45:00,011 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '53612e51bdc94ad5b90086091f684e1a', 'order_id': 'user1766645074947_vip_order_1766645082_cc1cd20d', 'detail': '{}', 'sign': '90920b8ff308e49dbe8f6d3489126fad', 'pay_time': '2025-12-25 14:44:59.925734', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 14:45:00,253 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766645074947
|
||||
2025-12-25 14:45:00,451 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 14:45:00,458 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 14:45:00,458 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766645074947, type: vip, order_id: user1766645074947_vip_order_1766645082_cc1cd20d
|
||||
2025-12-25 14:53:50,486 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '0c3481595d2244f49b988b02f6fb79b1', 'order_id': 'user1766645607019_vip_order_1766645617_7d2c2f0e', 'detail': '{}', 'sign': 'b97ca09f294f4caa628abc4d63311c83', 'pay_time': '2025-12-25 14:53:50.331570', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 14:53:50,658 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766645607019
|
||||
2025-12-25 14:53:50,822 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 14:53:50,828 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 14:53:50,828 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766645607019, type: vip, order_id: user1766645607019_vip_order_1766645617_7d2c2f0e
|
||||
2025-12-25 15:26:02,951 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'c7002f2ab8d34fd981606bd9fe0051a2', 'order_id': 'user1766102687534_vip_order_1766647552_9f9feed4', 'detail': '{}', 'sign': '7eaf3442d110d2af3ef6adf2eb11189b', 'pay_time': '2025-12-25 15:26:02.782398', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 15:26:03,549 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766102687534
|
||||
2025-12-25 15:26:03,819 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 15:26:03,834 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 15:26:03,836 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766102687534, type: vip, order_id: user1766102687534_vip_order_1766647552_9f9feed4
|
||||
2025-12-25 15:28:52,615 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'f210a5394ad84429b91d43ebee8dc48a', 'order_id': 'user1766647507325_vip_order_1766647720_bec3fa2a', 'detail': '{}', 'sign': '1c5fced854dc61daf40f0a7f485ed25e', 'pay_time': '2025-12-25 15:28:52.584563', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 15:28:52,792 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766647507325
|
||||
2025-12-25 15:28:52,954 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 15:28:53,029 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 15:28:53,029 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766647507325, type: vip, order_id: user1766647507325_vip_order_1766647720_bec3fa2a
|
||||
2025-12-25 16:08:32,724 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '9c8c1d5f84e447db9413e6ba8079e079', 'order_id': 'user1766650018794_vip_order_1766650105_99ab8550', 'detail': '{}', 'sign': '1d8f5c3b0bb4c7d4e7e3249b34b7c14b', 'pay_time': '2025-12-25 16:08:32.590930', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 16:08:32,895 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766650018794
|
||||
2025-12-25 16:08:33,058 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 16:08:33,065 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 16:08:33,065 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766650018794, type: vip, order_id: user1766650018794_vip_order_1766650105_99ab8550
|
||||
2025-12-25 16:08:49,855 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '057e5d84a56b4a5f9022ed60fed63584', 'order_id': 'user1766648960557_vip_order_1766650099_f3ffcbaf', 'detail': '{}', 'sign': 'ebc9dbf1b61a6ea2d2ba744572ec1784', 'pay_time': '2025-12-25 16:08:49.823710', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 16:08:50,024 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766648960557
|
||||
2025-12-25 16:08:50,190 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 16:08:50,193 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 16:08:50,193 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766648960557, type: vip, order_id: user1766648960557_vip_order_1766650099_f3ffcbaf
|
||||
2025-12-25 16:53:15,082 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '7c233317484b44f8b12f64752c9ba765', 'order_id': 'user1766642873343_vip_order_1766652778_2ddc93d9', 'detail': '{}', 'sign': '5befe13745a772364edfd851bcf9d83c', 'pay_time': '2025-12-25 16:53:14.927339', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 16:53:15,336 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766642873343
|
||||
2025-12-25 16:53:15,497 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 16:53:15,505 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 16:53:15,505 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766642873343, type: vip, order_id: user1766642873343_vip_order_1766652778_2ddc93d9
|
||||
2025-12-25 17:21:30,633 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '724bf0ff5b0c4ba886047a8f577e6a49', 'order_id': 'user1766425649141_vip_order_1766654472_e3a31ef2', 'detail': '{}', 'sign': '930b26b77e50d7b8677bc4b07a8ccefd', 'pay_time': '2025-12-25 17:21:30.479462', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 17:21:30,826 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766425649141
|
||||
2025-12-25 17:21:30,988 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 17:21:30,995 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 17:21:30,995 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766425649141, type: vip, order_id: user1766425649141_vip_order_1766654472_e3a31ef2
|
||||
2025-12-25 18:48:30,408 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '46adec50b319426db93f5efec4108336', 'order_id': 'user1766659694256_vip_order_1766659696_f8319dd5', 'detail': '{}', 'sign': '494b5f48f3410d8185060404620d558e', 'pay_time': '2025-12-25 18:48:30.276586', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 18:48:30,585 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766659694256
|
||||
2025-12-25 18:48:30,745 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 18:48:30,759 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 18:48:30,760 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766659694256, type: vip, order_id: user1766659694256_vip_order_1766659696_f8319dd5
|
||||
2025-12-25 23:43:41,286 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '73f41bf5555b46fba22a3ef5ab78a2f2', 'order_id': 'user1766677403431_vip_order_1766677408_51f35a7d', 'detail': '{}', 'sign': '9cb826f31fc24872d64a32ac4da10878', 'pay_time': '2025-12-25 23:43:41.104124', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-25 23:43:42,040 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766677403431
|
||||
2025-12-25 23:43:42,743 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-25 23:43:42,752 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-25 23:43:42,752 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766677403431, type: vip, order_id: user1766677403431_vip_order_1766677408_51f35a7d
|
||||
2025-12-26 01:28:00,596 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'afc37fdbf5394e5390f5daf25965bc30', 'order_id': 'user1766683323953_vip_order_1766683672_dffcccce', 'detail': '{}', 'sign': '7da90f4aa550ff781ba2eb29e816808e', 'pay_time': '2025-12-26 01:28:00.421039', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-26 01:28:00,817 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766683323953
|
||||
2025-12-26 01:28:00,984 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-26 01:28:00,995 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-26 01:28:00,996 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766683323953, type: vip, order_id: user1766683323953_vip_order_1766683672_dffcccce
|
||||
2025-12-26 07:32:19,663 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '4c809d871d84418da6336f2653a54a09', 'order_id': 'user1766705393451_vip_order_1766705520_54a049e8', 'detail': '{}', 'sign': '09a46bd70ca5692d59f07c4e1a97df89', 'pay_time': '2025-12-26 07:32:19.440263', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-26 07:32:20,466 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766705393451
|
||||
2025-12-26 07:32:20,766 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-26 07:32:20,799 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-26 07:32:20,806 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766705393451, type: vip, order_id: user1766705393451_vip_order_1766705520_54a049e8
|
||||
2025-12-26 09:51:47,523 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '5fd5db6752c048768d42099f40bcf94d', 'order_id': 'user1766713881133_vip_order_1766713892_63fcc777', 'detail': '{}', 'sign': 'bc66dbdf9e2050e8d16e210240c0d2fd', 'pay_time': '2025-12-26 09:51:47.392578', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-26 09:51:47,791 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766713881133
|
||||
2025-12-26 09:51:47,952 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-26 09:51:47,962 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-26 09:51:47,962 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766713881133, type: vip, order_id: user1766713881133_vip_order_1766713892_63fcc777
|
||||
2025-12-26 20:42:12,077 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '3d81365773924cf28e6633f8736c49e9', 'order_id': 'user1766456732682_vip_order_1766752919_c01e5c7c', 'detail': '{}', 'sign': '9c791d646e77a3c23d940ff75bbac2d5', 'pay_time': '2025-12-26 20:42:11.851603', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-26 20:42:12,726 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766456732682
|
||||
2025-12-26 20:42:13,088 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-26 20:42:13,127 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-26 20:42:13,684 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766456732682, type: vip, order_id: user1766456732682_vip_order_1766752919_c01e5c7c
|
||||
2025-12-26 21:59:52,133 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '1bc7e794e2504a0f8262f6ed08c26b89', 'order_id': 'user1766757398274_vip_order_1766757411_adac75bc', 'detail': '{}', 'sign': '88b0802f3651fdbf0ebcf36f5e93cd35', 'pay_time': '2025-12-26 21:59:51.964255', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-26 21:59:52,342 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766757398274
|
||||
2025-12-26 21:59:52,508 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-26 21:59:52,516 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-26 21:59:52,516 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766757398274, type: vip, order_id: user1766757398274_vip_order_1766757411_adac75bc
|
||||
2025-12-27 00:35:29,599 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'f035e2d41a8d4cdb952202b8a4670766', 'order_id': 'user1766766911300_vip_order_1766766916_05b79fe5', 'detail': '{}', 'sign': 'b8888a23e0282872c293a741572256aa', 'pay_time': '2025-12-27 00:35:29.446434', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-27 00:35:29,780 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766766911300
|
||||
2025-12-27 00:35:29,943 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-27 00:35:29,951 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-27 00:35:29,951 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766766911300, type: vip, order_id: user1766766911300_vip_order_1766766916_05b79fe5
|
||||
2025-12-27 22:06:29,961 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'd5fbb42c040844f69d1f13f4f0402a59', 'order_id': 'user1766760554294_vip_order_1766844380_dba8623e', 'detail': '{}', 'sign': '55635e22369cffcfb8156d9f1ee8697e', 'pay_time': '2025-12-27 22:06:29.721581', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-27 22:06:31,066 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766760554294
|
||||
2025-12-27 22:06:31,425 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-27 22:06:31,465 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-27 22:06:31,479 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766760554294, type: vip, order_id: user1766760554294_vip_order_1766844380_dba8623e
|
||||
2025-12-27 22:36:00,006 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'edb9213e2ac343bbb7de697092b7ec39', 'order_id': 'user1766092372361_vip_order_1766846141_d4d4ad0b', 'detail': '{}', 'sign': '084d88a8d918b9b1654327cf2cb895b5', 'pay_time': '2025-12-27 22:35:59.824034', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-27 22:36:00,291 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766092372361
|
||||
2025-12-27 22:36:00,457 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-27 22:36:00,464 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-27 22:36:00,464 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766092372361, type: vip, order_id: user1766092372361_vip_order_1766846141_d4d4ad0b
|
||||
2025-12-28 13:30:47,717 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'a3f3d369653c425887f0ab9b30a0a50c', 'order_id': 'user1766864758860_vip_order_1766899835_ecf39390', 'detail': '{}', 'sign': '4eca166a31f41ba4c72a4f9779d3054b', 'pay_time': '2025-12-28 13:30:47.532714', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-28 13:30:48,327 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766864758860
|
||||
2025-12-28 13:30:48,647 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-28 13:30:48,679 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-28 13:30:48,692 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766864758860, type: vip, order_id: user1766864758860_vip_order_1766899835_ecf39390
|
||||
2025-12-28 13:38:58,457 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '938ad71940a745e48644d931e411b1df', 'order_id': 'user1766855547122_vip_order_1766900323_ce3c2fbb', 'detail': '{}', 'sign': 'd6339a30dcc819df47e59f13fdf0bfb9', 'pay_time': '2025-12-28 13:38:58.266814', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-28 13:38:58,632 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766855547122
|
||||
2025-12-28 13:38:59,039 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-28 13:38:59,046 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-28 13:38:59,047 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766855547122, type: vip, order_id: user1766855547122_vip_order_1766900323_ce3c2fbb
|
||||
2025-12-28 13:40:17,029 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '81ef015f219845018093968d4eb29f3a', 'order_id': 'user1766900390848_vip_order_1766900392_aeaec3ba', 'detail': '{}', 'sign': '92780969a7d80b7c26b305a56943e055', 'pay_time': '2025-12-28 13:40:16.951540', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-28 13:40:17,211 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766900390848
|
||||
2025-12-28 13:40:17,376 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-28 13:40:17,379 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-28 13:40:17,380 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766900390848, type: vip, order_id: user1766900390848_vip_order_1766900392_aeaec3ba
|
||||
2025-12-28 15:47:45,741 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '8b996cf1517946a09433c32293723077', 'order_id': 'user1766895362623_vip_order_1766908051_7fc3fffc', 'detail': '{}', 'sign': 'd4d84928ac5c1b82302b17666b7ad13b', 'pay_time': '2025-12-28 15:47:45.590088', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-28 15:47:45,937 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766895362623
|
||||
2025-12-28 15:47:46,097 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-28 15:47:46,104 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-28 15:47:46,105 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766895362623, type: vip, order_id: user1766895362623_vip_order_1766908051_7fc3fffc
|
||||
2025-12-28 16:11:17,866 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '0d6f2a49b60a4d8eb7f5fc63b8497753', 'order_id': 'user1766909461315_vip_order_1766909463_62e1d6ac', 'detail': '{}', 'sign': '40f4acfc429d6e92f7977c0eac62c2bf', 'pay_time': '2025-12-28 16:11:17.733786', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-28 16:11:18,043 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766909461315
|
||||
2025-12-28 16:11:18,203 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-28 16:11:18,209 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-28 16:11:18,221 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766909461315, type: vip, order_id: user1766909461315_vip_order_1766909463_62e1d6ac
|
||||
2025-12-28 17:14:41,638 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'b11f8da725a347d5a733cc99e18846c4', 'order_id': 'user1766913040041_vip_order_1766913270_515b268c', 'detail': '{}', 'sign': 'f1531397c0aa48aadf659f8c83d27c16', 'pay_time': '2025-12-28 17:14:41.488840', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-28 17:14:41,810 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766913040041
|
||||
2025-12-28 17:14:41,970 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-28 17:14:41,980 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-28 17:14:41,981 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766913040041, type: vip, order_id: user1766913040041_vip_order_1766913270_515b268c
|
||||
2025-12-28 19:46:27,708 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '4cc4c0ad58394214bc085b377c3764b3', 'order_id': 'user1766425383848_vip_order_1766922377_e877eadc', 'detail': '{}', 'sign': 'c912c15710540aa8d71bfd6e3b77f4db', 'pay_time': '2025-12-28 19:46:27.518697', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-28 19:46:28,494 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766425383848
|
||||
2025-12-28 19:46:28,806 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-28 19:46:28,839 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-28 19:46:28,849 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766425383848, type: vip, order_id: user1766425383848_vip_order_1766922377_e877eadc
|
||||
2025-12-29 01:14:10,684 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '9a56e0a6795f42db8f26d5a024cc325d', 'order_id': 'user1766942020218_vip_order_1766942033_afdebf35', 'detail': '{}', 'sign': 'a7da24a07ac770e65a6d01a3e93ea019', 'pay_time': '2025-12-29 01:14:10.012262', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-29 01:14:11,561 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766942020218
|
||||
2025-12-29 01:14:11,942 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-29 01:14:11,987 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-29 01:14:12,005 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766942020218, type: vip, order_id: user1766942020218_vip_order_1766942033_afdebf35
|
||||
2025-12-29 02:55:46,502 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '48b759a62a464d56b3fb7147cf169176', 'order_id': 'user1766948108700_vip_order_1766948128_ede4556f', 'detail': '{}', 'sign': '0530aff0e4d17a12e231182e0fd62dfc', 'pay_time': '2025-12-29 02:55:46.368873', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-29 02:55:46,783 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766948108700
|
||||
2025-12-29 02:55:46,949 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-29 02:55:46,959 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-29 02:55:46,959 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766948108700, type: vip, order_id: user1766948108700_vip_order_1766948128_ede4556f
|
||||
2025-12-29 04:40:39,020 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'edac62a960f140369ceb717aeaba54a8', 'order_id': 'user1766954408526_vip_order_1766954427_b77e70bc', 'detail': '{}', 'sign': '2ca0969fef96e146055bb895bff89ab5', 'pay_time': '2025-12-29 04:40:38.871646', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-29 04:40:39,202 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766954408526
|
||||
2025-12-29 04:40:39,398 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-29 04:40:40,110 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-29 04:40:40,110 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766954408526, type: vip, order_id: user1766954408526_vip_order_1766954427_b77e70bc
|
||||
2025-12-29 11:22:44,233 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'e7872fdb149a4d0a9e9a377020ed3846', 'order_id': 'user1766978502076_vip_order_1766978555_addb54db', 'detail': '{}', 'sign': '12d19286d98654b69fb00b9e904a02b9', 'pay_time': '2025-12-29 11:22:44.052519', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-29 11:22:44,449 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766978502076
|
||||
2025-12-29 11:22:44,625 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-29 11:22:44,631 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-29 11:22:44,632 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766978502076, type: vip, order_id: user1766978502076_vip_order_1766978555_addb54db
|
||||
2025-12-29 15:18:01,222 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '62b15f12f36a4120a3ad45bd914419b8', 'order_id': 'user1766992589670_vip_order_1766992668_7feb4dd2', 'detail': '{}', 'sign': 'fb13c58d8ff4f23d9a3b08d15a0cd195', 'pay_time': '2025-12-29 15:18:01.035286', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-29 15:18:01,880 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1766992589670
|
||||
2025-12-29 15:18:02,184 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-29 15:18:02,214 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-29 15:18:02,227 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766992589670, type: vip, order_id: user1766992589670_vip_order_1766992668_7feb4dd2
|
||||
2025-12-29 22:45:30,783 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '673cf3034e584a1c937ab040d5918a3f', 'order_id': 'user1767019507607_vip_order_1767019509_bbfd26ab', 'detail': '{}', 'sign': '53fcdc75340722de59efc461e459cdfb', 'pay_time': '2025-12-29 22:45:30.577358', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-29 22:45:31,541 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767019507607
|
||||
2025-12-29 22:45:31,886 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-29 22:45:31,927 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-29 22:45:31,940 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767019507607, type: vip, order_id: user1767019507607_vip_order_1767019509_bbfd26ab
|
||||
2025-12-30 00:13:14,904 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'dac2bf04f45f4b96a0ce780711dc347d', 'order_id': 'user1767024766316_vip_order_1767024779_4de6dbba', 'detail': '{}', 'sign': 'fe599535e6e61db00bf22f75de029412', 'pay_time': '2025-12-30 00:13:14.770161', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-30 00:13:15,165 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767024766316
|
||||
2025-12-30 00:13:15,331 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-30 00:13:15,340 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-30 00:13:15,340 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767024766316, type: vip, order_id: user1767024766316_vip_order_1767024779_4de6dbba
|
||||
2025-12-30 00:51:51,344 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '209f74a9af7e4906a9e41017bbf3335c', 'order_id': 'user1767026896002_vip_order_1767027100_7dd417ff', 'detail': '{}', 'sign': 'c200f4067b09999a83bb6f9f3bc2b273', 'pay_time': '2025-12-30 00:51:51.188914', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-30 00:51:51,632 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767026896002
|
||||
2025-12-30 00:51:51,794 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-30 00:51:51,801 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-30 00:51:52,016 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767026896002, type: vip, order_id: user1767026896002_vip_order_1767027100_7dd417ff
|
||||
2025-12-30 06:00:15,795 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '7fe465367cdd43518d9bf290d9ea2632', 'order_id': 'user1767045585676_vip_order_1767045592_b3b24c97', 'detail': '{}', 'sign': '94f00384c52bd50dc599435aa3bfda94', 'pay_time': '2025-12-30 06:00:15.608307', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-30 06:00:16,643 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767045585676
|
||||
2025-12-30 06:00:16,996 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-30 06:00:17,033 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-30 06:00:17,045 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767045585676, type: vip, order_id: user1767045585676_vip_order_1767045592_b3b24c97
|
||||
2025-12-30 09:30:38,452 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'cdefff04e7404a03b384ee0c1ea2d6cc', 'order_id': 'user1767058197797_vip_order_1767058229_dfe82b3b', 'detail': '{}', 'sign': 'df23601fd2ceaa0e6b5cea929bdfea13', 'pay_time': '2025-12-30 09:30:38.275481', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-30 09:30:39,283 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767058197797
|
||||
2025-12-30 09:30:39,766 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-30 09:30:39,787 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-30 09:30:39,794 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767058197797, type: vip, order_id: user1767058197797_vip_order_1767058229_dfe82b3b
|
||||
2025-12-30 17:52:33,431 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '7881a501072a48818c8a14358af722dc', 'order_id': 'user1767088318302_vip_order_1767088329_a1770bfe', 'detail': '{}', 'sign': '7003335fd5562a6dab259aac90278dde', 'pay_time': '2025-12-30 17:52:33.219326', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-30 17:52:34,128 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767088318302
|
||||
2025-12-30 17:52:34,486 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-30 17:52:34,523 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-30 17:52:34,535 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767088318302, type: vip, order_id: user1767088318302_vip_order_1767088329_a1770bfe
|
||||
2025-12-30 20:31:31,918 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '85715ed961084e229188b712798f0516', 'order_id': 'user1767097859349_vip_order_1767097861_ccb0eddb', 'detail': '{}', 'sign': 'cfb1be415e68fd55912eb881391a8e2a', 'pay_time': '2025-12-30 20:31:31.753658', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-30 20:31:32,212 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767097859349
|
||||
2025-12-30 20:31:32,476 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-30 20:31:32,492 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-30 20:31:32,492 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767097859349, type: vip, order_id: user1767097859349_vip_order_1767097861_ccb0eddb
|
||||
2025-12-31 18:19:05,989 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '3f6b397d7a484255807b359914d040a3', 'order_id': 'user1767176330550_vip_order_1767176333_479ae9ee', 'detail': '{}', 'sign': '80ac79b3a392da436c7be8f939368099', 'pay_time': '2025-12-31 18:19:05.779904', 'pay_price': '88.00', 'more': ''}
|
||||
2025-12-31 18:19:06,866 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767176330550
|
||||
2025-12-31 18:19:07,287 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-31 18:19:07,348 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-31 18:19:07,944 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767176330550, type: vip, order_id: user1767176330550_vip_order_1767176333_479ae9ee
|
||||
2025-12-31 18:55:07,924 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'f306334a8b6447da8ce14db7bff78213', 'order_id': 'user1766044269820_book_order_1767178489_cdec2cc8', 'detail': '{}', 'sign': '1e3260c0f37039c2a51830d421441d84', 'pay_time': '2025-12-31 18:55:07.732277', 'pay_price': '0.88', 'more': ''}
|
||||
2025-12-31 18:55:08,742 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-31 18:55:08,770 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-31 18:55:08,778 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766044269820, type: book, order_id: user1766044269820_book_order_1767178489_cdec2cc8
|
||||
2025-12-31 19:00:41,588 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '2a6b73ec5b2d41ee9c0a2bb41be31177', 'order_id': 'user1766044269820_book_order_1767178823_d55ea2fa', 'detail': '{}', 'sign': '91d2e0d1ce37043981d523105cf10f89', 'pay_time': '2025-12-31 19:00:41.487375', 'pay_price': '0.88', 'more': ''}
|
||||
2025-12-31 19:00:41,780 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-31 19:00:41,787 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-31 19:00:41,787 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1766044269820, type: book, order_id: user1766044269820_book_order_1767178823_d55ea2fa
|
||||
2025-12-31 19:16:08,040 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': '2fa4787db82b4bd480d6974d44159240', 'order_id': 'user1767179744807_book_order_1767179752_58cb8e8f', 'detail': '{}', 'sign': '3b75920b471f741e64badad48cd65b9f', 'pay_time': '2025-12-31 19:16:07.906529', 'pay_price': '0.88', 'more': ''}
|
||||
2025-12-31 19:16:08,239 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2025-12-31 19:16:08,246 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2025-12-31 19:16:08,246 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767179744807, type: book, order_id: user1767179744807_book_order_1767179752_58cb8e8f
|
||||
2026-01-01 10:47:13,495 - XorPay 寮傛<E5AFAE>閫氱煡鍘熷<E98D98>鏁版嵁: {'aoid': 'ae1043fc189a46e2866e7a2ccaa87c94', 'order_id': 'user1767235545946_vip_order_1767235604_abfead81', 'detail': '{}', 'sign': 'bdd2d201ad80016b17a8e28cac971929', 'pay_time': '2026-01-01 10:47:13.251717', 'pay_price': '288.00', 'more': ''}
|
||||
2026-01-01 10:47:15,341 - memos 鐢ㄦ埛鍒涘缓鎴愬姛: user1767235545946
|
||||
2026-01-01 10:47:15,839 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/_superusers/auth-with-password "HTTP/1.1 200 OK"
|
||||
2026-01-01 10:47:15,888 - HTTP Request: POST https://pocketbase.hackrobot.cn/api/collections/payments/records "HTTP/1.1 200 OK"
|
||||
2026-01-01 10:47:15,890 - 鏀<>粯璁板綍鍐欏叆 PocketBase 鎴愬姛 - user_id: user1767235545946, type: vip, order_id: user1767235545946_vip_order_1767235604_abfead81
|
||||
@@ -1,44 +0,0 @@
|
||||
# 手机微信支付调试说明
|
||||
|
||||
前端（vipgroup 等）与 payjsapi 同机时，支付请求由服务端发起，应使用 `127.0.0.1:8700`。
|
||||
|
||||
## 1. 同机部署（vipgroup + payjsapi 都在本机）
|
||||
|
||||
**无需配置**。默认使用 `http://127.0.0.1:8700`。
|
||||
|
||||
若 `.env.local` 中有 `PAYMENT_API_URL=http://0.0.0.0:8700`，请删除或改为：
|
||||
```bash
|
||||
PAYMENT_API_URL=http://127.0.0.1:8700
|
||||
```
|
||||
（0.0.0.0 无法作为连接目标，会导致立即失败）
|
||||
|
||||
## 2. 确认 payjsapi 已启动
|
||||
|
||||
```bash
|
||||
cd C:\project\payjsapi
|
||||
python run.py
|
||||
```
|
||||
|
||||
应监听 `0.0.0.0:8700`，可从局域网访问。
|
||||
|
||||
## 3. 确认防火墙放行 8700 端口
|
||||
|
||||
Windows 防火墙可能阻止手机访问 8700。若 vipgroup 与 payjsapi 同机，请求是服务端内部调用，一般无问题。
|
||||
|
||||
## 4. 查看控制台日志
|
||||
|
||||
支付失败时，vipgroup 的 Next.js 控制台会输出：
|
||||
|
||||
```
|
||||
[pay] 请求失败: ... apiUrl: http://xxx:8700 requestHost: xxx
|
||||
```
|
||||
|
||||
- 若 `apiUrl` 为 `http://0.0.0.0:8700` → 在 `.env.local` 中设置 `PAYMENT_API_URL=http://192.168.41.222:8700`
|
||||
- 若 `apiUrl` 正确但仍失败 → 检查 payjsapi 是否运行、网络是否可达
|
||||
|
||||
## 5. vipgroup 需包含的配置逻辑
|
||||
|
||||
若 vipgroup 与 lms/nomadlms 结构不同，需确保：
|
||||
|
||||
1. 调用 `/api/pay` 或直接调用 payjsapi 时，使用正确的 `PAYMENT_API_URL`
|
||||
2. 本地开发时 `PAYMENT_API_URL` 指向 `http://{你的局域网IP}:8700`
|
||||
Reference in New Issue
Block a user