From 3f3b4b400afdfe2b8af78b74aae94a54a57010b4 Mon Sep 17 00:00:00 2001 From: long <452591453@qq.com> Date: Thu, 29 Oct 2026 19:13:19 +0800 Subject: [PATCH] fix(iam): preserve deployed consultation clock and release provenance --- admin/src/stores/modules/user.ts | 7 ++++++- docs/iam-v2.md | 8 ++++++++ server/tests/IamV2UiTest.mjs | 10 ++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts index 521834577..1f0176ed7 100644 --- a/admin/src/stores/modules/user.ts +++ b/admin/src/stores/modules/user.ts @@ -15,6 +15,7 @@ export interface UserState { routes: RouteRecordRaw[] perms: string[] isPaw: number // 0=需要修改密码,1=正常 + serverTimeOffsetMs: number } const useUserStore = defineStore({ @@ -28,7 +29,8 @@ const useUserStore = defineStore({ // 权限 perms: [], // 是否需要修改密码 - isPaw: 1 + isPaw: 1, + serverTimeOffsetMs: 0 }), getters: {}, actions: { @@ -37,6 +39,7 @@ const useUserStore = defineStore({ this.userInfo = {} this.perms = [] this.isPaw = 1 + this.serverTimeOffsetMs = 0 }, login(playload: any) { const { account, password } = playload @@ -104,6 +107,8 @@ const useUserStore = defineStore({ getUserInfo() .then((data) => { this.userInfo = data.user + const serverTime = Number(data.user?.web_consultation_policy?.server_time) + this.serverTimeOffsetMs = serverTime > 0 ? serverTime * 1000 - Date.now() : 0 this.perms = data.permissions this.routes = filterAsyncRoutes(data.menu) // 更新 isPaw 状态 diff --git a/docs/iam-v2.md b/docs/iam-v2.md index da5df6c2f..91ad30932 100644 --- a/docs/iam-v2.md +++ b/docs/iam-v2.md @@ -102,3 +102,11 @@ SQLite 合成测试不加载生产 `.env`、不发网络、不修改真实用户 ### 最终发布基线差异(追加) 最终32个变更路径核验:12个原文件中11个与开发基线相同,`admin/src/stores/modules/user.ts` 在线另有 `serverTimeOffsetMs` 状态、reset清理及 `web_consultation_policy.server_time` 的偏移计算;20个新增路径未发现碰撞。该生产逻辑必须保留。**当前以bcd基线生成的整包前端仅为本地构建验证,不直接用于生产发布。** 发布方应先获取/核验实际 `e183e1c` 及线上工作区差异,以其为发布副本应用本次IAM提交(保留时间偏移逻辑)再重新构建;不能通过覆盖生产user store或忽略差异来通过哈希校验。生产回退使用真实发布前备份,而非本地bcd基线副本。 + +### 保留生产前端的独立发布副本 + +只读补核了实际 `admin/src`、`admin/public`、index.html、package/lock、Vite/PostCSS/Tailwind、typings与TS配置,共710个输入,发现22个已变更文件和17个新增文件,无缺失或symlink。已有网页问诊/接诊、文字记录、复诊到期提醒/统计、处方订单、桌面下载等生产逻辑均按哈希快照保留。 + +独立前端副本位于 `/Users/long/Work/zyt-iam-v2-release-20261029`,分支 `codex/zyt-iam-v2-live-frontend`。它基于实际文件快照,而不是线上Git HEAD;仅应用10个受控IAM前端文件,705个非IAM生产输入逐字节不变。该副本仅用于前端构建,不使用其基线PHP目录发布后端。主实现树已三方保留生产user store的服务端时间偏移,并验证getUserInfo/reset行为。 + +没有读取生产.env:通过公开已部署JS核实 `baseUrl="https://admin.zhenyangtang.com.cn//"`、`timeout=60000`,最终构建显式使用 `VITE_APP_BASE_URL=https://admin.zhenyangtang.com.cn/` 与 `VITE_APP_REQUEST_TIMEOUT=60000` 保持一致。发布审查应结合 `frontend-production-manifest.json`、`production-frontend-drift.patch`、`release-frontend-manifest.json`、`public-build-config-match.json` 与最终构建包,不采用前面bcd基线的旧构建结果。生产原文件CRLF/尾空白保留原样,不为通过格式检查改写业务源文件。 diff --git a/server/tests/IamV2UiTest.mjs b/server/tests/IamV2UiTest.mjs index 5510e677e..1cc4f1f24 100644 --- a/server/tests/IamV2UiTest.mjs +++ b/server/tests/IamV2UiTest.mjs @@ -2,8 +2,9 @@ import assert from 'node:assert/strict' import fs from 'node:fs' import vm from 'node:vm' import { createRequire } from 'node:module' +import { pathToFileURL } from 'node:url' const require = createRequire(import.meta.url), ts = require('typescript'), sfc = require('@vue/compiler-sfc') -const root = new URL('../../',import.meta.url) +const root = process.env.IAM_UI_ROOT ? pathToFileURL(process.env.IAM_UI_ROOT.replace(/\/$/,'') + '/') : new URL('../../',import.meta.url) const files=['admin/src/components/iam-v2/launch.vue','admin/src/components/iam-v2/personal.vue','admin/src/views/permission/identity/index.vue','admin/src/views/account/iam-launch.vue'] for(const file of files){ const source=fs.readFileSync(new URL(file,root),'utf8'), {descriptor,errors}=sfc.parse(source,{filename:file}) @@ -48,4 +49,9 @@ targetFlow=await targetScenario({ticket:'one-use',source:'iam-portal'},{is_paw:1 targetFlow=await targetScenario({source:'iam-admin',intent:'i'.repeat(43)});assert.ok(targetFlow.events.some(x=>x[0]==='post'&&x[1]==='/launch/prepare'));assert.ok(targetFlow.events.some(x=>x[0]==='assign')) targetFlow=await targetScenario({source:'zmxy-erp',intent:'i'.repeat(43)});assert.ok(!targetFlow.events.some(x=>x[0]==='post')) targetFlow=await targetScenario({ticket:'one-use',iam_error:'ACCOUNT_MISMATCH'});assert.ok(!targetFlow.events.some(x=>x[0]==='login'));await vm.runInContext('switchAccount()',targetFlow.c);assert.ok(targetFlow.events.some(x=>x[0]==='post'&&x[1]==='/launch/reset'));assert.ok(targetFlow.events.some(x=>x[0]==='clear')) -console.log('PASS IamV2UiTest: 4 Vue components compile; default-off, explicit new tab, opener isolation, source-only POST, error closes tab, three-step confirm, batch ready-only, stable operation key, protected review retry snapshot, target URL cleanup/account mismatch/password-WeCom gates') +const storeSource=fs.readFileSync(new URL('admin/src/stores/modules/user.ts',root),'utf8') +const storeJS=ts.transpileModule(storeSource,{compilerOptions:{module:ts.ModuleKind.CommonJS,target:ts.ScriptTarget.ES2020}}).outputText.replace(/^.*require\(.+\);?$/gm,'').replace(/^Object.defineProperty\(exports.*$/gm,'') +const storeContext={exports:{},Date:{now:()=>500000},pinia_1:{defineStore:config=>config},auth_1:{getToken:()=> 'fixture',clearAuthInfo(){}},user_1:{getUserInfo:async()=>({user:{web_consultation_policy:{server_time:1000}},permissions:[],menu:[]})},router_1:{filterAsyncRoutes:r=>r}} +vm.createContext(storeContext);vm.runInContext(storeJS,storeContext);const descriptor=storeContext.exports.default,state=descriptor.state() +await descriptor.actions.getUserInfo.call(state);assert.equal(state.serverTimeOffsetMs,500000);descriptor.actions.resetState.call(state);assert.equal(state.serverTimeOffsetMs,0) +console.log('PASS IamV2UiTest: 4 Vue components compile; default-off, explicit new tab, opener isolation, source-only POST, error closes tab, three-step confirm, batch ready-only, stable operation key, protected review retry snapshot, target URL cleanup/account mismatch/password-WeCom gates, production consultation server-time offset preservation')