Compare commits

..
3 Commits
Author SHA1 Message Date
opencode f037f47e27 后台侧栏加宽至 352px,菜单名完整显示不再省略
- epay-ui.css:侧栏 22rem,菜单行高自适应、允许换行、取消 text-overflow:ellipsis
- head.php:资源版本 v=20261021c -> 20261021d 强制刷新缓存
- README:更新侧栏说明,补充单文件挂载 inode 注意事项
2026-11-13 17:12:46 +08:00
opencode 1754f067f3 修复容器重启后补丁丢失问题
- docker-compose.prod.yml:修正 volumes 缩进(YAML 之前无法解析),
  补齐 epay-ui.css/epay-ui.js/head.php/test.php 挂载(容器创建早于挂载配置,从未生效)
- 重建 php 容器后 entrypoint 从 staging 同步补丁,后台全屏布局/侧栏/测试支付页恢复正常
- README:补充'重启变回原样'的机制说明与维护规范
2026-11-13 17:07:11 +08:00
3970260761 868bdbf544 docs: README 增加部署章节(方式一 docker run / 方式二 Docker Compose 完整 yaml);修复 docker-compose.prod.yml 补丁挂载缩进错误 2026-11-08 01:41:24 +08:00
4 changed files with 209 additions and 17 deletions

No files matched your search

+191 -3
View File
@@ -12,6 +12,172 @@ plugins/ 支付插件源码
.env 环境变量(不入库)
```
## 部署
### 方式一:Docker 运行(最小启动)
不使用编排文件时,可用 `docker run` 逐个启动等价容器(先建网络与数据卷):
```bash
docker network create epay-network
# MySQL(对应 compose 的 mysql 服务)
docker run -d --name epay-mysql --network epay-network \
-e MYSQL_ROOT_PASSWORD=root_password \
-e MYSQL_DATABASE=epay \
-e MYSQL_USER=epay \
-e MYSQL_PASSWORD=epay_password \
-e TZ=Asia/Shanghai \
-v epay_mysql_data:/var/lib/mysql \
mysql:8.0 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --sql-mode= --default-time-zone=+08:00 --default-authentication-plugin=mysql_native_password
# PHP 应用(对应 compose 的 php 服务)
docker run -d --name epay-php --network epay-network \
-e TZ=Asia/Shanghai \
-e DB_HOST=epay-mysql -e DB_PORT=3306 -e DB_USER=epay -e DB_PASSWORD=epay_password -e DB_NAME=epay -e DB_PREFIX=pay \
-e ADMIN_PASSWORD=admin_password -e SITE_URL=http://localhost \
-v epay_app_data:/var/www/html \
-v ./plugins:/var/www/html/plugins \
-v epay_uploads:/var/www/html/assets/uploads \
-v epay_sessions:/var/lib/php/sessions \
ghcr.io/aliveranme/epay:latest
# Nginx(对应 compose 的 nginx 服务,只读共享 app_data)
docker run -d --name epay-nginx --network epay-network -p 80:80 \
-v ./docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro \
-v epay_app_data:/var/www/html:ro \
nginx:alpine
```
> `docker run` 为最小等价启动(不含 `patches/` 补丁挂载与 `cron` 定时容器),生产环境推荐方式二。
### 方式二:Docker Compose部署
仓库根目录 `docker-compose.prod.yml` 完整内容(与仓库文件一致,含全部 ports / volumes / environment):
```yaml
services:
nginx:
image: nginx:alpine
container_name: epay-nginx
restart: unless-stopped
ports:
- "${NGINX_PORT:-80}:80"
volumes:
- ./docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro
- app_data:/var/www/html:ro
depends_on:
php:
condition: service_started
networks:
- epay-network
php:
image: ghcr.io/aliveranme/epay:latest
container_name: epay-php
restart: unless-stopped
environment:
TZ: Asia/Shanghai
DB_HOST: ${DB_HOST:-mysql}
DB_PORT: ${DB_PORT:-3306}
DB_USER: ${DB_USER:-epay}
DB_PASSWORD: ${DB_PASSWORD}
DB_NAME: ${DB_NAME:-epay}
DB_PREFIX: ${DB_PREFIX:-pay}
ADMIN_PASSWORD: ${ADMIN_PASSWORD}
SITE_URL: ${SITE_URL:-http://localhost}
# 部署自定义配置(可选):API 接口是否校验 timestamp,1=开启(默认),0=关闭(兼容不传 timestamp 的老平台)
API_TIMESTAMP_CHECK: ${API_TIMESTAMP_CHECK:-}
volumes:
- app_data:/var/www/html
- ./plugins:/var/www/html/plugins
- uploads:/var/www/html/assets/uploads
- sessions:/var/lib/php/sessions
# 补丁:is_public_url 白名单(容器重启/升级后由 entrypoint 从 staging 自动同步)
- ./patches/functions.php:/var/www/html-staging/includes/functions.php:ro
# 补丁:后台布局覆盖 CSS(全屏自适应/侧栏加宽/导航两列)
- ./patches/epay-ui.css:/var/www/html-staging/assets/dist/epay-ui.css:ro
# 补丁:侧栏当前菜单自动滚动脚本
- ./patches/epay-ui.js:/var/www/html-staging/assets/dist/epay-ui.js:ro
# 补丁:后台入口资源版本号(?v= 强制回源)
- ./patches/head.php:/var/www/html-staging/admin/head.php:ro
# 补丁:后台改密码存明文(与登录逻辑一致)+ 登录兼容历史 md5 存储
- ./patches/admin/set.php:/var/www/html-staging/admin/set.php:ro
- ./patches/admin/login.php:/var/www/html-staging/admin/login.php:ro
# 补丁:支付页轮询时主动向微信查单(异步回调延迟兜底),重启后由 staging 同步
- ./patches/getshop.php:/var/www/html-staging/getshop.php:ro
extra_hosts:
- "newapi.88531.cn:host-gateway"
- "ai.88531.cn:host-gateway"
- "pay.88531.cn:host-gateway"
networks:
- epay-network
mysql:
image: mysql:8.0
container_name: epay-mysql
restart: unless-stopped
environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
MYSQL_DATABASE: ${DB_NAME:-epay}
MYSQL_USER: ${DB_USER:-epay}
MYSQL_PASSWORD: ${DB_PASSWORD}
TZ: Asia/Shanghai
command:
- --character-set-server=utf8mb4
- --collation-server=utf8mb4_unicode_ci
- --sql-mode=
- --default-time-zone=+08:00
- --default-authentication-plugin=mysql_native_password
volumes:
- mysql_data:/var/lib/mysql
networks:
- epay-network
cron:
image: alpine:latest
container_name: epay-cron
restart: unless-stopped
depends_on:
nginx:
condition: service_started
environment:
CRON_KEY: ${CRON_KEY}
SITE_URL: ${SITE_URL:-http://nginx}
entrypoint: |
/bin/sh -c '
apk add --no-cache curl tzdata;
ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime;
echo "*/5 * * * * curl -s -o /dev/null -w \"%{http_code}\" $${SITE_URL}/cron.php?key=$${CRON_KEY}" > /etc/crontabs/root;
crond -f -l 2
'
networks:
- epay-network
volumes:
app_data:
uploads:
sessions:
mysql_data:
networks:
epay-network:
driver: bridge
```
启动 / 停止:
```bash
# 准备 .env(不入库),至少包含:
# MYSQL_ROOT_PASSWORD、DB_PASSWORD、ADMIN_PASSWORD、SITE_URL、CRON_KEY、NGINX_PORT
docker compose -f docker-compose.prod.yml up -d
# 查看状态 / 停止 / 重建
docker compose -f docker-compose.prod.yml ps
docker compose -f docker-compose.prod.yml down
docker compose -f docker-compose.prod.yml up -d --build
```
## 本次修改内容
### 1. 测试支付页空白修复(`patches/test.php`)
@@ -42,8 +208,10 @@ WHERE name NOT REGEXP '[一-龥]'
- 结果:顶栏、侧栏、内容区铺满整个浏览器窗口,宽屏自适应
### 4. 后台侧栏优化(`patches/epay-ui.js` + `patches/epay-ui.css`)
- 侧栏宽度 256px → 320px
- 导航菜单一行 2 个(分组标题独占整行,超长文字省略号,隐藏右侧箭头)
- 侧栏宽度 256px → **352px(22rem)**
- 导航菜单一行 2 个(分组标题独占整行,隐藏右侧箭头)
- **菜单名完整显示,不截断、不用省略号**:超长菜单名(如"渠道商户违规记录")
自动换行,行高自适应,图标固定顶部对齐
- 脚本自动把当前页面对应的菜单(`aria-current="page"`)滚动到侧栏可视区中间,
解决菜单多时点击后"回到顶部找不到当前项"的问题
- 移动端抽屉菜单保持单列
@@ -69,5 +237,25 @@ WHERE name NOT REGEXP '[一-龥]'
## 日常维护
- 修改补丁:改 `patches/` 下对应文件 → 同步进容器(`docker cp`)→ 更新 `head.php` 的 `?v=` → 提交推送
- 容器重建:`docker compose -f docker-compose.prod.yml up -d`
- 容器重建:`docker-compose -f docker-compose.prod.yml up -d`(本机为 v1 命令)
- `.env` 含数据库/管理员密码等敏感信息,禁止提交
## ⚠️ 重要:为什么改完样式会"变回原样"
容器**每次启动**都会执行 entrypoint 的 `rsync -a --delete /var/www/html-staging/ /var/www/html/`,
用镜像原始文件覆盖工作目录,因此:
- **只允许改 `patches/` 下的文件**,且必须在 `docker-compose.prod.yml` 中挂载到
`/var/www/html-staging/<对应路径>`
- 直接用 `docker cp` / 在容器内改 `/var/www/html/...` 的文件,重启后**必然被还原**
- 改完 compose 挂载后必须 `docker-compose up -d php` **重建容器**(不是 restart),
挂载才会生效;重建时 entrypoint 会自动把补丁同步进工作目录
- 新增补丁时最容易漏的是挂载行和 YAML 缩进(所有 `-` 项必须同缩进),
`docker-compose -f docker-compose.prod.yml config -q` 可先校验
- **不要用 `sed -i` 等"替换 inode"的方式改单个挂载文件**:单文件 bind mount 绑定的是
inode,`sed -i` 会写入新 inode,容器内看到的还是旧内容。请在原文件上覆盖写入
(如编辑器保存、`cat > 文件`),或改完 `docker restart epay-php` 重新绑定
2026-10-21 就发生过一次:容器重启后后台样式全回原版、测试支付页空白复现,
原因是 `epay-ui.*` / `head.php` / `test.php` 的挂载没生效(容器创建早于挂载配置),
entrypoint 用镜像原文件覆盖了工作目录。补齐挂载并重建容器后恢复。
+10 -8
View File
@@ -35,14 +35,16 @@ services:
- ./plugins:/var/www/html/plugins
- uploads:/var/www/html/assets/uploads
- sessions:/var/lib/php/sessions
# 补丁:is_public_url 白名单(容器重启/升级后由 entrypoint 从 staging 自动同步)
- ./patches/functions.php:/var/www/html-staging/includes/functions.php:ro
# 补丁:后台布局覆盖 CSS(全屏自适应/侧栏加宽/导航两列)
- ./patches/epay-ui.css:/var/www/html-staging/assets/dist/epay-ui.css:ro
# 补丁:侧栏当前菜单自动滚动脚本
- ./patches/epay-ui.js:/var/www/html-staging/assets/dist/epay-ui.js:ro
# 补丁:后台入口资源版本号(?v= 强制回源)
- ./patches/head.php:/var/www/html-staging/admin/head.php:ro
# 补丁:is_public_url 白名单(容器重启/升级后由 entrypoint 从 staging 自动同步)
- ./patches/functions.php:/var/www/html-staging/includes/functions.php:ro
# 补丁:后台布局覆盖 CSS(全屏自适应/侧栏加宽/导航两列)
- ./patches/epay-ui.css:/var/www/html-staging/assets/dist/epay-ui.css:ro
# 补丁:侧栏当前菜单自动滚动脚本
- ./patches/epay-ui.js:/var/www/html-staging/assets/dist/epay-ui.js:ro
# 补丁:后台入口资源版本号(?v= 强制回源)
- ./patches/head.php:/var/www/html-staging/admin/head.php:ro
# 补丁:测试支付页 paytype JSON 数组修复
- ./patches/test.php:/var/www/html-staging/user/test.php:ro
# 补丁:后台改密码存明文(与登录逻辑一致)+ 登录兼容历史 md5 存储
- ./patches/admin/set.php:/var/www/html-staging/admin/set.php:ro
- ./patches/admin/login.php:/var/www/html-staging/admin/login.php:ro
+6 -4
View File
@@ -4,13 +4,15 @@
/* ===== epay custom overrides (patch 2026-09-23) ===== */
/* 全屏自适应:去掉 1440px 最大宽度限制 */
.max-w-\[1440px\]{max-width:none!important}
/* 左侧导航栏加宽 256px -> 320px */
aside[class*="w-64"]{width:20rem!important}
/* 左侧导航栏加宽 256px -> 352px */
aside[class*="w-64"]{width:22rem!important}
/* 侧栏导航一行显示 2 个菜单(桌面端;分组标题独占整行) */
aside nav[aria-label="主导航"]{grid-template-columns:repeat(2,minmax(0,1fr))}
aside nav[aria-label="主导航"] > p{grid-column:1 / -1}
aside nav[aria-label="主导航"] a{min-width:0}
aside nav[aria-label="主导航"] a > span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
aside nav[aria-label="主导航"] a{min-width:0;height:auto;min-height:2.5rem;align-items:flex-start;padding-top:.5rem;padding-bottom:.5rem}
aside nav[aria-label="主导航"] a > svg{flex-shrink:0;margin-top:.125rem}
/* 菜单名完整显示:不截断、不省略号,超长自动换行 */
aside nav[aria-label="主导航"] a > span{overflow:visible;text-overflow:clip;white-space:normal;word-break:break-word;line-height:1.35}
aside nav[aria-label="主导航"] a > .ml-auto{display:none}
/* 后台窄页面容器放宽 */
#epay-react-root[data-epay-view^="admin-"] .max-w-5xl,
+2 -2
View File
@@ -24,8 +24,8 @@ $epay_ui_config['features'] = array_merge([
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="color-scheme" content="light dark" />
<title><?php echo htmlspecialchars((string)$epay_ui_config['title'], ENT_QUOTES, 'UTF-8'); ?></title>
<link href="../assets/dist/epay-ui.css?v=20261021c" rel="stylesheet" />
<script type="module" src="../assets/dist/epay-ui.js?v=20261021c"></script>
<link href="../assets/dist/epay-ui.css?v=20261021d" rel="stylesheet" />
<script type="module" src="../assets/dist/epay-ui.js?v=20261021d"></script>
</head>
<body>
<div id="epay-react-root" data-epay-view="<?php echo htmlspecialchars($epay_ui_view, ENT_QUOTES, 'UTF-8'); ?>" data-epay-config="<?php echo htmlspecialchars(json_encode($epay_ui_config, JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_UNESCAPED_UNICODE), ENT_QUOTES, 'UTF-8'); ?>"></div>