feat(phase-4): AC-16/17/18 前端登录态与分片上传、后管包体与竞态门
AC-16(S1-F1/S1-F2) - frontend-vue ensureAuth:清态前先判 isAuthError——弱网/超时/5xx 不再把人踢回登录页; http.ts 的 onResponseRejected 给错误打鉴权标记(HTTP 401 与业务 401/4011 都算), 纯网络错误保留底层文案供调用方区分"断网"与"掉登录";clearLocalSession 导出复用。 - admin 全局错误兜底:main.ts 装 app.config.errorHandler(首屏就崩也接得住), window error / unhandledrejection 由 App.vue setup 调 useGlobalErrorReporting() 接线, 卸载出口在 onBeforeUnmount 摘监听与提示定时器(后管的 timer-cleanup-pairing 尺子要求 "注册点所在文件找得回反注册 + 卸载钩子",故接线必须在组件作用域,不在 main.ts)。 上报体只带 kind/message/stack/route/ts 并过脱敏(Bearer、JWT 三段式、query 里疑似 token/key/secret 的取值一律打码),凭据零容忍;服务端新增 /api/admin/client-errors(requireAdmin,字段截断 2000 后 WARN 落日志,不落库)。 AC-17(S1-F3) - 后端新增分片通道 ChunkedUploadService(init/part/status/complete/abort):8MB/片、 同片重复上传幂等覆盖、流式拼装复算 sha256、超限与缺片直接拒绝、24h 过期回收; FileUploadController 暴露 /api/files/chunk/**,LocalFileStorageService 加 saveTempFileFromFile(同一套扩展名黑名单与 fileKey 索引);三键显式写进 application.yml (不进"只在代码默认值里"的名单)。 - 工作台安装包 93MB:WorkbenchClientPackageService 走同一分片通道转存 client 桶 (objectKey 写进会话 purpose,拼装时逐字匹配,防借分片接口覆盖已发布包), confirm 失败带 cleanupUnconfirmedObject 补偿清理未登记对象;后管 ≤64MB 仍直传预签名 PUT。 - 用户端 upload.ts:大文件分片 + 逐片重试 + 进度回调,超时按体积给(不再固定 120s); 断点探测失败不再静默按"全缺"重传(catch-silence 棘轮因此一格没涨,blocks 300→301 已记名)。 AC-18(P1-F1/P1-F2/P1-F4/S1-F4) - 后管 manualChunks 摘掉 element-plus(按需引入已在 src/plugins/element.ts 生效): 实测构建产物已无 element-plus 独立 chunk,index.html 只 modulepreload vue 块。 - UsersPage/DeviceLogsPage 接 createLatestRequestGate,旧响应不再覆盖新页; 用户端新增 useServerTablePaging(只驻留当前页 + 自带竞态门 + 失败给原因), 挂载用例 3 例钉住"翻页重取/旧响应作废/失败可见"。 - DeliveryVideoWorkspace 两处轮询接 document.visibilityState,隐藏标签页暂停。 激活 Phase 0 预置契约 7 例(用户端 5 + 后管 5,共 12 例;其中 AC-16 后管两支按"接线在组件作用域" 的口径改写并把判据加强到反注册配对 + 根组件接线,见蓝图 §5)。 门禁读数:后端 mvn -o test-compile rc=0,CatchSilenceRatchetTest 9 例绿(total 1034→1045、 notRethrow 585→591、logOnly 182→188 逐处记名,EMPTY 未涨)、ChunkedUploadServiceTest 8 例、 WorkbenchClientPackageServiceTest 21 例、ClientErrorReportControllerTest 4 例;后管 1848 例 + mount 33 例 + vue-tsc + build 全绿;用户端 955 例 + mount 30 例 + vue-tsc + build 全绿。 真机:OssWorkbenchClientLiveVerificationTest 以线上 MinIO 实测 PUT→stat→sha256→presign→删除 全链 1 例绿(凭据只走环境变量,不落任何文件)。 ⚠ 按 pathspec 只圈本轮文件:application.yml 用索引手术只提交分片三键那一格,他人 「PENDING 不再按 2 小时判死」的 StaleTaskRepairService/ClientTaskPullSpi/application.yml 注释件与 useLiveTaskBoard/BrandAppearancePatentTab/task-delete-target 四件在飞改动 原样留在工作树未提交。
This commit is contained in:
@@ -1,6 +1,11 @@
|
||||
<script setup lang="ts">
|
||||
import { RouterView } from 'vue-router'
|
||||
import zhCn from 'element-plus/es/locale/lang/zh-cn'
|
||||
import { useGlobalErrorReporting } from '@/shared/api/error-report'
|
||||
|
||||
// 浏览器级错误兜底接线(S1-F2/AC-16):脚本级崩溃与没人接的 Promise 都进同一条上报路,
|
||||
// 卸载出口由该 composable 的 onBeforeUnmount 摘掉——根组件不卸载时它就是应用级单例。
|
||||
useGlobalErrorReporting()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
||||
@@ -1,14 +1,36 @@
|
||||
import { createApp } from 'vue'
|
||||
import { createPinia } from 'pinia'
|
||||
import { installElement } from '@/plugins/element'
|
||||
import { reportClientError } from '@/shared/api/error-report'
|
||||
import '@/styles/main.css'
|
||||
import App from './App.vue'
|
||||
import router from './router'
|
||||
|
||||
// 全局错误兜底(S1-F2/AC-16):渲染期异常、未捕获 Promise、脚本级崩溃三类都必须
|
||||
// 可见 + 上报,否则线上白屏只剩浏览器 console,运维永远没有现场。
|
||||
// 出口分两处,各按自己的时机生效:
|
||||
// - Vue 渲染/生命周期异常:挂在这里的 app.config.errorHandler(必须早于 mount,
|
||||
// 首屏就崩也不漏);
|
||||
// - window error 与 unhandledrejection:由 App.vue setup 调 useGlobalErrorReporting()
|
||||
// 接线,卸载出口在 onBeforeUnmount 里摘监听与提示定时器(只定义不接线等于没接)。
|
||||
// 上报本体(内存环 + 脱敏 + sendBeacon)在 @/shared/api/error-report。
|
||||
function installGlobalError(app: ReturnType<typeof createApp>): void {
|
||||
app.config.errorHandler = (error, _instance, info) => {
|
||||
reportClientError({
|
||||
kind: 'vue-render',
|
||||
message: error instanceof Error ? error.message : String(error),
|
||||
stack: error instanceof Error ? error.stack ?? '' : String(error),
|
||||
route: router.currentRoute.value.fullPath,
|
||||
ts: Date.now(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Element Plus 改为按需注册(见 src/plugins/element.ts);全局中文语言包改由
|
||||
// App.vue 的 <el-config-provider :locale="zhCn"> 提供,不要再在这里 use(ElementPlus)。
|
||||
const app = createApp(App)
|
||||
app.use(createPinia())
|
||||
app.use(router)
|
||||
installElement(app)
|
||||
installGlobalError(app)
|
||||
app.mount('#app')
|
||||
|
||||
@@ -22,11 +22,14 @@ import EditUserDialog from './EditUserDialog.vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import { createLatestRequestGate } from '@/utils/latest-request'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadError = ref('')
|
||||
// 用户列表竞态门(S1-F4):快速切公司/翻页只让最后一次响应落地
|
||||
const gate = createLatestRequestGate()
|
||||
const rows = ref<AdminUser[]>([])
|
||||
const total = ref(0)
|
||||
/** 所属管理员候选(来自列表响应的 admins),供超管筛选下拉使用。 */
|
||||
@@ -69,10 +72,13 @@ function listParams() {
|
||||
}
|
||||
|
||||
async function loadUsers() {
|
||||
// S1-F4:快速切公司/翻页时旧响应可能后返回并覆盖新结果——回写前必须过竞态门
|
||||
const token = gate.begin()
|
||||
loading.value = true
|
||||
loadError.value = ''
|
||||
try {
|
||||
const page = await fetchUserList(listParams())
|
||||
if (!gate.isCurrent(token)) return
|
||||
rows.value = page.items
|
||||
total.value = page.total
|
||||
if (Array.isArray(page.admins)) admins.value = page.admins
|
||||
@@ -81,14 +87,16 @@ async function loadUsers() {
|
||||
if (last > 0 && filters.page > last) {
|
||||
filters.page = last
|
||||
const retried = await fetchUserList(listParams())
|
||||
if (!gate.isCurrent(token)) return
|
||||
rows.value = retried.items
|
||||
total.value = retried.total
|
||||
}
|
||||
} catch (error) {
|
||||
if (!gate.isCurrent(token)) return
|
||||
loadError.value = error instanceof Error ? error.message : '用户列表加载失败'
|
||||
showAdminFeedback(loadError.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
if (gate.isCurrent(token)) loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@ import { computed, nextTick, onMounted, ref, watch } from 'vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { formatDateTime, orderedPair, todayDateInput } from '@/utils/datetime'
|
||||
import { createLatestRequestGate } from '@/utils/latest-request'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { fetchHistoryUserOptions } from './history-api.ts'
|
||||
import type { HistoryUserOption } from './history-user-option.ts'
|
||||
@@ -57,6 +58,8 @@ const companyTab = useCompanyTabStore()
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
// 设备日志列表竞态门(S1-F4)
|
||||
const gate = createLatestRequestGate()
|
||||
const rows = ref<DeviceLogFileRow[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -79,6 +82,8 @@ const retentionDays = ref(7)
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value)))
|
||||
|
||||
async function load() {
|
||||
// S1-F4:快速切公司/改筛选时旧响应可能晚到——回写前必须过竞态门
|
||||
const token = gate.begin()
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
@@ -91,14 +96,16 @@ async function load() {
|
||||
pageSize: pageSize.value,
|
||||
companyId: companyTab.requestCompanyId,
|
||||
})
|
||||
if (!gate.isCurrent(token)) return
|
||||
rows.value = result?.items || []
|
||||
total.value = Number(result?.total || 0)
|
||||
if (result?.retentionDays) retentionDays.value = result.retentionDays
|
||||
} catch (error) {
|
||||
if (!gate.isCurrent(token)) return
|
||||
loadFailure.value = error instanceof Error ? error.message : '日志列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
if (gate.isCurrent(token)) loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/** 工作台客户端包接口适配:列表 / 直传预签名 / 确认 / 删除。 */
|
||||
/** 工作台客户端包接口适配:列表 / 直传预签名 / 分片上传 / 确认 / 删除。 */
|
||||
import axios from 'axios'
|
||||
import { http, unwrap } from '@/api/http'
|
||||
import {
|
||||
@@ -12,6 +12,13 @@ export const WORKBENCH_CLIENT_PACKAGE_ENDPOINT = '/api/admin/workbench-client/pa
|
||||
export const WORKBENCH_CLIENT_PRESIGN_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/presign`
|
||||
export const WORKBENCH_CLIENT_CONFIRM_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/confirm`
|
||||
export const WORKBENCH_CLIENT_DELETE_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/delete`
|
||||
/** 分片通道(S1-F3/AC-17):init/complete/abort 在工作台端点,分片体走通用 /api/files/chunk。 */
|
||||
export const WORKBENCH_CLIENT_CHUNK_INIT_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/chunk/init`
|
||||
export const WORKBENCH_CLIENT_CHUNK_COMPLETE_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/chunk/complete`
|
||||
export const WORKBENCH_CLIENT_CHUNK_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/chunk`
|
||||
/** confirm 失败的补偿清理:只删"已转存未登记"的对象(已登记后端拒绝)。 */
|
||||
export const WORKBENCH_CLIENT_UNCONFIRMED_OBJECT_ENDPOINT = `${WORKBENCH_CLIENT_PACKAGE_ENDPOINT}/object`
|
||||
export const FILES_CHUNK_ENDPOINT = '/api/files/chunk'
|
||||
|
||||
/** 客户端自动更新契约(后管页面不直接调用):GET 返回 {version,file_url,sha256,...}。 */
|
||||
export const WORKBENCH_CLIENT_PUBLIC_LATEST_ENDPOINT = '/api/workbench-client/version/latest'
|
||||
@@ -19,6 +26,15 @@ export const WORKBENCH_CLIENT_PUBLIC_LATEST_ENDPOINT = '/api/workbench-client/ve
|
||||
/** MinIO 直传专用实例:不带 cookie、不挂 401 跳登录拦截器;大 zip 给足超时。 */
|
||||
const directPut = axios.create({ timeout: 600_000, withCredentials: false })
|
||||
|
||||
/** 单片大小:8MB——93MB 包 ≈ 12 片,一片失败只重传 8MB,不再从 0 重来。 */
|
||||
export const UPLOAD_PART_SIZE = 8 * 1024 * 1024
|
||||
|
||||
/** ≤64MB 仍走单次预签名直传(链路最短);再大改分片(S1-F3)。 */
|
||||
export const DIRECT_PUT_MAX_BYTES = 64 * 1024 * 1024
|
||||
|
||||
/** 每片重试次数(不含首次):弱网下一片抖一下不必整单作废。 */
|
||||
const PART_RETRY_LIMIT = 2
|
||||
|
||||
export async function fetchWorkbenchClientPackages(): Promise<WorkbenchClientPackageList> {
|
||||
const { data } = await http.get<unknown>(WORKBENCH_CLIENT_PACKAGES_ENDPOINT)
|
||||
return parseWorkbenchClientPackageList(data)
|
||||
@@ -70,6 +86,35 @@ export async function confirmWorkbenchClientPackage(
|
||||
return parseWorkbenchClientPackageUpload(data)
|
||||
}
|
||||
|
||||
/**
|
||||
* confirm 失败后的补偿清理:删除"已转存但未登记"的对象。
|
||||
* 后端对已登记对象会拒绝清理(防止误删线上正在用的包),失败不覆盖原始错误。
|
||||
* 返回是否确实清理成功——调用方据此决定报错文案是"可重传"还是"先刷新核对"。
|
||||
*/
|
||||
async function deleteUnconfirmedPackageObject(objectKey: string): Promise<boolean> {
|
||||
try {
|
||||
await http.delete(WORKBENCH_CLIENT_UNCONFIRMED_OBJECT_ENDPOINT, {
|
||||
params: { object_key: objectKey },
|
||||
})
|
||||
return true
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* confirm 失败后的补偿清理(分片链):删会话 + 尽力删未登记对象。
|
||||
*/
|
||||
async function cleanupUnconfirmedPackage(uploadId: string, objectKey: string): Promise<void> {
|
||||
try {
|
||||
await http.delete(`${WORKBENCH_CLIENT_CHUNK_ENDPOINT}/${encodeURIComponent(uploadId)}`, {
|
||||
params: objectKey ? { object_key: objectKey } : {},
|
||||
})
|
||||
} catch {
|
||||
// 尽力而为:清理失败只说明残留等人工处置,不能替原始错误改口
|
||||
}
|
||||
}
|
||||
|
||||
/** 按 id 批量删除客户端包(后端会顺带清理无引用对象的 MinIO 包体);返回实际删除行数。 */
|
||||
export async function deleteWorkbenchClientPackages(ids: number[]): Promise<number> {
|
||||
if (!ids.length) return 0
|
||||
@@ -78,17 +123,12 @@ export async function deleteWorkbenchClientPackages(ids: number[]): Promise<numb
|
||||
return typeof core.deleted === 'number' ? core.deleted : ids.length
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传客户端包(浏览器直传):presign 申请 → 直接 PUT 到 MinIO client 桶(不走 Java 中转)
|
||||
* → confirm 由服务端复算 sha256 落库。onProgress 回传 0-100 上传进度。
|
||||
*/
|
||||
export async function uploadWorkbenchClientPackage(
|
||||
/** 单次预签名 PUT 直传(≤DIRECT_PUT_MAX_BYTES 的短链路)。 */
|
||||
async function directPutUpload(
|
||||
file: Blob,
|
||||
fileName: string,
|
||||
version: string,
|
||||
target: WorkbenchClientUploadTarget,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<WorkbenchClientPackageItem | null> {
|
||||
const target = await requestWorkbenchClientPresign(fileName, version)
|
||||
): Promise<void> {
|
||||
await directPut.put(target.uploadUrl, file, {
|
||||
headers: { 'Content-Type': 'application/octet-stream' },
|
||||
onUploadProgress: (event) => {
|
||||
@@ -97,11 +137,114 @@ export async function uploadWorkbenchClientPackage(
|
||||
onProgress(total > 0 ? Math.min(Math.round((event.loaded / total) * 100), 100) : 0)
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 分片上传(S1-F3/AC-17):整包切成 partSize 片逐片 POST,每片独立重试;
|
||||
* 开传前先查已到片号——上一次断掉的会话可以直接续传(后端保留 24h)。
|
||||
* 这一问失败不静默按「全缺」重传:93MB 的包问不到续传点就说明链路已经不对了,
|
||||
* 当场报错让人重来,也比闷头把整包再传一遍便宜。
|
||||
*/
|
||||
async function chunkedUpload(
|
||||
file: Blob,
|
||||
uploadId: string,
|
||||
totalParts: number,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<void> {
|
||||
const { data } = await http.get<unknown>(`${FILES_CHUNK_ENDPOINT}/${encodeURIComponent(uploadId)}`)
|
||||
const core = (unwrap(data) ?? {}) as Record<string, unknown>
|
||||
const done = new Set<number>(
|
||||
(Array.isArray(core.uploaded_parts) ? core.uploaded_parts : []).map((index) => Number(index)),
|
||||
)
|
||||
const report = (partial: number) => {
|
||||
if (!onProgress) return
|
||||
const loaded = done.size * UPLOAD_PART_SIZE + partial
|
||||
onProgress(Math.min(Math.round((loaded / file.size) * 100), 99))
|
||||
}
|
||||
for (let index = 0; index < totalParts; index += 1) {
|
||||
if (done.has(index)) {
|
||||
report(0)
|
||||
continue
|
||||
}
|
||||
const blob = file.slice(index * UPLOAD_PART_SIZE, Math.min(file.size, (index + 1) * UPLOAD_PART_SIZE))
|
||||
let lastError: unknown = null
|
||||
for (let attempt = 0; attempt <= PART_RETRY_LIMIT; attempt += 1) {
|
||||
const form = new FormData()
|
||||
form.append('file', blob, `part-${index}`)
|
||||
try {
|
||||
await http.post(`${FILES_CHUNK_ENDPOINT}/${encodeURIComponent(uploadId)}/part/${index}`, form, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' },
|
||||
timeout: 300_000,
|
||||
onUploadProgress: (event) => report(Math.min(event.loaded || 0, blob.size)),
|
||||
})
|
||||
done.add(index)
|
||||
lastError = null
|
||||
break
|
||||
} catch (error) {
|
||||
lastError = error
|
||||
}
|
||||
}
|
||||
if (lastError) {
|
||||
throw lastError instanceof Error ? lastError : new Error(`第 ${index} 片上传失败`)
|
||||
}
|
||||
}
|
||||
if (onProgress) onProgress(100)
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传客户端包:≤64MB 走浏览器直传预签名 PUT;大包走后端分片通道(每片可重试/续传,
|
||||
* 服务端拼装后转存 client 桶)。两条链最后都收敛到 confirm:服务端复算 sha256、
|
||||
* 凭据扫描、版本唯一性登记。confirm 失败清理未登记对象,不留孤儿。
|
||||
*/
|
||||
export async function uploadWorkbenchClientPackage(
|
||||
file: Blob,
|
||||
fileName: string,
|
||||
version: string,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<WorkbenchClientPackageItem | null> {
|
||||
if (file.size <= DIRECT_PUT_MAX_BYTES) {
|
||||
const target = await requestWorkbenchClientPresign(fileName, version)
|
||||
await directPutUpload(file, target, onProgress)
|
||||
try {
|
||||
return await confirmWorkbenchClientPackage(target.objectKey, target.fileName, target.version)
|
||||
} catch (error) {
|
||||
// confirm 失败先 cleanup 未登记对象再报错;服务端若已登记会拒绝清理(CR-08 幂等窗口),
|
||||
// 那种情况保留原错误文案引导"先刷新列表",不冒充已处置。
|
||||
const cleaned = await deleteUnconfirmedPackageObject(target.objectKey)
|
||||
const reason = error instanceof Error ? error.message : String(error)
|
||||
if (cleaned) {
|
||||
throw new Error(`安装包已上传但登记未完成(${reason})。未登记对象已清理,可直接重新上传。`)
|
||||
}
|
||||
throw new Error(`安装包已上传,但确认未完成(${reason})。请先刷新列表确认,不要立即重复上传。`)
|
||||
}
|
||||
}
|
||||
const totalParts = Math.max(1, Math.ceil(file.size / UPLOAD_PART_SIZE))
|
||||
const { data } = await http.post<unknown>(WORKBENCH_CLIENT_CHUNK_INIT_ENDPOINT, null, {
|
||||
params: { file_name: fileName, version, total_parts: totalParts, total_bytes: file.size },
|
||||
})
|
||||
const core = (unwrap(data) ?? {}) as Record<string, unknown>
|
||||
const uploadId = typeof core.upload_id === 'string' ? core.upload_id : ''
|
||||
const objectKey = typeof core.object_key === 'string' ? core.object_key : ''
|
||||
if (!uploadId || !objectKey) {
|
||||
throw new Error('后端未返回分片会话,请重试')
|
||||
}
|
||||
const confirmedName = typeof core.file_name === 'string' ? core.file_name : fileName
|
||||
const confirmedVersion = typeof core.version === 'string' ? core.version : version
|
||||
let assembled = false
|
||||
try {
|
||||
return await confirmWorkbenchClientPackage(target.objectKey, target.fileName, target.version)
|
||||
await chunkedUpload(file, uploadId, totalParts, onProgress)
|
||||
await http.post(WORKBENCH_CLIENT_CHUNK_COMPLETE_ENDPOINT, null, {
|
||||
params: { upload_id: uploadId, object_key: objectKey, file_name: confirmedName, version: confirmedVersion },
|
||||
timeout: 600_000,
|
||||
})
|
||||
assembled = true
|
||||
return await confirmWorkbenchClientPackage(objectKey, confirmedName, confirmedVersion)
|
||||
} catch (error) {
|
||||
// 对象已经 PUT 成功,confirm 失败不等于上传失败;引导管理员先刷新列表,避免重复上传
|
||||
await cleanupUnconfirmedPackage(uploadId, objectKey)
|
||||
const reason = error instanceof Error ? error.message : String(error)
|
||||
throw new Error(`安装包已上传,但确认未完成(${reason})。请先刷新列表确认,不要立即重复上传。`)
|
||||
if (assembled) {
|
||||
throw new Error(`安装包已转存但登记未完成(${reason})。未登记对象已清理,可直接重新上传。`)
|
||||
}
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
/**
|
||||
* 后管浏览器错误上报(S1-F2/AC-16)。
|
||||
*
|
||||
* 之前渲染崩溃/未捕获 Promise 只进 console,线上白屏没有现场。这里做三件事:
|
||||
* 1. 屏上可见:右下角弹一条纯 DOM 提示(不依赖 element-plus,错误可能正是它引起的);
|
||||
* 2. 内存环:最近 20 条留痕(同用户端口径),便于现场排查;
|
||||
* 3. sendBeacon 上报服务端 `/api/admin/client-errors`(WARN 落日志)。
|
||||
*
|
||||
* 三类错误各有出口:Vue 渲染期异常由 `main.ts` 的 `app.config.errorHandler` 接(挂载前就要生效),
|
||||
* `window error` 与未捕获 Promise 由 `useGlobalErrorReporting()` 接——它必须在根组件 setup 里调用,
|
||||
* 卸载出口挂在 `onBeforeUnmount`:入口级注册点只定义不接线等于没接。
|
||||
*
|
||||
* 凭据零容忍:payload 只有 kind/message/stack/route/ts,**绝不**读取或携带本地登录令牌
|
||||
* 或任何请求头凭据原文(AC-1 同一把尺;预签名 URL 也当一次性凭据对待,不进上报)。
|
||||
*/
|
||||
import { onBeforeUnmount } from 'vue'
|
||||
|
||||
const REPORT_ENDPOINT = '/api/admin/client-errors'
|
||||
const RING_LIMIT = 20
|
||||
/** 风暴保护:同一原因 30s 内只弹一次屏、上报次数也设上限,日志不许被一种错误刷爆。 */
|
||||
const DEDUPE_WINDOW_MS = 30_000
|
||||
const MAX_STACK_CHARS = 2000
|
||||
|
||||
export interface ClientErrorPayload {
|
||||
kind: string
|
||||
message: string
|
||||
stack?: string
|
||||
route?: string
|
||||
ts?: number
|
||||
}
|
||||
|
||||
const ring: ClientErrorPayload[] = []
|
||||
const recent = new Map<string, number>()
|
||||
/** 屏上提示的一次性摘除定时器:全部登记,卸载时逐个 clearTimeout,不留没人收的尾巴。 */
|
||||
const toastTimers = new Set<number>()
|
||||
|
||||
function sanitize(text: string): string {
|
||||
// 兜底脱敏:堆栈/消息里若混进凭据一律打码——Bearer 值、JWT 三段式(登录令牌的形状),
|
||||
// 以及 query 里疑似 token/key/secret 的取值。上报通道绝不外带任何凭据原文。
|
||||
return text
|
||||
.replace(/(Bearer\s+)[A-Za-z0-9\-._~+/=]{8,}/gi, '$1***')
|
||||
.replace(/[A-Za-z0-9\-_]{10,}\.[A-Za-z0-9\-_]{10,}\.[A-Za-z0-9\-_]{8,}/g, '***')
|
||||
.replace(/([?&](?:token|key|secret|signature|expires)=)[^&\s"']+/gi, '$1***')
|
||||
}
|
||||
|
||||
function fingerprint(payload: ClientErrorPayload): string {
|
||||
return `${payload.kind}|${(payload.message || '').slice(0, 120)}`
|
||||
}
|
||||
|
||||
function showOnce(payload: ClientErrorPayload): void {
|
||||
if (typeof document === 'undefined') return
|
||||
const now = Date.now()
|
||||
const last = recent.get(fingerprint(payload)) ?? 0
|
||||
if (now - last < DEDUPE_WINDOW_MS) return
|
||||
recent.set(fingerprint(payload), now)
|
||||
const toast = document.createElement('div')
|
||||
toast.setAttribute('role', 'alert')
|
||||
toast.textContent = `页面出错了:${(payload.message || '未知错误').slice(0, 120)}(已记录,刷新可恢复;反复出现请联系支持)`
|
||||
toast.setAttribute(
|
||||
'style',
|
||||
'position:fixed;right:16px;bottom:16px;z-index:99999;max-width:420px;padding:10px 14px;'
|
||||
+ 'background:#b3261e;color:#fff;border-radius:8px;font-size:13px;box-shadow:0 4px 16px rgba(0,0,0,.3)',
|
||||
)
|
||||
document.body.appendChild(toast)
|
||||
const timer = window.setTimeout(() => {
|
||||
toast.remove()
|
||||
toastTimers.delete(timer)
|
||||
}, 8000)
|
||||
toastTimers.add(timer)
|
||||
}
|
||||
|
||||
export function reportClientError(payload: ClientErrorPayload): void {
|
||||
const entry: ClientErrorPayload = {
|
||||
kind: payload.kind || 'unknown',
|
||||
message: sanitize(String(payload.message ?? '')).slice(0, MAX_STACK_CHARS),
|
||||
stack: sanitize(String(payload.stack ?? '')).slice(0, MAX_STACK_CHARS),
|
||||
route: payload.route ?? (typeof location !== 'undefined' ? location.pathname : ''),
|
||||
ts: payload.ts ?? Date.now(),
|
||||
}
|
||||
ring.push(entry)
|
||||
if (ring.length > RING_LIMIT) ring.shift()
|
||||
// eslint-disable-next-line no-console
|
||||
console.error('[client-error]', entry)
|
||||
showOnce(entry)
|
||||
try {
|
||||
if (typeof navigator !== 'undefined' && typeof navigator.sendBeacon === 'function') {
|
||||
navigator.sendBeacon(REPORT_ENDPOINT, new Blob([JSON.stringify(entry)], { type: 'application/json' }))
|
||||
}
|
||||
} catch {
|
||||
// 上报失败只丢现场,不许把错误处理本身炸掉
|
||||
}
|
||||
}
|
||||
|
||||
/** 最近 N 条内存环(只读快照,排查用)。 */
|
||||
export function recentClientErrors(): ClientErrorPayload[] {
|
||||
return ring.slice()
|
||||
}
|
||||
|
||||
function handleWindowRejection(event: PromiseRejectionEvent): void {
|
||||
reportClientError({
|
||||
kind: 'unhandled-rejection',
|
||||
message: String(event.reason ?? ''),
|
||||
stack: event.reason instanceof Error ? event.reason.stack ?? '' : '',
|
||||
route: typeof location === 'undefined' ? '' : location.pathname,
|
||||
ts: Date.now(),
|
||||
})
|
||||
}
|
||||
|
||||
function handleWindowError(event: ErrorEvent): void {
|
||||
reportClientError({
|
||||
kind: 'window-error',
|
||||
message: event.message || (event.error instanceof Error ? event.error.message : ''),
|
||||
stack: event.error instanceof Error ? event.error.stack ?? '' : '',
|
||||
route: typeof location === 'undefined' ? '' : location.pathname,
|
||||
ts: Date.now(),
|
||||
})
|
||||
}
|
||||
|
||||
let browserEventsInstalled = false
|
||||
|
||||
/** 卸载出口:摘掉两个 window 监听 + 清掉所有还在倒计时的提示定时器。 */
|
||||
export function disposeGlobalErrorReporting(): void {
|
||||
if (typeof window === 'undefined') return
|
||||
window.removeEventListener('unhandledrejection', handleWindowRejection)
|
||||
window.removeEventListener('error', handleWindowError)
|
||||
for (const timer of toastTimers) window.clearTimeout(timer)
|
||||
toastTimers.clear()
|
||||
browserEventsInstalled = false
|
||||
}
|
||||
|
||||
/**
|
||||
* 浏览器级兜底接线(必须由根组件 setup 调用一次):脚本级崩溃与没人接的 Promise
|
||||
* 都收进同一条上报路;卸载配对走 onBeforeUnmount,与用户端 App.vue 的 dispose 口径一致。
|
||||
*/
|
||||
export function useGlobalErrorReporting(): void {
|
||||
if (typeof window === 'undefined' || browserEventsInstalled) return
|
||||
browserEventsInstalled = true
|
||||
window.addEventListener('unhandledrejection', handleWindowRejection)
|
||||
window.addEventListener('error', handleWindowError)
|
||||
onBeforeUnmount(disposeGlobalErrorReporting)
|
||||
}
|
||||
@@ -25,21 +25,21 @@ const read = (rel: string) => readFileSync(resolve(root, rel), 'utf-8')
|
||||
const PENDING_CHUNK = 'Pending Phase 4: AC-18 element-plus 不再进首屏 manualChunks'
|
||||
const PENDING_RACE = 'Pending Phase 4: AC-18 列表响应必须过 latest-request 门'
|
||||
|
||||
test('pending_ac18_login_不再预载_element_plus_整块', { skip: PENDING_CHUNK }, () => {
|
||||
test('pending_ac18_login_不再预载_element_plus_整块', () => {
|
||||
const vite = read('vite.config.ts')
|
||||
assert.doesNotMatch(vite, /['"]element-plus['"]\s*:\s*\[/,
|
||||
'P1-F1:manualChunks 里的 element-plus 条目必须摘掉(按需引入已在 src/plugins/element.ts 生效)')
|
||||
assert.match(vite, /manualChunks[\s\S]{0,200}vue/, 'vue 那一块仍应留在册,别顺手把护栏删空')
|
||||
})
|
||||
|
||||
test('pending_ac18_按需引入护栏不许被这次改动带崩', { skip: PENDING_CHUNK }, () => {
|
||||
test('pending_ac18_按需引入护栏不许被这次改动带崩', () => {
|
||||
const plugin = read('src/plugins/element.ts')
|
||||
assert.match(plugin, /installElement/, '按组件注册的正本入口必须还在')
|
||||
assert.match(read('tests/perf-element-on-demand.test.ts'), /element-plus/,
|
||||
'既有的按需引入尺子必须仍在册(摘 chunk 不等于回到全量引入)')
|
||||
})
|
||||
|
||||
test('pending_ac18_用户页与设备日志页必须接竞态门', { skip: PENDING_RACE }, () => {
|
||||
test('pending_ac18_用户页与设备日志页必须接竞态门', () => {
|
||||
for (const rel of ['src/pages/account/UsersPage.vue', 'src/pages/records/DeviceLogsPage.vue']) {
|
||||
const page = read(rel)
|
||||
assert.match(page, /from '@\/utils\/latest-request'/,
|
||||
|
||||
@@ -26,17 +26,34 @@ const read = (rel: string) => readFileSync(resolve(root, rel), 'utf-8')
|
||||
const PENDING_ERROR = 'Pending Phase 4: AC-16 全局错误兜底与脱敏上报'
|
||||
const PENDING_UPLOAD = 'Pending Phase 4: AC-17 93MB 包分片续传与孤儿对象清理'
|
||||
|
||||
test('pending_ac16_admin_渲染异常必须有全局兜底', { skip: PENDING_ERROR }, () => {
|
||||
test('pending_ac16_admin_渲染异常必须有全局兜底', () => {
|
||||
const main = read('src/main.ts')
|
||||
assert.match(main, /app\.config\.errorHandler\s*=/,
|
||||
'S1-F2:渲染期异常必须被 Vue 全局兜底接住,不能只进 console')
|
||||
assert.match(main, /addEventListener\(\s*['"]unhandledrejection['"]/,
|
||||
|
||||
// window error / unhandledrejection 两个出口的注册点从入口挪到了入口装的守卫模块:
|
||||
// 后管的 timer-cleanup-pairing 尺子要求"注册点所在文件必须找得回反注册 + 卸载钩子",
|
||||
// 而 main.ts 没有组件作用域可挂——只定义不接线等于没接,所以接线必须在根组件 setup 里。
|
||||
// 判据强度没有降:三类错误照样都要接住,另外多卡"反注册配对"和"根组件真的接了线"。
|
||||
const guard = read('src/shared/api/error-report.ts')
|
||||
assert.match(guard, /addEventListener\(\s*['"]unhandledrejection['"]/,
|
||||
'未捕获 Promise 同样要兜底(后管列表请求都是 promise 链)')
|
||||
assert.match(main, /addEventListener\(\s*['"]error['"]/,
|
||||
assert.match(guard, /addEventListener\(\s*['"]error['"]/,
|
||||
'脚本级崩溃(window error)必须留痕')
|
||||
assert.match(guard, /removeEventListener\(\s*['"]unhandledrejection['"]/,
|
||||
'AC-16:注册了就要找得回反注册,否则热更新/宿主拆栈会叠监听')
|
||||
assert.match(guard, /removeEventListener\(\s*['"]error['"]/,
|
||||
'AC-16:window error 的反注册同样要点名')
|
||||
assert.match(guard, /onBeforeUnmount\(/,
|
||||
'AC-16:卸载出口必须挂在组件生命周期上(模块里空有一个 dispose 函数不算接上)')
|
||||
|
||||
const app = read('src/App.vue')
|
||||
assert.match(app, /useGlobalErrorReporting\(\)/,
|
||||
'AC-16:根组件必须真的调用接线函数')
|
||||
assert.ok(main.includes('installGlobalError'), '入口仍须装 Vue 渲染兜底(首屏就崩也不能漏)')
|
||||
})
|
||||
|
||||
test('pending_ac16_admin_上报必须挂在入口且不带凭据', { skip: PENDING_ERROR }, () => {
|
||||
test('pending_ac16_admin_上报必须挂在入口且不带凭据', () => {
|
||||
const main = read('src/main.ts')
|
||||
assert.match(main, /installGlobalError|registerGlobalError|setupGlobalError/,
|
||||
'兜底与上报必须挂在入口上(只写在页面里=有些页面崩了没人接)')
|
||||
@@ -56,14 +73,14 @@ test('pending_ac16_admin_上报必须挂在入口且不带凭据', { skip: PENDI
|
||||
'上报里不许带令牌原文(凭据零容忍,与 AC-1 同一把尺)')
|
||||
})
|
||||
|
||||
test('pending_ac17_安装包必须分片续传并可观察进度', { skip: PENDING_UPLOAD }, () => {
|
||||
test('pending_ac17_安装包必须分片续传并可观察进度', () => {
|
||||
const api = read('src/pages/records/workbench-client-api.ts')
|
||||
assert.match(api, /partSize|uploadPart|createMultipartUpload|chunk/,
|
||||
'S1-F3:单次 PUT 一断就从 0 重来,必须改成分片/断点续传')
|
||||
assert.match(api, /onProgress|progress/, '93MB 上传必须有可见进度')
|
||||
})
|
||||
|
||||
test('pending_ac17_confirm失败必须清理对象', { skip: PENDING_UPLOAD }, () => {
|
||||
test('pending_ac17_confirm失败必须清理对象', () => {
|
||||
const api = read('src/pages/records/workbench-client-api.ts')
|
||||
assert.match(api, /confirm[\s\S]{0,400}(abort|deleteObject|cleanup|remove)/,
|
||||
'confirm 失败必须清对象(工作台包凭据零容忍:拒绝新包不等于旧对象已处置)')
|
||||
|
||||
@@ -37,7 +37,9 @@ export default defineConfig({
|
||||
output: {
|
||||
manualChunks: {
|
||||
vue: ['vue', 'vue-router', 'pinia'],
|
||||
'element-plus': ['element-plus'],
|
||||
// P1-F1:element-plus 不再钉成独立 chunk——按需引入已在 src/plugins/element.ts
|
||||
// 生效,manualChunks 却把整包 915KB(gzip 293KB)又拽回登录页 modulepreload。
|
||||
// 摘掉后组件按 import 图自然切块,进不了首屏。
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
package com.nanri.aiimage.modules.clienterror.controller;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 管理端浏览器错误上报(S1-F2/AC-16)。
|
||||
*
|
||||
* <p>此前后管页面渲染崩溃/未捕获 Promise 只进浏览器 console,线上白屏永远没有现场。
|
||||
* 本端点把上报落进服务端日志(WARN,带 uid/route 前缀可按 requestId grep)。
|
||||
* 只记纯文本且逐字段截断,不落库、不进队列——这是一份"看得见"的证据链,不是新数据集。</p>
|
||||
*
|
||||
* <p>鉴权:走 {@code /api/admin/**} 的管理员会话(sendBeacon 带同源 cookie)。
|
||||
* 报文体里禁止出现令牌等凭据(上报端已做脱敏,这里再卡一道长度上限)。</p>
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/api/admin/client-errors")
|
||||
@Tag(name = "管理端错误上报", description = "后管页面全局错误兜底的上报出口:落服务端日志,不落库")
|
||||
public class ClientErrorReportController {
|
||||
|
||||
private static final int MAX_FIELD_CHARS = 2000;
|
||||
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
|
||||
@PostMapping
|
||||
@Operation(summary = "上报一条浏览器错误", description = "字段:kind/message/stack/route/ts;全部截断后以 WARN 落服务端日志")
|
||||
public ApiResponse<Map<String, Object>> report(
|
||||
HttpServletRequest request,
|
||||
@RequestBody(required = false) Map<String, Object> payload) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdmin(request);
|
||||
Map<String, Object> body = payload == null ? Map.of() : payload;
|
||||
log.warn("[client-error] uid={} kind={} route={} ts={} message={} stack={}",
|
||||
operator.getId(),
|
||||
clip(body.get("kind")),
|
||||
clip(body.get("route")),
|
||||
body.get("ts"),
|
||||
clip(body.get("message")),
|
||||
clip(body.get("stack")));
|
||||
return ApiResponse.success(Map.of("recorded", true));
|
||||
}
|
||||
|
||||
static String clip(Object value) {
|
||||
String text = value == null ? "" : String.valueOf(value);
|
||||
return text.length() <= MAX_FIELD_CHARS ? text : text.substring(0, MAX_FIELD_CHARS) + "…";
|
||||
}
|
||||
}
|
||||
+94
@@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.file.controller;
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.modules.file.model.vo.ExcelInfoVo;
|
||||
import com.nanri.aiimage.modules.file.model.vo.UploadFileVo;
|
||||
import com.nanri.aiimage.modules.file.service.ChunkedUploadService;
|
||||
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
@@ -13,14 +14,20 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RequestPart;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@@ -30,6 +37,7 @@ public class FileUploadController {
|
||||
|
||||
private final LocalFileStorageService localFileStorageService;
|
||||
private final OssStorageService ossStorageService;
|
||||
private final ChunkedUploadService chunkedUploadService;
|
||||
|
||||
@PostMapping("/upload")
|
||||
@Operation(
|
||||
@@ -72,6 +80,92 @@ public class FileUploadController {
|
||||
return ApiResponse.success(vo);
|
||||
}
|
||||
|
||||
@PostMapping("/chunk/init")
|
||||
@Operation(
|
||||
summary = "初始化分片上传",
|
||||
description = """
|
||||
大文件分片上传的第一步:登记文件大小与分片数,返回 uploadId。
|
||||
分片逐个 POST 到 /chunk/{uploadId}/part/{index},全部到齐后调
|
||||
/chunk/{uploadId}/complete 拼装为普通临时文件(同一套 fileKey 语义)。
|
||||
每片可独立重试,前端也可先查 /chunk/{uploadId} 拿到已到片号续传。
|
||||
""")
|
||||
public ApiResponse<Map<String, Object>> initChunkUpload(
|
||||
@RequestParam String fileName,
|
||||
@RequestParam int totalParts,
|
||||
@RequestParam long totalBytes) {
|
||||
ChunkedUploadService.ChunkSession session =
|
||||
chunkedUploadService.init(fileName, totalParts, totalBytes, "");
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("upload_id", session.uploadId());
|
||||
result.put("total_parts", session.totalParts());
|
||||
return ApiResponse.success(result);
|
||||
}
|
||||
|
||||
@PostMapping("/chunk/{uploadId}/part/{index}")
|
||||
@Operation(summary = "上传一个分片", description = "同一片重复上传按覆盖处理(重试/续传幂等)。")
|
||||
public ApiResponse<Map<String, Object>> uploadChunk(
|
||||
@PathVariable String uploadId,
|
||||
@PathVariable int index,
|
||||
@RequestPart("file") MultipartFile file) throws Exception {
|
||||
int received = chunkedUploadService.savePart(uploadId, index, file);
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("upload_id", uploadId);
|
||||
result.put("received_parts", received);
|
||||
return ApiResponse.success(result);
|
||||
}
|
||||
|
||||
@GetMapping("/chunk/{uploadId}")
|
||||
@Operation(summary = "查询已上传分片", description = "返回已到齐的分片序号,供断点续传跳过已传片。")
|
||||
public ApiResponse<Map<String, Object>> chunkStatus(@PathVariable String uploadId) {
|
||||
List<Integer> parts = chunkedUploadService.uploadedParts(uploadId);
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("upload_id", uploadId);
|
||||
result.put("uploaded_parts", parts);
|
||||
return ApiResponse.success(result);
|
||||
}
|
||||
|
||||
@PostMapping("/chunk/{uploadId}/complete")
|
||||
@Operation(
|
||||
summary = "拼装分片并落盘",
|
||||
description = """
|
||||
全部分片到齐后流式拼装并复算 sha256,落盘为普通临时文件(返回 fileKey)。
|
||||
uploadToOss=true 时与 /upload 同一出口:拼装后转存公开 OSS。
|
||||
缺少任一分片直接拒绝,不会产出半个文件。
|
||||
""")
|
||||
public ApiResponse<UploadFileVo> completeChunkUpload(
|
||||
@PathVariable String uploadId,
|
||||
@RequestParam(required = false) String relativePath,
|
||||
@RequestParam(defaultValue = "false") boolean uploadToOss,
|
||||
@RequestParam(defaultValue = "COMMON") String moduleType) throws Exception {
|
||||
ChunkedUploadService.CompletedUpload completed = chunkedUploadService.complete(uploadId);
|
||||
try {
|
||||
UploadFileVo vo = localFileStorageService.saveTempFileFromFile(
|
||||
completed.file().toFile(), completed.fileName(), relativePath, completed.size());
|
||||
if (uploadToOss) {
|
||||
File localFile = new File(vo.getLocalPath());
|
||||
OssStorageService.UploadedResult uploaded =
|
||||
ossStorageService.uploadPublicFileWithFreshDownloadUrl(
|
||||
localFile, moduleType, vo.getOriginalFilename());
|
||||
vo.setObjectKey(uploaded.objectKey());
|
||||
vo.setUrl(uploaded.downloadUrl());
|
||||
vo.setMediaType(resolveMediaType(null, vo.getOriginalFilename()));
|
||||
}
|
||||
return ApiResponse.success(vo);
|
||||
} finally {
|
||||
completed.file().toFile().delete();
|
||||
}
|
||||
}
|
||||
|
||||
@DeleteMapping("/chunk/{uploadId}")
|
||||
@Operation(summary = "放弃分片上传", description = "删除未完成的会话与已落盘分片。")
|
||||
public ApiResponse<Map<String, Object>> abortChunkUpload(@PathVariable String uploadId) {
|
||||
chunkedUploadService.abort(uploadId);
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("upload_id", uploadId);
|
||||
result.put("aborted", true);
|
||||
return ApiResponse.success(result);
|
||||
}
|
||||
|
||||
@GetMapping("/excel-info")
|
||||
@Operation(summary = "读取 Excel 信息", description = "根据 fileKey 读取 Excel 第一行表头及总行数,供前端选择保留列和展示总条数。")
|
||||
@ApiResponses({
|
||||
|
||||
+342
@@ -0,0 +1,342 @@
|
||||
package com.nanri.aiimage.modules.file.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.config.StorageProperties;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HexFormat;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* 临时文件分片上传(S1-F3/AC-17):把大文件拆成固定大小的分片逐个落盘,全部到齐后
|
||||
* 在服务端流式拼装并复算 sha256。
|
||||
*
|
||||
* <p>存在的理由:单次 multipart/单次预签名 PUT 在弱网下一断就从 0 重传,93MB 级安装包
|
||||
* 与视频几乎没有一次成功的运气。分片后每一片都可独立重试,前端还能查询已到片号续传。</p>
|
||||
*
|
||||
* <p>落盘位置在 {@code local-temp-dir/chunk-uploads/},不进入业务结果目录;超过
|
||||
* {@code stale-hours} 未完成的分片会话在下次 init 时顺手清理。uploadId 只接受 32 位
|
||||
* 十六进制(自己生成、自己校验),分片序号只接受整数,用户文件名只进 meta 展示,
|
||||
* 不参与任何路径拼接。</p>
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class ChunkedUploadService {
|
||||
|
||||
private static final Pattern UPLOAD_ID_PATTERN = Pattern.compile("[0-9a-f]{32}");
|
||||
private static final ObjectMapper JSON = new ObjectMapper();
|
||||
private static final String META_NAME = "meta.json";
|
||||
|
||||
/** 单个分片上限:比前端 16MB 分片留足余量,防一次请求把临时盘打满。 */
|
||||
private static final long MAX_PART_BYTES = 64L * 1024 * 1024;
|
||||
|
||||
private final StorageProperties storageProperties;
|
||||
|
||||
/** 同一会话的落片/拼装/放弃串行化;会话结束即回收,避免长期驻留。 */
|
||||
private final ConcurrentHashMap<String, Object> sessionLocks = new ConcurrentHashMap<>();
|
||||
|
||||
@Value("${aiimage.file.chunk-upload.max-total-bytes:2147483648}")
|
||||
private long maxTotalBytes = 2L * 1024 * 1024 * 1024;
|
||||
|
||||
@Value("${aiimage.file.chunk-upload.max-parts:4096}")
|
||||
private int maxParts = 4096;
|
||||
|
||||
@Value("${aiimage.file.chunk-upload.stale-hours:24}")
|
||||
private long staleHours = 24;
|
||||
|
||||
/** 分片会话句柄:uploadId 与总片数。 */
|
||||
public record ChunkSession(String uploadId, int totalParts) {
|
||||
}
|
||||
|
||||
/** 拼装完成的临时文件;调用方负责删除。 */
|
||||
public record CompletedUpload(Path file, String fileName, long size, String sha256) {
|
||||
}
|
||||
|
||||
public ChunkSession init(String fileName, int totalParts, long totalBytes, String purpose) {
|
||||
String safeName = normalizeFileName(fileName);
|
||||
if (totalParts < 1 || totalParts > maxParts) {
|
||||
throw new BusinessException("分片数量非法(1-" + maxParts + ")");
|
||||
}
|
||||
if (totalBytes < 1 || totalBytes > maxTotalBytes) {
|
||||
throw new BusinessException("文件大小超出上限(最大 " + maxTotalBytes + " 字节)");
|
||||
}
|
||||
cleanupStaleSessions();
|
||||
String uploadId = UUID.randomUUID().toString().replace("-", "");
|
||||
Path dir = sessionDir(uploadId);
|
||||
try {
|
||||
Files.createDirectories(dir);
|
||||
ObjectNode meta = JSON.createObjectNode();
|
||||
meta.put("fileName", safeName);
|
||||
meta.put("totalParts", totalParts);
|
||||
meta.put("totalBytes", totalBytes);
|
||||
meta.put("purpose", purpose == null ? "" : purpose);
|
||||
meta.put("createdAt", Instant.now().toEpochMilli());
|
||||
JSON.writeValue(metaFile(uploadId).toFile(), meta);
|
||||
} catch (IOException ex) {
|
||||
deleteQuietly(dir);
|
||||
throw new BusinessException("初始化分片上传失败:" + ex.getMessage());
|
||||
}
|
||||
log.info("[chunk-upload] 初始化分片会话 uploadId={} fileName={} parts={} bytes={}",
|
||||
uploadId, safeName, totalParts, totalBytes);
|
||||
return new ChunkSession(uploadId, totalParts);
|
||||
}
|
||||
|
||||
/**
|
||||
* 落一片。同一片重复上传按覆盖处理(幂等):前端重试/续传时不必先查状态。
|
||||
* 返回当前已到齐的片数,供前端做进度展示。
|
||||
*/
|
||||
public int savePart(String uploadId, int index, MultipartFile part) throws IOException {
|
||||
Meta meta = readMeta(uploadId);
|
||||
if (index < 0 || index >= meta.totalParts) {
|
||||
throw new BusinessException("分片序号越界:" + index);
|
||||
}
|
||||
if (part == null || part.isEmpty()) {
|
||||
throw new BusinessException("分片内容为空");
|
||||
}
|
||||
if (part.getSize() > MAX_PART_BYTES) {
|
||||
throw new BusinessException("单个分片超过上限:" + part.getSize());
|
||||
}
|
||||
synchronized (lockOf(uploadId)) {
|
||||
Path dir = sessionDir(uploadId);
|
||||
Path target = dir.resolve("part-" + index);
|
||||
Path tmp = dir.resolve("part-" + index + ".tmp");
|
||||
try (InputStream in = part.getInputStream()) {
|
||||
Files.copy(in, tmp, StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING);
|
||||
long total = currentTotalBytes(uploadId, meta.totalParts);
|
||||
if (total > maxTotalBytes) {
|
||||
deleteQuietly(target);
|
||||
throw new BusinessException("分片累计超过文件上限(最大 " + maxTotalBytes + " 字节)");
|
||||
}
|
||||
if (total > meta.totalBytes) {
|
||||
deleteQuietly(target);
|
||||
throw new BusinessException("分片累计超过声明的文件大小:" + meta.totalBytes);
|
||||
}
|
||||
return (int) uploadedPartIndexes(uploadId, meta.totalParts).size();
|
||||
}
|
||||
}
|
||||
|
||||
public List<Integer> uploadedParts(String uploadId) {
|
||||
Meta meta = readMeta(uploadId);
|
||||
return uploadedPartIndexes(uploadId, meta.totalParts);
|
||||
}
|
||||
|
||||
/**
|
||||
* 全部片到齐后流式拼装并复算 sha256;拼装完成的文件落在 chunk-uploads 根下,
|
||||
* 会话目录随之清掉。缺少分片直接拒绝,绝不拼出半个文件。
|
||||
*/
|
||||
public CompletedUpload complete(String uploadId) throws IOException {
|
||||
Meta meta = readMeta(uploadId);
|
||||
synchronized (lockOf(uploadId)) {
|
||||
List<Integer> present = uploadedPartIndexes(uploadId, meta.totalParts);
|
||||
if (present.size() != meta.totalParts) {
|
||||
List<Integer> missing = new ArrayList<>();
|
||||
for (int i = 0; i < meta.totalParts; i++) {
|
||||
if (!present.contains(i)) {
|
||||
missing.add(i);
|
||||
if (missing.size() >= 20) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
throw new BusinessException("分片不完整,缺少 " + missing);
|
||||
}
|
||||
Path assembled = chunkRoot().resolve("assembled-" + uploadId + ".bin");
|
||||
MessageDigest digest = sha256Digest();
|
||||
long total = 0;
|
||||
try (OutputStream out = Files.newOutputStream(assembled)) {
|
||||
byte[] buffer = new byte[1 << 20];
|
||||
for (int i = 0; i < meta.totalParts; i++) {
|
||||
Path part = sessionDir(uploadId).resolve("part-" + i);
|
||||
try (InputStream in = Files.newInputStream(part)) {
|
||||
int read;
|
||||
while ((read = in.read(buffer)) > 0) {
|
||||
out.write(buffer, 0, read);
|
||||
digest.update(buffer, 0, read);
|
||||
total += read;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
Files.deleteIfExists(assembled);
|
||||
throw ex;
|
||||
}
|
||||
if (total != meta.totalBytes) {
|
||||
Files.deleteIfExists(assembled);
|
||||
throw new BusinessException(
|
||||
"拼装后大小与声明不一致:声明 " + meta.totalBytes + ",实际 " + total);
|
||||
}
|
||||
deleteQuietly(sessionDir(uploadId));
|
||||
sessionLocks.remove(uploadId);
|
||||
String sha256 = HexFormat.of().formatHex(digest.digest());
|
||||
log.info("[chunk-upload] 拼装完成 uploadId={} fileName={} bytes={} sha256={}",
|
||||
uploadId, meta.fileName, total, sha256);
|
||||
return new CompletedUpload(assembled, meta.fileName, total, sha256);
|
||||
}
|
||||
}
|
||||
|
||||
/** 放弃本次分片会话(前端取消/确认失败清理)。 */
|
||||
public void abort(String uploadId) {
|
||||
Meta meta = readMeta(uploadId);
|
||||
synchronized (lockOf(uploadId)) {
|
||||
deleteQuietly(sessionDir(uploadId));
|
||||
}
|
||||
sessionLocks.remove(uploadId);
|
||||
log.info("[chunk-upload] 已放弃分片会话 uploadId={} fileName={}", uploadId, meta.fileName);
|
||||
}
|
||||
|
||||
/** 分片会话随附的业务标识(工作台包用它钉住 objectKey,防拼装时换 key)。 */
|
||||
public String purposeOf(String uploadId) {
|
||||
return readMeta(uploadId).purpose;
|
||||
}
|
||||
|
||||
private Meta readMeta(String uploadId) {
|
||||
if (uploadId == null || !UPLOAD_ID_PATTERN.matcher(uploadId).matches()) {
|
||||
throw new BusinessException("分片会话不存在或已过期");
|
||||
}
|
||||
Path metaFile = metaFile(uploadId);
|
||||
if (!Files.isRegularFile(metaFile)) {
|
||||
throw new BusinessException("分片会话不存在或已过期");
|
||||
}
|
||||
try {
|
||||
JsonNode node = JSON.readTree(metaFile.toFile());
|
||||
return new Meta(node.path("fileName").asText(""),
|
||||
node.path("totalParts").asInt(0),
|
||||
node.path("totalBytes").asLong(0),
|
||||
node.path("purpose").asText(""));
|
||||
} catch (IOException ex) {
|
||||
throw new BusinessException("分片会话元数据损坏,请重新上传");
|
||||
}
|
||||
}
|
||||
|
||||
private List<Integer> uploadedPartIndexes(String uploadId, int totalParts) {
|
||||
List<Integer> result = new ArrayList<>();
|
||||
for (int i = 0; i < totalParts; i++) {
|
||||
if (Files.isRegularFile(sessionDir(uploadId).resolve("part-" + i))) {
|
||||
result.add(i);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private long currentTotalBytes(String uploadId, int totalParts) throws IOException {
|
||||
long total = 0;
|
||||
for (int i = 0; i < totalParts; i++) {
|
||||
Path part = sessionDir(uploadId).resolve("part-" + i);
|
||||
if (Files.isRegularFile(part)) {
|
||||
total += Files.size(part);
|
||||
}
|
||||
}
|
||||
return total;
|
||||
}
|
||||
|
||||
private Path chunkRoot() {
|
||||
return Path.of(storageProperties.getLocalTempDir()).resolve("chunk-uploads").normalize();
|
||||
}
|
||||
|
||||
private Path sessionDir(String uploadId) {
|
||||
if (uploadId == null || !UPLOAD_ID_PATTERN.matcher(uploadId).matches()) {
|
||||
throw new BusinessException("分片会话不存在或已过期");
|
||||
}
|
||||
return chunkRoot().resolve(uploadId);
|
||||
}
|
||||
|
||||
private Path metaFile(String uploadId) {
|
||||
return sessionDir(uploadId).resolve(META_NAME);
|
||||
}
|
||||
|
||||
private Object lockOf(String uploadId) {
|
||||
return sessionLocks.computeIfAbsent(uploadId, key -> new Object());
|
||||
}
|
||||
|
||||
private void cleanupStaleSessions() {
|
||||
Path root = chunkRoot();
|
||||
if (!Files.isDirectory(root)) {
|
||||
return;
|
||||
}
|
||||
long cutoff = System.currentTimeMillis() - Math.max(1, staleHours) * 3600_000L;
|
||||
try (Stream<Path> children = Files.list(root)) {
|
||||
children.forEach(child -> {
|
||||
try {
|
||||
if (Files.getLastModifiedTime(child).toMillis() < cutoff) {
|
||||
deleteQuietly(child);
|
||||
log.info("[chunk-upload] 清理过期分片会话/残留文件 path={}", child.getFileName());
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
log.warn("[chunk-upload] 条目时间戳读不出,本轮跳过该条 path={}", child.getFileName());
|
||||
}
|
||||
});
|
||||
} catch (IOException ex) {
|
||||
log.warn("[chunk-upload] 扫描过期分片会话失败: {}", ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private String normalizeFileName(String fileName) {
|
||||
String name = fileName == null ? "" : fileName.trim();
|
||||
if (name.isEmpty()) {
|
||||
throw new BusinessException("文件名不能为空");
|
||||
}
|
||||
if (name.length() > 255) {
|
||||
name = name.substring(name.length() - 255);
|
||||
}
|
||||
return name.replace('\\', '/').replaceAll(".*/", "");
|
||||
}
|
||||
|
||||
private MessageDigest sha256Digest() {
|
||||
try {
|
||||
return MessageDigest.getInstance("SHA-256");
|
||||
} catch (NoSuchAlgorithmException ex) {
|
||||
throw new IllegalStateException("SHA-256 not available", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteQuietly(Path path) {
|
||||
if (path == null) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if (Files.isDirectory(path)) {
|
||||
try (Stream<Path> walk = Files.walk(path)) {
|
||||
walk.sorted((a, b) -> b.getNameCount() - a.getNameCount())
|
||||
.forEach(p -> {
|
||||
try {
|
||||
Files.deleteIfExists(p);
|
||||
} catch (IOException ex) {
|
||||
log.warn("[chunk-upload] 残留片删除失败,留给下一轮清理 path={}", p);
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
Files.deleteIfExists(path);
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
log.warn("[chunk-upload] 清理未竟,残留交给过期回收 path={}", path);
|
||||
}
|
||||
}
|
||||
|
||||
private record Meta(String fileName, int totalParts, long totalBytes, String purpose) {
|
||||
}
|
||||
}
|
||||
+29
@@ -78,6 +78,35 @@ public class LocalFileStorageService {
|
||||
return vo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分片拼装后的落盘(AC-17):与 {@link #saveTempFile} 同一套扩展名闸门与 fileKey 索引,
|
||||
* 只是源从 MultipartFile 换成服务端已拼好的临时文件。
|
||||
*/
|
||||
public UploadFileVo saveTempFileFromFile(File source, String originalFilename,
|
||||
String relativePath, long declaredSize) throws IOException {
|
||||
File tempDir = FileUtil.file(storageProperties.getLocalTempDir());
|
||||
File parentDir = tempDir.getParentFile();
|
||||
if (parentDir != null) {
|
||||
FileUtil.mkdir(parentDir);
|
||||
}
|
||||
FileUtil.mkdir(tempDir);
|
||||
String fileKey = IdUtil.fastSimpleUUID();
|
||||
String extName = FileUtil.extName(originalFilename);
|
||||
rejectBlockedExtension(originalFilename, extName);
|
||||
String filename = fileKey + (extName.isEmpty() ? "" : "." + extName);
|
||||
File target = FileUtil.file(tempDir, filename);
|
||||
FileUtil.move(source, target, true);
|
||||
registerSourceFileIndex(fileKey, filename);
|
||||
|
||||
UploadFileVo vo = new UploadFileVo();
|
||||
vo.setFileKey(fileKey);
|
||||
vo.setOriginalFilename(originalFilename);
|
||||
vo.setLocalPath(target.getAbsolutePath());
|
||||
vo.setSize(target.length() > 0 ? target.length() : Math.max(0, declaredSize));
|
||||
vo.setRelativePath(relativePath);
|
||||
return vo;
|
||||
}
|
||||
|
||||
/** 扩展名黑名单校验:命中即拒绝落盘(大小写不敏感)。 */
|
||||
private void rejectBlockedExtension(String originalFilename, String extName) {
|
||||
if (extName == null || extName.isBlank()) {
|
||||
|
||||
+11
@@ -322,6 +322,17 @@ public class OssStorageService {
|
||||
return presignPublicClientUpload(objectKey, WORKBENCH_CLIENT_PREFIX, "workbench client", expirySeconds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 服务端直传工作台客户端包(AC-17 分片通道的落点):浏览器分片 → 后端拼装 → 这里
|
||||
* 上传到公开 client 桶的 {@code workbench-client/versions/} 前缀。
|
||||
* 与直传预签名写的是同一个桶/前缀,confirm 阶段的实物复算 sha256 与凭据扫描照旧生效。
|
||||
*/
|
||||
public String uploadWorkbenchClientObject(File file, String objectKey) {
|
||||
requireWorkbenchClientKey(objectKey);
|
||||
uploadFile(file, publicClientBucket(), objectKey);
|
||||
return objectKey;
|
||||
}
|
||||
|
||||
/** 返回工作台客户端包字节数;对象不存在返回 -1(直传确认时先卡大小,再算摘要)。 */
|
||||
public long workbenchClientObjectSize(String objectKey) {
|
||||
return publicClientObjectSize(objectKey, WORKBENCH_CLIENT_PREFIX, "workbench client");
|
||||
|
||||
+57
@@ -10,7 +10,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
@@ -69,6 +71,61 @@ public class WorkbenchClientPackageAdminController {
|
||||
packageService.confirmPackage(objectKey, fileName, version)));
|
||||
}
|
||||
|
||||
@PostMapping("/package/chunk/init")
|
||||
@Operation(summary = "初始化客户端包分片上传", description = "大包走分片:返回 uploadId 与 objectKey;分片上传到 /api/files/chunk/{uploadId}/part/{index}")
|
||||
public ApiResponse<Map<String, Object>> initChunkedPackage(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "上传的 zip 文件名") @RequestParam(value = "file_name") String fileName,
|
||||
@Parameter(description = "客户端版本号,如 1.0.0") @RequestParam("version") String version,
|
||||
@Parameter(description = "总分片数") @RequestParam("total_parts") int totalParts,
|
||||
@Parameter(description = "文件总字节数") @RequestParam("total_bytes") long totalBytes) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
log.info("[workbench-client] 管理端初始化分片上传 operator={} fileName={} version={} parts={}",
|
||||
operator.getUsername(), fileName, version, totalParts);
|
||||
return ApiResponse.success(packageService.initChunkedPackage(
|
||||
fileName, version, totalParts, totalBytes));
|
||||
}
|
||||
|
||||
@PostMapping("/package/chunk/complete")
|
||||
@Operation(summary = "拼装客户端包分片并转存", description = "全部分片到齐后服务端拼装、上传 client 桶;随后照旧调用 /package/confirm 复算摘要并落库")
|
||||
public ApiResponse<Map<String, Object>> completeChunkedPackage(
|
||||
HttpServletRequest request,
|
||||
@RequestParam("upload_id") String uploadId,
|
||||
@Parameter(description = "分片初始化返回的对象 key") @RequestParam("object_key") String objectKey,
|
||||
@Parameter(description = "上传的 zip 文件名") @RequestParam("file_name") String fileName,
|
||||
@Parameter(description = "客户端版本号") @RequestParam("version") String version) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
log.info("[workbench-client] 管理端拼装分片上传 operator={} uploadId={} objectKey={}",
|
||||
operator.getUsername(), uploadId, objectKey);
|
||||
return ApiResponse.success(packageService.completeChunkedPackage(
|
||||
uploadId, objectKey, fileName, version));
|
||||
}
|
||||
|
||||
@DeleteMapping("/package/chunk/{uploadId}")
|
||||
@Operation(summary = "放弃客户端包分片上传", description = "删除分片会话;confirm 失败时带 object_key 一并清理未登记对象")
|
||||
public ApiResponse<Map<String, Object>> abortChunkedPackage(
|
||||
HttpServletRequest request,
|
||||
@PathVariable("uploadId") String uploadId,
|
||||
@Parameter(description = "已转存但未登记的对象 key(可空)") @RequestParam(value = "object_key", required = false) String objectKey) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
log.info("[workbench-client] 管理端放弃分片上传 operator={} uploadId={} objectKey={}",
|
||||
operator.getUsername(), uploadId, objectKey);
|
||||
packageService.abortChunkedPackage(uploadId, objectKey);
|
||||
return ApiResponse.success(Map.of("aborted", true));
|
||||
}
|
||||
|
||||
@DeleteMapping("/package/object")
|
||||
@Operation(summary = "清理已转存未登记的包对象", description = "confirm 失败的补偿出口;对象已登记时拒绝清理并报错,防误删线上更新目标")
|
||||
public ApiResponse<Map<String, Object>> cleanupUnconfirmedObject(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "要清理的对象 key") @RequestParam("object_key") String objectKey) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
log.info("[workbench-client] 管理端清理未登记包对象 operator={} objectKey={}",
|
||||
operator.getUsername(), objectKey);
|
||||
packageService.cleanupUnconfirmedObject(objectKey);
|
||||
return ApiResponse.success(Map.of("removed", true));
|
||||
}
|
||||
|
||||
@PostMapping("/package/delete")
|
||||
@Operation(summary = "批量删除客户端包", description = "按 id 删除记录;关联 MinIO 包体仅当无其它记录引用时清除")
|
||||
public ApiResponse<Map<String, Object>> deletePackages(
|
||||
|
||||
+109
-4
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.workbenchclient.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.file.service.ChunkedUploadService;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.workbenchclient.mapper.WorkbenchClientPackageMapper;
|
||||
import com.nanri.aiimage.modules.workbenchclient.model.entity.WorkbenchClientPackageEntity;
|
||||
@@ -97,6 +98,7 @@ public class WorkbenchClientPackageService {
|
||||
|
||||
private final WorkbenchClientPackageMapper packageMapper;
|
||||
private final OssStorageService ossStorageService;
|
||||
private final ChunkedUploadService chunkedUploadService;
|
||||
|
||||
/** 管理端列表:按上传时间倒序,第一条即客户端当前更新目标。 */
|
||||
public List<Map<String, Object>> listPackages() {
|
||||
@@ -170,10 +172,7 @@ public class WorkbenchClientPackageService {
|
||||
public Map<String, Object> presignPackage(String fileName, String version) {
|
||||
String normalizedName = requireZipFileName(fileName);
|
||||
String normalizedVersion = requireVersion(version);
|
||||
String objectKey = OBJECT_KEY_PREFIX
|
||||
+ OBJECT_NAME_FORMATTER.format(LocalDateTime.now())
|
||||
+ "-" + UUID.randomUUID().toString().replace("-", "")
|
||||
+ "-" + safeVersionKey(normalizedVersion) + ".zip";
|
||||
String objectKey = newObjectKey(normalizedVersion);
|
||||
int expirySeconds = effectivePresignExpirySeconds();
|
||||
log.info("[workbench-client] 签发客户端包直传预签名 version={} fileName={} objectKey={} expirySeconds={}",
|
||||
normalizedVersion, normalizedName, objectKey, expirySeconds);
|
||||
@@ -187,6 +186,112 @@ public class WorkbenchClientPackageService {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分片上传第一步(AC-17):与直传同一个对象 key 规则,key 写进分片会话的 purpose,
|
||||
* 拼装时必须逐字匹配——否则管理员可借分片接口覆盖任意已发布包。
|
||||
*/
|
||||
public Map<String, Object> initChunkedPackage(String fileName, String version,
|
||||
int totalParts, long totalBytes) {
|
||||
String normalizedName = requireZipFileName(fileName);
|
||||
String normalizedVersion = requireVersion(version);
|
||||
if (totalBytes <= 0 || totalBytes > MAX_UPLOAD_BYTES) {
|
||||
throw new BusinessException("文件超过允许的大小限制");
|
||||
}
|
||||
String objectKey = newObjectKey(normalizedVersion);
|
||||
ChunkedUploadService.ChunkSession session =
|
||||
chunkedUploadService.init(normalizedName, totalParts, totalBytes, objectKey);
|
||||
log.info("[workbench-client] 初始化分片上传 version={} fileName={} objectKey={} parts={} bytes={}",
|
||||
normalizedVersion, normalizedName, objectKey, totalParts, totalBytes);
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("upload_id", session.uploadId());
|
||||
result.put("object_key", objectKey);
|
||||
result.put("file_name", normalizedName);
|
||||
result.put("version", normalizedVersion);
|
||||
result.put("total_parts", session.totalParts());
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分片拼装完成:拼好的 zip 由服务端上传到公开 client 桶,随后前端照旧调用
|
||||
* /package/confirm —— 摘要复算、凭据扫描、版本唯一性全部沿用直传那条链。
|
||||
*/
|
||||
public Map<String, Object> completeChunkedPackage(String uploadId, String objectKey,
|
||||
String fileName, String version) {
|
||||
String normalizedName = requireZipFileName(fileName);
|
||||
String normalizedVersion = requireVersion(version);
|
||||
if (objectKey == null || !objectKey.startsWith(OBJECT_KEY_PREFIX)) {
|
||||
throw new BusinessException("非法的对象路径,请重新上传");
|
||||
}
|
||||
if (!objectKey.endsWith("-" + safeVersionKey(normalizedVersion) + ".zip")) {
|
||||
throw new BusinessException("版本号与上传对象不匹配,请重新上传");
|
||||
}
|
||||
if (!objectKey.equals(chunkedUploadService.purposeOf(uploadId))) {
|
||||
throw new BusinessException("上传会话与对象不匹配,请重新上传");
|
||||
}
|
||||
ChunkedUploadService.CompletedUpload completed;
|
||||
try {
|
||||
completed = chunkedUploadService.complete(uploadId);
|
||||
} catch (IOException ex) {
|
||||
throw new BusinessException("拼装安装包失败:" + ex.getMessage());
|
||||
}
|
||||
try {
|
||||
ossStorageService.uploadWorkbenchClientObject(completed.file().toFile(), objectKey);
|
||||
} finally {
|
||||
completed.file().toFile().delete();
|
||||
}
|
||||
log.info("[workbench-client] 分片拼装并转存完成 version={} objectKey={} bytes={} sha256={}",
|
||||
normalizedVersion, objectKey, completed.size(), completed.sha256());
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("object_key", objectKey);
|
||||
result.put("file_url", ossStorageService.getWorkbenchClientDownloadUrl(objectKey));
|
||||
result.put("file_name", normalizedName);
|
||||
result.put("version", normalizedVersion);
|
||||
result.put("sha256", completed.sha256());
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理已上传但未登记的包对象(confirm 失败后的补偿):数据库已有同 key 记录时拒绝,
|
||||
* 避免管理员误删线上正在使用的安装包。
|
||||
*/
|
||||
public void cleanupUnconfirmedObject(String objectKey) {
|
||||
if (objectKey == null || !objectKey.startsWith(OBJECT_KEY_PREFIX)) {
|
||||
throw new BusinessException("非法的对象路径");
|
||||
}
|
||||
if (findByObjectKey(objectKey) != null) {
|
||||
throw new BusinessException("该对象已登记,不能按未确认清理");
|
||||
}
|
||||
ossStorageService.removeWorkbenchClientObject(objectKey);
|
||||
log.info("[workbench-client] 已清理未登记的包对象 objectKey={}", objectKey);
|
||||
}
|
||||
|
||||
/**
|
||||
* 放弃分片上传:删分片会话;若已拼装并转存过对象(confirm 失败场景),一并清理未登记对象。
|
||||
* 会话不存在/对象已登记都不算失败——补偿清理要尽力而为,不能反过来挡住重传。
|
||||
*/
|
||||
public void abortChunkedPackage(String uploadId, String objectKey) {
|
||||
try {
|
||||
chunkedUploadService.abort(uploadId);
|
||||
} catch (BusinessException ex) {
|
||||
log.info("[workbench-client] 分片会话已不存在(可能已完成) uploadId={}", uploadId);
|
||||
}
|
||||
if (objectKey != null && objectKey.startsWith(OBJECT_KEY_PREFIX)) {
|
||||
try {
|
||||
cleanupUnconfirmedObject(objectKey);
|
||||
} catch (BusinessException ex) {
|
||||
log.warn("[workbench-client] 清理未登记对象失败 objectKey={} reason={}",
|
||||
objectKey, ex.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private String newObjectKey(String normalizedVersion) {
|
||||
return OBJECT_KEY_PREFIX
|
||||
+ OBJECT_NAME_FORMATTER.format(LocalDateTime.now())
|
||||
+ "-" + UUID.randomUUID().toString().replace("-", "")
|
||||
+ "-" + safeVersionKey(normalizedVersion) + ".zip";
|
||||
}
|
||||
|
||||
/**
|
||||
* 直传确认:校验对象存在、大小上限、版本号与对象名一致,服务端复算 sha256 后落库。
|
||||
* <p>sha256 为空或长度不对直接拒绝——宁可让管理员重传,也不让客户端拿到没有锚点的包。
|
||||
|
||||
@@ -212,6 +212,16 @@ aiimage:
|
||||
source-retention-hours: ${AIIMAGE_STORAGE_SOURCE_RETENTION_HOURS:24}
|
||||
result-retention-hours: ${AIIMAGE_STORAGE_RESULT_RETENTION_HOURS:24}
|
||||
transient-payload-retention-hours: ${AIIMAGE_STORAGE_TRANSIENT_PAYLOAD_RETENTION_HOURS:72}
|
||||
# 大文件分片上传通道(AC-17/S1-F3):浏览器分片 → 服务端拼装 → 复算 sha256 后按普通临时件落库。
|
||||
# 这三键是闸门值而不是调优参数:放宽等于同时放大临时盘驻留与拼装阶段的耗时上限。
|
||||
file:
|
||||
chunk-upload:
|
||||
# 单个会话允许的总字节(默认 2GiB):init 与逐片累计都要过这道闸,超限直接拒绝
|
||||
max-total-bytes: ${AIIMAGE_FILE_CHUNK_UPLOAD_MAX_TOTAL_BYTES:2147483648}
|
||||
# 允许的分片数上限(默认 4096):与前端 8MB/片相乘即体积的第二道闸
|
||||
max-parts: ${AIIMAGE_FILE_CHUNK_UPLOAD_MAX_PARTS:4096}
|
||||
# 未完成会话与残留片的驻留小时数:超时由清理动作回收,避免断掉的上传永久占盘
|
||||
stale-hours: ${AIIMAGE_FILE_CHUNK_UPLOAD_STALE_HOURS:24}
|
||||
temp-dir:
|
||||
retention-hours: ${AIIMAGE_TEMP_DIR_RETENTION_HOURS:24}
|
||||
capacity-plan:
|
||||
|
||||
@@ -57,7 +57,9 @@ class CatchSilenceRatchetTest {
|
||||
// 10-28 V179 采集被过滤行追溯抬 579 -> 582(审计件三枚:逐批插入容错/回流簿记容错/尾 sheet 降级,
|
||||
// 逐处记名见 STRICT_TOTAL 上方注释)。
|
||||
// 10-28 Phase 3 抬 582 -> 585(心跳降级一枚 + 优雅停机两枚中断恢复,逐处记名见 STRICT_TOTAL 上方注释)。
|
||||
static final int GIVEN_NOT_RETHROW = 585;
|
||||
// 10-29 Phase 4D 抬 585 -> 591(AC-17 分片通道六枚 LOG_ONLY:清理/收尾失败不得盖掉主错误,
|
||||
// 逐处记名见 STRICT_TOTAL 上方注释;EMPTY 一格没涨)。
|
||||
static final int GIVEN_NOT_RETHROW = 591;
|
||||
static final int GIVEN_LOG_ONLY = 249;
|
||||
static final int GIVEN_EMPTY = 56;
|
||||
|
||||
@@ -211,8 +213,29 @@ class CatchSilenceRatchetTest {
|
||||
* <li>{@code TaskFileJobConfig.videoQueueExecutor} 一枚:信号量 acquire 被中断只恢复中断标记
|
||||
* (S1-B2 视频独立许可,照抄 taskQueueExecutor 的既有形状)。</li>
|
||||
* </ul>
|
||||
* <p>10-29 Phase 4D(AC-17/S1-F3 大文件分片通道)抬 total 1034 -> 1045,11 枚逐处记名。
|
||||
* 这一批是"新增通道"而不是"给既有出口补兜":整条 {@code ChunkedUploadService} 与
|
||||
* {@code WorkbenchClientPackageService} 的分片方法都是新落点,Java 的受检 {@code IOException}
|
||||
* 使每一段磁盘动作都必须有自己的出口,形状与既有件同口径:
|
||||
* <ul>
|
||||
* <li>RETHROW 五枚——{@code ChunkedUploadService.init}(建会话目录失败:先 {@code deleteQuietly}
|
||||
* 再抛 {@code BusinessException},不留半个会话)、{@code complete}(拼装中途失败:删掉半成品
|
||||
* 后原样 {@code throw ex},绝不产出半个文件)、{@code readMeta}(元数据损坏直接抛,
|
||||
* 让调用方重新 init 而不是按坏元数据继续拼)、{@code sha256Digest}(JVM 无 SHA-256 属环境级
|
||||
* 不可能,抛 {@code IllegalStateException} 带 cause)、{@code WorkbenchClientPackageService
|
||||
* .completeChunkedPackage}(拼装 IOException 翻成业务文案,500 变可读错误)。</li>
|
||||
* <li>LOG_ONLY 六枚,块体各只有一句带锚点的 log,误差方向都是"清理/收尾失败不得盖掉主错误"——
|
||||
* {@code ChunkedUploadService.cleanupStaleSessions} 内层(单条目时间戳读不出,本轮跳过该条)
|
||||
* 与外层({@code Files.list} 失败,整轮清理放弃但不拦新会话)、
|
||||
* {@code deleteQuietly} 的逐片删除与整体遍历两枚(残留交给过期回收),
|
||||
* {@code WorkbenchClientPackageService.abortChunkedPackage} 的两枚(会话已不存在只 INFO;
|
||||
* 未登记对象清理失败 WARN 带 objectKey,登记成功的对象后端会拒绝清理,不该在这里改口)。</li>
|
||||
* <li>EMPTY 一格没涨:三处原本写成 {@code catch (IOException ignored) { /* 尽力清理 *\/ }} 的
|
||||
* 空体已按 10-26 那批的先例改成 WARN 带 path——空体是三类高危出口里最贵的一种,
|
||||
* 这里宁可让 {@code STRICT_LOG_ONLY} 涨六格,也不给"删除失败连日志都不留"开门。</li>
|
||||
* </ul>
|
||||
*/
|
||||
static final int STRICT_TOTAL = 1034;
|
||||
static final int STRICT_TOTAL = 1045;
|
||||
/**
|
||||
* 重抛型 catch 的**下限**(不是上限):本轮把两处吞异常改成重抛之后实测 388。
|
||||
* 这一格只能涨不能跌——它是"异常会往外走"的总量,把它钉成"只许减"就等于拦着别人修吞异常。
|
||||
@@ -322,8 +345,13 @@ class CatchSilenceRatchetTest {
|
||||
* 块体 log.warn 带 taskId/moduleType)、{@code TaskFileJobConfig.taskQueueVirtualThreadExecutor}
|
||||
* 的 {@code shutdown()} 与 {@code TaskFileJobConfig.videoQueueExecutor}(S1-B6/S1-B2,
|
||||
* {@code InterruptedException} 只恢复中断标记),逐处记名见 STRICT_TOTAL 上方注释。
|
||||
* 10-29 Phase 4D 再抬 585 -> 591(AC-17 分片通道六枚 LOG_ONLY,逐处记名见 STRICT_TOTAL 上方注释):
|
||||
* {@code ChunkedUploadService.cleanupStaleSessions} 内外两枚、{@code deleteQuietly} 逐片与整体两枚、
|
||||
* {@code WorkbenchClientPackageService.abortChunkedPackage} 的「会话已不存在」INFO 与
|
||||
* 「未登记对象清理失败」WARN 两枚。六枚的误差方向都是「清理/收尾失败不得盖掉主错误」,
|
||||
* 主错误由外层重抛;本批 EMPTY 一格没涨(原先三枚空体已按 10-26 先例改成带 path 的 WARN)。
|
||||
*/
|
||||
static final int STRICT_NOT_RETHROW = 585;
|
||||
static final int STRICT_NOT_RETHROW = 591;
|
||||
/**
|
||||
* 10-17 抬 172 -> 173,出处就是上面点名过的 {@code TaskHeartbeatLivenessService.stamp()}:
|
||||
* 块体只有「取到 key 名 + log.warn」一句,写心跳证据失败时既不重试也不抛出——
|
||||
@@ -347,8 +375,13 @@ class CatchSilenceRatchetTest {
|
||||
* 块体只有一句带 {@code [collect-data]} 锚点的 WARN(taskId+chunk+err),坏批点名后其余批照常
|
||||
* 落库。同批另两处({@code markResolved} 追加 return、{@code writeFilteredSheet} 置 incomplete 位)
|
||||
* 因块内多一句只进 NOT_RETHROW。
|
||||
* 10-29 Phase 4D 抬 182 -> 188(AC-17 分片通道六枚,逐处记名见 STRICT_TOTAL 上方注释):
|
||||
* {@code ChunkedUploadService.cleanupStaleSessions} 内外两枚、{@code deleteQuietly} 逐片与整体两枚
|
||||
* (这四枚原本是 {@code catch (IOException ignored)} 空体,按 10-26 那批先例改成带 path 的 WARN,
|
||||
* 是「空体换 LOG_ONLY」的迁移而不是新增沉默),加上
|
||||
* {@code WorkbenchClientPackageService.abortChunkedPackage} 的 INFO 与 WARN 两枚。
|
||||
*/
|
||||
static final int STRICT_LOG_ONLY = 182; // 严格口径:块内每条顶层语句都是 log 调用才算
|
||||
static final int STRICT_LOG_ONLY = 188; // 严格口径:块内每条顶层语句都是 log 调用才算
|
||||
static final int STRICT_EMPTY = 56;
|
||||
|
||||
/**
|
||||
|
||||
+85
@@ -0,0 +1,85 @@
|
||||
package com.nanri.aiimage.modules.clienterror.controller;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 后管浏览器错误上报口(S1-F2/AC-16)的鉴权与体量闸门。
|
||||
*
|
||||
* <p>两条底线:① 这是写入口,匿名请求(sendBeacon 没带管理员会话)必须被拒——与 AC-8
|
||||
* 「匿名写端点要凭据」同一口径,否则任何人都能往服务端日志里灌任意文本;
|
||||
* ② 报文体一律逐字段截断,堆栈不许把整条日志撑爆,也不许原样回显给调用方。</p>
|
||||
*/
|
||||
class ClientErrorReportControllerTest {
|
||||
|
||||
private final AdminAuthSupport adminAuthSupport = mock(AdminAuthSupport.class);
|
||||
private final HttpServletRequest request = mock(HttpServletRequest.class);
|
||||
|
||||
private ClientErrorReportController newController() {
|
||||
return new ClientErrorReportController(adminAuthSupport);
|
||||
}
|
||||
|
||||
private void loginAsAdmin() {
|
||||
AdminUserEntity operator = new AdminUserEntity();
|
||||
operator.setId(11L);
|
||||
when(adminAuthSupport.requireAdmin(any())).thenReturn(operator);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 匿名上报必须被拒() {
|
||||
when(adminAuthSupport.requireAdmin(any())).thenThrow(new BusinessException(401, "未登录"));
|
||||
|
||||
assertThatThrownBy(() -> newController().report(request, Map.of("kind", "window-error")))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("未登录");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 合法会话上报成功且只回一个录制标记() {
|
||||
loginAsAdmin();
|
||||
|
||||
ApiResponse<Map<String, Object>> response = newController().report(request, Map.of(
|
||||
"kind", "vue-render",
|
||||
"message", "Cannot read properties of undefined",
|
||||
"route", "/admin/users",
|
||||
"ts", 1_730_000_000_000L));
|
||||
|
||||
assertThat(response.getData()).containsExactly(entryOf("recorded", true));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 空请求体不得把上报本身炸掉() {
|
||||
loginAsAdmin();
|
||||
|
||||
assertThat(newController().report(request, null).getData()).containsKey("recorded");
|
||||
assertThat(newController().report(request, new HashMap<>()).getData()).containsKey("recorded");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 超长字段截断到上限并留截断标记() {
|
||||
String huge = "x".repeat(5_000);
|
||||
|
||||
String clipped = ClientErrorReportController.clip(huge);
|
||||
|
||||
assertThat(clipped).hasSize(2001).endsWith("…");
|
||||
assertThat(ClientErrorReportController.clip(null)).isEmpty();
|
||||
assertThat(ClientErrorReportController.clip("短文本")).isEqualTo("短文本");
|
||||
}
|
||||
|
||||
private static Map.Entry<String, Object> entryOf(String key, Object value) {
|
||||
return Map.entry(key, value);
|
||||
}
|
||||
}
|
||||
+149
@@ -0,0 +1,149 @@
|
||||
package com.nanri.aiimage.modules.file.service;
|
||||
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.config.StorageProperties;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import org.springframework.mock.web.MockMultipartFile;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.security.MessageDigest;
|
||||
import java.util.HexFormat;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* AC-17 分片上传:拼装正确、缺片拒绝、重复片幂等、放弃即清理、uploadId 不可穿越。
|
||||
* 不依赖 MinIO/MySQL —— 分片装配在本地临时目录完成,转存 MinIO 由工作台链路单独验证。
|
||||
*/
|
||||
class ChunkedUploadServiceTest {
|
||||
|
||||
@TempDir
|
||||
Path tempDir;
|
||||
|
||||
private ChunkedUploadService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
StorageProperties properties = new StorageProperties();
|
||||
properties.setLocalTempDir(tempDir.toString());
|
||||
service = new ChunkedUploadService(properties);
|
||||
}
|
||||
|
||||
private MockMultipartFile part(String content) {
|
||||
return new MockMultipartFile("file", "part.bin", "application/octet-stream",
|
||||
content.getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 分片到齐后拼装并复算摘要() throws Exception {
|
||||
String first = "hello-";
|
||||
String second = "world";
|
||||
long total = first.getBytes(StandardCharsets.UTF_8).length
|
||||
+ second.getBytes(StandardCharsets.UTF_8).length;
|
||||
ChunkedUploadService.ChunkSession session =
|
||||
service.init("包.zip", 2, total, "purpose-key");
|
||||
|
||||
assertEquals(1, service.savePart(session.uploadId(), 0, part(first)));
|
||||
assertEquals(2, service.savePart(session.uploadId(), 1, part(second)));
|
||||
|
||||
ChunkedUploadService.CompletedUpload completed = service.complete(session.uploadId());
|
||||
try {
|
||||
String content = Files.readString(completed.file(), StandardCharsets.UTF_8);
|
||||
assertEquals(first + second, content);
|
||||
assertEquals(total, completed.size());
|
||||
assertEquals("包.zip", completed.fileName());
|
||||
String expected = HexFormat.of().formatHex(
|
||||
MessageDigest.getInstance("SHA-256")
|
||||
.digest((first + second).getBytes(StandardCharsets.UTF_8)));
|
||||
assertEquals(expected, completed.sha256(), "摘要必须是对拼装实物算出来的");
|
||||
} finally {
|
||||
Files.deleteIfExists(completed.file());
|
||||
}
|
||||
assertFalse(Files.exists(tempDir.resolve("chunk-uploads").resolve(session.uploadId())),
|
||||
"拼装完成后分片会话目录必须清掉");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 缺少分片必须拒绝且不产出半个文件() throws Exception {
|
||||
ChunkedUploadService.ChunkSession session = service.init("a.zip", 2, 10, "");
|
||||
service.savePart(session.uploadId(), 0, part("12345"));
|
||||
|
||||
BusinessException error = assertThrows(BusinessException.class,
|
||||
() -> service.complete(session.uploadId()));
|
||||
assertTrue(error.getMessage().contains("缺少"), "必须明确告知缺哪片: " + error.getMessage());
|
||||
try (var files = Files.list(tempDir.resolve("chunk-uploads"))) {
|
||||
assertFalse(files.anyMatch(p -> p.getFileName().toString().startsWith("assembled-")),
|
||||
"缺片时不许留在半成品");
|
||||
} catch (Exception ex) {
|
||||
throw new AssertionError(ex);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void 重复上传同一片按覆盖处理() throws Exception {
|
||||
ChunkedUploadService.ChunkSession session = service.init("a.bin", 1, 3, "");
|
||||
service.savePart(session.uploadId(), 0, part("old"));
|
||||
service.savePart(session.uploadId(), 0, part("new"));
|
||||
|
||||
ChunkedUploadService.CompletedUpload completed = service.complete(session.uploadId());
|
||||
try {
|
||||
assertEquals("new", Files.readString(completed.file(), StandardCharsets.UTF_8));
|
||||
} finally {
|
||||
Files.deleteIfExists(completed.file());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void 声明大小与实际不符必须拒绝() throws Exception {
|
||||
ChunkedUploadService.ChunkSession session = service.init("a.bin", 1, 99, "");
|
||||
service.savePart(session.uploadId(), 0, part("short"));
|
||||
|
||||
BusinessException error = assertThrows(BusinessException.class,
|
||||
() -> service.complete(session.uploadId()));
|
||||
assertTrue(error.getMessage().contains("不一致"), error.getMessage());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 放弃会话立即清理分片() throws Exception {
|
||||
ChunkedUploadService.ChunkSession session = service.init("a.bin", 1, 3, "");
|
||||
service.savePart(session.uploadId(), 0, part("abc"));
|
||||
service.abort(session.uploadId());
|
||||
|
||||
assertFalse(Files.exists(tempDir.resolve("chunk-uploads").resolve(session.uploadId())));
|
||||
assertThrows(BusinessException.class, () -> service.uploadedParts(session.uploadId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void uploadId必须拒绝路径穿越() {
|
||||
assertThrows(BusinessException.class, () -> service.uploadedParts("../etc"));
|
||||
assertThrows(BusinessException.class, () -> service.abort("..\\..\\windows"));
|
||||
assertThrows(BusinessException.class, () -> service.savePart("abc", 0, part("x")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 分片序号越界必须拒绝() {
|
||||
ChunkedUploadService.ChunkSession session = service.init("a.bin", 2, 10, "");
|
||||
assertThrows(BusinessException.class,
|
||||
() -> service.savePart(session.uploadId(), 2, part("x")));
|
||||
assertThrows(BusinessException.class,
|
||||
() -> service.savePart(session.uploadId(), -1, part("x")));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 已上传片号可查询用于续传() throws Exception {
|
||||
ChunkedUploadService.ChunkSession session = service.init("a.bin", 3, 9, "");
|
||||
service.savePart(session.uploadId(), 0, part("aaa"));
|
||||
service.savePart(session.uploadId(), 2, part("ccc"));
|
||||
|
||||
List<Integer> uploaded = service.uploadedParts(session.uploadId());
|
||||
assertEquals(List.of(0, 2), uploaded);
|
||||
}
|
||||
}
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
package com.nanri.aiimage.modules.file.service.oss;
|
||||
|
||||
import com.nanri.aiimage.config.OssProperties;
|
||||
import com.nanri.aiimage.modules.workbenchclient.service.WorkbenchClientPackageService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.UUID;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* 线上 MinIO 实测(opt-in):AC-17 分片拼装后的服务端转存链路必须真的落进
|
||||
* 公开 client 桶的 {@code workbench-client/versions/} 前缀,且 stat/sha256/删除
|
||||
* 全程可用——本机日常闸门不带凭据时自动跳过,绝不碰生产。
|
||||
*
|
||||
* <p>跑法(凭据来自线上 java-server 容器 env,只进环境变量、不落任何文件)::</p>
|
||||
* <pre>
|
||||
* AIIMAGE_OSS_ACCESS_KEY_ID=... AIIMAGE_OSS_ACCESS_KEY_SECRET=... \
|
||||
* mvn -o test -Dtest=OssWorkbenchClientLiveVerificationTest
|
||||
* </pre>
|
||||
*/
|
||||
@EnabledIfEnvironmentVariable(named = "AIIMAGE_OSS_ACCESS_KEY_ID", matches = ".+")
|
||||
class OssWorkbenchClientLiveVerificationTest {
|
||||
|
||||
private static final DateTimeFormatter STAMP = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
|
||||
|
||||
private OssStorageService liveService() {
|
||||
OssProperties properties = new OssProperties();
|
||||
properties.setRegion("us-east-1");
|
||||
properties.setEndpoint(System.getenv().getOrDefault("AIIMAGE_OSS_ENDPOINT", "https://oss.aishufu.top"));
|
||||
properties.setPublicEndpoint(
|
||||
System.getenv().getOrDefault("AIIMAGE_OSS_PUBLIC_ENDPOINT", "https://oss.aishufu.top"));
|
||||
properties.setBucket("nanri-ai-images");
|
||||
properties.setAccessKeyId(System.getenv("AIIMAGE_OSS_ACCESS_KEY_ID"));
|
||||
properties.setAccessKeySecret(System.getenv("AIIMAGE_OSS_ACCESS_KEY_SECRET"));
|
||||
return new OssStorageService(properties);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 服务端转存线上MinIO_大小与摘要对得上并可清理() throws Exception {
|
||||
OssStorageService service = liveService();
|
||||
String objectKey = WorkbenchClientPackageService.OBJECT_KEY_PREFIX
|
||||
+ "zz-live-verify-" + STAMP.format(LocalDateTime.now())
|
||||
+ "-" + UUID.randomUUID().toString().replace("-", "") + "-0.0.0.zip";
|
||||
Path zip = Files.createTempFile("live-verify-", ".zip");
|
||||
byte[] marker = "phase4-live-verify".getBytes(StandardCharsets.UTF_8);
|
||||
try (ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(zip))) {
|
||||
out.putNextEntry(new ZipEntry("verify.txt"));
|
||||
out.write(marker);
|
||||
out.closeEntry();
|
||||
}
|
||||
long declaredSize = Files.size(zip);
|
||||
try {
|
||||
service.uploadWorkbenchClientObject(zip.toFile(), objectKey);
|
||||
long statSize = service.workbenchClientObjectSize(objectKey);
|
||||
assertEquals(declaredSize, statSize, "stat 必须回读真实对象大小");
|
||||
|
||||
String sha256 = service.workbenchClientObjectSha256(objectKey);
|
||||
assertNotNull(sha256);
|
||||
assertEquals(64, sha256.length(), "sha256 必须是 64 位 hex");
|
||||
|
||||
String presignUrl = service.presignWorkbenchClientUpload(objectKey, 120);
|
||||
assertNotNull(presignUrl);
|
||||
assertTrue(presignUrl.contains(objectKey.substring(objectKey.indexOf('/') + 1))
|
||||
|| presignUrl.contains(objectKey),
|
||||
"预签名 URL 必须指向本次对象");
|
||||
} finally {
|
||||
service.removeWorkbenchClientObject(objectKey);
|
||||
Files.deleteIfExists(zip);
|
||||
}
|
||||
assertEquals(-1L, service.workbenchClientObjectSize(objectKey), "清理后对象必须不存在");
|
||||
}
|
||||
}
|
||||
+3
-1
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.file.service.ChunkedUploadService;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.workbenchclient.mapper.WorkbenchClientPackageMapper;
|
||||
import com.nanri.aiimage.modules.workbenchclient.model.entity.WorkbenchClientPackageEntity;
|
||||
@@ -61,12 +62,13 @@ class WorkbenchClientPackageServiceTest {
|
||||
|
||||
private final WorkbenchClientPackageMapper packageMapper = mock(WorkbenchClientPackageMapper.class);
|
||||
private final OssStorageService ossStorageService = mock(OssStorageService.class);
|
||||
private final ChunkedUploadService chunkedUploadService = mock(ChunkedUploadService.class);
|
||||
|
||||
@TempDir
|
||||
Path tempDir;
|
||||
|
||||
private WorkbenchClientPackageService service() {
|
||||
return new WorkbenchClientPackageService(packageMapper, ossStorageService);
|
||||
return new WorkbenchClientPackageService(packageMapper, ossStorageService, chunkedUploadService);
|
||||
}
|
||||
|
||||
/** 每次调用返回一个新的合法 zip:confirm 扫描后会把临时文件删掉,不能复用同一个路径。 */
|
||||
|
||||
@@ -815,6 +815,30 @@ function sleep(milliseconds: number) {
|
||||
return new Promise<void>((resolve) => window.setTimeout(resolve, milliseconds))
|
||||
}
|
||||
|
||||
/**
|
||||
* 隐藏标签页暂停轮询(P1-F4):页面不可见时不再每 5 秒打一次任务接口,
|
||||
* 等 visibilitychange 回前台再放行。回到前台后第一次等待照常执行,不改变终态判定。
|
||||
*/
|
||||
function waitWhileHidden(): Promise<void> {
|
||||
if (typeof document === 'undefined' || document.visibilityState !== 'hidden') {
|
||||
return Promise.resolve()
|
||||
}
|
||||
return new Promise<void>((resolve) => {
|
||||
const onVisible = () => {
|
||||
if (document.visibilityState !== 'hidden') {
|
||||
document.removeEventListener('visibilitychange', onVisible)
|
||||
resolve()
|
||||
}
|
||||
}
|
||||
document.addEventListener('visibilitychange', onVisible)
|
||||
})
|
||||
}
|
||||
|
||||
async function sleepRespectingVisibility(milliseconds: number) {
|
||||
await waitWhileHidden()
|
||||
await sleep(milliseconds)
|
||||
}
|
||||
|
||||
async function waitForImageVideoTask(ticket: ImageVideoAsyncTaskVo): Promise<unknown> {
|
||||
let task = ticket
|
||||
for (let pollCount = 0; pollCount < IMAGE_VIDEO_TASK_MAX_POLLS; pollCount += 1) {
|
||||
@@ -826,7 +850,7 @@ async function waitForImageVideoTask(ticket: ImageVideoAsyncTaskVo): Promise<unk
|
||||
if (isTerminalImageVideoTask(task)) {
|
||||
throw new Error(task.errorMessage || 'Coze 任务执行失败')
|
||||
}
|
||||
await sleep(IMAGE_VIDEO_TASK_POLL_DELAY_MS)
|
||||
await sleepRespectingVisibility(IMAGE_VIDEO_TASK_POLL_DELAY_MS)
|
||||
task = await getImageVideoAsyncTask(task.taskId)
|
||||
}
|
||||
throw new Error('Coze 任务查询超时,请稍后重试')
|
||||
@@ -1133,7 +1157,13 @@ async function pollAssemblyResult(tab: WorkspaceTab, taskId: number) {
|
||||
assembly.polling = false
|
||||
return
|
||||
}
|
||||
assembly.pollTimer = window.setTimeout(() => {
|
||||
assembly.pollTimer = window.setTimeout(async () => {
|
||||
// P1-F4:结果轮询(约 5s/轮)在隐藏标签页里暂停,回前台再续链
|
||||
await waitWhileHidden()
|
||||
if (disposed) {
|
||||
assembly.polling = false
|
||||
return
|
||||
}
|
||||
void pollAssemblyResult(tab, taskId)
|
||||
}, IMAGE_VIDEO_TASK_POLL_DELAY_MS)
|
||||
}
|
||||
|
||||
@@ -83,12 +83,36 @@ export function onResponseFulfilled(response: AxiosResponse): AxiosResponse {
|
||||
/** 响应失败分支:折叠为 Error 之前先判下线(互踢与登录态失效;后者也可能真以 HTTP 401 回来)。 */
|
||||
export function onResponseRejected(error: unknown): Promise<never> {
|
||||
const payload = responsePayloadOf(error)
|
||||
if (isKickedPayload(payload)) {
|
||||
handleKicked()
|
||||
} else if (isUnauthorizedPayload(payload) || responseStatusOf(error) === 401) {
|
||||
handleSessionExpired(authReasonOf(responseHeadersOf(error)))
|
||||
const status = responseStatusOf(error)
|
||||
// S1-F1:把"这是不是鉴权失败"随错误带出去。弱网/5xx 与 401 过去在调用方长得一模一样,
|
||||
// ensureAuth 那条旁路因此逢错就清令牌;现在清态只认这个标注(HTTP 200+code=401 也算)。
|
||||
const authFailure = isKickedPayload(payload) || isUnauthorizedPayload(payload) || status === 401
|
||||
if (authFailure) {
|
||||
if (isKickedPayload(payload)) {
|
||||
handleKicked()
|
||||
} else {
|
||||
handleSessionExpired(authReasonOf(responseHeadersOf(error)))
|
||||
}
|
||||
}
|
||||
return Promise.reject(new Error(extractErrorMessage(error)))
|
||||
const friendly = extractErrorMessage(error)
|
||||
// 纯网络层错误(没有任何响应:断网/DNS/超时)保留底层技术文案——它不是后端返回的英文,
|
||||
// 不受"只透中文"闸门约束;调用方据此区分"网络断了"与"登录失效",据此决定重试还是登出。
|
||||
const noResponse = status === undefined && payload === undefined
|
||||
const rawMessage = (error as { message?: unknown })?.message
|
||||
const message = (!authFailure && noResponse && typeof rawMessage === 'string' && rawMessage)
|
||||
? rawMessage
|
||||
: friendly
|
||||
const rejected = new Error(message) as Error & { isAuthError?: boolean }
|
||||
rejected.isAuthError = authFailure
|
||||
return Promise.reject(rejected)
|
||||
}
|
||||
|
||||
/**
|
||||
* 这次请求失败是否为鉴权类(401/4011/互踢),由 onResponseRejected 标注。
|
||||
* 调用方据此决定要不要清登录态——网络抖动与 5xx 一律不是。
|
||||
*/
|
||||
export function isAuthError(error: unknown): boolean {
|
||||
return (error as { isAuthError?: boolean } | null | undefined)?.isAuthError === true
|
||||
}
|
||||
|
||||
function createHttpClient(): AxiosInstance {
|
||||
|
||||
@@ -24,14 +24,23 @@ export interface UploadTempFileOptions {
|
||||
moduleType?: string;
|
||||
}
|
||||
|
||||
export async function uploadTempFileToJava(
|
||||
/** 分片阈值与片大小(S1-F3/AC-17):≤8MB 单次 multipart 足够;再大必须分片,
|
||||
* 否则视频/大包一断就从 0 重传,且 120s 固定超时对慢链路根本不够用。 */
|
||||
export const UPLOAD_PART_SIZE = 8 * 1024 * 1024
|
||||
export const CHUNK_UPLOAD_THRESHOLD = UPLOAD_PART_SIZE
|
||||
/** 每片重试次数(不含首次)。 */
|
||||
const PART_RETRY_LIMIT = 2
|
||||
|
||||
function uploadPartUrl(uploadId: string, index: number): string {
|
||||
return `${JAVA_API_PREFIX}/files/chunk/${encodeURIComponent(uploadId)}/part/${index}`
|
||||
}
|
||||
|
||||
/** 单次 multipart 上传(小文件短链路)。超时按体积给,不再固定 120s。 */
|
||||
async function singleUpload(
|
||||
file: File,
|
||||
relativePathOrOptions?: string | UploadTempFileOptions,
|
||||
) {
|
||||
const options =
|
||||
typeof relativePathOrOptions === 'string'
|
||||
? { relativePath: relativePathOrOptions }
|
||||
: relativePathOrOptions || {}
|
||||
options: UploadTempFileOptions,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<JavaApiResponse<UploadFileVo>> {
|
||||
const formData = new FormData()
|
||||
formData.append('file', file)
|
||||
if (options.relativePath) {
|
||||
@@ -50,8 +59,105 @@ export async function uploadTempFileToJava(
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data',
|
||||
},
|
||||
timeout: 120000,
|
||||
// 30s 保底 + 每 MB 15s:慢公网传 100MB 视频不再被固定 120s 掐死(S1-F3)
|
||||
timeout: 30_000 + Math.ceil(file.size / (1024 * 1024)) * 15_000,
|
||||
onUploadProgress: (event) => {
|
||||
if (!onProgress) return
|
||||
const total = event.total || file.size
|
||||
onProgress(total > 0 ? Math.min(Math.round((event.loaded / total) * 100), 100) : 0)
|
||||
},
|
||||
},
|
||||
)
|
||||
return response.data
|
||||
}
|
||||
|
||||
/**
|
||||
* 分片上传(AC-17):init → 逐片 POST(每片独立重试)→ complete 服务端拼装。
|
||||
* 开传前查询已到片号:上一次断掉的会话可跳过已传片(后端保留 24h)。
|
||||
*/
|
||||
async function chunkedUpload(
|
||||
file: File,
|
||||
options: UploadTempFileOptions,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<JavaApiResponse<UploadFileVo>> {
|
||||
const totalParts = Math.max(1, Math.ceil(file.size / UPLOAD_PART_SIZE))
|
||||
const init = await http.post<JavaApiResponse<{ upload_id?: string }>>(
|
||||
`${JAVA_API_PREFIX}/files/chunk/init`,
|
||||
null,
|
||||
{ params: { fileName: file.name, totalParts, totalBytes: file.size } },
|
||||
)
|
||||
const uploadId = String(init.data?.data?.upload_id ?? '')
|
||||
if (!uploadId) {
|
||||
throw new Error('后端未返回分片会话,请重试')
|
||||
}
|
||||
|
||||
// 开传前先问到已达片号:上一次断掉的会话可以跳过已传片(后端保留 24h)。
|
||||
// 这一问失败不再静默按"全缺"重传:断网/5xx 当场说清楚,别闷头把整包从 0 再传一遍。
|
||||
const status = await http.get<JavaApiResponse<{ uploaded_parts?: unknown[] }>>(
|
||||
`${JAVA_API_PREFIX}/files/chunk/${encodeURIComponent(uploadId)}`,
|
||||
)
|
||||
const arrived = status.data?.data?.uploaded_parts
|
||||
const done = new Set<number>(Array.isArray(arrived) ? arrived.map((index) => Number(index)) : [])
|
||||
|
||||
const report = (partialBytes: number) => {
|
||||
if (!onProgress) return
|
||||
const loaded = done.size * UPLOAD_PART_SIZE + partialBytes
|
||||
onProgress(Math.min(Math.round((loaded / file.size) * 100), 99))
|
||||
}
|
||||
|
||||
for (let index = 0; index < totalParts; index += 1) {
|
||||
if (done.has(index)) {
|
||||
report(0)
|
||||
continue
|
||||
}
|
||||
const blob = file.slice(index * UPLOAD_PART_SIZE, Math.min(file.size, (index + 1) * UPLOAD_PART_SIZE))
|
||||
let lastError: unknown = null
|
||||
for (let attempt = 0; attempt <= PART_RETRY_LIMIT; attempt += 1) {
|
||||
const form = new FormData()
|
||||
form.append('file', blob, `part-${index}`)
|
||||
try {
|
||||
await http.post(uploadPartUrl(uploadId, index), form, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' },
|
||||
timeout: 300_000,
|
||||
onUploadProgress: (event) => report(Math.min(event.loaded || 0, blob.size)),
|
||||
})
|
||||
done.add(index)
|
||||
lastError = null
|
||||
break
|
||||
} catch (error) {
|
||||
lastError = error
|
||||
}
|
||||
}
|
||||
if (lastError) {
|
||||
await http.delete(`${JAVA_API_PREFIX}/files/chunk/${encodeURIComponent(uploadId)}`).catch(() => undefined)
|
||||
throw lastError instanceof Error ? lastError : new Error('分片上传失败')
|
||||
}
|
||||
}
|
||||
|
||||
const params: Record<string, string | boolean> = {}
|
||||
if (options.relativePath) params.relativePath = options.relativePath
|
||||
if (options.uploadToOss) params.uploadToOss = true
|
||||
if (options.moduleType) params.moduleType = options.moduleType
|
||||
const response = await http.post<JavaApiResponse<UploadFileVo>>(
|
||||
`${JAVA_API_PREFIX}/files/chunk/${encodeURIComponent(uploadId)}/complete`,
|
||||
null,
|
||||
{ params, timeout: 600_000 },
|
||||
)
|
||||
if (onProgress) onProgress(100)
|
||||
return response.data
|
||||
}
|
||||
|
||||
export async function uploadTempFileToJava(
|
||||
file: File,
|
||||
relativePathOrOptions?: string | UploadTempFileOptions,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<JavaApiResponse<UploadFileVo>> {
|
||||
const options =
|
||||
typeof relativePathOrOptions === 'string'
|
||||
? { relativePath: relativePathOrOptions }
|
||||
: relativePathOrOptions || {}
|
||||
if (file.size > CHUNK_UPLOAD_THRESHOLD) {
|
||||
return chunkedUpload(file, options, onProgress)
|
||||
}
|
||||
return singleUpload(file, options, onProgress)
|
||||
}
|
||||
|
||||
@@ -9,9 +9,10 @@
|
||||
* - 两者都没有或校验失败 → 返回 false,由守卫跳转登录页。
|
||||
*/
|
||||
|
||||
import { get } from '@/shared/api/http'
|
||||
import { get, isAuthError } from '@/shared/api/http'
|
||||
import { decideAuthGate } from './auth-gate.ts'
|
||||
import { AUTH_TOKEN_KEY, UID_KEY } from './session-keys.ts'
|
||||
import { clearLocalSession } from './kick-handler.ts'
|
||||
import { writeCompanyIdentity } from './company-identity'
|
||||
import { writeAccountExpiry } from './account-expiry'
|
||||
|
||||
@@ -47,12 +48,12 @@ export async function ensureAuth(): Promise<boolean> {
|
||||
writeCompanyIdentity(response.data)
|
||||
writeAccountExpiry(response.data)
|
||||
return true
|
||||
} catch {
|
||||
// token 失效:清掉本地登录态(跳转交给路由守卫)
|
||||
try {
|
||||
window.localStorage.removeItem(AUTH_TOKEN_KEY)
|
||||
} catch {
|
||||
/* 忽略 */
|
||||
} catch (error) {
|
||||
// S1-F1:只有真正的鉴权失败(HTTP 401 / 业务 401·4011)才算登录失效。
|
||||
// 弱网、5xx、超时都是网络问题——过去这里不分原因清掉令牌并把用户踢回登录页,
|
||||
// 现在只在 isAuthError 标注为鉴权类时清态;其余原因保留登录态,交由守卫按原状放行/重试。
|
||||
if (isAuthError(error)) {
|
||||
clearLocalSession()
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ function hadLocalSession(): boolean {
|
||||
}
|
||||
|
||||
/** 清登录态并关闭自动登录。设备号与记住的账号保留:同设备重登不算新设备。 */
|
||||
function clearLocalSession(): void {
|
||||
export function clearLocalSession(): void {
|
||||
try {
|
||||
const storage = window.localStorage
|
||||
storage.removeItem(AUTH_TOKEN_KEY)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { computed, ref, watch, type ComputedRef, type Ref } from 'vue'
|
||||
import { computed, onMounted, ref, watch, type ComputedRef, type Ref } from 'vue'
|
||||
|
||||
/**
|
||||
* 表格分页(2026-09 全维度审查 F9)。
|
||||
@@ -6,6 +6,11 @@ import { computed, ref, watch, type ComputedRef, type Ref } from 'vue'
|
||||
* 工具页的"匹配结果"表此前把整份数据绑到 el-table 的 :data 上,全量行常驻 DOM
|
||||
* (每行 8+ 节点,几百行就会明显拖慢打开/滚动)。这里提供共用的分页切片:
|
||||
* 只改变渲染的数据窗口,不改动数据源本身,因此挑选/删除/提交等逻辑不受影响。
|
||||
*
|
||||
* 2026-10-29(AC-18/P1-F2)补另一半:`useTablePaging` 只切**渲染**窗口,数据仍整份驻内存;
|
||||
* 大列表(撞款矩阵、结果明细)真正的出路是**服务端分页**——每页只从后端取当前窗口。
|
||||
* `useServerTablePaging` 提供这一模式:调用方交一个 `fetchPage({page,pageSize})` 取数函数,
|
||||
* 组件只持有当前页 + 总数,页码/每页变化自动重取(带 latest-request 门防旧响应覆盖)。
|
||||
*/
|
||||
|
||||
/** 默认每页条数:足够一屏展示,又不会让 DOM 随列表规模线性膨胀。 */
|
||||
@@ -60,3 +65,66 @@ export function useTablePaging<T>(
|
||||
|
||||
return { page, pageSize, total, paged }
|
||||
}
|
||||
|
||||
/** 服务端一页的返回形状:调用方从后端响应里整理出 items + total。 */
|
||||
export interface ServerPage<T> {
|
||||
items: T[];
|
||||
total: number;
|
||||
}
|
||||
|
||||
/** 取数函数:按 page(从 1 起)与 pageSize 向后端请求当前窗口。 */
|
||||
export type PageFetcher<T> = (params: { page: number; pageSize: number }) => Promise<ServerPage<T>>
|
||||
|
||||
/** 纯函数:页码越界收敛 + 请求参数拼装,供单测直接对撞(不依赖组件实例)。 */
|
||||
export function resolveServerWindow(page: number, total: number, pageSize: number): { page: number; pageSize: number } {
|
||||
return { page: clampPage(page, total, pageSize), pageSize }
|
||||
}
|
||||
|
||||
/**
|
||||
* 服务端分页(AC-18/P1-F2):只驻留当前页数据,页码或每页变化时重新 fetch。
|
||||
*
|
||||
* - 旧响应覆盖防护:每次 fetch 前 `gate.begin()` 拿令牌,回写前比 `isCurrent`;
|
||||
* 快速翻页/切筛选时晚到的旧页不会盖住新页(与 latest-request 同一语义,这里自带)。
|
||||
* - `reload()` 供外部在增删改后主动刷新当前页。
|
||||
*/
|
||||
export function useServerTablePaging<T>(
|
||||
fetchPage: PageFetcher<T>,
|
||||
pageSize: number = DEFAULT_TABLE_PAGE_SIZE,
|
||||
) {
|
||||
const page = ref(1)
|
||||
const total = ref(0)
|
||||
const rows = ref<T[]>([]) as Ref<T[]>
|
||||
const loading = ref(false)
|
||||
const error = ref('')
|
||||
let token = 0
|
||||
|
||||
async function load(): Promise<void> {
|
||||
const current = ++token
|
||||
loading.value = true
|
||||
error.value = ''
|
||||
try {
|
||||
const result = await fetchPage({ page: page.value, pageSize })
|
||||
if (current !== token) return // 已被更新的请求作废,丢弃旧页
|
||||
rows.value = result.items
|
||||
total.value = result.total
|
||||
} catch (e) {
|
||||
if (current !== token) return
|
||||
error.value = e instanceof Error ? e.message : '加载失败'
|
||||
} finally {
|
||||
if (current === token) loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
watch([page, () => pageSize], () => { void load() })
|
||||
onMounted(() => { void load() })
|
||||
|
||||
return {
|
||||
page,
|
||||
pageSize,
|
||||
total,
|
||||
rows,
|
||||
loading,
|
||||
error,
|
||||
reload: load,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,12 @@ const BASELINE = {
|
||||
// 解闸失败时必须当场说清楚(console.warn 留链 + ElMessage.error 给用户),不能让按钮变成
|
||||
// 「点了没反应」——这一支首条语句虽是 console.*,但块内有 ElMessage 用户可见出口,
|
||||
// 按扫描器口径不算静默,所以 silent 一格没动、只进 blocks。
|
||||
blocks: 300,
|
||||
// 301 = 300 + 1 处分片上传的逐片重试(AC-17/S1-F3,src/shared/api/upload.ts::chunkedUpload):
|
||||
// 单片网络抖动就地重试 2 次,仍失败就 DELETE 掉整个分片会话并把最后一次的真实错误上抛给调用方
|
||||
// ——错误既没被吞也没被 console 糊过去(catch 体只做 `lastError = error`,片循环外 throw),
|
||||
// 所以 silent 一格没涨,只进 blocks。断点探测那一步刻意没写 try/catch:问不到已达片号就当场
|
||||
// 报错,不闷头把整包从 0 重传。
|
||||
blocks: 301,
|
||||
// 298 = 296 + 全局错误出口 app-error.ts 的两支新 try/catch(10-09 装 app.config.errorHandler /
|
||||
// window.onerror / unhandledrejection 时引入),两支都不是"吞":
|
||||
// ① String(reason) 对无 toString 的对象/Symbol 会抛,兜法返回一句中文占位文本,
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
/**
|
||||
* 服务端分页 composable 的挂载用例(AC-18/P1-F2)。
|
||||
*
|
||||
* 钉三件事,缺一条就是假绿:
|
||||
* ① 只驻留当前页——组件内存里永远只有 fetchPage 交回来的那一页,不是整份数据;
|
||||
* ② 翻页真的重取——page 变化必须再打一次后端(fetchPage 带上新页码),不是本地切片;
|
||||
* ③ 旧响应不许盖新页——快速翻页时先发的请求后返回,回写必须被 latest-request 门丢掉
|
||||
* (这正是 S1-F4 在服务端分页形态下的等价物)。
|
||||
*
|
||||
* 跑法:cd frontend-vue && npx vitest run tests/mount/server-table-paging.mount.test.ts
|
||||
*/
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount } from '@vue/test-utils'
|
||||
import { defineComponent, h, nextTick } from 'vue'
|
||||
|
||||
import { useServerTablePaging } from '@/shared/composables/useTablePaging'
|
||||
|
||||
const Harness = defineComponent({
|
||||
props: {
|
||||
fetchPage: { type: Function, required: true },
|
||||
},
|
||||
setup(props) {
|
||||
const paging = useServerTablePaging(props.fetchPage as never, 2)
|
||||
return { paging }
|
||||
},
|
||||
render() {
|
||||
return h('div', [
|
||||
h('span', { 'data-test': 'rows' }, String(this.paging.rows.value.length)),
|
||||
h('span', { 'data-test': 'total' }, String(this.paging.total.value)),
|
||||
h('span', { 'data-test': 'page' }, String(this.paging.page.value)),
|
||||
h('span', { 'data-test': 'error' }, this.paging.error.value),
|
||||
])
|
||||
},
|
||||
})
|
||||
|
||||
describe('useServerTablePaging', () => {
|
||||
it('只驻留当前页,翻页按新页码重取', async () => {
|
||||
const fetchPage = vi.fn(async ({ page, pageSize }) => ({
|
||||
items: page === 1
|
||||
? [{ id: 'a' }, { id: 'b' }]
|
||||
: [{ id: `p${page}-${pageSize}` }],
|
||||
total: 5,
|
||||
}))
|
||||
const wrapper = mount(Harness, { props: { fetchPage } })
|
||||
await flushPromises()
|
||||
|
||||
expect(wrapper.get('[data-test=rows]').text()).toBe('2')
|
||||
expect(wrapper.get('[data-test=total]').text()).toBe('5')
|
||||
expect(fetchPage).toHaveBeenCalledTimes(1)
|
||||
expect(fetchPage).toHaveBeenLastCalledWith({ page: 1, pageSize: 2 })
|
||||
|
||||
wrapper.vm.paging.page.value = 3
|
||||
await flushPromises()
|
||||
await nextTick()
|
||||
|
||||
expect(fetchPage).toHaveBeenCalledTimes(2)
|
||||
expect(fetchPage).toHaveBeenLastCalledWith({ page: 3, pageSize: 2 })
|
||||
// 第二页只有 1 行(第 5 条)——数据源里从不出现整份 5 行
|
||||
expect(wrapper.get('[data-test=rows]').text()).toBe('1')
|
||||
})
|
||||
|
||||
it('旧请求晚到不得覆盖新页(竞态门)', async () => {
|
||||
let firstResolve: (v: { items: { id: string }[]; total: number }) => void = () => undefined
|
||||
const fetchPage = vi.fn((params: { page: number }) => {
|
||||
if (params.page === 1) {
|
||||
return new Promise<{ items: { id: string }[]; total: number }>((resolve) => {
|
||||
firstResolve = resolve
|
||||
})
|
||||
}
|
||||
return Promise.resolve({ items: [{ id: 'fresh' }], total: 3 })
|
||||
})
|
||||
const wrapper = mount(Harness, { props: { fetchPage } })
|
||||
await nextTick()
|
||||
|
||||
// 第一页请求仍在飞时立刻翻到第二页:第二页先返回并落地
|
||||
wrapper.vm.paging.page.value = 2
|
||||
await flushPromises()
|
||||
expect(wrapper.get('[data-test=rows]').text()).toBe('1')
|
||||
|
||||
// 迟到的第一页响应(2 行)绝不能盖掉当前页
|
||||
firstResolve({ items: [{ id: 'stale-1' }, { id: 'stale-2' }], total: 99 })
|
||||
await flushPromises()
|
||||
expect(wrapper.get('[data-test=rows]').text()).toBe('1')
|
||||
expect(wrapper.get('[data-test=total]').text()).toBe('3')
|
||||
})
|
||||
|
||||
it('取数失败把原因说出来,不静默空表', async () => {
|
||||
const fetchPage = vi.fn(async () => { throw new Error('后端 503') })
|
||||
const wrapper = mount(Harness, { props: { fetchPage } })
|
||||
await flushPromises()
|
||||
|
||||
expect(wrapper.get('[data-test=error]').text()).toBe('后端 503')
|
||||
expect(wrapper.get('[data-test=rows]').text()).toBe('0')
|
||||
})
|
||||
})
|
||||
@@ -29,7 +29,7 @@ const PENDING_AUTH = 'Pending Phase 4: AC-16 网络错误/5xx 不许清登录态
|
||||
const PENDING_UPLOAD = 'Pending Phase 4: AC-17 大文件分片续传与进度'
|
||||
const PENDING_PERF = 'Pending Phase 4: AC-18 表格窗口化与轮询可见性'
|
||||
|
||||
test('pending_ac16_ensureAuth_只在鉴权失败时清态', { skip: PENDING_AUTH }, () => {
|
||||
test('pending_ac16_ensureAuth_只在鉴权失败时清态', () => {
|
||||
const source = read('src/shared/auth/ensure-auth.ts')
|
||||
const catchBlock = source.match(/catch\s*\([^)]*\)\s*\{[\s\S]*?\n\s*\}/g)?.join('\n') ?? ''
|
||||
assert.ok(catchBlock, 'ensureAuth 必须有可判定的异常分支')
|
||||
@@ -39,7 +39,7 @@ test('pending_ac16_ensureAuth_只在鉴权失败时清态', { skip: PENDING_AUTH
|
||||
'S1-F1:无条件 removeItem(AUTH_TOKEN_KEY) 的旁路必须收掉(弱网不该把人踢回登录页)')
|
||||
})
|
||||
|
||||
test('pending_ac16_网络错误保留态后仍返回可续用', { skip: PENDING_AUTH }, async () => {
|
||||
test('pending_ac16_网络错误保留态后仍返回可续用', async () => {
|
||||
const { onResponseRejected } = await import('../src/shared/api/http.ts')
|
||||
const store = new Map<string, string>([['aiimage_auth_token', 'jwt-token'], ['uid', '1206']])
|
||||
;(globalThis as Record<string, unknown>).window = {
|
||||
@@ -59,7 +59,7 @@ test('pending_ac16_网络错误保留态后仍返回可续用', { skip: PENDING_
|
||||
assert.equal(store.get('uid'), '1206', 'AC-16:网络错误不许清用户身份')
|
||||
})
|
||||
|
||||
test('pending_ac17_上传必须分片且不再单次 120s', { skip: PENDING_UPLOAD }, () => {
|
||||
test('pending_ac17_上传必须分片且不再单次 120s', () => {
|
||||
const source = read('src/shared/api/upload.ts')
|
||||
assert.match(source, /partSize|uploadPart|createMultipartUpload|chunk/,
|
||||
'S1-F3:大文件必须走分片/断点续传')
|
||||
@@ -68,13 +68,13 @@ test('pending_ac17_上传必须分片且不再单次 120s', { skip: PENDING_UPLO
|
||||
assert.match(source, /onProgress|progress/, '进度必须可见')
|
||||
})
|
||||
|
||||
test('pending_ac18_表格必须窗口化渲染或走服务端分页', { skip: PENDING_PERF }, () => {
|
||||
test('pending_ac18_表格必须窗口化渲染或走服务端分页', () => {
|
||||
const source = read('src/shared/composables/useTablePaging.ts')
|
||||
assert.match(source, /serverSide|virtual|fetchPage|loadPage/,
|
||||
'P1-F2:只切渲染窗口=数据仍全量驻内存,必须补服务端分页/虚拟滚动')
|
||||
})
|
||||
|
||||
test('pending_ac18_轮询必须看页面可见性', { skip: PENDING_PERF }, () => {
|
||||
test('pending_ac18_轮询必须看页面可见性', () => {
|
||||
for (const rel of ['src/shared/components/CostGuardAlert.vue',
|
||||
'src/pages/image-video/components/DeliveryVideoWorkspace.vue']) {
|
||||
const source = read(rel)
|
||||
|
||||
Reference in New Issue
Block a user