## 一、支付:改由已安装的 epay 插件承载(不再自研签名)
- 下单:\addons\epay\library\Service::submitOrder($amount 元, $orderNo, 'wechat', $body, $notifyUrl, null, 'miniapp', $openid)
- 验签:Service::checkNotify('wechat')(内部 $pay->verify());应答:$pay->success()(v2 = XML)
- 业务编排仍在 application/api/controller/Pay.php,不改插件源码:
POST /pay/prepay(取调起参数,下发前剔除 appId);POST /pay/notify(公开路由:插件验签 → 金额核对 → 幂等分派)
- 配置真源 = addons/epay/config.php(后台「插件管理 → 微信支付宝整合插件 → 配置」);
fc_config 的 wx.mchId / wx.apiKey / wx.payNotifyUrl 废弃;后台「系统设置」支付表单改只读并跳插件配置页
- 插件 API 保持 version=v2(PHP 7.4 可跑);certs/* 为 0 字节占位,不含任何真实密钥
- 修复 BUG-015:Pay::notify() 与基类站内信同名且签名不兼容导致 /pay/* 全 500,动作改名 notifyCallback()
## 二、插件纳入 Git 版本管理
- .gitignore 移除 /addons/* 与 /public/assets/addons/*(保留 .gitkeep 占位)
- 入库 addons/epay、addons/wechat、public/assets/addons/*、addons/.htaccess(deny from all)
- config.php 入库为空白模板;服务器请在填好密钥后执行
git update-index --skip-worktree addons/epay/config.php,避免真实密钥回传仓库
## 三、安全修复:余额充值资损(高危,已实测复现)
- 现象:POST /order/recharge {payType:'balance'} 只加余额不扣款(余额 134.50 → 1022.50),等于凭空增发余额,
可再去买会员 / 付费发布 / 解锁联系方式
- 修复:/order/recharge 仅接受 payType=wxpay,balance → 「余额充值仅支持微信支付」,其它 → 「支付方式不支持」;
订单恒为 status=pending、pay_type=wxpay、paytime=null;入账只发生在 /pay/notify 回调(Order::creditRecharge)
或后台「会员管理 → 余额充值」(fc/userext/recharge)
- 小程序充值页同步为「仅微信支付」+ 防重复提交 + onShow 刷新资产;mock / 用例 / 文档同步
## 四、其他 v1.1.0 能力
- 媒体上传:POST /post/upload(图片 ≤10MB / 视频 ≤50MB,真落盘),发布页 uni.uploadFile 真上传
- LBS:fc_post.lat/lng、首页 sort=nearby(距离升序、无坐标排最后)、卡片 distance、详情页地图
- 互动:举报 POST /report(原因字典)、收藏 / 关注(fc_favorite / fc_follow、/favorite/*、/follow/toggle)
- 交易:余额充值 POST /order/recharge、优惠券 /coupon/list|receive(fc_coupon / fc_user_coupon、我的资产券)
- 发布计费:会员发布折扣(discountRate/discountText)+ 免费发布条数(freeQuota*)
- 后台新增:数据总览 fc/dashboard、系统设置 fc/setting、优惠券管理 fc/coupon(含菜单与权限节点)
## 五、本批审核修复
- 详情页:游客不再请求登录态接口(避免 401 被清 token 踢去登录);微信付费查看改为支付后轮询解锁,
不再读取 wxpay 分支未返回的 contact;加防重复提交
- 发布页:freeLeftToday → freeQuotaLeft / freeQuotaCycle / freeUnlimited(对齐后端出参);
上传图预览拼后端域名(新增 format.js#assetUrl,后端返回相对路径)
- 收藏空态「去首页」:switchTab → reLaunch(项目用自绘 fc-tabbar,无 tabBar,switchTab 必然失败)
- 会员券 days=0 显示「永久有效」;manifest.json 补 requiredPrivateInfos(getLocation / chooseLocation)
- 后端:publishConfig 补 discountRate/discountText 与 memberPostDiscountText();优惠券总开关 coupon.enabled
真生效(关闭后 list/receive 拒绝);后台 fc/Coupon 的 add/edit 补 strip_tags 过滤(防存储型 XSS)、
补 searchFields='name',列表 name 列再做一次 HTML 转义
- FcInstall:补清理后台菜单缓存 __menu__(否则新菜单要等缓存过期才显示),并同步 README 说明
- 后台语言包 fc/setting.php 按「支付只读 + 跳插件配置」的新页面重写
- 文档同步:uniapp/docs/{01,03,04}、uniapp/README.md、docs/05-后端实现规范.md、后台 README 上线步骤
## 六、校验结果(全部通过)
- 后端端到端:tools/verify-api.mjs 226/226(含新增「拒绝余额充值(资损防护)」用例)
- 小程序:uniapp/tests/run.mjs 167/167;validate.mjs 0 错 0 警;check-scss 19/19
- 后台:check-admin-i18n 0 错 0 警;check-theme 0 错 0 警;9 个页面 HTTP 200 全中文
- php -l 改动/新增 PHP 文件 0 语法错误;探针复测:余额不再增长、epay 插件下单/验签链路通
191 行
7.4 KiB
JavaScript
191 行
7.4 KiB
JavaScript
/**
|
||
* v1.0.7 新增能力用例:我的发布 / 后台手动置顶 / 免费-付费发布开关与套餐额度
|
||
*
|
||
* 覆盖需求:
|
||
* ① 发布后能看到发布记录(/post/mine + 状态计数 + 驳回原因)
|
||
* ② 后台手动置顶 → 用户端主页置顶优先展示(/home/feed)
|
||
* ③ 发布模式开关(免费/付费)+ 单条价格 + 月卡/年卡价格与含发布条数
|
||
* ④ 计费口径:金额只由后台配置决定,客户端传入的 amount 一律被忽略
|
||
*/
|
||
import { describe, it, expect, expectReject } from './harness.mjs'
|
||
import { homeApi, postApi, memberApi } from '../common/api/index.js'
|
||
import { datasets } from '../common/mock/data.js'
|
||
|
||
/** 每个用例前把 mock 状态复位,保证用例之间互不影响 */
|
||
function resetPublish() {
|
||
datasets.publishRule.mode = 'paid'
|
||
datasets.publishRule.singlePrice = 5
|
||
datasets.publishRule.monthPrice = 19.9
|
||
datasets.publishRule.monthQuota = 30
|
||
datasets.publishRule.yearPrice = 168
|
||
datasets.publishRule.yearQuota = 500
|
||
datasets.publishRule.quotaLeft = 30
|
||
setFreeQuota(2)
|
||
datasets.publishRule.isMember = true
|
||
}
|
||
|
||
/** 设置免费发布条数(字段名与后端 Post::publishConfig 对齐:freeQuota/freeQuotaUsed/freeQuotaLeft) */
|
||
function setFreeQuota(total, used = 0) {
|
||
datasets.publishRule.freeQuota = total
|
||
datasets.publishRule.freeQuotaUsed = used
|
||
datasets.publishRule.freeQuotaLeft = Math.max(0, total - used)
|
||
datasets.publishRule.freeUnlimited = false
|
||
}
|
||
|
||
describe('发布配置 · 后台开关与价格下发', () => {
|
||
it('返回发布模式、三档价格与剩余额度', async () => {
|
||
resetPublish()
|
||
const cfg = await postApi.publishConfig()
|
||
expect(cfg.mode).toBe('paid')
|
||
expect(cfg.singlePrice).toBe(5)
|
||
expect(cfg.monthPrice).toBe(19.9)
|
||
expect(cfg.monthQuota).toBe(30)
|
||
expect(cfg.yearPrice).toBe(168)
|
||
expect(cfg.yearQuota).toBe(500)
|
||
expect(cfg.quotaLeft).toBe(30)
|
||
expect(cfg.isMember).toBe(true)
|
||
})
|
||
|
||
it('免费模式:所有人免费发布且不消耗额度', async () => {
|
||
resetPublish()
|
||
datasets.publishRule.mode = 'free'
|
||
datasets.publishRule.quotaLeft = 0
|
||
const res = await postApi.create({ title: '免费模式发布', content: '内容', plan: 'free' })
|
||
expect(res.order).toBeFalsy()
|
||
expect(res.plan).toBe('free')
|
||
expect(res.amount).toBe(0)
|
||
})
|
||
})
|
||
|
||
describe('发布计费 · 服务端定价与套餐额度', () => {
|
||
it('套餐额度内免费发布:无订单且额度 -1', async () => {
|
||
resetPublish()
|
||
const res = await postApi.create({ title: '额度内发布', content: '内容', plan: 'free' })
|
||
expect(res.order).toBeFalsy()
|
||
expect(res.plan).toBe('quota')
|
||
expect(res.quotaLeft).toBe(29)
|
||
const mine = await postApi.mine({ page: 1, size: 20 })
|
||
const created = mine.list.find((p) => p.title === '额度内发布')
|
||
expect(created).toBeDefined()
|
||
expect(created.auditStatus).toBe(0)
|
||
})
|
||
|
||
it('额度与每日免费次数都用尽时,免费发布被拦截', async () => {
|
||
resetPublish()
|
||
datasets.publishRule.quotaLeft = 0
|
||
setFreeQuota(0) // 关闭免费额度,隔离出「必须付费」的场景
|
||
await expectReject(() => postApi.create({ title: '无额度', content: '内容', plan: 'free' }), '请选择发布方式')
|
||
})
|
||
|
||
it('付费模式下仍保留每日免费额度(避免硬付费墙)', async () => {
|
||
resetPublish()
|
||
datasets.publishRule.quotaLeft = 0
|
||
setFreeQuota(2)
|
||
const first = await postApi.create({ title: '今日免费第 1 条', content: '内容', plan: 'free' })
|
||
expect(first.plan).toBe('free')
|
||
expect(first.order).toBeFalsy()
|
||
const cfg = await postApi.publishConfig()
|
||
expect(cfg.freeQuotaLeft).toBe(1)
|
||
const second = await postApi.create({ title: '今日免费第 2 条', content: '内容', plan: 'free' })
|
||
expect(second.plan).toBe('free')
|
||
// 第 3 条超出每日额度 → 必须付费
|
||
await expectReject(() => postApi.create({ title: '超出每日额度', content: '内容', plan: 'free' }), '请选择发布方式')
|
||
})
|
||
|
||
it('单条付费:金额取后台配置,忽略客户端传入的 amount', async () => {
|
||
resetPublish()
|
||
datasets.publishRule.quotaLeft = 0
|
||
setFreeQuota(0)
|
||
const res = await postApi.create({
|
||
title: '单条付费发布',
|
||
content: '内容',
|
||
plan: 'single',
|
||
payType: 'wxpay',
|
||
amount: 0.01, // 客户端篡改金额:应被无条件忽略
|
||
})
|
||
expect(res.order.amount).toBe(5)
|
||
expect(res.order.orderNo).toContain('PO')
|
||
})
|
||
|
||
it('单条付费缺少支付方式时报错', async () => {
|
||
resetPublish()
|
||
datasets.publishRule.quotaLeft = 0
|
||
setFreeQuota(0)
|
||
await expectReject(() => postApi.create({ title: 'x', content: 'y', plan: 'single' }), '支付方式不支持')
|
||
})
|
||
|
||
it('月卡/年卡走会员开通接口,开通后获得对应发布条数', async () => {
|
||
resetPublish()
|
||
datasets.publishRule.quotaLeft = 0
|
||
setFreeQuota(0)
|
||
const opened = await memberApi.open({ planId: 'M1', payType: 'balance' })
|
||
expect(opened.postQuota).toBe(30)
|
||
expect(opened.quotaLeft).toBe(30)
|
||
const res = await postApi.create({ title: '月卡额度发布', content: '内容', plan: 'free' })
|
||
expect(res.plan).toBe('quota')
|
||
expect(res.quotaLeft).toBe(29)
|
||
// 年卡:含 500 条
|
||
const year = await memberApi.open({ planId: 'M12', payType: 'balance' })
|
||
expect(year.postQuota).toBe(500)
|
||
expect(year.quotaLeft).toBe(529)
|
||
})
|
||
|
||
it('会员套餐列表带出「含发布条数」字段', async () => {
|
||
const plans = await memberApi.plans()
|
||
expect(plans.length).toBe(3)
|
||
plans.forEach((p) => expect(p.postQuota).toBeGreaterThan(0))
|
||
})
|
||
})
|
||
|
||
describe('我的发布 · 审核状态与计数', () => {
|
||
it('列表返回本人信息与各状态计数', async () => {
|
||
const res = await postApi.mine({ page: 1, size: 20 })
|
||
expect(res.list.length).toBeGreaterThan(0)
|
||
expect(res.counts.all).toBeGreaterThan(0)
|
||
expect(res.counts.pending + res.counts.passed + res.counts.rejected).toBeGreaterThan(0)
|
||
res.list.forEach((p) => {
|
||
expect(p.auditStatus).toBeDefined()
|
||
expect(p.status).toBeDefined()
|
||
expect(p.isTop).toBeDefined()
|
||
})
|
||
})
|
||
|
||
it('按状态筛选:待审核 / 已驳回(含驳回原因)/ 已下架', async () => {
|
||
const pending = await postApi.mine({ status: 'pending' })
|
||
expect(pending.list.every((p) => p.auditStatus === 0 && p.status === 1)).toBe(true)
|
||
|
||
const rejected = await postApi.mine({ status: 'rejected' })
|
||
expect(rejected.list.every((p) => p.auditStatus === 2)).toBe(true)
|
||
expect(rejected.list[0].auditReason).toBeTruthy()
|
||
|
||
const offline = await postApi.mine({ status: 'offline' })
|
||
expect(offline.list.every((p) => p.status === 0)).toBe(true)
|
||
})
|
||
|
||
it('置顶的发布记录排在最前', async () => {
|
||
const res = await postApi.mine({ page: 1, size: 20 })
|
||
expect(res.list[0].isTop).toBe(true)
|
||
})
|
||
|
||
it('可删除本人发布(删除后列表不再包含)', async () => {
|
||
const before = await postApi.mine({ page: 1, size: 20 })
|
||
const target = before.list[0]
|
||
await postApi.remove(target.id)
|
||
const after = await postApi.mine({ page: 1, size: 20 })
|
||
expect(after.counts.all).toBe(before.counts.all - 1)
|
||
expect(after.list.some((p) => p.id === target.id)).toBe(false)
|
||
})
|
||
})
|
||
|
||
describe('后台置顶 → 用户端展示闭环', () => {
|
||
it('置顶信息在首页信息流优先展示', async () => {
|
||
const feed = await homeApi.feed({ page: 1, size: 10 })
|
||
expect(feed.list[0].isTop).toBe(true)
|
||
// 置顶项之后才是非置顶项
|
||
const firstUnpinned = feed.list.findIndex((p) => !p.isTop)
|
||
if (firstUnpinned > -1) {
|
||
expect(feed.list.slice(firstUnpinned).every((p) => !p.isTop)).toBe(true)
|
||
}
|
||
})
|
||
})
|