Compare commits

...
3 Commits
Author SHA1 Message Date
jinghui fb8d034ffb fix: 移除 ca_authorizations 唯一键 uk_bot_contact,修复同机器二次激活 500 (Duplicate entry) 2026-11-12 17:51:32 +08:00
jinghui 9375600f65 feat: 订单支付完成自动补发卡密写回订单(供 it-tools 站内支付页当场显示卡密)
原分支1(带 bot_qq/contact_qq 下单)只创建授权、不发卡,订单 card_id 为空,
queryOrder 查不到卡密 → 支付结果页无卡可显示。现支付完成时优先取卡池未用卡、
卡池不足自动新建,绑机器码后写回 order.card_id。分支2(IPTV 无 bot_qq 直购)逻辑不变。
2026-11-11 18:28:25 +08:00
3970260761 9f0bc85465 docs: README 增加「方式二:Docker Compose部署」(完整 compose yaml + docker compose up -d + 等价 docker run) 2026-11-08 01:41:23 +08:00
3 changed files with 156 additions and 1 deletions

No files matched your search

+112
View File
@@ -117,6 +117,118 @@ http://localhost:8080
首次启动自动完成:前端构建 → 数据库初始化 → Nginx + PHP-FPM 启动。 首次启动自动完成:前端构建 → 数据库初始化 → Nginx + PHP-FPM 启动。
### 方式二:Docker Compose部署
上面「方式一」使用的仓库根目录 `docker-compose.yml` 完整内容(与仓库文件一致,含全部 ports / volumes / environment):
```yaml
version: "3.8"
services:
db:
image: mysql:8.0
container_name: cardauth-db
restart: unless-stopped
environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root_secret_change_me}
MYSQL_DATABASE: ${DB_NAME:-card_auth}
MYSQL_USER: ${DB_USER:-card_auth}
MYSQL_PASSWORD: ${DB_PASS:-card_auth_pass}
volumes:
- mysql_data:/var/lib/mysql
- ./backend/database/schema.sql:/docker-entrypoint-initdb.d/01-schema.sql:ro
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-time-zone=+08:00
healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
interval: 10s
timeout: 5s
retries: 5
networks:
- cardauth
app:
build: .
container_name: cardauth-app
restart: unless-stopped
ports:
- "8881:80"
environment:
APP_ENV: production
APP_DEBUG: "false"
APP_URL: ${APP_URL:-http://localhost:8881}
DB_HOST: db
DB_PORT: "3306"
DB_NAME: ${DB_NAME:-card_auth}
DB_USER: ${DB_USER:-card_auth}
DB_PASS: ${DB_PASS:-card_auth_pass}
DB_PREFIX: ca_
JWT_SECRET: ${JWT_SECRET:-}
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root_secret_change_me}
PAYMENT_TYPE: ${PAYMENT_TYPE:-epay}
PAYMENT_API_URL: ${PAYMENT_API_URL:-}
PAYMENT_APP_ID: ${PAYMENT_APP_ID:-}
PAYMENT_APP_KEY: ${PAYMENT_APP_KEY:-}
depends_on:
db:
condition: service_healthy
networks:
- cardauth
volumes:
# PHP 上传限制:容器内 ini 改动不持久,用挂载固化(容器重建也生效)
- ./php/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini:ro
# 安装包与头像持久化:否则容器重建后已发布版本文件丢失
- ./backend/public/uploads:/var/www/public/uploads
volumes:
mysql_data:
driver: local
networks:
cardauth:
driver: bridge
```
启动 / 停止:
```bash
# 1. 配置环境变量
cp .env.docker .env
# 编辑 .env,设置 JWT_SECRET 和数据库密码
# 2. 启动(与方式一等价)
docker compose up -d
# 3. 查看状态 / 停止
docker compose ps
docker compose down
```
不使用 Compose 时,等价的最小 `docker run` 启动方式(先建网络与 MySQL,再构建并启动应用):
```bash
docker network create cardauth
docker run -d --name cardauth-db --network cardauth \
-e MYSQL_ROOT_PASSWORD=root_secret_change_me \
-e MYSQL_DATABASE=card_auth \
-e MYSQL_USER=card_auth \
-e MYSQL_PASSWORD=card_auth_pass \
-v cardauth_mysql_data:/var/lib/mysql \
-v ./backend/database/schema.sql:/docker-entrypoint-initdb.d/01-schema.sql:ro \
mysql:8.0 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-time-zone=+08:00
docker build -t cardauth-app:latest .
docker run -d --name cardauth-app --network cardauth -p 8881:80 \
-e APP_ENV=production -e APP_DEBUG=false \
-e APP_URL=http://localhost:8881 \
-e DB_HOST=cardauth-db -e DB_PORT=3306 \
-e DB_NAME=card_auth -e DB_USER=card_auth -e DB_PASS=card_auth_pass \
-e DB_PREFIX=ca_ -e JWT_SECRET=change_me_to_random_64_chars \
-v ./backend/public/uploads:/var/www/public/uploads \
cardauth-app:latest
```
### 方式二:传统部署 ### 方式二:传统部署
#### 环境要求 #### 环境要求
@@ -4,6 +4,7 @@ namespace App\Controllers;
use App\Core\Controller; use App\Core\Controller;
use App\Core\Database; use App\Core\Database;
use App\Core\Validator; use App\Core\Validator;
use App\Services\SnowflakeService;
/** /**
* 订单管理控制器 * 订单管理控制器
@@ -291,6 +292,49 @@ class OrderController extends Controller
] ]
); );
} }
// ===== 分支1(带 bot_qq)也补发一张卡写入订单,供支付结果页显示卡密 =====
$bindInfo = json_encode([
'machine_id' => $botQq,
'ip' => '',
'device_info' => 'buy-page',
'first_bind_at' => date('Y-m-d H:i:s'),
'order_no' => $order['order_no'],
], JSON_UNESCAPED_UNICODE);
$cardExpire = calcExpireTime($durationDays);
$issuedCard = $db->fetch(
"SELECT * FROM {$db->table('cards')} WHERE project_id = ? AND card_type_id = ? AND status = 'unused' ORDER BY id ASC LIMIT 1",
[$order['project_id'], $order['card_type_id']]
);
if ($issuedCard) {
$issuedCardId = (int) $issuedCard['id'];
$db->execute(
"UPDATE {$db->table('cards')} SET status = 'used', bind_info = ?, bound_at = NOW(), expire_time = ?, order_id = ? WHERE id = ?",
[$bindInfo, $cardExpire, $orderId, $issuedCardId]
);
}
else {
// 卡池空:自动新建一张,保证支付结果必有卡密可显示
$snowflake = new SnowflakeService();
$issuedCardId = $db->insert(
"INSERT INTO {$db->table('cards')} (card_key, project_id, card_type_id, type, duration_days, status, bind_info, bound_at, expire_time, order_id, remark) VALUES (?, ?, ?, ?, ?, 'used', ?, NOW(), ?, ?, ?)",
[
$snowflake->generateCardKey(),
$order['project_id'],
$order['card_type_id'],
$cardType['name'] ?? '',
$durationDays,
$bindInfo,
$cardExpire,
$orderId,
'订单' . $order['order_no'] . '自动发放',
]
);
}
$db->execute(
"UPDATE {$db->table('orders')} SET card_id = ? WHERE id = ?",
[$issuedCardId, $orderId]
);
} else { } else {
// ===== 无 bot_qq 订单:自动发卡并绑定机器码(IPTV App 直购闭环)===== // ===== 无 bot_qq 订单:自动发卡并绑定机器码(IPTV App 直购闭环)=====
// contact_info 约定格式: "MACHINE:TV-XXXX" (App下单时带上电视机器码) // contact_info 约定格式: "MACHINE:TV-XXXX" (App下单时带上电视机器码)
-1
View File
@@ -241,7 +241,6 @@ CREATE TABLE `ca_authorizations` (
`created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
`updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `uk_bot_contact` (`bot_qq`, `contact_qq`),
KEY `idx_bot_qq` (`bot_qq`), KEY `idx_bot_qq` (`bot_qq`),
KEY `idx_contact_qq` (`contact_qq`), KEY `idx_contact_qq` (`contact_qq`),
KEY `idx_card_id` (`card_id`), KEY `idx_card_id` (`card_id`),