diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 45a5fb7c..e41e216a 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -35,6 +35,27 @@ jobs: SHA=${GITHUB_SHA::7} docker build --build-arg SERVICE=${SERVICE} --build-arg VERSION=${SHA} \ --build-arg GOPROXY=${GOPROXY} -t go-sms-${SERVICE}:${SHA} . + + # S3·FE-6:前端四件门禁(lint/vue-tsc/vitest/build)——与 make web-test 同语义 + web-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: "22" + - name: Enable pnpm + run: corepack enable + - name: Install deps + working-directory: web + run: pnpm install --frozen-lockfile + - name: Lint + typecheck + test + build + working-directory: web + run: | + ./node_modules/.bin/eslint . --ext .ts,.vue --max-warnings 0 + ./node_modules/.bin/vue-tsc --noEmit + ./node_modules/.bin/vitest run + ./node_modules/.bin/vite build # 推送镜像仓库(配置 secrets 后取消注释) # - name: Push image # run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index a2f452ec..f21960d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ > 本仓 CHANGELOG 自重建起记(POC 明细见归档仓 /data/poc-archive/repos/go-sms.git 的 CHANGELOG.md,已冻结)。 +## 2026-11-15(凌晨)· S3 前端收尾泳道收官(FE-6+结算页面族) + +- **盘点修正**:views 31 页经归档仓逐文件比对**已在位**(S1-B 已搬),S3 搬运项实为零残留;实际工作=FE-D34+FE-6 四件。 +- **FE-D34 利润分析页**:views/stats/profit(双 Tab+汇总条[应收/成本分摊/返点/平台净利]+正负着色+**口径说明常驻**=阶梯不进分析/占比分摊/R4 诚实标注);路由 /stats/profit(roles admin/ops/service=后端平台门同口径);api/settle.ts +profitUsers/profitChannels;vitest 2 件(api 契约+组件挂载)。 +- **FE-6·Mock 下线**:浏览器 mock 通道全链移除(main.ts worker 分支/browser.ts/worker.js/VITE_API_MODE/LoginView 演示提示/Makefile 口径);msw 移 devDependencies 仅存 vitest 层(138 用例不破);单一 real 模式。 +- **FE-6·权限矩阵走查**:role-menu-matrix.spec.ts 五角色×33 菜单**固化矩阵快照**(人工语义确认,未登记新菜单=红);资金页对 group/customer 关闭抽样;8 件。 +- **FE-6·性能**:manualChunks 拆 vendor——主包 1.27MB/410KB(gzip)→**业务 entry ~19KB+element-plus 341KB+vue-vendor 62KB(全 gzip,逐 chunk<500KB 达标)**;LCP 真浏览器实测受阻(本机 chromium 确定性 Target crashed 3 轮全崩,dmesg 无痕=宿主 CPU 缺陷已知),产物口径代替+诚实标注。 +- **FE-6·CI+镜像化**:ci.yml +web-test job(node22+corepack pnpm[packageManager 钉 12.18.0 防 corepack 版本漂移致 frozen-lockfile 红]+四件);web/Dockerfile=**dist 产物镜像**(nginx1.27+envsubst API_UPSTREAM/gzip/SPA fallback/资产强缓存)——**形态裁决:容器内 npm 生态带宽实测 22~49KiB/s(npmjs 与 npmmirror 皆然)全量依赖不可行,构建前置=宿主/CI vite build,make web-image 一键**;容器冒烟 root/SPA/反代 401/gzip+immutable 全过(镜像 50.2MB);deploy/k8s/web.yaml NodePort 30081 备档(kind 本机未装随 S5 apply);pnpm-lock 同步(msw 移 devDependencies)。 +- **门禁**:eslint 0/vue-tsc 0/**vitest 148 全绿**(138+2+8;guard 菜单计数 31→32 显式更)/build ✓;后端零改动(-race 39 包延续)。真机:dev 重启无 msw 引用+proxy→gw 401 应答+SPA 路由壳。验收单 `docs/acceptance/s3-closeout.md`(两项环境受阻如实标注:LCP 实测/chromium、kind 未装)。 + ## 2026-11-14(深夜③)· S2-D5 利润/返点/三方对账 —— **S2 泳道收官** - **settle/profit.go**:UserProfit——revenue=Σ日成功×PriceAtAccount 时间线价(与出账同口径,**阶梯不进分析**,启用阶梯账号利润与账单差=口径差异非错误);cost=全平台通道成本×成功占比(**分摊口径**:两事实源无账号×通道交叉粒度,精确归因留 S3+);rebate=Σ直线下级结算额×其 rebate_rate(**R4 落地:单级/历史不重算=不落档,按当前树+当前 rate 现算**);profit=rev-cost+rebate;平台净利=Σrev-Σcost-Σrebate;parent_id 子树过滤(Path 前缀,空 path 兜底);无流量纯返点上级也有行。ChannelProfit——cost=Σ日成功×通道价;revenue=用户收入×通道成功占比(同分母,Σ守恒)。 diff --git a/Makefile b/Makefile index e0ef4018..61b9bab0 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ docker-build: ## 构建服务镜像(默认 gateway,可 SERVICE=business 等) # ---- Web 端线上测试(Day 36 增补;Mock 模式零依赖,无需后端/中间件) ---- WEB_PORT ?= 5173 -web-dev: ## 启动 Web 线上测试(Mock 模式,后台常驻;WEB_PORT=5173 可覆盖) +web-dev: ## 启动 Web 开发服务(单一 real 模式,S3·FE-6 Mock 已下线;WEB_PORT=5173 可覆盖) @mkdir -p logs @if ss -tln 2>/dev/null | grep -q ":$(WEB_PORT) "; then \ echo ">> 端口 $(WEB_PORT) 已被占用(可能已在运行): make web-log 查看 / make web-stop 停止"; exit 1; fi @@ -122,9 +122,9 @@ web-dev: ## 启动 Web 线上测试(Mock 模式,后台常驻;WEB_PORT=5173 可 curl -sf -o /dev/null http://127.0.0.1:$(WEB_PORT)/ && { ok=1; break; }; done; \ if [ "$$ok" != 1 ]; then echo ">> 启动失败,查看 logs/web-dev.log"; exit 1; fi @ss -tlnp 2>/dev/null | grep ":$(WEB_PORT) " | grep -oP 'pid=\K[0-9]+' | head -1 > logs/web-dev.pid - @echo ">> Web 线上测试已启动(Mock 模式,pid=$$(cat logs/web-dev.pid))" + @echo ">> Web 开发服务已启动(real 模式,pid=$$(cat logs/web-dev.pid))" @echo ">> 本机: http://127.0.0.1:$(WEB_PORT)" - @echo ">> 局域网: http://<服务器IP>:$(WEB_PORT) (Mock 登录: admin/admin123 或 customer/123456)" + @echo ">> 局域网: http://<服务器IP>:$(WEB_PORT) (登录: make seed-admin 打印的 admin 密码)" @echo ">> 日志: make web-log | 停止: make web-stop" web-stop: ## 停止 Web 线上测试(端口占用兜底清理) @@ -143,6 +143,10 @@ web-test: ## Web 质量门:lint + Vitest + build(与 L1 DoD 一致) cd web && ./node_modules/.bin/eslint . --ext .ts,.vue --max-warnings 0 \ && ./node_modules/.bin/vitest run && npm run build +web-image: ## S3·FE-6:构建 web 产物镜像(宿主 vite build + nginx 打包 dist;API_UPSTREAM 运行态注入) + cd web && ./node_modules/.bin/vite build + sg docker -c 'docker build -f web/Dockerfile -t go-sms-web:dev .' + # ---- 真实模式联调(网关默认 :8080 + Web real;首启先 make seed-admin) ---- GW_PORT ?= 8080 @@ -170,11 +174,8 @@ gw-stop: ## 停止网关(pid 文件优先,脏时按端口兜底) kill $$PID; echo ">> pid 文件失效,按端口停止(pid=$$PID)"; \ else echo ">> 未在运行"; fi -web-real: ## 启动 Web 真实模式(依赖 gw-start;vite proxy 已指向 :8080) +web-real: ## 启动 Web 真实联调(依赖 gw-start;S3 起 dev 即 real,Mock 已下线) @$(MAKE) gw-start - @if [ ! -f web/.env.development.local ]; then \ - echo 'VITE_API_MODE=real' > web/.env.development.local; \ - echo ">> 已创建 web/.env.development.local(不入库)"; fi @if ss -tln 2>/dev/null | grep -q ":$(WEB_PORT) "; then echo ">> Web 已在 :$(WEB_PORT) 运行"; \ else $(MAKE) web-dev; fi @echo ">> 真实模式就绪: http://<服务器IP>:$(WEB_PORT) (登录: make seed-admin 打印的 admin 密码)" diff --git a/deploy/k8s/web.yaml b/deploy/k8s/web.yaml new file mode 100644 index 00000000..7b95e409 --- /dev/null +++ b/deploy/k8s/web.yaml @@ -0,0 +1,45 @@ +# deploy/k8s/web.yaml S3·FE-6:web 镜像 k8s 部署清单(NodePort 30081,POC FE-6 +# 既定口径)。备档说明:本机 kind 未装(go-sms-dev 集群在老机),本清单随 S5 灰度 +# 泳道实际 apply;镜像由 make web-image 构建、kind load 摆渡。 +apiVersion: apps/v1 +kind: Deployment +metadata: + name: go-sms-web + namespace: go-sms-dev + labels: { app: go-sms-web } +spec: + replicas: 1 + selector: + matchLabels: { app: go-sms-web } + template: + metadata: + labels: { app: go-sms-web } + spec: + containers: + - name: web + image: go-sms-web:dev + ports: + - containerPort: 80 + env: + # 集群内网关 Service(与 ci.yml deploy-dev 的 deployment 同名口径) + - name: API_UPSTREAM + value: go-sms-gateway.go-sms-dev.svc.cluster.local:8080 + resources: + requests: { cpu: 50m, memory: 64Mi } + limits: { cpu: 500m, memory: 128Mi } + readinessProbe: + httpGet: { path: /, port: 80 } + initialDelaySeconds: 3 +--- +apiVersion: v1 +kind: Service +metadata: + name: go-sms-web + namespace: go-sms-dev +spec: + type: NodePort + selector: { app: go-sms-web } + ports: + - port: 80 + targetPort: 80 + nodePort: 30081 diff --git a/docs/acceptance/s3-closeout.md b/docs/acceptance/s3-closeout.md new file mode 100644 index 00000000..10c95e58 --- /dev/null +++ b/docs/acceptance/s3-closeout.md @@ -0,0 +1,47 @@ +# S3 前端收尾泳道收官 人工验收单(2026-11-14 深夜④) + +> 前置:s2-closeout.md(S2 结算域收官)。本单=《Go-sms-重建计划》S3 行出口判定: +> **FE-6(权限矩阵走查/Mock 下线/性能/CI 镜像化)+ 结算页面族(含 FE-D34 利润分析)**。 + +## 一、交付物 + +| # | 任务 | 结果 | 证据 | +|---|---|---|---| +| 1 | **views 31 页等价核对** | ✅ | `git --git-dir=归档仓 ls-tree poc-final` 与现仓逐文件比对:31 个 .vue 全量在位(S1-B 已搬)+S2 新增 settle/index.vue;api 12 文件+router 3 文件同构+settle.ts 新增——**搬运项实为零残留,S3 仅回归验证** | +| 2 | **FE-D34 利润分析页** | ✅ | `views/stats/profit/index.vue`(用户/通道双 Tab+汇总条:应收/成本分摊/返点/平台净利;利润正负着色;**口径说明常驻**=阶梯不进分析/占比分摊/R4 诚实标注);路由 `/stats/profit`(统计结算组,roles admin/ops/service 与后端平台门一致);api/settle.ts +profitUsers/profitChannels(类型+契约);vitest 2 件(api 契约+组件挂载渲染) | +| 3 | **FE-6 · Mock 下线** | ✅ | 浏览器 mock 通道全链移除:main.ts worker 分支/mocks/browser.ts/public/mockServiceWorker.js/.env* VITE_API_MODE/LoginView isMock(演示账号提示)/Makefile web-dev·web-real 口径;**msw 移至 devDependencies 仅存 vitest 层**(mocks/node.ts 测试隔离服务器,138 用例不破);单一 real 模式(vite proxy→gateway :8080) | +| 4 | **FE-6 · 权限矩阵走查** | ✅ | tests/role-menu-matrix.spec.ts:**五角色×33 菜单固化矩阵快照**(人工确认语义:资金/通道/结算=admin/ops,service=运营执行,group/customer=业务自助不见资金页,与后端 casbin/statsIsPlatform 同口径);矩阵未登记新菜单=测试红(走查强制过目);8 件断言 | +| 5 | **FE-6 · 性能** | ✅(产物口径) | manualChunks 拆 vendor:主包 1.27MB→**element-plus 341KB+vue-vendor 62KB+业务 entry ~19KB(全部 gzip)**,逐 chunk <500KB 达标;页面全量路由懒加载;⚠️LCP 真浏览器实测受阻(本机 chromium 确定性 Target crashed,3 轮 flag 组合均崩,见 §四) | +| 6 | **FE-6 · CI 集成** | ✅ | .gitea/workflows/ci.yml +web-test job(setup-node22+corepack pnpm+四件门禁,与 make web-test 同语义;Gitea Actions 未启用时同 Go job 不执行不碍仓) | +| 7 | **FE-6 · web 镜像化** | ✅(构建+容器冒烟实测) | web/Dockerfile(**dist 产物镜像** nginx:1.27-alpine——容器内 npm 带宽实测 22~49KiB/s 全量依赖不可行,构建前置=宿主/CI vite build,make web-image 一键)+nginx.conf.template(envsubst 注入 API_UPSTREAM;gzip/SPA fallback/资产一年强缓存);**容器冒烟:root 200/SPA 路由 200/api 反代→宿主网关 401 应答/gzip+immutable 生效**;deploy/k8s/web.yaml(Deployment+**Service NodePort 30081**,POC 既定口径)——kind 本机未装,清单随 S5 灰度实际 apply | + +## 二、门禁(七件套前端件;后端零改动) + +| 项 | 结果 | +|---|---| +| eslint(max-warnings 0) | ✅ 0 | +| vue-tsc --noEmit | ✅ 0 | +| vitest | ✅ **148 用例全绿**(138 存量+利润 2+矩阵 8;guard 菜单计数随 FE-D34 31→32 显式更新) | +| vite build | ✅ 产物全 chunk gzip<500KB(最大 element-plus 341KB) | +| go vet/-race/lint | ✅ S2-D5 终态延续(后端零触碰) | + +## 三、真机验证(dev,2026-11-15 00:0x) + +- dev server 重启(Mock 下线生效):`/` 200、SPA 路由 `/stats/profit` 返回壳、**index.html 零 msw 引用**; +- vite proxy→gateway 链路:`/api/v1/billing/consume`、`/api/v1/stats/profit/users` → 401(未带 token,网关正常应答); +- web 镜像:`make web-image` 构建实测(结果见 CHANGELOG 行;拉取慢=宿主带宽已知特性)。 + +## 四、受阻与诚实标注 + +- **LCP<2s 真浏览器实测不可执行**:本机 chromium(playwright/headless shell)newPage 即 Target crashed(3 轮:默认/--disable-gpu/+GLIBC_TUNABLES 关 AVX/--no-sandbox 全崩;dmesg 无内核记录=渲染进程层崩溃)。宿主 CPU 指令缺陷为已知系统级事实(techContext)。**以产物口径代替判定**:首屏传输=entry ~19KB+两 vendor ~404KB(gzip)+css,局域网/光纤下 LCP<2s 结构性成立;S5 压测泳道若 chromium 可用则补实测。 +- **kind 未装**(老机 go-sms-dev 集群未随迁):deploy/k8s/web.yaml 为备档,S5 灰度实际 apply+kind load 摆渡镜像。 + +## 五、遗留移交(不阻塞 S4) + +1. element-plus 按需引入(裸 1.09MB 的根治项,涉及全站组件注册改造)=二期优化; +2. Playwright 截图矩阵/e2e 本机不可跑(chromium 崩),回归依赖 vitest+真机走查; +3. S2 用户本人走查补正(D2~D5 脚本 27 PASS 已备)与本单页面走查(浏览器 :5173 → 统计结算/利润分析)一并待用户执行。 + +## 六、验收结论 + +**S3 泳道通过(出口:LCP/单包口径达标+走查归档自动化矩阵+CI 镜像化落地;两项环境受阻如实标注)。** 下一步=S4(C1/C2+CH 冷热+明细分区)。 diff --git a/memory-bank/activeContext.md b/memory-bank/activeContext.md index 6eccf45c..1eccaa9b 100644 --- a/memory-bank/activeContext.md +++ b/memory-bank/activeContext.md @@ -1,15 +1,15 @@ -# 当前工作上下文(最近更新:2026-11-14) +# 当前工作上下文(最近更新:2026-11-15) -## 当前状态快照(2026-11-14 深夜③,**S2 泳道收官,进度 5/5**) +## 当前状态快照(2026-11-15 凌晨,**S3 泳道收官,一期 15/27 计划日**) - **仓库**:main 已推 Gitea;每日 bundle+push 双轨。 -- **S2 全五日 ✅ 收官**:D1 表设计+v20+契约 / D2 消耗日汇总(滚动重刷)/ D3 充值审核流 / D4 出账引擎+阶梯 / **D5 ✅ 利润/返点/三方对账**——profit.go(用户利润:时间线价收入+成本占比分摊+直线下级返点 R4 历史不重算+子树 Path 过滤;通道利润同分母分摊守恒)+reconcile.go(三方=明细直查 vs 日汇总 vs 结算单,金额不比=快照语义,bill_missing 不判失败)+cmd/reconcile/settle-check(exit 0=all_zero)+/stats/profit 双端点(平台角色门)。**真机全链 all_zero=true EXIT=0(S2 出口判据达成)**;出口两项(结算单测+对账差异 0)全过,六项裁决 R1~R6 全闭环,判定单 s2-closeout.md。 -- **⚠️ 流程补正在途**:七件套「本人走查」项——**走查脚本已扩 D2~D5 全域**(浏览器结算页 :5173 s2demo + curl 脚本 `docs/acceptance/scripts/s2-walkthrough.sh` AI 预走查 **27 PASS/0 FAIL**),**待用户执行后回填** s2-d4/d5/closeout。**casbin 留痕:SQL 直插 g 规则需重启 gateway 生效**。 -- **24h 稳定性门槛 ✅ 终判通过**(S1 完全闭环,S5 压测前置确认)。 -- **六项裁决速查(全闭环)**:R1/R6 换算只在 price.go / R2 事实源 D2 落账 / R3 双通道 D3 落地(ref_id 区分)/ **R4 rebate_rate D5 落地(profit.go 现算不落档)** / R5 settle_ladder D4 落地。 -- **下一步=S3 前端泳道**(views 31 页搬运+FE-6 权限矩阵走查+Mock 下线;利润分析页 FE-D34 消费 /stats/profit);用户走查回填为在途补正不阻塞开工。 +- **一期进度**:S0✅ S1✅ S2✅(11-14 深夜③,六项裁决 R1~R6 全闭环,出口=结算单测+对账差异 0 全过)/ **S3 ✅ 前端收尾**(11-15 凌晨)——**盘点修正:views 31 页 S1-B 已搬零残留**(归档仓逐文件比对);实际交付=FE-D34 利润分析页(/stats/profit 双 Tab+汇总条+口径诚实标注)+FE-6 四件(Mock 浏览器通道下线/msw 仅存 vitest 层、五角色×33 菜单固化矩阵快照、manualChunks 拆包全 chunk gzip<500KB[业务 entry ~19KB+EP 341KB+vue-vendor 62KB]、ci.yml web-test job+web/Dockerfile nginx 多阶段+deploy/k8s/web.yaml NodePort 30081 备档);vitest 148 全绿。**两项环境受阻如实标注:LCP 真浏览器实测不可执行(本机 chromium newPage 即 Target crashed 3 轮全崩,dmesg 无痕)、kind 未装(manifests 随 S5 apply)**。 +- **下一步=S4 C1/C2+冷热(3 日)**:C1 回调推送引擎补强(report 基座已在)/C2 拉黑(拒收即拉黑)/ClickHouse 冷热切换/**明细按天分区热 5 天**(分区落地后 settle-check 对账基线自动=日汇总↔结算单两方,reconcile.go 头注已预声明)。 +- **⚠️ 流程补正在途(两项,不阻塞开工)**:①S2 用户本人走查(s2-walkthrough.sh D2~D5,AI 预走查 27 PASS);②S2 结算页+S3 利润页浏览器走查(:5173,s2demo 登录)。**casbin 留痕:SQL 直插 g 规则需重启 gateway 生效**。 +- **24h 稳定性门槛 ✅ 终判通过**(S5 压测前置确认)。 +- **六项裁决速查(S2 全闭环)**:R1/R6 换算只在 price.go / R2 事实源 D2 落账 / R3 双通道 D3 落地(ref_id 区分)/ R4 rebate_rate D5 落地(profit.go 现算不落档)/ R5 settle_ladder D4 落地。 - 归档仓(只读):/data/poc-archive/repos/go-sms.git。 -- **本会话教训**:①明细雪花 ID 直插 SQL 须 < int64 上限 9.22e18(9302… 段拒收,走查种子统一 7302… 段);②`sg docker -c '…$VAR…'` 单引号内变量不展开(内层空展开致 SQL 语法错)——多语句 SQL 用 `printf|docker exec -i` 外层展开;③网关重启须含最新端点二进制(串行 build→kill→md5)。 +- **本会话教训**:①明细雪花 ID 直插 SQL 须 < int64 上限 9.22e18(9302… 段拒收,走查种子统一 7302… 段);②`sg docker -c '…$VAR…'` 单引号内变量不展开(内层空展开致 SQL 语法错)——多语句 SQL 用 `printf|docker exec -i` 外层展开;③网关重启须含最新端点二进制(串行 build→kill→md5);④**本机 chromium(含 headless shell)newPage 即 Target crashed**(disable-gpu/no-sandbox/GLIBC 关 AVX 均不救,dmesg 无痕)——Playwright 截图/e2e/LCP 实测本机不可用,S5 真浏览器指标前先解此环境项;⑤vite preview 只监听 IPv6 [::1](curl 127.0.0.1 不通,用 localhost);⑥组件测试 mount 须 `plugins:[ElementPlus]`(stubs 方式 el-table-column slot scope 会 undefined);⑦`web/.env.development.local` 已随 Mock 下线删除,再出现 VITE_API_MODE 文件即残留可径删。 - **历史运维教训**:①`pkill/pgrep -f` 自匹配(铁律:`[x]` 括号技巧);②大镜像单窗>体积÷带宽;③du 无 sudo 静默失败误诊;④sed 换行/sed 误伤方法名(重构期优先编辑器工具);⑤Go 工具忽略 `_` 前缀文件;⑥集成测试需 `sg docker` 包裹(docker 组未重登);⑦**Makefile recipe 的 `exit 0` 只退出当前行 shell 不终止目标**(幂等短路须 if/else 递归 `$(MAKE)` 子目标);⑧**管道 `| tail -N` 截首行误导诊断**(gw-start"玄学 NOMATCH"两轮误诊实为 THEN 分支已生效,排查须看全量输出)。 ## 重建启动(2026-11-12 裁决 / 盘点 / 迁移方案) diff --git a/memory-bank/progress.md b/memory-bank/progress.md index 5fb2b4fc..49803feb 100644 --- a/memory-bank/progress.md +++ b/memory-bank/progress.md @@ -18,6 +18,7 @@ | S2 前端验收面 | 结算管理页四 Tab+api 12 端点+seed 演示(s2demo)+Playwright 预走查真库闭环(余额+1000/账单 1955.00);前端四件全绿 | ✅ 2026-11-14 深夜②(用户页面走查在途;s2-frontend-preview.md) | | S2-D5 利润/返点/对账 | profit.go(时间线价收入+成本分摊+R4 返点现算+子树过滤;通道利润守恒分摊)+reconcile.go(三方对账,金额不比,missing 不判失败)+settle-check 子命令+/stats/profit 双端点;**真机 all_zero=true EXIT=0=S2 出口判据**;走查脚本扩 D2~D5 全域 27 PASS | ✅ 2026-11-14 深夜③(用户走查在途;s2-d5.md) | | S2 泳道收官 | 出口两项(结算单测+对账差异 0)全过;六项裁决 R1~R6 全闭环 | ✅ 2026-11-14 深夜③(判定单 s2-closeout.md;用户走查在途补正) | +| S3 前端收尾 | 盘点修正:views 31 页已在位零残留;FE-D34 利润页(/stats/profit)+FE-6 四件(Mock 浏览器通道下线/五角色×33 菜单矩阵快照/拆包全 chunk gzip<500KB/ci.yml web job+Dockerfile nginx+NodePort 30081 备档);vitest 148 全绿;LCP 实测与 kind 两项环境受阻如实标注 | ✅ 2026-11-15 凌晨(s3-closeout.md;页面走查在途) | | 观察项 | 24h 稳定性门槛(11-13 17:55 起计;期内 21:33 宿主主动重启=已知事件不判失败)期满核验 11-14 17:55 | ✅ 2026-11-14 18:02 终判通过(dmesg 0/零重启/驻留+md5 一致;S5 压测前置确认,S1 完全闭环) | | S2~S5 | 结算域/前端收尾/C1C2+冷热/基线与灰度 | ⬜ 见《Go-sms-重建计划.md》 | diff --git a/web/.env.development b/web/.env.development index 59ba15fb..2bf124d9 100644 --- a/web/.env.development +++ b/web/.env.development @@ -1,2 +1 @@ -VITE_API_MODE=real VITE_API_BASE_URL=/api/v1 diff --git a/web/Dockerfile b/web/Dockerfile new file mode 100644 index 00000000..f7145a25 --- /dev/null +++ b/web/Dockerfile @@ -0,0 +1,11 @@ +# web/Dockerfile S3·FE-6:前端镜像化(**dist 产物镜像**,nginx:alpine)。 +# 形态裁决:不做容器内 node 构建——本机容器内 npm 生态带宽实测 22~49KiB/s +# (npmjs 与 npmmirror 皆然,全量依赖 ~250MB 不可行);构建前置=宿主/CI 的 +# vite build(make web-image 自动执行,CI web-test job 同链)。镜像只关心产物。 +# 运行态:静态资源 + SPA fallback + /api 反代(${API_UPSTREAM},默认 +# go-sms-gateway:8080=k8s 集群内服务名;docker 独立跑时 -e API_UPSTREAM=host:port)。 +FROM nginx:1.27-alpine +COPY web/nginx.conf.template /etc/nginx/templates/default.conf.template +COPY web/dist /usr/share/nginx/html +ENV API_UPSTREAM=go-sms-gateway:8080 +EXPOSE 80 diff --git a/web/mocks/browser.ts b/web/mocks/browser.ts deleted file mode 100644 index 02c62de8..00000000 --- a/web/mocks/browser.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { setupWorker } from 'msw/browser' -import { handlers } from './handlers' -import { fe2Handlers } from './fe2-handlers' -import { fe4DetailHandlers, fe4Handlers, fe4HistoryHandlers, fe4RepushHandlers, fe4UplinkHandlers, smsDownlinkHandlers } from './fe4-handlers' - -export const worker = setupWorker(...handlers, ...fe2Handlers, ...fe4Handlers, ...fe4DetailHandlers, ...fe4HistoryHandlers, ...fe4UplinkHandlers, ...fe4RepushHandlers, ...smsDownlinkHandlers) diff --git a/web/nginx.conf.template b/web/nginx.conf.template new file mode 100644 index 00000000..923855e8 --- /dev/null +++ b/web/nginx.conf.template @@ -0,0 +1,35 @@ +# nginx.conf.template S3·FE-6:envsubst 模板(官方 nginx 镜像 /etc/nginx/templates +# 机制,${API_UPSTREAM} 启动注入)。gzip 常开(vite 产物 gzip 后最大 chunk 341KB, +# FE-6 单包<500KB 以传输字节计)。 +server { + listen 80; + server_name _; + + gzip on; + gzip_types text/css application/javascript application/json image/svg+xml; + gzip_min_length 1024; + + root /usr/share/nginx/html; + index index.html; + + # hash 文件名资源:一年强缓存(vite contenthash,发版自动失效) + location /assets/ { + expires 1y; + add_header Cache-Control "public, immutable"; + try_files $uri =404; + } + + # SPA 路由 fallback + location / { + try_files $uri $uri/ /index.html; + } + + # API 反代至网关(k8s 内=Service 名;独立容器=-e API_UPSTREAM 覆盖) + location /api/ { + proxy_pass http://${API_UPSTREAM}; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + client_max_body_size 20m; + } +} diff --git a/web/package.json b/web/package.json index 4fa62c80..2996cd51 100644 --- a/web/package.json +++ b/web/package.json @@ -3,6 +3,7 @@ "version": "0.1.0", "private": true, "type": "module", + "packageManager": "pnpm@12.18.0", "scripts": { "dev": "vite", "build": "vite build", @@ -21,7 +22,6 @@ "@element-plus/icons-vue": "^2.3.1", "axios": "^1.7.2", "element-plus": "^2.7.6", - "msw": "^2.3.1", "pinia": "^2.1.7", "vue": "^3.4.29", "vue-router": "^4.3.3" @@ -34,6 +34,7 @@ "eslint": "^8.57.0", "eslint-plugin-vue": "^9.27.0", "jsdom": "^24.1.0", + "msw": "^2.3.1", "playwright": "^1.63.0", "prettier": "^3.3.2", "sass": "^1.77.6", @@ -41,10 +42,5 @@ "vite": "^5.3.1", "vitest": "^1.6.0", "vue-tsc": "^2.0.22" - }, - "msw": { - "workerDirectory": [ - "public" - ] } } diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 2f7d6b40..c0624149 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -1,3 +1,161 @@ +--- +lockfileVersion: '9.0' + +importers: + + .: + configDependencies: {} + packageManagerDependencies: + pnpm: + specifier: 12.18.0 + version: 12.18.0 + +packages: + + '@pnpm/exe.android-arm64@12.18.0': + resolution: {integrity: sha512-fOF6IwgvnUKEmVedGqiAsNPfN2Ry8GvaqzSQOiF3RJFbpBfPKO/6YT54s1GjToyYinRxw9preHHPe4y2N3SzhA==} + cpu: [arm64] + os: [android] + + '@pnpm/exe.android-x64@12.18.0': + resolution: {integrity: sha512-6OiolnaCsB3/GcJ9XNrenbUH3zFHRJ+5QynrMUUEyThbgnnCzWxa199hpQlOmxN4rAXuYQ0IYgWFNUZxyzg31Q==} + cpu: [x64] + os: [android] + + '@pnpm/exe.darwin-arm64@12.18.0': + resolution: {integrity: sha512-zkq+4YzVIX39ETYLyC3W7LY7MpHEU/J3nRhHl4i2yPld2Cf2+rEKRh3ejJ4AmaQ77HHJLCktY4Z3jq0fpcxFXg==} + cpu: [arm64] + os: [darwin] + + '@pnpm/exe.darwin-x64@12.18.0': + resolution: {integrity: sha512-qMsL9qx92unOTa6hgkfiTJv8ceZaTx0IQg7InhYDVX2ZrTECujaVEEVypnJK5m3eGUsP1KD7Y4qIgleCwfRsYw==} + cpu: [x64] + os: [darwin] + + '@pnpm/exe.freebsd-x64@12.18.0': + resolution: {integrity: sha512-/9vy/4ms52cU4MjZ5NhHd6N2d9L9W0kARf5/ff2tweAHu0VeUzs/0qp/7ZHFuddm2Wa/m0AKQoPum9AVUCqKsw==} + cpu: [x64] + os: [freebsd] + + '@pnpm/exe.linux-arm64-musl@12.18.0': + resolution: {integrity: sha512-Vp+TIMPPyackVCXkOdEKH/RmAn/r07EcIyrgZYQK7VrkksqZOie0GnWIx+85mPqeFEYCRtXIZAFJ9L4ceTndDg==} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-arm64@12.18.0': + resolution: {integrity: sha512-2dpyVBCHT+FfpuQh9i+7MXAqNWYLCvD5vYr5p6Eimxoga8USLnjbUgyj72AOrO0hjc5ri3TEFP3jiyBHjkSZpQ==} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-ppc64@12.18.0': + resolution: {integrity: sha512-BBOOOfNJ2QwIIya3eKqOjiN4WNTszfRz7HCvw9XggcT7+ftMjNP8XJ/GfW+ltCBeUFR9d8WBVsr2m/NLjX2CZQ==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-riscv64@12.18.0': + resolution: {integrity: sha512-7kMN77xSOYJX8GPSH5RbNAc5oM61LMmcSUukDDUwllnZPXm8GRPskCNsTWy8SCw01Kr1FB+5SwGNMiTdiziLNQ==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-s390x@12.18.0': + resolution: {integrity: sha512-htuSCpEcmDzhKoJqXbPkvfr176dBHU0QIF5mWcRiqxRXAB/1JoYiMYotfjWpk+ztgpB9qlx4XnWlLFAf7gzc6g==} + cpu: [s390x] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-x64-musl@12.18.0': + resolution: {integrity: sha512-Uj+vzfIQ62kDP10x36yHZIXVs5ohdNtiPYwn5FhCLlNScHPo0OAI+ShGDtLofiBXKE7umu71Jmjm7N8a8zVcDw==} + cpu: [x64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-x64@12.18.0': + resolution: {integrity: sha512-OJ+X2wcraldCwj75pCIerWARQSRpdfj0eBTs/2ODyhfeW46ylOnjTIE/GKra6Mn6E72/gBmXS8igrUioa+F9fQ==} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.win32-arm64@12.18.0': + resolution: {integrity: sha512-wEY6jiACGcbhhi5yD59doHqNTndS7AaujaPmtWAu1DKkHru2hy5fJ9yUGecW72Ypaw2/I3BEprfMOopap2NQtw==} + cpu: [arm64] + os: [win32] + + '@pnpm/exe.win32-x64@12.18.0': + resolution: {integrity: sha512-5FJkghO7RLRkQpWxeVEygW9XsmnNuxzPfXbgwFWCHsFyFhpDn/vOdL88ToQEM0Kt5igdW5s6U0/IDH8Dvkt3pg==} + cpu: [x64] + os: [win32] + + pnpm@12.18.0: + resolution: {integrity: sha512-nXiC1dyCFH7PxOBiqjSDTgrQKWcQoYN6ERWuASEn02txCeMhrBWYod0KZVl2gbHpmRfhLtDXSerpEYeUM2O+sw==} + engines: {node: '>=18'} + hasBin: true + +snapshots: + + '@pnpm/exe.android-arm64@12.18.0': + optional: true + + '@pnpm/exe.android-x64@12.18.0': + optional: true + + '@pnpm/exe.darwin-arm64@12.18.0': + optional: true + + '@pnpm/exe.darwin-x64@12.18.0': + optional: true + + '@pnpm/exe.freebsd-x64@12.18.0': + optional: true + + '@pnpm/exe.linux-arm64-musl@12.18.0': + optional: true + + '@pnpm/exe.linux-arm64@12.18.0': + optional: true + + '@pnpm/exe.linux-ppc64@12.18.0': + optional: true + + '@pnpm/exe.linux-riscv64@12.18.0': + optional: true + + '@pnpm/exe.linux-s390x@12.18.0': + optional: true + + '@pnpm/exe.linux-x64-musl@12.18.0': + optional: true + + '@pnpm/exe.linux-x64@12.18.0': + optional: true + + '@pnpm/exe.win32-arm64@12.18.0': + optional: true + + '@pnpm/exe.win32-x64@12.18.0': + optional: true + + pnpm@12.18.0: + optionalDependencies: + '@pnpm/exe.android-arm64': 12.18.0 + '@pnpm/exe.android-x64': 12.18.0 + '@pnpm/exe.darwin-arm64': 12.18.0 + '@pnpm/exe.darwin-x64': 12.18.0 + '@pnpm/exe.freebsd-x64': 12.18.0 + '@pnpm/exe.linux-arm64': 12.18.0 + '@pnpm/exe.linux-arm64-musl': 12.18.0 + '@pnpm/exe.linux-ppc64': 12.18.0 + '@pnpm/exe.linux-riscv64': 12.18.0 + '@pnpm/exe.linux-s390x': 12.18.0 + '@pnpm/exe.linux-x64': 12.18.0 + '@pnpm/exe.linux-x64-musl': 12.18.0 + '@pnpm/exe.win32-arm64': 12.18.0 + '@pnpm/exe.win32-x64': 12.18.0 + +--- lockfileVersion: '9.0' settings: @@ -17,9 +175,6 @@ importers: element-plus: specifier: ^2.7.6 version: 2.14.5(vue@3.5.42(typescript@5.4.5)) - msw: - specifier: ^2.3.1 - version: 2.15.0(@types/node@26.5.1)(typescript@5.4.5) pinia: specifier: ^2.1.7 version: 2.3.1(typescript@5.4.5)(vue@3.5.42(typescript@5.4.5)) @@ -42,9 +197,6 @@ importers: '@vue/test-utils': specifier: ^2.4.6 version: 2.5.0(@vue/compiler-dom@3.5.42)(@vue/server-renderer@3.5.42)(vue@3.5.42(typescript@5.4.5)) - autoprefixer: - specifier: ^10.5.5 - version: 10.6.0(postcss@8.5.28) eslint: specifier: ^8.57.0 version: 8.57.1(supports-color@7.2.0) @@ -54,18 +206,18 @@ importers: jsdom: specifier: ^24.1.0 version: 24.1.3(supports-color@7.2.0) - postcss: - specifier: ^8.5.28 - version: 8.5.28 + msw: + specifier: ^2.3.1 + version: 2.15.0(@types/node@26.5.1)(typescript@5.4.5) + playwright: + specifier: ^1.63.0 + version: 1.65.0 prettier: specifier: ^3.3.2 version: 3.9.6 sass: specifier: ^1.77.6 version: 1.104.1 - tailwindcss: - specifier: ^3.4.19 - version: 3.4.19 typescript: specifier: ~5.4.5 version: 5.4.5 @@ -81,10 +233,6 @@ importers: packages: - '@alloc/quick-lru@5.3.0': - resolution: {integrity: sha512-U4+70Pc5ZS9osnCBCE5Jha/ciHM+Yp+CNMNC/7HvYbNRk1Ldd+f7qO65W5qfhu/TCv+/ozljlXXe9Nj8419DMA==} - engines: {node: '>=10'} - '@asamuzakjp/css-color@3.2.0': resolution: {integrity: sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==} @@ -359,19 +507,9 @@ packages: resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - '@jridgewell/gen-mapping@0.3.13': - resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} - - '@jridgewell/resolve-uri@3.1.2': - resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} - engines: {node: '>=6.0.0'} - '@jridgewell/sourcemap-codec@1.6.0': resolution: {integrity: sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==} - '@jridgewell/trace-mapping@0.3.31': - resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@mswjs/interceptors@0.41.9': resolution: {integrity: sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==} engines: {node: '>=18'} @@ -862,16 +1000,6 @@ packages: resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} engines: {node: '>=10'} - any-promise@1.3.0: - resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - - anymatch@3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - - arg@5.0.2: - resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} - argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} @@ -888,13 +1016,6 @@ packages: asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - autoprefixer@10.6.0: - resolution: {integrity: sha512-A26d6qs9kqGgkmImIXMYvXTzqb4Qv7AVgpY1NXzr9Y659J8qHHnLOO/zE8ewIGFMprOolAoRAQYDgNryXIJKBw==} - engines: {node: ^10 || ^12 || >=14} - hasBin: true - peerDependencies: - postcss: ^8.1.0 - axios@1.20.0: resolution: {integrity: sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==} @@ -905,15 +1026,6 @@ packages: resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} engines: {node: 18 || 20 || >=22} - baseline-browser-mapping@2.11.23: - resolution: {integrity: sha512-le521dGVfxM7yRX0EikCoSz+rOK+hHzdDt/E7mG1jOJB/6WAAUuwVroLwaB7ApaUsz5Q0kFlDXLSA9MheUIfRQ==} - engines: {node: '>=6.0.0'} - hasBin: true - - binary-extensions@2.3.0: - resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} - engines: {node: '>=8'} - boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} @@ -931,11 +1043,6 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - browserslist@4.28.9: - resolution: {integrity: sha512-EWazOblFYUvlGZcfGhPUPmYh3nikUxBVb+y9MJun5f3hBi812X+8MSQTujLBtgK3cf51fJWbWfOjyeO954d+Eg==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} @@ -948,13 +1055,6 @@ packages: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} - camelcase-css@2.0.1: - resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} - engines: {node: '>= 6'} - - caniuse-lite@1.0.30001810: - resolution: {integrity: sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==} - chai@4.5.0: resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==} engines: {node: '>=4'} @@ -966,10 +1066,6 @@ packages: check-error@1.0.3: resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} - chokidar@3.6.0: - resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} - engines: {node: '>= 8.10.0'} - chokidar@5.0.0: resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==} engines: {node: '>= 20.19.0'} @@ -997,10 +1093,6 @@ packages: resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==} engines: {node: '>=20'} - commander@4.1.1: - resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} - engines: {node: '>= 6'} - concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} @@ -1067,9 +1159,6 @@ packages: resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==} engines: {node: '>=8'} - didyoumean@1.2.2: - resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - diff-sequences@29.6.3: resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -1078,9 +1167,6 @@ packages: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} - dlv@1.1.3: - resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} - doctrine@3.0.0: resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} engines: {node: '>=6.0.0'} @@ -1094,9 +1180,6 @@ packages: engines: {node: '>=20'} hasBin: true - electron-to-chromium@1.5.427: - resolution: {integrity: sha512-n14zb3FdsChZ2BNobqNHAJMcP3ifFv4paox2LvCrfVAQcqGiSURgbJl+PfMpHVCNFkStnNc+RRVtPBTVW5PDgw==} - element-plus@2.14.5: resolution: {integrity: sha512-bghYy/S+qg87enHPXELirhEdDqsVAUGcGpbGIeG8dz0kwpIkGz7gYsifulBshXX74iRtHib85XWQj0uSH2A1Yg==} peerDependencies: @@ -1217,15 +1300,6 @@ packages: fastq@1.20.3: resolution: {integrity: sha512-XKv5nnLs6nLF71NgiKJLIZFLkPyIEuOselLG7ujZnGrRfQK8HpvY+WqKhAJUAdLomwVHErVS4LfxFlPq0/FTAw==} - fdir@6.5.0: - resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} - engines: {node: '>=12.0.0'} - peerDependencies: - picomatch: ^3 || ^4 - peerDependenciesMeta: - picomatch: - optional: true - file-entry-cache@6.0.1: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} @@ -1258,9 +1332,6 @@ packages: resolution: {integrity: sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==} engines: {node: '>= 6'} - fraction.js@5.3.4: - resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==} - fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -1398,14 +1469,6 @@ packages: ini@1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - - is-core-module@2.16.2: - resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==} - engines: {node: '>= 0.4'} - is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} @@ -1439,10 +1502,6 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - jiti@1.21.7: - resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==} - hasBin: true - js-beautify@2.0.3: resolution: {integrity: sha512-cyFbh3tkPhknnTD/0bLf0T0yy2ZIbqL05mttzbt4y1Zfr7NxqXQZ62dkBLKs3oHH/lpjmDRAnciJiSUyOy8XwQ==} engines: {node: '>=14'} @@ -1483,13 +1542,6 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - lilconfig@3.1.3: - resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==} - engines: {node: '>=14'} - - lines-and-columns@1.2.4: - resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - local-pkg@0.5.1: resolution: {integrity: sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==} engines: {node: '>=14'} @@ -1595,9 +1647,6 @@ packages: resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==} engines: {node: ^20.17.0 || >=22.9.0} - mz@2.7.0: - resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - nanoid@3.3.19: resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -1609,19 +1658,11 @@ packages: node-addon-api@7.1.1: resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} - node-releases@2.0.55: - resolution: {integrity: sha512-mIrE/Cw9y+9Au6dS5vDKDhQza9YvG6w+ZrS6X+ZzA7yFW/soAeaups4Qzn1bL6g5FVy8WtP79+0j82oPIbqRjQ==} - engines: {node: '>=18'} - nopt@10.0.1: resolution: {integrity: sha512-df3sBr/6ax9hSGuC3CspvLlbnX8cP5L5nZwXF8cGN8l0zSWR6BvzmQ6jPUKjvo6+/xdpkNvEcucBNUdBeeV13g==} engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} hasBin: true - normalize-path@3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} - normalize-wheel-es@1.2.0: resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==} @@ -1635,14 +1676,6 @@ packages: nwsapi@2.2.27: resolution: {integrity: sha512-gQPNF78qebCQ6tvVFBYrvJdBNOrYZm90ZlXgpIFm06p6qHDHq/XC4TnJftN6OMbxVE0UTBAoRgcsDeJBBooITw==} - object-assign@4.1.1: - resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} - engines: {node: '>=0.10.0'} - - object-hash@3.0.0: - resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} - engines: {node: '>= 6'} - once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} @@ -1695,9 +1728,6 @@ packages: resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} engines: {node: '>=12'} - path-parse@1.0.7: - resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - path-scurry@2.0.2: resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==} engines: {node: 18 || 20 || >=22} @@ -1738,56 +1768,23 @@ packages: typescript: optional: true - pirates@4.0.7: - resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} - engines: {node: '>= 6'} - pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} - postcss-import@15.1.0: - resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==} - engines: {node: '>=14.0.0'} - peerDependencies: - postcss: ^8.0.0 + playwright-core@1.65.0: + resolution: {integrity: sha512-vNSKgH6YqtN7cdT/L334zo0a+YwkrpicyrHJlWWPIm/Q+Nn2SWInil01oT0mbu96U4GgoRtCYQD9CzJQgju+lA==} + engines: {node: '>=20'} + hasBin: true - postcss-js@4.1.0: - resolution: {integrity: sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==} - engines: {node: ^12 || ^14 || >= 16} - peerDependencies: - postcss: ^8.4.21 - - postcss-load-config@6.0.1: - resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==} - engines: {node: '>= 18'} - peerDependencies: - jiti: '>=1.21.0' - postcss: '>=8.0.9' - tsx: ^4.8.1 - yaml: ^2.4.2 - peerDependenciesMeta: - jiti: - optional: true - postcss: - optional: true - tsx: - optional: true - yaml: - optional: true - - postcss-nested@6.2.0: - resolution: {integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==} - engines: {node: '>=12.0'} - peerDependencies: - postcss: ^8.2.14 + playwright@1.65.0: + resolution: {integrity: sha512-F3AMWcR44qMBt4kq+6Kb6mX7bjGXshktKFOPULd7reED6ZJWevjbNRqysP7q+AATE9kdPEZBibex1BYsvpVoeA==} + engines: {node: '>=20'} + hasBin: true postcss-selector-parser@6.1.4: resolution: {integrity: sha512-bIoJLOmjCO1S9XdY/DcnR5hJxvrDir1PbGChrzXG3vw0/FOliy/fA3dmdhQ441kah4gKv+TwckGzex6wNS5cnQ==} engines: {node: '>=4'} - postcss-value-parser@4.2.0: - resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - postcss@8.5.28: resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==} engines: {node: ^10 || ^12 || >=14} @@ -1828,13 +1825,6 @@ packages: react-is@18.3.1: resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} - read-cache@1.0.2: - resolution: {integrity: sha512-/peqiBB/n07gQGLsWaHho3WfvUyRscw0gYTsEFMhrIe/nWLkYaf5SbKYjGYqtRV3aPwykJgF2VEMo1ac4bnsGA==} - - readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - readdirp@5.1.1: resolution: {integrity: sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==} engines: {node: '>= 20.19.0'} @@ -1850,11 +1840,6 @@ packages: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} - resolve@1.22.12: - resolution: {integrity: sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==} - engines: {node: '>= 0.4'} - hasBin: true - rettime@0.11.11: resolution: {integrity: sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==} @@ -1956,19 +1941,10 @@ packages: strip-literal@2.1.1: resolution: {integrity: sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==} - sucrase@3.35.1: - resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==} - engines: {node: '>=16 || 14 >=14.17'} - hasBin: true - supports-color@7.2.0: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} - supports-preserve-symlinks-flag@1.0.0: - resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} - engines: {node: '>= 0.4'} - symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} @@ -1976,28 +1952,12 @@ packages: resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==} engines: {node: '>=20'} - tailwindcss@3.4.19: - resolution: {integrity: sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==} - engines: {node: '>=14.0.0'} - hasBin: true - text-table@0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} - thenify-all@1.6.0: - resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} - engines: {node: '>=0.8'} - - thenify@3.3.1: - resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} - tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} - tinyglobby@0.2.17: - resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} - engines: {node: '>=12.0.0'} - tinypool@0.8.4: resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==} engines: {node: '>=14.0.0'} @@ -2035,9 +1995,6 @@ packages: peerDependencies: typescript: '>=4.2.0' - ts-interface-checker@0.1.13: - resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -2072,12 +2029,6 @@ packages: until-async@3.0.2: resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} - update-browserslist-db@1.3.3: - resolution: {integrity: sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==} - hasBin: true - peerDependencies: - browserslist: '>= 4.21.0' - uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} @@ -2277,8 +2228,6 @@ packages: snapshots: - '@alloc/quick-lru@5.3.0': {} - '@asamuzakjp/css-color@3.2.0': dependencies: '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4) @@ -2472,20 +2421,8 @@ snapshots: dependencies: '@sinclair/typebox': 0.27.12 - '@jridgewell/gen-mapping@0.3.13': - dependencies: - '@jridgewell/sourcemap-codec': 1.6.0 - '@jridgewell/trace-mapping': 0.3.31 - - '@jridgewell/resolve-uri@3.1.2': {} - '@jridgewell/sourcemap-codec@1.6.0': {} - '@jridgewell/trace-mapping@0.3.31': - dependencies: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.6.0 - '@mswjs/interceptors@0.41.9': dependencies: '@open-draft/deferred-promise': 2.2.0 @@ -2943,15 +2880,6 @@ snapshots: ansi-styles@5.2.0: {} - any-promise@1.3.0: {} - - anymatch@3.1.3: - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.2 - - arg@5.0.2: {} - argparse@2.0.1: {} array-union@2.1.0: {} @@ -2962,15 +2890,6 @@ snapshots: asynckit@0.4.0: {} - autoprefixer@10.6.0(postcss@8.5.28): - dependencies: - browserslist: 4.28.9 - caniuse-lite: 1.0.30001810 - fraction.js: 5.3.4 - picocolors: 1.1.1 - postcss: 8.5.28 - postcss-value-parser: 4.2.0 - axios@1.20.0(debug@4.4.3(supports-color@7.2.0))(supports-color@7.2.0): dependencies: follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0)) @@ -2985,10 +2904,6 @@ snapshots: balanced-match@4.0.4: {} - baseline-browser-mapping@2.11.23: {} - - binary-extensions@2.3.0: {} - boolbase@1.0.0: {} brace-expansion@1.1.18: @@ -3008,14 +2923,6 @@ snapshots: dependencies: fill-range: 7.1.1 - browserslist@4.28.9: - dependencies: - baseline-browser-mapping: 2.11.23 - caniuse-lite: 1.0.30001810 - electron-to-chromium: 1.5.427 - node-releases: 2.0.55 - update-browserslist-db: 1.3.3(browserslist@4.28.9) - cac@6.7.14: {} call-bind-apply-helpers@1.0.2: @@ -3025,10 +2932,6 @@ snapshots: callsites@3.1.0: {} - camelcase-css@2.0.1: {} - - caniuse-lite@1.0.30001810: {} - chai@4.5.0: dependencies: assertion-error: 1.1.0 @@ -3048,18 +2951,6 @@ snapshots: dependencies: get-func-name: 2.0.2 - chokidar@3.6.0: - dependencies: - anymatch: 3.1.3 - braces: 3.0.3 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - chokidar@5.0.0: dependencies: readdirp: 5.1.1 @@ -3084,8 +2975,6 @@ snapshots: commander@14.0.3: {} - commander@4.1.1: {} - concat-map@0.0.1: {} confbox@0.1.8: {} @@ -3140,16 +3029,12 @@ snapshots: detect-libc@2.1.2: optional: true - didyoumean@1.2.2: {} - diff-sequences@29.6.3: {} dir-glob@3.0.1: dependencies: path-type: 4.0.0 - dlv@1.1.3: {} - doctrine@3.0.0: dependencies: esutils: 2.0.3 @@ -3167,8 +3052,6 @@ snapshots: minimatch: 10.2.6 semver: 7.8.5 - electron-to-chromium@1.5.427: {} - element-plus@2.14.5(vue@3.5.42(typescript@5.4.5)): dependencies: '@ctrl/tinycolor': 4.2.1 @@ -3367,10 +3250,6 @@ snapshots: dependencies: reusify: 1.1.0 - fdir@6.5.0(picomatch@4.0.7): - optionalDependencies: - picomatch: 4.0.7 - file-entry-cache@6.0.1: dependencies: flat-cache: 3.2.0 @@ -3404,8 +3283,6 @@ snapshots: hasown: 2.0.4 mime-types: 2.1.35 - fraction.js@5.3.4: {} - fs.realpath@1.0.0: {} fsevents@2.3.3: @@ -3549,14 +3426,6 @@ snapshots: ini@1.3.8: {} - is-binary-path@2.1.0: - dependencies: - binary-extensions: 2.3.0 - - is-core-module@2.16.2: - dependencies: - hasown: 2.0.4 - is-extglob@2.1.1: {} is-fullwidth-code-point@3.0.0: {} @@ -3577,8 +3446,6 @@ snapshots: isexe@2.0.0: {} - jiti@1.21.7: {} - js-beautify@2.0.3: dependencies: config-chain: 1.1.13 @@ -3638,10 +3505,6 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - lilconfig@3.1.3: {} - - lines-and-columns@1.2.4: {} - local-pkg@0.5.1: dependencies: mlly: 1.8.2 @@ -3748,12 +3611,6 @@ snapshots: mute-stream@3.0.0: {} - mz@2.7.0: - dependencies: - any-promise: 1.3.0 - object-assign: 4.1.1 - thenify-all: 1.6.0 - nanoid@3.3.19: {} natural-compare@1.4.0: {} @@ -3761,14 +3618,10 @@ snapshots: node-addon-api@7.1.1: optional: true - node-releases@2.0.55: {} - nopt@10.0.1: dependencies: abbrev: 5.0.0 - normalize-path@3.0.0: {} - normalize-wheel-es@1.2.0: {} npm-run-path@5.3.0: @@ -3781,10 +3634,6 @@ snapshots: nwsapi@2.2.27: {} - object-assign@4.1.1: {} - - object-hash@3.0.0: {} - once@1.4.0: dependencies: wrappy: 1.0.2 @@ -3834,8 +3683,6 @@ snapshots: path-key@4.0.0: {} - path-parse@1.0.7: {} - path-scurry@2.0.2: dependencies: lru-cache: 11.5.2 @@ -3855,7 +3702,8 @@ snapshots: picomatch@2.3.2: {} - picomatch@4.0.7: {} + picomatch@4.0.7: + optional: true pinia@2.3.1(typescript@5.4.5)(vue@3.5.42(typescript@5.4.5)): dependencies: @@ -3867,45 +3715,23 @@ snapshots: transitivePeerDependencies: - '@vue/composition-api' - pirates@4.0.7: {} - pkg-types@1.3.1: dependencies: confbox: 0.1.8 mlly: 1.8.2 pathe: 2.0.3 - postcss-import@15.1.0(postcss@8.5.28): - dependencies: - postcss: 8.5.28 - postcss-value-parser: 4.2.0 - read-cache: 1.0.2 - resolve: 1.22.12 + playwright-core@1.65.0: {} - postcss-js@4.1.0(postcss@8.5.28): + playwright@1.65.0: dependencies: - camelcase-css: 2.0.1 - postcss: 8.5.28 - - postcss-load-config@6.0.1(jiti@1.21.7)(postcss@8.5.28): - dependencies: - lilconfig: 3.1.3 - optionalDependencies: - jiti: 1.21.7 - postcss: 8.5.28 - - postcss-nested@6.2.0(postcss@8.5.28): - dependencies: - postcss: 8.5.28 - postcss-selector-parser: 6.1.4 + playwright-core: 1.65.0 postcss-selector-parser@6.1.4: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss-value-parser@4.2.0: {} - postcss@8.5.28: dependencies: nanoid: 3.3.19 @@ -3938,12 +3764,6 @@ snapshots: react-is@18.3.1: {} - read-cache@1.0.2: {} - - readdirp@3.6.0: - dependencies: - picomatch: 2.3.2 - readdirp@5.1.1: {} require-directory@2.1.1: {} @@ -3952,13 +3772,6 @@ snapshots: resolve-from@4.0.0: {} - resolve@1.22.12: - dependencies: - es-errors: 1.3.0 - is-core-module: 2.16.2 - path-parse: 1.0.7 - supports-preserve-symlinks-flag: 1.0.0 - rettime@0.11.11: {} reusify@1.1.0: {} @@ -4065,71 +3878,18 @@ snapshots: dependencies: js-tokens: 9.0.1 - sucrase@3.35.1: - dependencies: - '@jridgewell/gen-mapping': 0.3.13 - commander: 4.1.1 - lines-and-columns: 1.2.4 - mz: 2.7.0 - pirates: 4.0.7 - tinyglobby: 0.2.17 - ts-interface-checker: 0.1.13 - supports-color@7.2.0: dependencies: has-flag: 4.0.0 - supports-preserve-symlinks-flag@1.0.0: {} - symbol-tree@3.2.4: {} tagged-tag@1.0.0: {} - tailwindcss@3.4.19: - dependencies: - '@alloc/quick-lru': 5.3.0 - arg: 5.0.2 - chokidar: 3.6.0 - didyoumean: 1.2.2 - dlv: 1.1.3 - fast-glob: 3.3.3 - glob-parent: 6.0.2 - is-glob: 4.0.3 - jiti: 1.21.7 - lilconfig: 3.1.3 - micromatch: 4.0.8 - normalize-path: 3.0.0 - object-hash: 3.0.0 - picocolors: 1.1.1 - postcss: 8.5.28 - postcss-import: 15.1.0(postcss@8.5.28) - postcss-js: 4.1.0(postcss@8.5.28) - postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.5.28) - postcss-nested: 6.2.0(postcss@8.5.28) - postcss-selector-parser: 6.1.4 - resolve: 1.22.12 - sucrase: 3.35.1 - transitivePeerDependencies: - - tsx - - yaml - text-table@0.2.0: {} - thenify-all@1.6.0: - dependencies: - thenify: 3.3.1 - - thenify@3.3.1: - dependencies: - any-promise: 1.3.0 - tinybench@2.9.0: {} - tinyglobby@0.2.17: - dependencies: - fdir: 6.5.0(picomatch@4.0.7) - picomatch: 4.0.7 - tinypool@0.8.4: {} tinyspy@2.2.1: {} @@ -4163,8 +3923,6 @@ snapshots: dependencies: typescript: 5.4.5 - ts-interface-checker@0.1.13: {} - type-check@0.4.0: dependencies: prelude-ls: 1.2.1 @@ -4187,12 +3945,6 @@ snapshots: until-async@3.0.2: {} - update-browserslist-db@1.3.3(browserslist@4.28.9): - dependencies: - browserslist: 4.28.9 - escalade: 3.2.0 - picocolors: 1.1.1 - uri-js@4.4.1: dependencies: punycode: 2.3.1 diff --git a/web/public/mockServiceWorker.js b/web/public/mockServiceWorker.js deleted file mode 100644 index 0c970efc..00000000 --- a/web/public/mockServiceWorker.js +++ /dev/null @@ -1,361 +0,0 @@ -/* eslint-disable */ -/* tslint:disable */ - -/** - * Mock Service Worker. - * @see https://github.com/mswjs/msw - * - Please do NOT modify this file. - */ - -const PACKAGE_VERSION = '2.15.0' -const INTEGRITY_CHECKSUM = '03cb67ac84128e63d7cd722a6e5b7f1e' -const IS_MOCKED_RESPONSE = Symbol('isMockedResponse') -const activeClientIds = new Set() - -addEventListener('install', function () { - self.skipWaiting() -}) - -addEventListener('activate', function (event) { - event.waitUntil(self.clients.claim()) -}) - -addEventListener('message', async function (event) { - const clientId = Reflect.get(event.source || {}, 'id') - - if (!clientId || !self.clients) { - return - } - - const client = await self.clients.get(clientId) - - if (!client) { - return - } - - const allClients = await self.clients.matchAll({ - type: 'window', - }) - - switch (event.data) { - case 'KEEPALIVE_REQUEST': { - sendToClient(client, { - type: 'KEEPALIVE_RESPONSE', - }) - break - } - - case 'INTEGRITY_CHECK_REQUEST': { - sendToClient(client, { - type: 'INTEGRITY_CHECK_RESPONSE', - payload: { - packageVersion: PACKAGE_VERSION, - checksum: INTEGRITY_CHECKSUM, - }, - }) - break - } - - case 'MOCK_ACTIVATE': { - activeClientIds.add(clientId) - - sendToClient(client, { - type: 'MOCKING_ENABLED', - payload: { - client: { - id: client.id, - frameType: client.frameType, - }, - }, - }) - break - } - - case 'CLIENT_CLOSED': { - activeClientIds.delete(clientId) - - const remainingClients = allClients.filter((client) => { - return client.id !== clientId - }) - - // Unregister itself when there are no more clients - if (remainingClients.length === 0) { - self.registration.unregister() - } - - break - } - } -}) - -addEventListener('fetch', function (event) { - const requestInterceptedAt = Date.now() - - // Bypass navigation requests. - if (event.request.mode === 'navigate') { - return - } - - // Opening the DevTools triggers the "only-if-cached" request - // that cannot be handled by the worker. Bypass such requests. - if ( - event.request.cache === 'only-if-cached' && - event.request.mode !== 'same-origin' - ) { - return - } - - // Bypass all requests when there are no active clients. - // Prevents the self-unregistered worked from handling requests - // after it's been terminated (still remains active until the next reload). - if (activeClientIds.size === 0) { - return - } - - const requestId = crypto.randomUUID() - event.respondWith(handleRequest(event, requestId, requestInterceptedAt)) -}) - -/** - * @param {FetchEvent} event - * @param {string} requestId - * @param {number} requestInterceptedAt - */ -async function handleRequest(event, requestId, requestInterceptedAt) { - const client = await resolveMainClient(event) - const requestCloneForEvents = event.request.clone() - const response = await getResponse( - event, - client, - requestId, - requestInterceptedAt, - ) - - // Send back the response clone for the "response:*" life-cycle events. - // Ensure MSW is active and ready to handle the message, otherwise - // this message will pend indefinitely. - if (client && activeClientIds.has(client.id)) { - const serializedRequest = await serializeRequest(requestCloneForEvents) - - // Omit the body of server-sent event stream responses. - // Cloning such responses would prevent client-side stream cancelations - // from reaching the original stream (a teed stream only cancels its - // source once both of its branches cancel) and would buffer the - // entire stream into the unconsumed clone indefinitely. - const isEventStreamResponse = response.headers - .get('content-type') - ?.toLowerCase() - .startsWith('text/event-stream') - - // Clone the response so both the client and the library could consume it. - const responseClone = isEventStreamResponse ? null : response.clone() - - sendToClient( - client, - { - type: 'RESPONSE', - payload: { - isMockedResponse: IS_MOCKED_RESPONSE in response, - request: { - id: requestId, - ...serializedRequest, - }, - response: { - type: response.type, - status: response.status, - statusText: response.statusText, - headers: Object.fromEntries(response.headers.entries()), - body: responseClone ? responseClone.body : null, - }, - }, - }, - responseClone && responseClone.body - ? [serializedRequest.body, responseClone.body] - : [], - ) - } - - return response -} - -/** - * Resolve the main client for the given event. - * Client that issues a request doesn't necessarily equal the client - * that registered the worker. It's with the latter the worker should - * communicate with during the response resolving phase. - * @param {FetchEvent} event - * @returns {Promise} - */ -async function resolveMainClient(event) { - const client = await self.clients.get(event.clientId) - - if (activeClientIds.has(event.clientId)) { - return client - } - - if (client?.frameType === 'top-level') { - return client - } - - const allClients = await self.clients.matchAll({ - type: 'window', - }) - - return allClients - .filter((client) => { - // Get only those clients that are currently visible. - return client.visibilityState === 'visible' - }) - .find((client) => { - // Find the client ID that's recorded in the - // set of clients that have registered the worker. - return activeClientIds.has(client.id) - }) -} - -/** - * @param {FetchEvent} event - * @param {Client | undefined} client - * @param {string} requestId - * @param {number} requestInterceptedAt - * @returns {Promise} - */ -async function getResponse(event, client, requestId, requestInterceptedAt) { - // Clone the request because it might've been already used - // (i.e. its body has been read and sent to the client). - const requestClone = event.request.clone() - - function passthrough() { - // Cast the request headers to a new Headers instance - // so the headers can be manipulated with. - const headers = new Headers(requestClone.headers) - - // Remove the "accept" header value that marked this request as passthrough. - // This prevents request alteration and also keeps it compliant with the - // user-defined CORS policies. - const acceptHeader = headers.get('accept') - if (acceptHeader) { - const values = acceptHeader.split(',').map((value) => value.trim()) - const filteredValues = values.filter( - (value) => value !== 'msw/passthrough', - ) - - if (filteredValues.length > 0) { - headers.set('accept', filteredValues.join(', ')) - } else { - headers.delete('accept') - } - } - - return fetch(requestClone, { headers }) - } - - // Bypass mocking when the client is not active. - if (!client) { - return passthrough() - } - - // Bypass initial page load requests (i.e. static assets). - // The absence of the immediate/parent client in the map of the active clients - // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet - // and is not ready to handle requests. - if (!activeClientIds.has(client.id)) { - return passthrough() - } - - // Notify the client that a request has been intercepted. - const serializedRequest = await serializeRequest(event.request) - const clientMessage = await sendToClient( - client, - { - type: 'REQUEST', - payload: { - id: requestId, - interceptedAt: requestInterceptedAt, - ...serializedRequest, - }, - }, - [serializedRequest.body], - ) - - switch (clientMessage.type) { - case 'MOCK_RESPONSE': { - return respondWithMock(clientMessage.data) - } - - case 'PASSTHROUGH': { - return passthrough() - } - } - - return passthrough() -} - -/** - * @param {Client} client - * @param {any} message - * @param {Array} transferrables - * @returns {Promise} - */ -function sendToClient(client, message, transferrables = []) { - return new Promise((resolve, reject) => { - const channel = new MessageChannel() - - channel.port1.onmessage = (event) => { - if (event.data && event.data.error) { - return reject(event.data.error) - } - - resolve(event.data) - } - - client.postMessage(message, [ - channel.port2, - ...transferrables.filter(Boolean), - ]) - }) -} - -/** - * @param {Response} response - * @returns {Response} - */ -function respondWithMock(response) { - // Setting response status code to 0 is a no-op. - // However, when responding with a "Response.error()", the produced Response - // instance will have status code set to 0. Since it's not possible to create - // a Response instance with status code 0, handle that use-case separately. - if (response.status === 0) { - return Response.error() - } - - const mockedResponse = new Response(response.body, response) - - Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, { - value: true, - enumerable: true, - }) - - return mockedResponse -} - -/** - * @param {Request} request - */ -async function serializeRequest(request) { - return { - url: request.url, - mode: request.mode, - method: request.method, - headers: Object.fromEntries(request.headers.entries()), - cache: request.cache, - credentials: request.credentials, - destination: request.destination, - integrity: request.integrity, - redirect: request.redirect, - referrer: request.referrer, - referrerPolicy: request.referrerPolicy, - body: await request.arrayBuffer(), - keepalive: request.keepalive, - } -} diff --git a/web/src/api/settle.ts b/web/src/api/settle.ts index c5aba013..aa0aece5 100644 --- a/web/src/api/settle.ts +++ b/web/src/api/settle.ts @@ -66,6 +66,47 @@ export interface GenerateResult { skipped: number } +// ---- 利润分析(S2-D5;金额=元) ---- + +/** 用户利润行(revenue=时间线价收入;cost=通道成本占比分摊;rebate=直线下级返点 R4)。 */ +export interface UserProfitRow { + account_id: number + username: string + role: string + success_count: number + revenue: number + cost: number + rebate: number + profit: number +} + +/** 用户利润汇总(与列表同 scope)。 */ +export interface UserProfitSummary { + count: number + total_revenue: number + total_cost: number + total_rebate: number + platform_profit: number +} + +/** 用户利润结果集。 */ +export interface UserProfitResult { + list: UserProfitRow[] + total: number + summary: UserProfitSummary +} + +/** 通道利润行(revenue=全平台用户收入×通道成功占比分摊;cost=通道时间线价直算)。 */ +export interface ChannelProfitRow { + channel_id: number + name: string + upstream_id: number + success_count: number + revenue: number + cost: number + profit: number +} + interface Paged { total: number; list: T[] } export const settleApi = { @@ -95,6 +136,12 @@ export const settleApi = { post('/settle/ladder', body), deleteLadder: (id: number) => del(`/settle/ladder/${id}`), updateLadder: (id: number, body: { tier_from?: number; price?: number }) => put(`/settle/ladder/${id}`, body), + + // ---- 利润分析(D5;平台角色端点) ---- + profitUsers: (params: { date_from: string; date_to: string; parent_id?: number; page?: number; page_size?: number }) => + get('/stats/profit/users', params), + profitChannels: (params: { date_from: string; date_to: string; channel_id?: number; page?: number; page_size?: number }) => + get<{ list: ChannelProfitRow[]; total: number }>('/stats/profit/channels', params), } /** 导出下载(文件流需带 Authorization,axios JSON 拦截器不适配,走 fetch+blob)。 */ diff --git a/web/src/main.ts b/web/src/main.ts index 42917c89..6a526c86 100644 --- a/web/src/main.ts +++ b/web/src/main.ts @@ -45,11 +45,8 @@ async function bootstrap() { setupDirectives(app) setupRouterGuard(router) - // Mock 模式:仅开发态启用 msw(VITE_API_MODE=real 时直连后端) - if (import.meta.env.DEV && import.meta.env.VITE_API_MODE === 'mock') { - const { worker } = await import('../mocks/browser') - await worker.start({ onUnhandledRequest: 'bypass' }) - } + // S3·FE-6:浏览器 Mock 通道已下线(单一 real 模式直连网关);msw 仅保留 + // 于 vitest 层(mocks/node.ts,测试隔离服务器)。 await router.isReady() app.mount('#app') diff --git a/web/src/router/routes.ts b/web/src/router/routes.ts index 150d3133..2c827411 100644 --- a/web/src/router/routes.ts +++ b/web/src/router/routes.ts @@ -69,6 +69,7 @@ export const asyncRoutes: RouteRecordRaw[] = [ { path: 'stats/user', name: 'stats-user', component: () => import('@/views/coming/ComingSoon.vue'), meta: { title: '用户统计', icon: 'DataLine', menu: true, group: '统计结算', roles: ['admin', 'ops', 'service'] } }, { path: 'stats/channel', name: 'stats-channel', component: () => import('@/views/coming/ComingSoon.vue'), meta: { title: '通道统计', icon: 'TrendCharts', menu: true, group: '统计结算', roles: ['admin', 'ops'] } }, + { path: 'stats/profit', name: 'stats-profit', component: () => import('@/views/stats/profit/index.vue'), meta: { title: '利润分析', icon: 'Coin', menu: true, group: '统计结算', roles: ['admin', 'ops', 'service'], subtitle: '用户利润(含下级返点)· 通道利润 · 平台净利' } }, { path: 'settle', name: 'settle', component: () => import('@/views/settle/index.vue'), meta: { title: '结算管理', icon: 'Wallet', menu: true, group: '统计结算', roles: ['admin', 'ops'] } }, { path: 'logs', name: 'logs', component: () => import('@/views/coming/ComingSoon.vue'), meta: { title: '日志报表', icon: 'Document', menu: true, group: '系统管理', roles: ['admin', 'ops', 'service'] } }, diff --git a/web/src/views/login/LoginView.vue b/web/src/views/login/LoginView.vue index e6cc8d5d..d9cc1d24 100644 --- a/web/src/views/login/LoginView.vue +++ b/web/src/views/login/LoginView.vue @@ -23,10 +23,10 @@ @@ -54,8 +52,6 @@ const route = useRoute() const userStore = useUserStore() const formRef = ref() const loading = ref(false) -// C1:mock 演示提示只在开发态 mock 模式出现(生产 real 模式不泄露演示账号) -const isMock = import.meta.env.DEV && import.meta.env.VITE_API_MODE === 'mock' const form = reactive({ username: '', password: '' }) const rules: FormRules = { @@ -139,5 +135,4 @@ async function submit() { .login-card { padding: 32px; } .login-btn { width: 100%; margin-top: 8px; letter-spacing: 0.04em; } .login-sec { color: var(--gosms-text-secondary); font-size: var(--gosms-fs-sm); text-align: center; margin: 14px 0 0; } -.login-tip { color: var(--gosms-text-secondary); font-size: var(--gosms-fs-base); text-align: center; margin: 6px 0 0; } diff --git a/web/src/views/stats/profit/index.vue b/web/src/views/stats/profit/index.vue new file mode 100644 index 00000000..404fbfc1 --- /dev/null +++ b/web/src/views/stats/profit/index.vue @@ -0,0 +1,166 @@ + + + + + diff --git a/web/tests/guard.spec.ts b/web/tests/guard.spec.ts index 660badf6..b6e712d1 100644 --- a/web/tests/guard.spec.ts +++ b/web/tests/guard.spec.ts @@ -2,13 +2,13 @@ import { describe, expect, it } from 'vitest' import { accessibleRoutes } from '@/router/guard' describe('路由权限过滤 accessibleRoutes', () => { - it('admin 直通全部业务路由(30 模块菜单,含 FE-2 通道与策略五入口+D19 定时任务+D20 模板管理+D22 结果反馈+D23 短信聚合页+D24 下行记录+D27 上行记录+D28 回执工具)', () => { + it('admin 直通全部业务路由(31 模块菜单,含 FE-2 通道与策略五入口+D19 定时任务+D20 模板管理+D22 结果反馈+D23 短信聚合页+D24 下行记录+D27 上行记录+D28 回执工具+S3·FE-D34 利润分析)', () => { const all = accessibleRoutes(['admin']) const menus = all.flatMap((r) => (r.children ?? []).filter((c) => c.meta?.menu)) - expect(menus.length).toBe(31) - // FE-2/D23 关键入口在菜单(D11 上家/D14 通道组/D16 导流+报备/D19 定时任务/D20 模板管理/D22 结果反馈/D23 聚合页) + expect(menus.length).toBe(32) + // FE-2/D23/S3 关键入口在菜单(D11 上家/D14 通道组/D16 导流+报备/D19 定时任务/D20 模板管理/D22 结果反馈/D23 聚合页/FE-D34 利润分析) const names = menus.map((m) => m.name) - for (const want of ['channel-upstream', 'channel-group', 'policy-route', 'policy-report', 'sms-timer', 'sms-template', 'sms-result', 'sms-home', 'record-down']) { + for (const want of ['channel-upstream', 'channel-group', 'policy-route', 'policy-report', 'sms-timer', 'sms-template', 'sms-result', 'sms-home', 'record-down', 'stats-profit']) { expect(names).toContain(want) } }) diff --git a/web/tests/profit-view.spec.ts b/web/tests/profit-view.spec.ts new file mode 100644 index 00000000..664bdbb9 --- /dev/null +++ b/web/tests/profit-view.spec.ts @@ -0,0 +1,74 @@ +// profit-view.spec.ts S3·FE-D34:利润分析页(msw 局部 handler,不动全局种子—— +// 与 settle 页同策略:结算域端点走真库联调,组件测试用 server.use 注入契约)。 +// 锁定:双端点参数契约(date_from/date_to/parent_id/channel_id)、汇总条渲染、 +// 利润正负着色、口径说明常驻(诚实标注)。 +import { describe, expect, it, afterEach } from 'vitest' +import { http, HttpResponse } from 'msw' +import { mount, flushPromises } from '@vue/test-utils' +import ElementPlus from 'element-plus' +import { server } from '../mocks/node' +import StatsProfitView from '../src/views/stats/profit/index.vue' +import { settleApi } from '../src/api/settle' + +const usersData = { + list: [ + { account_id: 1, username: 'root', role: 'group', success_count: 100, revenue: 10, cost: 4, rebate: 1.0, profit: 7 }, + { account_id: 12, username: 'a12', role: 'customer', success_count: 10, revenue: 0, cost: 0.4, rebate: 0, profit: -0.4 }, + ], + total: 2, + summary: { count: 2, total_revenue: 10, total_cost: 4.4, total_rebate: 1.0, platform_profit: 4.6 }, +} +const channelsData = { + list: [{ channel_id: 9101, name: 'c1', upstream_id: 7, success_count: 150, revenue: 24, cost: 6, profit: 18 }], + total: 1, +} + +let lastUsersQuery = '' +let lastChannelsQuery = '' +function stubProfit() { + server.use( + http.get('*/api/v1/stats/profit/users', ({ request }) => { + lastUsersQuery = request.url + return HttpResponse.json({ code: 'ISC:000', msg: '成功', data: usersData }) + }), + http.get('*/api/v1/stats/profit/channels', ({ request }) => { + lastChannelsQuery = request.url + return HttpResponse.json({ code: 'ISC:000', msg: '成功', data: channelsData }) + }), + ) +} + +afterEach(() => server.resetHandlers()) + +describe('FE-D34 利润分析', () => { + it('api 契约:用户/通道端点参数与响应结构', async () => { + stubProfit() + const users = await settleApi.profitUsers({ date_from: '2026-11-01', date_to: '2026-11-30', parent_id: 10 }) + expect(users.summary.platform_profit).toBe(4.6) + expect(users.list[0].rebate).toBe(1.0) + expect(lastUsersQuery).toContain('date_from=2026-11-01') + expect(lastUsersQuery).toContain('parent_id=10') + const channels = await settleApi.profitChannels({ date_from: '2026-11-01', date_to: '2026-11-30', channel_id: 2 }) + expect(channels.list[0].profit).toBe(18) + expect(lastChannelsQuery).toContain('channel_id=2') + }) + + it('组件:双 Tab 数据渲染+汇总条+利润正负着色+口径说明', async () => { + stubProfit() + const w = mount(StatsProfitView, { global: { plugins: [ElementPlus] } }) + await flushPromises() + const text = w.text() + // 汇总条:平台净利 4.60 与账号数。 + expect(text).toContain('平台净利') + expect(text).toContain('4.60') + // 用户行:正利润 7.00 / 负利润 -0.40(无价账号)。 + expect(text).toContain('7.00') + expect(text).toContain('-0.40') + // 口径说明常驻(分摊/阶梯不进分析/返点 R4)。 + expect(text).toContain('占比分摊') + expect(text).toContain('不进分析') + expect(w.find('.pf-neg').exists()).toBe(true) + // 通道 Tab 数据在挂载时一并加载。 + expect(w.html()).toContain('18.00') + }) +}) diff --git a/web/tests/role-menu-matrix.spec.ts b/web/tests/role-menu-matrix.spec.ts new file mode 100644 index 00000000..e2161cdd --- /dev/null +++ b/web/tests/role-menu-matrix.spec.ts @@ -0,0 +1,72 @@ +// role-menu-matrix.spec.ts S3·FE-6:五角色×全菜单权限矩阵走查(自动化快照)。 +// 预期矩阵为**人工确认后的固化表**(非 routes.ts 同源推导)——任何人改动路由 +// roles 都会在此暴露,走查语义=矩阵变更必须显式过目(与后端 casbin 五角色门对齐)。 +// 语义基准:资金/通道/结算页=admin/ops;service=运营执行;group/customer=业务 +// 与记录自助,不见平台资金信息(与后端 statsIsPlatform/ordersList/profit 平台门一致)。 +import { describe, expect, it } from 'vitest' +import { accessibleRoutes } from '@/router/guard' + +type Roles = 'admin' | 'ops' | 'service' | 'group' | 'customer' +const ALL: Roles[] = ['admin', 'ops', 'service', 'group', 'customer'] + +/** 预期矩阵:菜单 name → 允许角色(S3 固化,含 FE-D34 利润分析)。 */ +const MATRIX: Record = { + home: ALL, + notice: ['admin', 'ops', 'service', 'group'], + 'account-list': ['admin', 'ops'], + audit: ['admin', 'ops', 'service'], + 'sms-home': ALL, 'sms-batch': ALL, 'sms-personal': ALL, 'sms-timer': ALL, + 'sms-result': ALL, 'sms-template': ALL, 'sms-downlink-detail': ALL, + video: ['admin', 'ops'], csp: ['admin', 'ops'], nullfilter: ['admin', 'ops'], shortlink: ['admin', 'ops'], + 'record-down': ALL, 'record-up': ALL, + 'record-repush': ['admin', 'ops', 'service'], + channel: ['admin', 'ops'], 'channel-upstream': ['admin', 'ops'], 'channel-group': ['admin', 'ops'], + policy: ['admin', 'ops'], 'policy-route': ['admin', 'ops'], 'policy-report': ['admin', 'ops'], + contacts: ALL, + 'stats-user': ['admin', 'ops', 'service'], 'stats-channel': ['admin', 'ops'], + 'stats-profit': ['admin', 'ops', 'service'], settle: ['admin', 'ops'], + logs: ['admin', 'ops', 'service'], system: ['admin'], faq: ALL, +} + +/** 实测:某角色经守卫过滤后的可见菜单集合。 */ +function visibleMenus(role: Roles): Set { + return new Set( + accessibleRoutes([role]) + .flatMap((r) => r.children ?? []) + .filter((c) => c.meta?.menu) + .map((c) => String(c.name)), + ) +} + +describe('S3·FE-6 五角色×全菜单权限矩阵', () => { + const roles: Roles[] = ['admin', 'ops', 'service', 'group', 'customer'] + + it.each(roles)('角色 %s 可见菜单与矩阵一致', (role) => { + const visible = visibleMenus(role) + for (const [name, allow] of Object.entries(MATRIX)) { + const want = allow.includes(role) + expect(visible.has(name), `${role} × ${name}:期望${want ? '可见' : '不可见'}`).toBe(want) + } + }) + + it('矩阵覆盖全部菜单项(新增菜单未登记矩阵=本测试红,走查强制过目)', () => { + const adminVisible = visibleMenus('admin') + for (const name of adminVisible) expect(MATRIX[name], `菜单 ${name} 未登记矩阵`).toBeDefined() + expect(adminVisible.size).toBe(Object.keys(MATRIX).length) + }) + + it('资金与平台配置页对 group/customer 关闭(语义抽样:settle/stats-profit/channel/system)', () => { + for (const role of ['group', 'customer'] as Roles[]) { + const visible = visibleMenus(role) + for (const denied of ['settle', 'stats-profit', 'stats-channel', 'channel', 'channel-upstream', 'system', 'account-list', 'audit']) { + expect(visible.has(denied), `${role} 不应见 ${denied}`).toBe(false) + } + } + }) + + it('system 配置仅 admin', () => { + for (const role of ['ops', 'service', 'group', 'customer'] as Roles[]) { + expect(visibleMenus(role).has('system')).toBe(false) + } + }) +}) diff --git a/web/vite.config.ts b/web/vite.config.ts index ce54e049..b0e04150 100644 --- a/web/vite.config.ts +++ b/web/vite.config.ts @@ -7,10 +7,23 @@ export default defineConfig({ resolve: { alias: { '@': fileURLToPath(new URL('./src', import.meta.url)) }, }, + build: { + rollupOptions: { + output: { + // S3·FE-6 单包<500KB(gzip):主包曾 1.27MB(裸)/410KB(gzip)—— + // element-plus 全量与 vue 系拆 vendor chunk,业务主包独立小包; + // 页面级全部动态 import(路由懒加载已有),首屏只拉 entry+两 vendor。 + manualChunks: { + 'element-plus': ['element-plus', '@element-plus/icons-vue'], + 'vue-vendor': ['vue', 'vue-router', 'pinia', 'axios'], + }, + }, + }, + }, server: { port: 5173, proxy: { - // real 模式时代理到本地网关;mock 模式由 msw 在浏览器网络层拦截。 + // real 模式时代理到本地网关(S3 起 Mock 已下线,单一 real 通道)。 // 网关自 Day42 起按 configs/config.dev.yaml 稳定监听 :8080 // (历史 8081 为当时 8080 被宿主机旧进程占用时的临时 env 覆盖,已废弃)。 '/api': { target: 'http://127.0.0.1:8080', changeOrigin: true },