feat(workbench-client): 新增数富AI工作台客户端包管理独立更新渠道
后台上传安装包,confirm 阶段由服务端从 MinIO 实物流式复算 sha256 后落库, 客户端经 /api/workbench-client/version/latest 自动检查更新;与 ShuFuAI 桌面端 的 nanri-image/versions/ 渠道隔离,包体落 client 桶 workbench-client/versions/。
This commit is contained in:
@@ -89,6 +89,10 @@ export const OPERATION_GUIDES: Record<string, OperationGuideData> = {
|
||||
text: '上传新的教程压缩包后即刻生效:工具台首页「立即下载教程」以下载最新上传的包为准。确认旧包不再需要后再删除。',
|
||||
steps: ['上传教程压缩包', '到工具台核对下载', '清理历史包'],
|
||||
},
|
||||
admin_workbench_client_package: {
|
||||
text: '上传新的工作台客户端 ZIP 包后即刻生效:客户端从 /api/workbench-client/version/latest 自动检测版本并升级;服务端会复算 sha256 供客户端校验。确认旧包不再需要后再删除。',
|
||||
steps: ['填写版本号并上传 ZIP', '核对版本与 sha256', '清理历史包'],
|
||||
},
|
||||
digital_human_version: {
|
||||
text: '数字人版本需先上传草稿,再发布并标记最新版本。',
|
||||
steps: ['上传草稿', '确认更新日志', '发布或设为最新'],
|
||||
|
||||
@@ -0,0 +1,503 @@
|
||||
<script setup lang="ts">
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
/** 数富AI工作台客户端包管理页:上传 ZIP → 直传 MinIO → 服务端复算 sha256 落库;
|
||||
* 客户端从 /api/workbench-client/version/latest 自动检测并按最新上传升级。
|
||||
* 列表默认按上传时间倒序,第一条即当前生效版本;删除最新包后自动回落到上一版。 */
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import {
|
||||
deleteWorkbenchClientPackages,
|
||||
fetchWorkbenchClientPackages,
|
||||
uploadWorkbenchClientPackage,
|
||||
} from './workbench-client-api.ts'
|
||||
import { formatFileSize, isValidWorkbenchClientVersion, WORKBENCH_CLIENT_VERSION_MAX_LENGTH } from './workbench-client-model.ts'
|
||||
import type { WorkbenchClientPackageItem } from './workbench-client-dto.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const items = ref<WorkbenchClientPackageItem[]>([])
|
||||
/** 版本号/文件名搜索(客户端过滤)。 */
|
||||
const keyword = ref('')
|
||||
const filteredItems = computed(() => {
|
||||
const kw = (keyword.value || '').trim().toLowerCase()
|
||||
if (!kw) return items.value
|
||||
return items.value.filter((item) =>
|
||||
`${item.version}`.toLowerCase().includes(kw) || item.fileName.toLowerCase().includes(kw),
|
||||
)
|
||||
})
|
||||
/** 全站分页统一:客户端分页(10/20/50/100)。 */
|
||||
const page = ref(1)
|
||||
const pageSize = ref(10)
|
||||
const pagedItems = computed(() => filteredItems.value.slice((page.value - 1) * pageSize.value, page.value * pageSize.value))
|
||||
function changePage(p: number) { page.value = p }
|
||||
function changeSize(size: number) { pageSize.value = size; page.value = 1 }
|
||||
// 搜索导致数据收缩时回钳页码,避免停在空页。
|
||||
watch(filteredItems, () => {
|
||||
page.value = Math.min(page.value, Math.max(1, Math.ceil(filteredItems.value.length / pageSize.value)))
|
||||
})
|
||||
|
||||
/** 当前生效版本 = 列表第一条(客户端更新接口下发的就是它)。 */
|
||||
const activeId = computed(() => items.value[0]?.id ?? null)
|
||||
|
||||
// 勾选删除:选中跨页累计;表头复选只作用于当前页,避免误选整表。
|
||||
const selectedIds = ref<Set<number>>(new Set())
|
||||
const selectedCount = computed(() => selectedIds.value.size)
|
||||
function toggleSelect(id: number) {
|
||||
const next = new Set(selectedIds.value)
|
||||
if (next.has(id)) next.delete(id)
|
||||
else next.add(id)
|
||||
selectedIds.value = next
|
||||
}
|
||||
function toggleSelectAllPage() {
|
||||
const pageRows = pagedItems.value
|
||||
const allOn = pageRows.length > 0 && pageRows.every((row) => selectedIds.value.has(row.id))
|
||||
const next = new Set(selectedIds.value)
|
||||
if (allOn) pageRows.forEach((row) => next.delete(row.id))
|
||||
else pageRows.forEach((row) => next.add(row.id))
|
||||
selectedIds.value = next
|
||||
}
|
||||
async function removeSelected() {
|
||||
if (!selectedCount.value) return
|
||||
const rows = items.value.filter((row) => selectedIds.value.has(row.id))
|
||||
const sample = rows.slice(0, 3).map((row) => row.version).join('、')
|
||||
const summary = rows.length > 3 ? `${sample} 等 ${rows.length} 个` : sample
|
||||
if (!(await openAdminConfirm({ message: `确认删除选中的 ${rows.length} 个客户端包(${summary})?此操作不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteWorkbenchClientPackages(Array.from(selectedIds.value))
|
||||
ElMessage.success(`已删除 ${rows.length} 个客户端包`)
|
||||
selectedIds.value = new Set()
|
||||
await load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
async function removeOne(row: WorkbenchClientPackageItem) {
|
||||
if (!(await openAdminConfirm({ message: `确认删除客户端包 ${row.version}(${row.fileName})?此操作不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteWorkbenchClientPackages([row.id])
|
||||
ElMessage.success('删除成功')
|
||||
selectedIds.value = new Set([...selectedIds.value].filter((id) => id !== row.id))
|
||||
await load()
|
||||
} catch (error) {
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
const uploadVisible = ref(false)
|
||||
const uploading = ref(false)
|
||||
const uploadPercent = ref(0)
|
||||
const newVersion = ref('')
|
||||
const pickedFile = ref<File | null>(null)
|
||||
const uploadMsg = ref('')
|
||||
const uploadMsgOk = ref(false)
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
items.value = (await fetchWorkbenchClientPackages()).items
|
||||
} catch (error) {
|
||||
loadFailure.value = error instanceof Error ? error.message : '客户端包列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function onFileChange(file: File) {
|
||||
pickedFile.value = file
|
||||
}
|
||||
|
||||
function openUpload() {
|
||||
uploadMsg.value = ''
|
||||
uploadMsgOk.value = false
|
||||
newVersion.value = ''
|
||||
pickedFile.value = null
|
||||
uploadVisible.value = true
|
||||
}
|
||||
|
||||
async function submitUpload() {
|
||||
uploadMsg.value = ''
|
||||
uploadMsgOk.value = false
|
||||
uploadPercent.value = 0
|
||||
if (!newVersion.value.trim()) {
|
||||
uploadMsg.value = '请填写版本号'
|
||||
return
|
||||
}
|
||||
if (!isValidWorkbenchClientVersion(newVersion.value)) {
|
||||
uploadMsg.value = `版本号不能超过 ${WORKBENCH_CLIENT_VERSION_MAX_LENGTH} 个字符`
|
||||
return
|
||||
}
|
||||
if (!pickedFile.value) {
|
||||
uploadMsg.value = '请选择 zip 压缩包'
|
||||
return
|
||||
}
|
||||
if (!/\.zip$/i.test(pickedFile.value.name)) {
|
||||
uploadMsg.value = '仅支持 .zip 格式'
|
||||
return
|
||||
}
|
||||
if (pickedFile.value.size > 512 * 1024 * 1024) {
|
||||
uploadMsg.value = '文件超过允许的大小限制'
|
||||
return
|
||||
}
|
||||
uploading.value = true
|
||||
try {
|
||||
await uploadWorkbenchClientPackage(pickedFile.value, pickedFile.value.name, newVersion.value.trim(), (p) => {
|
||||
uploadPercent.value = p
|
||||
uploadMsg.value = p >= 100 ? '上传完成,正在复算 sha256 并登记...' : `正在上传:${p}%`
|
||||
})
|
||||
uploadMsg.value = '上传成功,客户端已可检测到新版本'
|
||||
uploadMsgOk.value = true
|
||||
newVersion.value = ''
|
||||
pickedFile.value = null
|
||||
uploadPercent.value = 0
|
||||
load()
|
||||
} catch (error) {
|
||||
uploadMsg.value = error instanceof Error ? error.message : '上传失败'
|
||||
} finally {
|
||||
uploading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="workbench-view">
|
||||
<section class="panel-box">
|
||||
<div class="workbench-head">
|
||||
<h3>客户端包列表</h3>
|
||||
<div class="workbench-head-tools">
|
||||
<input v-model="keyword" type="text" placeholder="搜索版本号或文件名" class="workbench-keyword" />
|
||||
<button class="btn btn-danger" type="button" :disabled="!selectedCount" @click="removeSelected">删除选中{{ selectedCount ? `(${selectedCount})` : '' }}</button>
|
||||
<button class="btn" type="button" @click="openUpload">上传客户端包</button>
|
||||
</div>
|
||||
</div>
|
||||
<p class="page-hint">客户端更新检查接口:<code>/api/workbench-client/version/latest</code>;最新上传的一条即当前生效版本。</p>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll workbench-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 40px" class="th-select">
|
||||
<input type="checkbox" :checked="pagedItems.length > 0 && pagedItems.every((r) => selectedIds.has(r.id))" @change="toggleSelectAllPage" :disabled="!pagedItems.length" />
|
||||
</th>
|
||||
<th style="width: 120px">版本号</th>
|
||||
<th style="width: 220px">文件名</th>
|
||||
<th style="width: 100px">大小</th>
|
||||
<th style="width: 220px">SHA-256</th>
|
||||
<th style="width: 150px">上传时间</th>
|
||||
<th>下载链接</th>
|
||||
<th style="width: 170px">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="filteredItems.length">
|
||||
<tr v-for="row in pagedItems" :key="row.id" :class="{ 'row-selected': selectedIds.has(row.id) }">
|
||||
<td class="td-select">
|
||||
<input type="checkbox" :checked="selectedIds.has(row.id)" @change="toggleSelect(row.id)" />
|
||||
</td>
|
||||
<td>
|
||||
<span class="version-cell" :title="row.version">{{ row.version }}</span>
|
||||
<span v-if="row.id === activeId" class="tag-active">当前生效</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="file-name" :title="row.fileName">{{ row.fileName }}</span>
|
||||
</td>
|
||||
<td>{{ formatFileSize(row.fileSize) }}</td>
|
||||
<td>
|
||||
<span v-if="row.sha256" class="sha-cell" :title="row.sha256">{{ row.sha256 }}</span>
|
||||
<span v-else class="dim">—</span>
|
||||
</td>
|
||||
<td>{{ formatDateTime(row.createdAt) }}</td>
|
||||
<td>
|
||||
<a v-if="row.fileUrl" class="link-cell" :href="row.fileUrl" target="_blank" rel="noopener" :title="row.fileUrl">{{ row.fileUrl }}</a>
|
||||
<span v-else class="dim">—</span>
|
||||
</td>
|
||||
<td class="ops-cell">
|
||||
<a v-if="row.fileUrl" class="btn btn-sm dl-btn" :href="row.fileUrl" download>下载</a>
|
||||
<span v-else class="dim">—</span>
|
||||
<button class="btn btn-sm btn-danger" type="button" @click="removeOne(row)">删除</button>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else-if="loading">
|
||||
<td colspan="8" class="empty-tip">加载中...</td>
|
||||
</tr>
|
||||
<tr v-else>
|
||||
<td colspan="8" class="empty-tip">{{ keyword ? '暂无匹配客户端包' : '暂无客户端包记录' }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<OldPagination v-if="filteredItems.length > 0" :total="filteredItems.length" :page="page" :page-size="pageSize" @change="changePage" @size-change="changeSize" />
|
||||
</section>
|
||||
|
||||
<el-dialog v-model="uploadVisible" title="上传客户端包" width="540px">
|
||||
<p class="upload-desc">上传数富AI工作台客户端 ZIP 包后,客户端会从公开版本接口自动检测到新版本并升级;服务端会复算 sha256 供客户端校验。</p>
|
||||
<el-form label-width="110px">
|
||||
<el-form-item label="版本号" required>
|
||||
<el-input v-model="newVersion" :placeholder="`例如:1.0.0(最长 ${WORKBENCH_CLIENT_VERSION_MAX_LENGTH} 字符)`" :maxlength="WORKBENCH_CLIENT_VERSION_MAX_LENGTH" />
|
||||
<p class="zip-hint">客户端按版本号判断是否需要升级,必填</p>
|
||||
</el-form-item>
|
||||
<el-form-item label="ZIP 压缩包" required>
|
||||
<el-upload :auto-upload="false" :limit="1" accept=".zip" :on-change="(file: any) => onFileChange(file.raw)" :on-remove="() => (pickedFile = null)">
|
||||
<el-button>选择文件</el-button>
|
||||
</el-upload>
|
||||
<p class="zip-hint">仅支持 .zip 格式,最大 512MB</p>
|
||||
<div v-if="pickedFile" class="dim">{{ pickedFile.name }}({{ formatFileSize(pickedFile.size) }})</div>
|
||||
</el-form-item>
|
||||
<el-progress v-if="uploading && uploadPercent > 0" :percentage="uploadPercent" :stroke-width="10" :status="uploadPercent >= 100 ? 'success' : undefined" class="upload-progress" />
|
||||
<el-alert v-if="uploadMsg" :title="uploadMsg" :type="uploadMsgOk ? 'success' : 'error'" :closable="false" show-icon class="upload-msg" />
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="uploadVisible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="uploading" @click="submitUpload">上传客户端包</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 沿用软件版本/教程管理页(旧版 admin.html panel-version)的样式语言。 */
|
||||
.workbench-view {
|
||||
font-family: inherit;
|
||||
color: #24384d;
|
||||
}
|
||||
.panel-box {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
padding: 20px 22px 24px;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 14px;
|
||||
background: linear-gradient(145deg, #ffffff, #f9fbfd);
|
||||
box-shadow: 0 1px 2px rgba(39, 67, 94, 0.04), 0 14px 30px -24px rgba(39, 67, 94, 0.28);
|
||||
}
|
||||
h3 {
|
||||
margin: 0;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
color: #24384d;
|
||||
letter-spacing: 0.2px;
|
||||
}
|
||||
.workbench-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.workbench-head-tools {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
.workbench-keyword {
|
||||
width: 220px;
|
||||
min-height: 42px;
|
||||
padding: 6px 12px;
|
||||
border: 1px solid #cbd9e6;
|
||||
border-radius: 9px;
|
||||
background: #f8fbfd;
|
||||
color: #24384d;
|
||||
font-size: 13.5px;
|
||||
font-family: inherit;
|
||||
color-scheme: light;
|
||||
outline: none;
|
||||
transition: border-color 160ms ease, box-shadow 160ms ease, background 160ms ease;
|
||||
}
|
||||
.workbench-keyword:hover {
|
||||
border-color: #9fb7cd;
|
||||
}
|
||||
.workbench-keyword:focus {
|
||||
background: #ffffff;
|
||||
border-color: #5f85ad;
|
||||
box-shadow: 0 0 0 3px rgba(95, 133, 173, 0.16);
|
||||
}
|
||||
.page-hint {
|
||||
margin: -6px 0 14px;
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.page-hint code {
|
||||
padding: 1px 6px;
|
||||
border-radius: 5px;
|
||||
background: #edf4fa;
|
||||
color: #2f5d8b;
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||
font-size: 12px;
|
||||
}
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 8px;
|
||||
min-height: 42px;
|
||||
padding: 9px 18px;
|
||||
border: 1px solid #4f78a5;
|
||||
border-radius: 9px;
|
||||
background: linear-gradient(135deg, #5f85ad, #4f78a5);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13.5px;
|
||||
cursor: pointer;
|
||||
box-shadow: 0 8px 18px -14px rgba(79, 120, 165, 0.72);
|
||||
transition: background 160ms ease, box-shadow 160ms ease, transform 120ms ease;
|
||||
}
|
||||
.btn:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #7094ba, #5d83ac);
|
||||
box-shadow: 0 11px 22px -14px rgba(79, 120, 165, 0.8);
|
||||
}
|
||||
.btn:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.55;
|
||||
}
|
||||
.btn-sm {
|
||||
min-height: 36px;
|
||||
padding: 7px 12px;
|
||||
}
|
||||
.btn-danger {
|
||||
background: linear-gradient(135deg, #c06d77, #b35f6a);
|
||||
border-color: #b35f6a;
|
||||
}
|
||||
.btn-danger:hover:not(:disabled) {
|
||||
background: linear-gradient(135deg, #cb7c84, #b96570);
|
||||
}
|
||||
.table-scroll {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
overflow-x: auto;
|
||||
border: 1px solid #dbe5ee;
|
||||
border-radius: 10px;
|
||||
background: #ffffff;
|
||||
}
|
||||
.table-scroll table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
.workbench-table-scroll > table {
|
||||
min-width: 1200px;
|
||||
}
|
||||
.table-scroll th,
|
||||
.table-scroll td {
|
||||
padding: 10px 12px;
|
||||
text-align: left;
|
||||
font-size: 13.5px;
|
||||
line-height: 1.5;
|
||||
border-bottom: 1px solid #e0e8ef;
|
||||
vertical-align: middle;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.table-scroll th {
|
||||
background: #edf4fa;
|
||||
color: #4e6479;
|
||||
border-bottom-color: #d5e1eb;
|
||||
font-size: 12.5px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.4px;
|
||||
}
|
||||
.table-scroll tbody tr:hover td {
|
||||
background: #f1f7fb;
|
||||
}
|
||||
.table-scroll tbody tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.file-name,
|
||||
.version-cell {
|
||||
display: inline-block;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.tag-active {
|
||||
display: inline-block;
|
||||
margin-left: 6px;
|
||||
padding: 1px 7px;
|
||||
border: 1px solid #4f9a72;
|
||||
border-radius: 999px;
|
||||
background: #eaf6ef;
|
||||
color: #2f7a55;
|
||||
font-size: 11.5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.sha-cell {
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
color: #5b6f83;
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||
font-size: 12px;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.link-cell {
|
||||
display: block;
|
||||
color: #2f5d8b;
|
||||
text-decoration: none;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.link-cell:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.dl-btn {
|
||||
text-decoration: none;
|
||||
}
|
||||
.dim {
|
||||
color: #8293a5;
|
||||
font-size: 12px;
|
||||
}
|
||||
.empty-tip {
|
||||
padding: 44px 24px;
|
||||
text-align: center;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.upload-desc {
|
||||
margin: 0 0 12px;
|
||||
color: #5b6f83;
|
||||
font-size: 12.5px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
.zip-hint {
|
||||
margin: 4px 0 0;
|
||||
color: #5b6f83;
|
||||
font-size: 12px;
|
||||
}
|
||||
.ops-cell {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
}
|
||||
.row-selected td {
|
||||
background: #fdf0ee;
|
||||
}
|
||||
.th-select,
|
||||
.td-select {
|
||||
text-align: center;
|
||||
padding-left: 4px !important;
|
||||
padding-right: 4px !important;
|
||||
}
|
||||
.th-select input,
|
||||
.td-select input {
|
||||
cursor: pointer;
|
||||
accent-color: #b33a2e;
|
||||
}
|
||||
.upload-progress {
|
||||
margin: 2px 0 10px;
|
||||
}
|
||||
.upload-msg {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.upload-msg :deep(.el-alert__title) {
|
||||
word-break: break-all;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,98 @@
|
||||
/** 工作台客户端包接口适配:列表 / 直传预签名 / 确认 / 删除。 */
|
||||
import axios from 'axios'
|
||||
import { http, unwrap } from '@/api/http'
|
||||
import {
|
||||
parseWorkbenchClientPackageList,
|
||||
parseWorkbenchClientPackageUpload,
|
||||
} from './workbench-client-model.ts'
|
||||
import type { WorkbenchClientPackageItem, WorkbenchClientPackageList } from './workbench-client-dto.ts'
|
||||
|
||||
export const WORKBENCH_CLIENT_PACKAGES_ENDPOINT = '/api/admin/workbench-client/packages'
|
||||
export const WORKBENCH_CLIENT_PACKAGE_ENDPOINT = '/api/admin/workbench-client/package'
|
||||
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`
|
||||
|
||||
/** 客户端自动更新契约(后管页面不直接调用):GET 返回 {version,file_url,sha256,...}。 */
|
||||
export const WORKBENCH_CLIENT_PUBLIC_LATEST_ENDPOINT = '/api/workbench-client/version/latest'
|
||||
|
||||
/** MinIO 直传专用实例:不带 cookie、不挂 401 跳登录拦截器;大 zip 给足超时。 */
|
||||
const directPut = axios.create({ timeout: 600_000, withCredentials: false })
|
||||
|
||||
export async function fetchWorkbenchClientPackages(): Promise<WorkbenchClientPackageList> {
|
||||
const { data } = await http.get<unknown>(WORKBENCH_CLIENT_PACKAGES_ENDPOINT)
|
||||
return parseWorkbenchClientPackageList(data)
|
||||
}
|
||||
|
||||
export interface WorkbenchClientUploadTarget {
|
||||
objectKey: string
|
||||
uploadUrl: string
|
||||
fileUrl: string
|
||||
version: string
|
||||
fileName: string
|
||||
}
|
||||
|
||||
/** 第一步:向后端申请直传 PUT 预签名地址(登录会话签发,3 分钟有效)。 */
|
||||
export async function requestWorkbenchClientPresign(
|
||||
fileName: string,
|
||||
version: string,
|
||||
): Promise<WorkbenchClientUploadTarget> {
|
||||
const { data } = await http.post<unknown>(WORKBENCH_CLIENT_PRESIGN_ENDPOINT, null, {
|
||||
params: { file_name: fileName, version },
|
||||
})
|
||||
const core = (unwrap(data) ?? {}) as Record<string, unknown>
|
||||
const uploadUrl = typeof core.upload_url === 'string' ? core.upload_url : ''
|
||||
const objectKey = typeof core.object_key === 'string' ? core.object_key : ''
|
||||
if (!uploadUrl || !objectKey) {
|
||||
throw new Error('后端未返回直传地址,请重试')
|
||||
}
|
||||
return {
|
||||
objectKey,
|
||||
uploadUrl,
|
||||
fileUrl: typeof core.file_url === 'string' ? core.file_url : '',
|
||||
version: typeof core.version === 'string' ? core.version : version.trim(),
|
||||
fileName: typeof core.file_name === 'string' ? core.file_name : fileName,
|
||||
}
|
||||
}
|
||||
|
||||
/** 第三步:直传完成后通知后端核对对象、复算 sha256 并落库(data.item 为新记录行)。 */
|
||||
export async function confirmWorkbenchClientPackage(
|
||||
objectKey: string,
|
||||
fileName: string,
|
||||
version: string,
|
||||
): Promise<WorkbenchClientPackageItem | null> {
|
||||
const { data } = await http.post<unknown>(WORKBENCH_CLIENT_CONFIRM_ENDPOINT, null, {
|
||||
params: { object_key: objectKey, file_name: fileName, version },
|
||||
})
|
||||
return parseWorkbenchClientPackageUpload(data)
|
||||
}
|
||||
|
||||
/** 按 id 批量删除客户端包(后端会顺带清理无引用对象的 MinIO 包体);返回实际删除行数。 */
|
||||
export async function deleteWorkbenchClientPackages(ids: number[]): Promise<number> {
|
||||
if (!ids.length) return 0
|
||||
const { data } = await http.post<unknown>(WORKBENCH_CLIENT_DELETE_ENDPOINT, ids)
|
||||
const core = (unwrap(data) ?? {}) as Record<string, unknown>
|
||||
return typeof core.deleted === 'number' ? core.deleted : ids.length
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传客户端包(浏览器直传):presign 申请 → 直接 PUT 到 MinIO client 桶(不走 Java 中转)
|
||||
* → confirm 由服务端复算 sha256 落库。onProgress 回传 0-100 上传进度。
|
||||
*/
|
||||
export async function uploadWorkbenchClientPackage(
|
||||
file: Blob,
|
||||
fileName: string,
|
||||
version: string,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<WorkbenchClientPackageItem | null> {
|
||||
const target = await requestWorkbenchClientPresign(fileName, version)
|
||||
await directPut.put(target.uploadUrl, file, {
|
||||
headers: { 'Content-Type': 'application/octet-stream' },
|
||||
onUploadProgress: (event) => {
|
||||
if (!onProgress) return
|
||||
const total = event.total || 0
|
||||
onProgress(total > 0 ? Math.min(Math.round((event.loaded / total) * 100), 100) : 0)
|
||||
},
|
||||
})
|
||||
return confirmWorkbenchClientPackage(target.objectKey, target.fileName, target.version)
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
/** 工作台客户端包 DTO(后管「数富AI工作台客户端包管理」页)。纯类型。 */
|
||||
|
||||
/** 客户端包行(GET /api/admin/workbench-client/packages data.items,Java snake)。 */
|
||||
export interface WorkbenchClientPackageItem {
|
||||
id: number
|
||||
version: string
|
||||
fileName: string
|
||||
objectKey: string
|
||||
fileSize: number
|
||||
/** 更新包 sha256(hex 小写),客户端下载后的完整性锚点 */
|
||||
sha256: string
|
||||
fileUrl: string
|
||||
createdAt: string
|
||||
}
|
||||
|
||||
export interface WorkbenchClientPackageList {
|
||||
items: WorkbenchClientPackageItem[]
|
||||
}
|
||||
|
||||
export function emptyWorkbenchClientPackageList(): WorkbenchClientPackageList {
|
||||
return { items: [] }
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
/** 工作台客户端包列表加载模型:解析 snake/camel、格式化大小与版本号校验;纯逻辑。 */
|
||||
import { unwrap } from '../../api/envelope.ts'
|
||||
import { type WorkbenchClientPackageItem, type WorkbenchClientPackageList } from './workbench-client-dto.ts'
|
||||
|
||||
/** 与后端 biz_workbench_client_package.version VARCHAR(64) 对齐。 */
|
||||
export const WORKBENCH_CLIENT_VERSION_MAX_LENGTH = 64
|
||||
|
||||
function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value.trim() : ''
|
||||
}
|
||||
|
||||
function numberOrNull(value: unknown): number | null {
|
||||
return typeof value === 'number' && Number.isFinite(value) ? Math.floor(value) : null
|
||||
}
|
||||
|
||||
/** 解析单条客户端包行;缺 id 视为无效。 */
|
||||
export function toWorkbenchClientPackageItem(raw: unknown): WorkbenchClientPackageItem | null {
|
||||
if (!raw || typeof raw !== 'object') return null
|
||||
const r = raw as Record<string, unknown>
|
||||
const id = numberOrNull(r.id)
|
||||
if (id === null) return null
|
||||
return {
|
||||
id,
|
||||
version: text(r.version),
|
||||
fileName: text(r.file_name ?? r.fileName),
|
||||
objectKey: text(r.object_key ?? r.objectKey),
|
||||
fileSize: numberOrNull(r.file_size ?? r.fileSize) ?? 0,
|
||||
sha256: text(r.sha256),
|
||||
fileUrl: text(r.file_url ?? r.fileUrl),
|
||||
createdAt: text(r.created_at ?? r.createdAt),
|
||||
}
|
||||
}
|
||||
|
||||
/** 归一化客户端包列表负载为前端结果;缺省回空列表。 */
|
||||
export function parseWorkbenchClientPackageList(payload: unknown): WorkbenchClientPackageList {
|
||||
const data = unwrap<unknown>(payload)
|
||||
const record = data && typeof data === 'object' ? (data as Record<string, unknown>) : {}
|
||||
const items = Array.isArray(record.items)
|
||||
? record.items
|
||||
.map((raw) => toWorkbenchClientPackageItem(raw))
|
||||
.filter((item): item is WorkbenchClientPackageItem => item !== null)
|
||||
: []
|
||||
return { items }
|
||||
}
|
||||
|
||||
/** 上传成功后返回的新记录行(data.item);无 item 回 null。 */
|
||||
export function parseWorkbenchClientPackageUpload(payload: unknown): WorkbenchClientPackageItem | null {
|
||||
const data = unwrap<unknown>(payload)
|
||||
if (!data || typeof data !== 'object') return null
|
||||
const item = (data as Record<string, unknown>).item
|
||||
return item ? toWorkbenchClientPackageItem(item) : null
|
||||
}
|
||||
|
||||
/** 版本号必填且不超过后端列宽;客户端要靠它比较是否需要升级。 */
|
||||
export function isValidWorkbenchClientVersion(value: string): boolean {
|
||||
const normalized = typeof value === 'string' ? value.trim() : ''
|
||||
return normalized.length > 0 && normalized.length <= WORKBENCH_CLIENT_VERSION_MAX_LENGTH
|
||||
}
|
||||
|
||||
/** 字节数展示:0=未知展示为 -,其余按 KB/MB/GB 人性化。 */
|
||||
export function formatFileSize(bytes: number): string {
|
||||
if (!Number.isFinite(bytes) || bytes <= 0) return '—'
|
||||
if (bytes < 1024) return `${bytes} B`
|
||||
const units = ['KB', 'MB', 'GB']
|
||||
let value = bytes / 1024
|
||||
let unitIndex = 0
|
||||
while (value >= 1024 && unitIndex < units.length - 1) {
|
||||
value /= 1024
|
||||
unitIndex += 1
|
||||
}
|
||||
return `${value >= 100 ? value.toFixed(0) : value.toFixed(1)} ${units[unitIndex]}`
|
||||
}
|
||||
@@ -30,6 +30,7 @@ export const adminPages: AdminPageDef[] = [
|
||||
{ path: 'records/history', menuKey: 'admin_history', title: '生成记录', companyScoped: true, load: () => import('@/pages/records/RecordsHistoryPage.vue') },
|
||||
{ path: 'records/software-version', menuKey: 'admin_version', title: '软件版本管理', companyScoped: false, load: () => import('@/pages/records/RecordsSoftwareVersionPage.vue') },
|
||||
{ path: 'records/tutorial', menuKey: 'admin_tutorial', title: '教程管理', companyScoped: false, load: () => import('@/pages/records/RecordsTutorialPage.vue') },
|
||||
{ path: 'records/workbench-client-package', menuKey: 'admin_workbench_client_package', title: '数富AI工作台客户端包管理', companyScoped: false, load: () => import('@/pages/records/WorkbenchClientPackagePage.vue') },
|
||||
{ path: 'records/device-logs', menuKey: 'admin_device_logs', title: '日志管理', companyScoped: true, load: () => import('@/pages/records/DeviceLogsPage.vue') },
|
||||
{ path: 'task-center/board', menuKey: 'admin_task_center', title: '客户端任务管理', companyScoped: true, load: () => import('@/pages/task-center/TaskCenterBoardPage.vue') },
|
||||
{ path: 'records/digital-human-version', menuKey: 'digital_human_version', title: '数字人版本管理', load: () => import('@/pages/records/RecordsDigitalHumanVersionPage.vue') },
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readSource } from './helpers.ts'
|
||||
import { adminPages } from '../src/router/routes.ts'
|
||||
import { OPERATION_GUIDES } from '../src/layout/operation-guides.ts'
|
||||
|
||||
/** 工作台客户端包管理页:独立渠道、上传直传、服务端 sha256、客户端自动更新契约。 */
|
||||
|
||||
test('align_workbench_client_page_registered', () => {
|
||||
const page = adminPages.find((p) => p.path === 'records/workbench-client-package')
|
||||
assert.ok(page, '路由注册表应包含 records/workbench-client-package')
|
||||
assert.equal(page.menuKey, 'admin_workbench_client_package')
|
||||
assert.equal(page.title, '数富AI工作台客户端包管理')
|
||||
assert.equal(page.companyScoped, false, '客户端包是全平台共享资源,不按公司隔离')
|
||||
})
|
||||
|
||||
test('align_workbench_client_page_wiring', () => {
|
||||
const page = readSource('src/pages/records/WorkbenchClientPackagePage.vue')
|
||||
// 上传:版本号必填 → zip → 直传(进度条)→ 成功提示留驻弹窗。
|
||||
assert.match(page, /上传客户端包/, '存在上传入口按钮')
|
||||
assert.match(page, /uploadWorkbenchClientPackage/, '上传走工作台客户端包直传链路')
|
||||
assert.match(page, /label="版本号" required/, '上传弹窗要求填写版本号')
|
||||
assert.match(page, /请填写版本号/, '未填版本号时提示')
|
||||
assert.match(page, /仅支持 \.zip 格式/, '格式校验提示')
|
||||
assert.match(page, /上传成功,客户端已可检测到新版本/, '成功提示说明客户端已能检测更新')
|
||||
// 列表:当前生效标记、sha256、下载、删除、空态。
|
||||
assert.match(page, /当前生效/, '最新上传的包标记当前生效')
|
||||
assert.match(page, /sha256/, '展示服务端复算的摘要')
|
||||
assert.match(page, /formatFileSize/, '展示包体大小')
|
||||
assert.match(page, /\/api\/workbench-client\/version\/latest/, '页面标明客户端更新检查接口')
|
||||
assert.match(page, /确认删除选中的/, '批量删除二次确认')
|
||||
assert.match(page, /暂无客户端包记录/, '空态文案')
|
||||
})
|
||||
|
||||
test('align_workbench_client_api_contract', () => {
|
||||
const api = readSource('src/pages/records/workbench-client-api.ts')
|
||||
assert.match(api, /\/api\/admin\/workbench-client\/packages/, '列表端点')
|
||||
assert.match(api, /WORKBENCH_CLIENT_PACKAGE_ENDPOINT = '\/api\/admin\/workbench-client\/package'/, '上传端点前缀')
|
||||
assert.match(api, /\$\{WORKBENCH_CLIENT_PACKAGE_ENDPOINT\}\/presign/, '直传预签名端点')
|
||||
assert.match(api, /\$\{WORKBENCH_CLIENT_PACKAGE_ENDPOINT\}\/confirm/, '确认端点')
|
||||
assert.match(api, /\$\{WORKBENCH_CLIENT_PACKAGE_ENDPOINT\}\/delete/, '删除端点')
|
||||
assert.match(api, /params: \{ file_name: fileName, version \}/, '预签名回传文件名与版本号')
|
||||
assert.match(api, /params: \{ object_key: objectKey, file_name: fileName, version \}/, '确认回传对象 key、文件名与版本号')
|
||||
assert.match(api, /withCredentials: false/, '直传实例不挂会话拦截器')
|
||||
assert.match(api, /\/api\/workbench-client\/version\/latest/, '公开更新契约路径固定')
|
||||
})
|
||||
|
||||
test('align_workbench_client_model_parsers', () => {
|
||||
const model = readSource('src/pages/records/workbench-client-model.ts')
|
||||
assert.match(model, /r\.file_name \?\? r\.fileName/, '兼容 snake/camel 文件名')
|
||||
assert.match(model, /r\.file_url \?\? r\.fileUrl/, '兼容 snake/camel 下载链接')
|
||||
assert.match(model, /r\.file_size \?\? r\.fileSize/, '兼容 snake/camel 文件大小')
|
||||
assert.match(model, /r\.object_key \?\? r\.objectKey/, '兼容 snake/camel 对象 key')
|
||||
assert.match(model, /r\.sha256/, '解析 sha256')
|
||||
assert.match(model, /isValidWorkbenchClientVersion/, '版本号必填校验')
|
||||
})
|
||||
|
||||
test('align_workbench_client_guide_registered', () => {
|
||||
const guide = OPERATION_GUIDES.admin_workbench_client_package
|
||||
assert.ok(guide, '每个菜单页都必须有操作提示')
|
||||
assert.match(guide.text, /sha256/, '提示说明服务端会复算摘要')
|
||||
assert.match(guide.text, /\/api\/workbench-client\/version\/latest/, '提示说明客户端更新检查接口')
|
||||
})
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"note": "readSource 钉子逐文件基线。两把尺子:pins=落在用例体内的读盘,reads=全文读点总数(含模块级夹具与 helper)。都只许减;pins 下降而 reads 没同步下降=把读盘挪出体内,不算改进。由 tests/source-pin-ratchet.test.ts 生成。",
|
||||
"totals": {
|
||||
"files": 244,
|
||||
"cases": 1728,
|
||||
"pins": 448,
|
||||
"reads": 639
|
||||
"files": 245,
|
||||
"cases": 1733,
|
||||
"pins": 451,
|
||||
"reads": 642
|
||||
},
|
||||
"files": {
|
||||
"admin-scaffold.test.ts": {
|
||||
@@ -182,6 +182,11 @@
|
||||
"pins": 1,
|
||||
"reads": 1
|
||||
},
|
||||
"align-workbench-client.test.ts": {
|
||||
"cases": 5,
|
||||
"pins": 3,
|
||||
"reads": 3
|
||||
},
|
||||
"company-config-entry-super-only.test.ts": {
|
||||
"cases": 4,
|
||||
"pins": 3,
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
/**
|
||||
* 工作台客户端包管理页挂载测试:列表渲染、搜索、删除二次确认。
|
||||
* 直传与 Element Plus 弹窗在 mount 环境里用 stub 顶掉,只验页面自己的状态与 API 调用。
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount } from '@vue/test-utils'
|
||||
|
||||
import WorkbenchClientPackagePage from '@/pages/records/WorkbenchClientPackagePage.vue'
|
||||
|
||||
const api = vi.hoisted(() => ({
|
||||
fetchWorkbenchClientPackages: vi.fn(),
|
||||
uploadWorkbenchClientPackage: vi.fn(),
|
||||
deleteWorkbenchClientPackages: vi.fn(),
|
||||
}))
|
||||
const confirmMock = vi.hoisted(() => vi.fn())
|
||||
const feedbackMock = vi.hoisted(() => vi.fn())
|
||||
const messageMock = vi.hoisted(() => ({ success: vi.fn() }))
|
||||
|
||||
vi.mock('@/pages/records/workbench-client-api.ts', () => api)
|
||||
vi.mock('@/components/admin-confirm', () => ({ openAdminConfirm: confirmMock }))
|
||||
vi.mock('@/components/admin-feedback-ui', () => ({ showAdminFeedback: feedbackMock }))
|
||||
vi.mock('element-plus', () => ({ ElMessage: messageMock }))
|
||||
|
||||
const SHA = 'c'.repeat(64)
|
||||
const row = {
|
||||
id: 7,
|
||||
version: '1.2.3',
|
||||
fileName: 'ShuFuAI-Workbench-1.2.3.zip',
|
||||
objectKey: 'workbench-client/versions/20261024100000123-1.2.3.zip',
|
||||
fileSize: 2048,
|
||||
sha256: SHA,
|
||||
fileUrl: 'https://download.aishufu.top/client/workbench-client/versions/1.2.3.zip',
|
||||
createdAt: '2026-10-24 10:00',
|
||||
}
|
||||
|
||||
const stubs = {
|
||||
'el-dialog': { template: '<div><slot /></div>' },
|
||||
'el-form': { template: '<form><slot /></form>' },
|
||||
'el-form-item': { template: '<div><slot /></div>' },
|
||||
'el-input': {
|
||||
props: ['modelValue'],
|
||||
emits: ['update:modelValue'],
|
||||
template: '<input :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />',
|
||||
},
|
||||
'el-upload': { template: '<div><slot /></div>' },
|
||||
'el-button': { template: '<button><slot /></button>' },
|
||||
'el-progress': true,
|
||||
'el-alert': { props: ['title'], template: '<div>{{ title }}</div>' },
|
||||
}
|
||||
|
||||
function mountPage() {
|
||||
return mount(WorkbenchClientPackagePage, { global: { stubs } })
|
||||
}
|
||||
|
||||
describe('WorkbenchClientPackagePage', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
api.fetchWorkbenchClientPackages.mockResolvedValue({ items: [row] })
|
||||
api.deleteWorkbenchClientPackages.mockResolvedValue(1)
|
||||
confirmMock.mockResolvedValue(true)
|
||||
})
|
||||
|
||||
it('渲染版本、文件名、sha256 与当前生效标记', async () => {
|
||||
const wrapper = mountPage()
|
||||
await flushPromises()
|
||||
|
||||
const text = wrapper.text()
|
||||
expect(text).toContain('1.2.3')
|
||||
expect(text).toContain('ShuFuAI-Workbench-1.2.3.zip')
|
||||
expect(text).toContain(SHA)
|
||||
expect(text).toContain('当前生效')
|
||||
expect(text).toContain('2.0 KB')
|
||||
})
|
||||
|
||||
it('搜索无命中时显示空态', async () => {
|
||||
const wrapper = mountPage()
|
||||
await flushPromises()
|
||||
|
||||
await wrapper.get('input.workbench-keyword').setValue('9.9.9')
|
||||
await flushPromises()
|
||||
|
||||
expect(wrapper.text()).toContain('暂无匹配客户端包')
|
||||
})
|
||||
|
||||
it('删除单条会二次确认并调用删除接口', async () => {
|
||||
const wrapper = mountPage()
|
||||
await flushPromises()
|
||||
|
||||
await wrapper.get('.ops-cell .btn-danger').trigger('click')
|
||||
await flushPromises()
|
||||
|
||||
expect(confirmMock).toHaveBeenCalledTimes(1)
|
||||
expect(api.deleteWorkbenchClientPackages).toHaveBeenCalledWith([7])
|
||||
expect(api.fetchWorkbenchClientPackages).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
})
|
||||
@@ -40,6 +40,7 @@ const OPS_MIN_COL_PX: Record<string, number> = {
|
||||
'src/pages/records/RecordsDigitalHumanVersionPage.vue': 287,
|
||||
'src/pages/records/RecordsSoftwareVersionPage.vue': 77,
|
||||
'src/pages/records/RecordsTutorialPage.vue': 77,
|
||||
'src/pages/records/WorkbenchClientPackagePage.vue': 77,
|
||||
'src/pages/shop/ShopKeysPage.vue': 240,
|
||||
'src/pages/shop/ShopManagePage.vue': 199,
|
||||
}
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import {
|
||||
formatFileSize,
|
||||
isValidWorkbenchClientVersion,
|
||||
parseWorkbenchClientPackageList,
|
||||
parseWorkbenchClientPackageUpload,
|
||||
WORKBENCH_CLIENT_VERSION_MAX_LENGTH,
|
||||
} from '@/pages/records/workbench-client-model.ts'
|
||||
|
||||
const SHA = 'a'.repeat(64)
|
||||
|
||||
describe('workbench-client model:列表解析', () => {
|
||||
it('解析 snake_case 行并丢弃缺 id 的坏行', () => {
|
||||
const list = parseWorkbenchClientPackageList({
|
||||
success: true,
|
||||
data: {
|
||||
items: [
|
||||
{
|
||||
id: 7,
|
||||
version: '1.2.3',
|
||||
file_name: 'ShuFuAI-Workbench-1.2.3.zip',
|
||||
object_key: 'workbench-client/versions/20261024100000123-1.2.3.zip',
|
||||
file_size: 2048,
|
||||
sha256: SHA,
|
||||
file_url: 'https://download.aishufu.top/client/workbench-client/versions/1.2.3.zip',
|
||||
created_at: '2026-10-24 10:00',
|
||||
},
|
||||
{ version: 'bad-no-id' },
|
||||
],
|
||||
},
|
||||
})
|
||||
|
||||
expect(list.items).toHaveLength(1)
|
||||
expect(list.items[0]).toMatchObject({
|
||||
id: 7,
|
||||
version: '1.2.3',
|
||||
fileName: 'ShuFuAI-Workbench-1.2.3.zip',
|
||||
objectKey: 'workbench-client/versions/20261024100000123-1.2.3.zip',
|
||||
fileSize: 2048,
|
||||
sha256: SHA,
|
||||
fileUrl: 'https://download.aishufu.top/client/workbench-client/versions/1.2.3.zip',
|
||||
createdAt: '2026-10-24 10:00',
|
||||
})
|
||||
})
|
||||
|
||||
it('兼容 camelCase 负载,缺省回空列表', () => {
|
||||
const camel = parseWorkbenchClientPackageList({
|
||||
success: true,
|
||||
data: { items: [{ id: 2, version: '2.0.0', fileName: 'a.zip', fileSize: 10, sha256: SHA, fileUrl: 'u', createdAt: 't' }] },
|
||||
})
|
||||
expect(camel.items[0].fileName).toBe('a.zip')
|
||||
expect(camel.items[0].fileUrl).toBe('u')
|
||||
|
||||
expect(parseWorkbenchClientPackageList({ success: true, data: {} }).items).toEqual([])
|
||||
})
|
||||
|
||||
it('上传返回行取 data.item,缺 item 回 null', () => {
|
||||
const item = parseWorkbenchClientPackageUpload({
|
||||
success: true,
|
||||
data: { item: { id: 3, version: '3.0.0', file_name: 'c.zip', sha256: SHA } },
|
||||
})
|
||||
expect(item?.version).toBe('3.0.0')
|
||||
expect(item?.sha256).toBe(SHA)
|
||||
expect(parseWorkbenchClientPackageUpload({ success: true, data: {} })).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
describe('workbench-client model:版本号与大小', () => {
|
||||
it('版本号必填且不超过后端列宽', () => {
|
||||
expect(isValidWorkbenchClientVersion('')).toBe(false)
|
||||
expect(isValidWorkbenchClientVersion(' ')).toBe(false)
|
||||
expect(isValidWorkbenchClientVersion('1.0.0')).toBe(true)
|
||||
expect(isValidWorkbenchClientVersion('a'.repeat(WORKBENCH_CLIENT_VERSION_MAX_LENGTH))).toBe(true)
|
||||
expect(isValidWorkbenchClientVersion('a'.repeat(WORKBENCH_CLIENT_VERSION_MAX_LENGTH + 1))).toBe(false)
|
||||
})
|
||||
|
||||
it('大小展示与旧页面口径一致', () => {
|
||||
expect(formatFileSize(0)).toBe('—')
|
||||
expect(formatFileSize(2048)).toBe('2.0 KB')
|
||||
expect(formatFileSize(90 * 1024 * 1024)).toBe('90.0 MB')
|
||||
})
|
||||
})
|
||||
@@ -77,6 +77,7 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton {
|
||||
"/logout",
|
||||
"/api/version", // 客户端启动时拉最新版本号,必须先于登录
|
||||
"/api/tutorial", // 后台可维护的使用教程,公开内容
|
||||
"/api/workbench-client", // 数富AI工作台客户端更新检查:必须先于登录,公开只读版本元数据
|
||||
"/api/kd-flow/verify", // 开店流程访问密码校验:它自己就是那道门
|
||||
// 下面四条都是 AdminConsoleController 的 302 兜底(response.sendRedirect 完事,
|
||||
// 不读库、不回数据),旧书签打进这些地址只会被送到 /admin-vue/。
|
||||
|
||||
+96
-46
@@ -20,9 +20,13 @@ import org.springframework.stereotype.Service;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.net.URI;
|
||||
import java.net.URLDecoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.HexFormat;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Objects;
|
||||
@@ -42,6 +46,8 @@ public class OssStorageService {
|
||||
private static final String SOFTWARE_VERSION_PREFIX = "nanri-image/versions/";
|
||||
/** 教程安装包对象键前缀(公开 client 桶,工具台「立即下载教程」直链来源)。 */
|
||||
private static final String TUTORIAL_PREFIX = "tutorial/";
|
||||
/** 数富AI工作台客户端安装/更新包前缀(公开 client 桶,独立于桌面端 nanri-image/versions/)。 */
|
||||
private static final String WORKBENCH_CLIENT_PREFIX = "workbench-client/versions/";
|
||||
private static final String LEGACY_MINIO_ENDPOINT = "http://47.110.241.161:9000";
|
||||
/** readObjectBytes 兜底读取上限(20MB):防止大对象一次性读入内存导致 OOM。 */
|
||||
private static final long DEFAULT_READ_MAX_BYTES = 20L * 1024 * 1024;
|
||||
@@ -191,12 +197,11 @@ public class OssStorageService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 为软件版本安装包签发浏览器直传用的预签名 PUT URL(client 桶公开路径)。
|
||||
* 签名 host 取 public-endpoint(oss.aishufu.top),浏览器对返回的 URL 直接 PUT 即可落对象;
|
||||
* 服务端自己的读写走 internal-endpoint 那张 client,两者不能合用一张。
|
||||
* 公开 client 桶直传预签名共用实现:桌面端版本 / 教程 / 工作台客户端三族只差前缀守卫。
|
||||
* 签名 host 取 public-endpoint(oss.aishufu.top),浏览器拿到后直接 PUT;不能用内网 client 签。
|
||||
*/
|
||||
public String presignSoftwareVersionUpload(String objectKey, int expirySeconds) {
|
||||
requirePrefixedObjectKey(objectKey, SOFTWARE_VERSION_PREFIX, "software version");
|
||||
private String presignPublicClientUpload(String objectKey, String prefix, String what, int expirySeconds) {
|
||||
requirePrefixedObjectKey(objectKey, prefix, what);
|
||||
try {
|
||||
return presignClient().getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
|
||||
.method(Method.PUT)
|
||||
@@ -209,9 +214,18 @@ public class OssStorageService {
|
||||
}
|
||||
}
|
||||
|
||||
/** 返回软件版本对象的字节数;对象不存在返回 -1(直传完成后由服务端核对大小是否超限)。 */
|
||||
public long softwareVersionObjectSize(String objectKey) {
|
||||
requirePrefixedObjectKey(objectKey, SOFTWARE_VERSION_PREFIX, "software version");
|
||||
/**
|
||||
* 为软件版本安装包签发浏览器直传用的预签名 PUT URL(client 桶公开路径)。
|
||||
* 签名 host 取 public-endpoint(oss.aishufu.top),浏览器对返回的 URL 直接 PUT 即可落对象;
|
||||
* 服务端自己的读写走 internal-endpoint 那张 client,两者不能合用一张。
|
||||
*/
|
||||
public String presignSoftwareVersionUpload(String objectKey, int expirySeconds) {
|
||||
return presignPublicClientUpload(objectKey, SOFTWARE_VERSION_PREFIX, "software version", expirySeconds);
|
||||
}
|
||||
|
||||
/** 公开 client 桶对象大小共用实现:对象不存在返回 -1(直传确认时先卡大小)。 */
|
||||
private long publicClientObjectSize(String objectKey, String prefix, String what) {
|
||||
requirePrefixedObjectKey(objectKey, prefix, what);
|
||||
try {
|
||||
var stat = buildClient().statObject(StatObjectArgs.builder()
|
||||
.bucket(publicClientBucket())
|
||||
@@ -228,6 +242,11 @@ public class OssStorageService {
|
||||
}
|
||||
}
|
||||
|
||||
/** 返回软件版本对象的字节数;对象不存在返回 -1(直传完成后由服务端核对大小是否超限)。 */
|
||||
public long softwareVersionObjectSize(String objectKey) {
|
||||
return publicClientObjectSize(objectKey, SOFTWARE_VERSION_PREFIX, "software version");
|
||||
}
|
||||
|
||||
/** 生成软件版本对象的公开下载 URL(与历史 file_url 同构:path-style client 桶)。 */
|
||||
public String getSoftwareVersionDownloadUrl(String objectKey) {
|
||||
requirePrefixedObjectKey(objectKey, SOFTWARE_VERSION_PREFIX, "software version");
|
||||
@@ -246,9 +265,9 @@ public class OssStorageService {
|
||||
: buildPublicUrl(base, objectKey, publicClientBucket());
|
||||
}
|
||||
|
||||
/** 删除软件版本对象(client 桶);确认环节发现超限等异常时清理残留,避免公共桶悬挂大对象。 */
|
||||
public void removeSoftwareVersionObject(String objectKey) {
|
||||
requirePrefixedObjectKey(objectKey, SOFTWARE_VERSION_PREFIX, "software version");
|
||||
/** 公开 client 桶对象删除共用实现;后台删除记录时清理无引用对象。 */
|
||||
private void removePublicClientObject(String objectKey, String prefix, String what) {
|
||||
requirePrefixedObjectKey(objectKey, prefix, what);
|
||||
try {
|
||||
buildClient().removeObject(RemoveObjectArgs.builder()
|
||||
.bucket(publicClientBucket())
|
||||
@@ -259,41 +278,22 @@ public class OssStorageService {
|
||||
}
|
||||
}
|
||||
|
||||
/** 删除软件版本对象(client 桶);确认环节发现超限等异常时清理残留,避免公共桶悬挂大对象。 */
|
||||
public void removeSoftwareVersionObject(String objectKey) {
|
||||
removePublicClientObject(objectKey, SOFTWARE_VERSION_PREFIX, "software version");
|
||||
}
|
||||
|
||||
/**
|
||||
* 为教程安装包签发浏览器直传用的预签名 PUT URL(公开 client 桶 tutorial/ 前缀)。
|
||||
* 签名 host 同 {@link #presignSoftwareVersionUpload}:必须是公网入口,不能用内网 client。
|
||||
*/
|
||||
public String presignTutorialUpload(String objectKey, int expirySeconds) {
|
||||
requireTutorialKey(objectKey);
|
||||
try {
|
||||
return presignClient().getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
|
||||
.method(Method.PUT)
|
||||
.bucket(publicClientBucket())
|
||||
.object(objectKey)
|
||||
.expiry(Math.max(60, expirySeconds), TimeUnit.SECONDS)
|
||||
.build());
|
||||
} catch (Exception ex) {
|
||||
throw storageFailure("presign", objectKey, ex);
|
||||
}
|
||||
return presignPublicClientUpload(objectKey, TUTORIAL_PREFIX, "tutorial", expirySeconds);
|
||||
}
|
||||
|
||||
/** 返回教程对象的字节数;对象不存在返回 -1(直传完成后由服务端核对大小是否超限)。 */
|
||||
public long tutorialObjectSize(String objectKey) {
|
||||
requireTutorialKey(objectKey);
|
||||
try {
|
||||
var stat = buildClient().statObject(StatObjectArgs.builder()
|
||||
.bucket(publicClientBucket())
|
||||
.object(objectKey)
|
||||
.build());
|
||||
return stat.size();
|
||||
} catch (ErrorResponseException ex) {
|
||||
if (isNotFound(ex)) {
|
||||
return -1L;
|
||||
}
|
||||
throw storageFailure("stat", objectKey, ex);
|
||||
} catch (Exception ex) {
|
||||
throw storageFailure("stat", objectKey, ex);
|
||||
}
|
||||
return publicClientObjectSize(objectKey, TUTORIAL_PREFIX, "tutorial");
|
||||
}
|
||||
|
||||
/** 生成教程对象的公开下载 URL(与历史直链同构:https://oss.aishufu.top/client/tutorial/...)。 */
|
||||
@@ -304,21 +304,71 @@ public class OssStorageService {
|
||||
|
||||
/** 删除教程对象(client 桶);后台删除记录时清理无引用对象。 */
|
||||
public void removeTutorialObject(String objectKey) {
|
||||
requireTutorialKey(objectKey);
|
||||
try {
|
||||
buildClient().removeObject(RemoveObjectArgs.builder()
|
||||
.bucket(publicClientBucket())
|
||||
.object(objectKey)
|
||||
.build());
|
||||
} catch (Exception ex) {
|
||||
throw storageFailure("delete", objectKey, ex);
|
||||
}
|
||||
removePublicClientObject(objectKey, TUTORIAL_PREFIX, "tutorial");
|
||||
}
|
||||
|
||||
private void requireTutorialKey(String objectKey) {
|
||||
requirePrefixedObjectKey(objectKey, TUTORIAL_PREFIX, "tutorial");
|
||||
}
|
||||
|
||||
/**
|
||||
* 为工作台客户端包签发浏览器直传 PUT 预签名(client 桶 workbench-client/versions/ 前缀)。
|
||||
* 签名 host 与软件版本/教程包一致:必须走公网入口,不能拿内网 client 签。
|
||||
*/
|
||||
public String presignWorkbenchClientUpload(String objectKey, int expirySeconds) {
|
||||
return presignPublicClientUpload(objectKey, WORKBENCH_CLIENT_PREFIX, "workbench client", expirySeconds);
|
||||
}
|
||||
|
||||
/** 返回工作台客户端包字节数;对象不存在返回 -1(直传确认时先卡大小,再算摘要)。 */
|
||||
public long workbenchClientObjectSize(String objectKey) {
|
||||
return publicClientObjectSize(objectKey, WORKBENCH_CLIENT_PREFIX, "workbench client");
|
||||
}
|
||||
|
||||
/**
|
||||
* 服务端流式复算工作台客户端包的 sha256(hex 小写)。
|
||||
* 直传路径不能相信浏览器报的摘要:这条摘要是客户端更新时的硬校验锚点,必须对 MinIO 实物算。
|
||||
*/
|
||||
public String workbenchClientObjectSha256(String objectKey) {
|
||||
requireWorkbenchClientKey(objectKey);
|
||||
MessageDigest digest;
|
||||
try {
|
||||
digest = MessageDigest.getInstance("SHA-256");
|
||||
} catch (NoSuchAlgorithmException ex) {
|
||||
throw new IllegalStateException("SHA-256 not available", ex);
|
||||
}
|
||||
try (InputStream stream = buildClient().getObject(GetObjectArgs.builder()
|
||||
.bucket(publicClientBucket())
|
||||
.object(objectKey)
|
||||
.build())) {
|
||||
byte[] buffer = new byte[1 << 20];
|
||||
int read;
|
||||
while ((read = stream.read(buffer)) > 0) {
|
||||
digest.update(buffer, 0, read);
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
throw storageFailure("sha256", objectKey, ex);
|
||||
}
|
||||
return HexFormat.of().formatHex(digest.digest());
|
||||
}
|
||||
|
||||
/** 工作台客户端包公开下载 URL:优先 download-endpoint(主机 B 反代回源),未配置回退 public-endpoint。 */
|
||||
public String getWorkbenchClientDownloadUrl(String objectKey) {
|
||||
requireWorkbenchClientKey(objectKey);
|
||||
String base = downloadEndpoint();
|
||||
return base == null
|
||||
? getPublicUrl(objectKey, publicClientBucket())
|
||||
: buildPublicUrl(base, objectKey, publicClientBucket());
|
||||
}
|
||||
|
||||
/** 删除工作台客户端包对象(client 桶);后台删除记录时清理无引用对象。 */
|
||||
public void removeWorkbenchClientObject(String objectKey) {
|
||||
removePublicClientObject(objectKey, WORKBENCH_CLIENT_PREFIX, "workbench client");
|
||||
}
|
||||
|
||||
private void requireWorkbenchClientKey(String objectKey) {
|
||||
requirePrefixedObjectKey(objectKey, WORKBENCH_CLIENT_PREFIX, "workbench client");
|
||||
}
|
||||
|
||||
/** objectKey 前缀守卫:软件版本族与教程族八格同款,只是前缀与文案里的名字不同。 */
|
||||
private void requirePrefixedObjectKey(String objectKey, String prefix, String what) {
|
||||
if (objectKey == null || !objectKey.startsWith(prefix)) {
|
||||
|
||||
+2
-1
@@ -90,7 +90,8 @@ public class PermissionMenuSchemaInitializer {
|
||||
new DefaultAdminMenu("生成记录", "admin_history", "history", 70, "admin_group_record"),
|
||||
new DefaultAdminMenu("视频任务记录", "admin_image_video_tasks", "image-video-tasks", 75, "admin_group_record"),
|
||||
new DefaultAdminMenu("软件版本管理", "admin_version", "version", 80, "admin_group_record"),
|
||||
new DefaultAdminMenu("数字人版本管理", "digital_human_version", "digital-human-version", 81, "admin_group_record")
|
||||
new DefaultAdminMenu("数字人版本管理", "digital_human_version", "digital-human-version", 81, "admin_group_record"),
|
||||
new DefaultAdminMenu("工作台客户端包管理", "admin_workbench_client_package", "records/workbench-client-package", 83, "admin_group_record")
|
||||
);
|
||||
|
||||
@EventListener(ApplicationReadyEvent.class)
|
||||
|
||||
+2
-2
@@ -58,7 +58,7 @@ public class PermissionMenuService {
|
||||
|
||||
/**
|
||||
* 管理/平台配置类菜单:出口仍是 {@code requireAdmin}(用户、菜单、分组、密钥、公司、版本、教程、
|
||||
* 日志),普通账号即使被勾了也用不了。
|
||||
* 工作台客户端包、日志),普通账号即使被勾了也用不了。
|
||||
*
|
||||
* <p>2026-10-06 入口放开后必须与下发集一起剪:现网实查有 13 个普通账号带着 {@code admin_users}、
|
||||
* 11 个带 {@code admin_user_secrets}、9 个带 {@code admin_version} 的授权行,只在出口拦而照常下发
|
||||
@@ -69,7 +69,7 @@ public class PermissionMenuService {
|
||||
"admin_users", "admin_columns", "admin_group_manage",
|
||||
"admin_user_secrets", "admin_user_secret_usage",
|
||||
"admin_version", "digital_human_version", "admin_tutorial",
|
||||
"admin_device_logs");
|
||||
"admin_workbench_client_package", "admin_device_logs");
|
||||
|
||||
private final PermissionMenuMapper permissionMenuMapper;
|
||||
private final UserColumnPermissionMapper userColumnPermissionMapper;
|
||||
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package com.nanri.aiimage.modules.workbenchclient.controller;
|
||||
|
||||
import com.nanri.aiimage.modules.workbenchclient.service.WorkbenchClientPackageService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 工作台客户端公开版本接口。
|
||||
*
|
||||
* <p>返回裸 JSON(不套 ApiResponse),字段名固定为 {@code version/file_url/sha256}:
|
||||
* 客户端更新器直接按这三个字段比较版本、下载、校验摘要。新增字段只能追加,不能改名。
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/api/workbench-client/version")
|
||||
@Tag(name = "工作台客户端公开版本接口", description = "工作台客户端自动更新检查")
|
||||
public class PublicWorkbenchClientVersionController {
|
||||
|
||||
private final WorkbenchClientPackageService packageService;
|
||||
|
||||
@GetMapping("/latest")
|
||||
@Operation(summary = "最新客户端包", description = "返回最新上传的版本号、公开下载直链与 sha256;空表时字段为 null")
|
||||
public Map<String, Object> latestVersion() {
|
||||
return packageService.latestPackage();
|
||||
}
|
||||
|
||||
@GetMapping("/list")
|
||||
@Operation(summary = "客户端包版本列表", description = "按上传时间倒序返回最近 50 条,供客户端「指定版本更新」使用")
|
||||
public Map<String, Object> listVersions() {
|
||||
return packageService.listPublicPackages();
|
||||
}
|
||||
}
|
||||
+82
@@ -0,0 +1,82 @@
|
||||
package com.nanri.aiimage.modules.workbenchclient.controller;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.workbenchclient.service.WorkbenchClientPackageService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
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.GetMapping;
|
||||
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.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 数富AI工作台客户端包管理(后台「工作台客户端包管理」页)。
|
||||
* <p>列表、直传预签名、确认落库、删除;客户端读公开接口
|
||||
* {@code /api/workbench-client/version/latest} 自动检查更新。
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/api/admin/workbench-client")
|
||||
@Tag(name = "工作台客户端包管理", description = "数富AI工作台安装/更新包管理:列表与上传(浏览器直传 MinIO,服务端复算 sha256)")
|
||||
public class WorkbenchClientPackageAdminController {
|
||||
|
||||
private final WorkbenchClientPackageService packageService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
|
||||
@GetMapping("/packages")
|
||||
@Operation(summary = "客户端包列表", description = "按上传时间倒序返回全部记录(第一条即客户端当前更新目标)")
|
||||
public ApiResponse<Map<String, Object>> listPackages(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
log.info("[workbench-client] 管理端查询客户端包列表 operator={}", operator.getUsername());
|
||||
return ApiResponse.success(Map.of("items", packageService.listPackages()));
|
||||
}
|
||||
|
||||
@PostMapping("/package/presign")
|
||||
@Operation(summary = "签发客户端包直传预签名", description = "返回浏览器直传 MinIO client 桶的 PUT 预签名地址;直传完成后调用 /package/confirm 校验落库")
|
||||
public ApiResponse<Map<String, Object>> presignPackage(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "上传的 zip 文件名") @RequestParam(value = "file_name", required = false) String fileName,
|
||||
@Parameter(description = "客户端版本号,如 1.0.0") @RequestParam(value = "version", required = false) String version) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
log.info("[workbench-client] 管理端签发客户端包直传预签名 operator={} fileName={} version={}",
|
||||
operator.getUsername(), fileName, version);
|
||||
return ApiResponse.success(packageService.presignPackage(fileName, version));
|
||||
}
|
||||
|
||||
@PostMapping("/package/confirm")
|
||||
@Operation(summary = "确认客户端包直传完成", description = "服务端核对对象、复算 sha256 并落库,返回新记录行")
|
||||
public ApiResponse<Map<String, Object>> confirmPackage(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "预签名返回的对象 key") @RequestParam(value = "object_key", required = false) String objectKey,
|
||||
@Parameter(description = "上传的 zip 文件名") @RequestParam(value = "file_name", required = false) String fileName,
|
||||
@Parameter(description = "客户端版本号,如 1.0.0") @RequestParam(value = "version", required = false) String version) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
log.info("[workbench-client] 管理端确认客户端包直传完成 operator={} objectKey={} fileName={} version={}",
|
||||
operator.getUsername(), objectKey, fileName, version);
|
||||
return ApiResponse.success("上传成功", Map.of("item",
|
||||
packageService.confirmPackage(objectKey, fileName, version)));
|
||||
}
|
||||
|
||||
@PostMapping("/package/delete")
|
||||
@Operation(summary = "批量删除客户端包", description = "按 id 删除记录;关联 MinIO 包体仅当无其它记录引用时清除")
|
||||
public ApiResponse<Map<String, Object>> deletePackages(
|
||||
HttpServletRequest request,
|
||||
@RequestBody List<Long> ids) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
log.info("[workbench-client] 管理端删除客户端包 operator={} ids={}", operator.getUsername(), ids);
|
||||
int deleted = packageService.deletePackages(ids);
|
||||
return ApiResponse.success("删除成功", Map.of("deleted", deleted));
|
||||
}
|
||||
}
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
package com.nanri.aiimage.modules.workbenchclient.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.nanri.aiimage.modules.workbenchclient.model.entity.WorkbenchClientPackageEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface WorkbenchClientPackageMapper extends BaseMapper<WorkbenchClientPackageEntity> {
|
||||
}
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
package com.nanri.aiimage.modules.workbenchclient.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 数富AI工作台客户端安装/更新包记录。
|
||||
*
|
||||
* <p>包体放公开 client 桶 {@code workbench-client/versions/} 前缀,与桌面端 ShuFuAI 的
|
||||
* {@code nanri-image/versions/} 完全隔离;客户端从 {@code /api/workbench-client/version/latest}
|
||||
* 取版本号、下载直链与 sha256,自行比较版本并升级。
|
||||
*/
|
||||
@Data
|
||||
@TableName("biz_workbench_client_package")
|
||||
public class WorkbenchClientPackageEntity {
|
||||
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
/** 客户端版本号(客户端据此判断是否需要升级) */
|
||||
private String version;
|
||||
|
||||
/** 原始 zip 文件名(展示用) */
|
||||
private String fileName;
|
||||
|
||||
/** MinIO 对象 key(client 桶,workbench-client/versions/ 前缀) */
|
||||
private String objectKey;
|
||||
|
||||
/** 文件字节数 */
|
||||
private Long fileSize;
|
||||
|
||||
/** 更新包 sha256(hex 小写),客户端下载后的完整性锚点 */
|
||||
private String sha256;
|
||||
|
||||
/** 上传时间,由数据库 CURRENT_TIMESTAMP 兜底;最新一条即客户端更新目标 */
|
||||
private LocalDateTime createdAt;
|
||||
}
|
||||
+295
@@ -0,0 +1,295 @@
|
||||
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.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.workbenchclient.mapper.WorkbenchClientPackageMapper;
|
||||
import com.nanri.aiimage.modules.workbenchclient.model.entity.WorkbenchClientPackageEntity;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* 数富AI工作台客户端安装/更新包管理。
|
||||
*
|
||||
* <p>后台只做三件事:上传 zip(浏览器直传 MinIO)、列表、删除。客户端更新接口按上传时间取
|
||||
* 最新一条({@code created_at DESC, id DESC}),删除最新包后自动回落到上一版。
|
||||
* <p>与教程包的关键差别:confirm 阶段必须由服务端从 MinIO 流式复算 sha256 并落库,
|
||||
* 不能留空——客户端下载后要用它做整包完整性校验。
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class WorkbenchClientPackageService {
|
||||
|
||||
/** 独立于桌面端软件版本的前缀:同一公开 client 桶,互不覆盖。 */
|
||||
public static final String OBJECT_KEY_PREFIX = "workbench-client/versions/";
|
||||
|
||||
/** 与桌面端安装包同量级,沿用 512MB 上限。 */
|
||||
private static final long MAX_UPLOAD_BYTES = 512L * 1024 * 1024;
|
||||
|
||||
/** 版本号长度上限,与 biz_workbench_client_package.version VARCHAR(64) 对齐。 */
|
||||
private static final int MAX_VERSION_LENGTH = 64;
|
||||
|
||||
/** 直传预签名有效期:3 分钟足够数百 MB 级安装包上传。 */
|
||||
private static final int PRESIGN_EXPIRY_SECONDS = 180;
|
||||
|
||||
/** 公开版本列表上限:够客户端做「指定版本更新」下拉即可。 */
|
||||
private static final int PUBLIC_LIST_LIMIT = 50;
|
||||
|
||||
private static final DateTimeFormatter CREATED_AT_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
|
||||
|
||||
/** 毫秒级时间戳:同秒连续上传同一版本时也不会覆盖对象。 */
|
||||
private static final DateTimeFormatter OBJECT_NAME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
|
||||
|
||||
/** 对齐软件版本/教程包的 key 安全化规则:保留中文/字母/数字/._-,其余替换为 _。 */
|
||||
private static final Pattern UNSAFE_KEY_CHARS =
|
||||
Pattern.compile("[^\\w.\\-]", Pattern.UNICODE_CHARACTER_CLASS);
|
||||
|
||||
private final WorkbenchClientPackageMapper packageMapper;
|
||||
private final OssStorageService ossStorageService;
|
||||
|
||||
/** 管理端列表:按上传时间倒序,第一条即客户端当前更新目标。 */
|
||||
public List<Map<String, Object>> listPackages() {
|
||||
List<WorkbenchClientPackageEntity> entities = packageMapper.selectList(
|
||||
new LambdaQueryWrapper<WorkbenchClientPackageEntity>()
|
||||
.orderByDesc(WorkbenchClientPackageEntity::getCreatedAt)
|
||||
.orderByDesc(WorkbenchClientPackageEntity::getId));
|
||||
log.info("[workbench-client] 查询客户端包列表 count={}", entities.size());
|
||||
List<Map<String, Object>> items = new ArrayList<>(entities.size());
|
||||
for (WorkbenchClientPackageEntity entity : entities) {
|
||||
items.add(toItemMap(entity));
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
/** 客户端更新检查:最新上传的一条;空表时字段全为 null,客户端保持当前版本。 */
|
||||
public Map<String, Object> latestPackage() {
|
||||
WorkbenchClientPackageEntity entity = newest();
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
if (entity == null) {
|
||||
log.info("[workbench-client] 查询最新客户端包:无记录");
|
||||
result.put("version", null);
|
||||
result.put("file_url", null);
|
||||
result.put("sha256", null);
|
||||
result.put("file_name", null);
|
||||
result.put("file_size", null);
|
||||
result.put("created_at", null);
|
||||
return result;
|
||||
}
|
||||
log.info("[workbench-client] 查询最新客户端包 id={} version={} objectKey={}",
|
||||
entity.getId(), entity.getVersion(), entity.getObjectKey());
|
||||
result.put("version", entity.getVersion() == null ? "" : entity.getVersion());
|
||||
result.put("file_url", downloadUrl(entity));
|
||||
result.put("sha256", entity.getSha256() == null ? "" : entity.getSha256());
|
||||
result.put("file_name", entity.getFileName() == null ? "" : entity.getFileName());
|
||||
result.put("file_size", entity.getFileSize() == null ? 0L : entity.getFileSize());
|
||||
result.put("created_at", formatCreatedAt(entity));
|
||||
return result;
|
||||
}
|
||||
|
||||
/** 公开版本列表:桌面端/工作台「指定版本更新」下拉的数据源。 */
|
||||
public Map<String, Object> listPublicPackages() {
|
||||
List<WorkbenchClientPackageEntity> entities = packageMapper.selectList(
|
||||
new LambdaQueryWrapper<WorkbenchClientPackageEntity>()
|
||||
.orderByDesc(WorkbenchClientPackageEntity::getCreatedAt)
|
||||
.orderByDesc(WorkbenchClientPackageEntity::getId)
|
||||
.last("LIMIT " + PUBLIC_LIST_LIMIT));
|
||||
List<Map<String, Object>> items = new ArrayList<>(entities.size());
|
||||
for (WorkbenchClientPackageEntity entity : entities) {
|
||||
items.add(toItemMap(entity));
|
||||
}
|
||||
log.info("[workbench-client] 查询公开客户端包列表 limit={} count={}", PUBLIC_LIST_LIMIT, items.size());
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("items", items);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 签发直传预签名:对象 key 由「毫秒时间戳 + 安全版本号」组成,每次上传互不覆盖。
|
||||
*/
|
||||
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())
|
||||
+ "-" + safeVersionKey(normalizedVersion) + ".zip";
|
||||
log.info("[workbench-client] 签发客户端包直传预签名 version={} fileName={} objectKey={} expirySeconds={}",
|
||||
normalizedVersion, normalizedName, objectKey, PRESIGN_EXPIRY_SECONDS);
|
||||
String uploadUrl = ossStorageService.presignWorkbenchClientUpload(objectKey, PRESIGN_EXPIRY_SECONDS);
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("object_key", objectKey);
|
||||
result.put("upload_url", uploadUrl);
|
||||
result.put("file_url", ossStorageService.getWorkbenchClientDownloadUrl(objectKey));
|
||||
result.put("version", normalizedVersion);
|
||||
result.put("file_name", normalizedName);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 直传确认:校验对象存在、大小上限、版本号与对象名一致,服务端复算 sha256 后落库。
|
||||
* <p>sha256 为空或长度不对直接拒绝——宁可让管理员重传,也不让客户端拿到没有锚点的包。
|
||||
*/
|
||||
public Map<String, Object> confirmPackage(String objectKey, String fileName, String version) {
|
||||
if (objectKey == null || !objectKey.startsWith(OBJECT_KEY_PREFIX)) {
|
||||
log.warn("[workbench-client] 直传确认失败:非法对象路径 objectKey={}", objectKey);
|
||||
throw new BusinessException("非法的对象路径,请重新上传");
|
||||
}
|
||||
String normalizedName = requireZipFileName(fileName);
|
||||
String normalizedVersion = requireVersion(version);
|
||||
String expectedSuffix = "-" + safeVersionKey(normalizedVersion) + ".zip";
|
||||
if (!objectKey.endsWith(expectedSuffix)) {
|
||||
log.warn("[workbench-client] 直传确认失败:版本号与对象不匹配 version={} objectKey={}",
|
||||
normalizedVersion, objectKey);
|
||||
throw new BusinessException("版本号与上传对象不匹配,请重新上传");
|
||||
}
|
||||
long size = ossStorageService.workbenchClientObjectSize(objectKey);
|
||||
if (size < 0) {
|
||||
log.warn("[workbench-client] 直传确认失败:对象不存在 objectKey={}", objectKey);
|
||||
throw new BusinessException("对象存储中未找到上传的安装包,请重新上传");
|
||||
}
|
||||
if (size > MAX_UPLOAD_BYTES) {
|
||||
log.warn("[workbench-client] 直传对象超过大小上限,清理残留 objectKey={} bytes={}", objectKey, size);
|
||||
ossStorageService.removeWorkbenchClientObject(objectKey);
|
||||
throw new BusinessException("文件超过允许的大小限制");
|
||||
}
|
||||
String sha256 = ossStorageService.workbenchClientObjectSha256(objectKey);
|
||||
if (sha256 == null || sha256.length() != 64) {
|
||||
log.warn("[workbench-client] 直传确认失败:摘要计算异常 objectKey={} sha256={}", objectKey, sha256);
|
||||
throw new BusinessException("安装包摘要计算失败,请重新上传");
|
||||
}
|
||||
Long duplicated = packageMapper.selectCount(new LambdaQueryWrapper<WorkbenchClientPackageEntity>()
|
||||
.eq(WorkbenchClientPackageEntity::getObjectKey, objectKey));
|
||||
if (duplicated != null && duplicated > 0) {
|
||||
log.warn("[workbench-client] 直传确认失败:对象已被记录,重复提交 objectKey={}", objectKey);
|
||||
throw new BusinessException("该安装包已登记,请勿重复提交");
|
||||
}
|
||||
|
||||
WorkbenchClientPackageEntity entity = new WorkbenchClientPackageEntity();
|
||||
entity.setVersion(normalizedVersion);
|
||||
entity.setFileName(normalizedName);
|
||||
entity.setObjectKey(objectKey);
|
||||
entity.setFileSize(size);
|
||||
entity.setSha256(sha256);
|
||||
packageMapper.insert(entity);
|
||||
log.info("[workbench-client] 客户端包登记成功 id={} version={} fileName={} bytes={} sha256={}",
|
||||
entity.getId(), normalizedVersion, normalizedName, size, sha256);
|
||||
WorkbenchClientPackageEntity saved = packageMapper.selectById(entity.getId());
|
||||
return toItemMap(saved == null ? entity : saved);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按 id 批量删除记录;MinIO 对象仅在删除后无任何剩余记录引用时才清除。
|
||||
* <p>最新包被删后,客户端下次检查自动回落到上一版(按上传时间取最新)。
|
||||
*/
|
||||
public int deletePackages(List<Long> ids) {
|
||||
List<Long> distinctIds = ids == null ? List.of() : ids.stream()
|
||||
.filter(id -> id != null).distinct().toList();
|
||||
if (distinctIds.isEmpty()) {
|
||||
throw new BusinessException("请选择要删除的客户端包");
|
||||
}
|
||||
List<WorkbenchClientPackageEntity> targets = packageMapper.selectBatchIds(distinctIds);
|
||||
int deleted = 0;
|
||||
for (Long id : distinctIds) {
|
||||
deleted += packageMapper.deleteById(id);
|
||||
}
|
||||
Set<String> touchedKeys = new LinkedHashSet<>();
|
||||
for (WorkbenchClientPackageEntity target : targets) {
|
||||
if (target.getObjectKey() != null && !target.getObjectKey().isBlank()) {
|
||||
touchedKeys.add(target.getObjectKey());
|
||||
}
|
||||
}
|
||||
int removedObjects = 0;
|
||||
for (String objectKey : touchedKeys) {
|
||||
Long remain = packageMapper.selectCount(new LambdaQueryWrapper<WorkbenchClientPackageEntity>()
|
||||
.eq(WorkbenchClientPackageEntity::getObjectKey, objectKey));
|
||||
if (remain == null || remain <= 0) {
|
||||
removedObjects += removeObjectQuietly(objectKey) ? 1 : 0;
|
||||
}
|
||||
}
|
||||
log.info("[workbench-client] 批量删除客户端包 ids={} deleted={} 清理关联文件数={}",
|
||||
distinctIds, deleted, removedObjects);
|
||||
return deleted;
|
||||
}
|
||||
|
||||
private WorkbenchClientPackageEntity newest() {
|
||||
return packageMapper.selectOne(new LambdaQueryWrapper<WorkbenchClientPackageEntity>()
|
||||
.orderByDesc(WorkbenchClientPackageEntity::getCreatedAt)
|
||||
.orderByDesc(WorkbenchClientPackageEntity::getId)
|
||||
.last("LIMIT 1"));
|
||||
}
|
||||
|
||||
private boolean removeObjectQuietly(String objectKey) {
|
||||
try {
|
||||
if (!objectKey.startsWith(OBJECT_KEY_PREFIX)) {
|
||||
return false;
|
||||
}
|
||||
ossStorageService.removeWorkbenchClientObject(objectKey);
|
||||
return true;
|
||||
} catch (RuntimeException ex) {
|
||||
log.warn("[workbench-client] 清理客户端包对象失败,保留对象 objectKey={} err={}",
|
||||
objectKey, ex.getMessage());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private String requireZipFileName(String fileName) {
|
||||
String normalized = fileName == null ? "" : fileName.trim();
|
||||
if (normalized.isEmpty()) {
|
||||
throw new BusinessException("请选择要上传的 zip 压缩包");
|
||||
}
|
||||
if (!normalized.toLowerCase(Locale.ROOT).endsWith(".zip")) {
|
||||
throw new BusinessException("仅支持 .zip 格式");
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private String requireVersion(String version) {
|
||||
String normalized = version == null ? "" : version.trim();
|
||||
if (normalized.isEmpty()) {
|
||||
throw new BusinessException("请填写版本号");
|
||||
}
|
||||
if (normalized.length() > MAX_VERSION_LENGTH) {
|
||||
throw new BusinessException("版本号不能超过 " + MAX_VERSION_LENGTH + " 个字符");
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private String safeVersionKey(String version) {
|
||||
String replaced = UNSAFE_KEY_CHARS.matcher(version).replaceAll("_");
|
||||
return replaced.isEmpty() ? "unknown" : replaced;
|
||||
}
|
||||
|
||||
private String downloadUrl(WorkbenchClientPackageEntity entity) {
|
||||
return entity.getObjectKey() == null || entity.getObjectKey().isBlank()
|
||||
? "" : ossStorageService.getWorkbenchClientDownloadUrl(entity.getObjectKey());
|
||||
}
|
||||
|
||||
private String formatCreatedAt(WorkbenchClientPackageEntity entity) {
|
||||
return entity.getCreatedAt() == null ? "" : entity.getCreatedAt().format(CREATED_AT_FORMATTER);
|
||||
}
|
||||
|
||||
private Map<String, Object> toItemMap(WorkbenchClientPackageEntity entity) {
|
||||
Map<String, Object> item = new LinkedHashMap<>();
|
||||
item.put("id", entity.getId());
|
||||
item.put("version", entity.getVersion() == null ? "" : entity.getVersion());
|
||||
item.put("file_name", entity.getFileName() == null ? "" : entity.getFileName());
|
||||
item.put("object_key", entity.getObjectKey() == null ? "" : entity.getObjectKey());
|
||||
item.put("file_size", entity.getFileSize() == null ? 0L : entity.getFileSize());
|
||||
item.put("sha256", entity.getSha256() == null ? "" : entity.getSha256());
|
||||
item.put("file_url", downloadUrl(entity));
|
||||
item.put("created_at", formatCreatedAt(entity));
|
||||
return item;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
-- =============================================================
|
||||
-- 迁移 V167__workbench_client_package
|
||||
--
|
||||
-- 1. 变更目的:新增「数富AI工作台客户端包管理」独立渠道。
|
||||
-- - 新表 biz_workbench_client_package 存版本号、文件名、MinIO 对象 key、大小、sha256、上传时间。
|
||||
-- - 包体落公开 client 桶 workbench-client/versions/ 前缀,与桌面端 ShuFuAI 的
|
||||
-- nanri-image/versions/ 隔离;客户端从 /api/workbench-client/version/latest 自动检查更新。
|
||||
-- - 后台菜单 column_key='admin_workbench_client_package',
|
||||
-- route_path='records/workbench-client-package',挂在「记录与版本」组下,排序 83。
|
||||
--
|
||||
-- 2. 口径:
|
||||
-- - 最新包按 created_at DESC, id DESC 取第一条(不设 is_latest 标记);删掉最新包后
|
||||
-- 客户端下一次检查自动回落到上一版。
|
||||
-- - sha256 NOT NULL:后台上传 confirm 阶段由服务端从 MinIO 实物流式复算,空值直接拒绝落库。
|
||||
-- - 菜单 company_id=1 为模板树;其余公司(含停用公司)逐家复制,子行 parent_id 必须认
|
||||
-- 本公司的 admin_group_record 组行,严禁跨公司认父(V149/V164 同一口径)。
|
||||
-- - 本迁移不预授 user_column_permission:该页是管理/平台页(后端 requireAdmin),
|
||||
-- 管理员后续在「菜单权限配置」里按公司分配可见性。
|
||||
--
|
||||
-- 3. 影响表与数据量:新表 1 张;columns +N 行(N=公司数)。字典小表,毫秒级。
|
||||
--
|
||||
-- 4. 【可重跑性】建表 IF NOT EXISTS;两段菜单 INSERT 带 NOT EXISTS 守卫;重跑逐条 no-op。
|
||||
--
|
||||
-- 5. 回滚(如需):
|
||||
-- DELETE FROM columns WHERE column_key='admin_workbench_client_package';
|
||||
-- DROP TABLE IF EXISTS biz_workbench_client_package;
|
||||
-- =============================================================
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `biz_workbench_client_package` (
|
||||
`id` BIGINT NOT NULL AUTO_INCREMENT,
|
||||
`version` VARCHAR(64) NOT NULL COMMENT '客户端版本号(客户端据此判断是否升级)',
|
||||
`file_name` VARCHAR(255) NOT NULL COMMENT '原始 zip 文件名(展示用)',
|
||||
`object_key` VARCHAR(512) NOT NULL COMMENT 'MinIO 对象 key(client 桶,workbench-client/versions/ 前缀)',
|
||||
`file_size` BIGINT NOT NULL DEFAULT 0 COMMENT '文件字节数',
|
||||
`sha256` VARCHAR(64) NOT NULL COMMENT '更新包 sha256(hex 小写),客户端下载后的完整性锚点',
|
||||
`created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '上传时间;最新一条即客户端更新目标',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_workbench_client_object_key` (`object_key`),
|
||||
KEY `idx_workbench_client_created_at` (`created_at`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='数富AI工作台客户端安装/更新包';
|
||||
|
||||
-- ---------- 1. 公司 1 模板行(认公司 1 的 admin_group_record 组行) ----------
|
||||
INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`)
|
||||
SELECT '工作台客户端包管理', 'admin_workbench_client_package', 'admin', 'records/workbench-client-package', 83, grp.`id`, 1
|
||||
FROM `columns` grp
|
||||
WHERE grp.`company_id` = 1 AND grp.`column_key` = 'admin_group_record'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `columns`
|
||||
WHERE `company_id` = 1
|
||||
AND (`column_key` = 'admin_workbench_client_package'
|
||||
OR (`menu_type` = 'admin' AND `route_path` = 'records/workbench-client-package'))
|
||||
);
|
||||
|
||||
-- ---------- 2. 复制到其余公司(含停用公司),各自认本公司组行 ----------
|
||||
INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`)
|
||||
SELECT '工作台客户端包管理', 'admin_workbench_client_package', 'admin', 'records/workbench-client-package', 83, grp.`id`, c.`id`
|
||||
FROM `company` c
|
||||
JOIN `columns` grp ON grp.`company_id` = c.`id` AND grp.`column_key` = 'admin_group_record'
|
||||
WHERE c.`id` <> 1
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `columns` col
|
||||
WHERE col.`company_id` = c.`id`
|
||||
AND (col.`column_key` = 'admin_workbench_client_package'
|
||||
OR (col.`menu_type` = 'admin' AND col.`route_path` = 'records/workbench-client-package'))
|
||||
);
|
||||
|
||||
-- ---------- 3. 自检闸门:不为 0 就抛 1048(V143/V149/V164 家族) ----------
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS `_v167_gate` (`must_be_zero` INT NOT NULL);
|
||||
|
||||
-- 闸门 1:每家公司都必须恰好一行 admin_workbench_client_package(少一家=那家管理员静默看不到)
|
||||
INSERT INTO `_v167_gate`
|
||||
SELECT IF(COUNT(*) = 0, 0, NULL)
|
||||
FROM (
|
||||
SELECT c.`id`
|
||||
FROM `company` c
|
||||
LEFT JOIN `columns` col ON col.`company_id` = c.`id` AND col.`column_key` = 'admin_workbench_client_package'
|
||||
GROUP BY c.`id`
|
||||
HAVING COUNT(col.`id`) <> 1
|
||||
) bad;
|
||||
|
||||
-- 闸门 2:admin/records/workbench-client-package 路由不允许被别的 column_key 占行
|
||||
INSERT INTO `_v167_gate`
|
||||
SELECT IF(COUNT(*) = 0, 0, NULL)
|
||||
FROM `columns` col
|
||||
WHERE col.`menu_type` = 'admin'
|
||||
AND col.`route_path` = 'records/workbench-client-package'
|
||||
AND col.`column_key` <> 'admin_workbench_client_package';
|
||||
|
||||
-- 闸门 3:该菜单行的父必须是本公司的 admin_group_record 组行
|
||||
INSERT INTO `_v167_gate`
|
||||
SELECT IF(COUNT(*) = 0, 0, NULL)
|
||||
FROM (
|
||||
SELECT col.`id`
|
||||
FROM `columns` col
|
||||
LEFT JOIN `columns` grp ON grp.`id` = col.`parent_id` AND grp.`column_key` = 'admin_group_record'
|
||||
WHERE col.`column_key` = 'admin_workbench_client_package'
|
||||
AND (grp.`id` IS NULL OR grp.`company_id` <> col.`company_id`)
|
||||
) bad;
|
||||
|
||||
DROP TEMPORARY TABLE `_v167_gate`;
|
||||
+170
@@ -0,0 +1,170 @@
|
||||
package com.nanri.aiimage.modules.workbenchclient.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
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;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyList;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.verifyNoInteractions;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 工作台客户端包独立渠道:上传确认必须由服务端把 sha256 算出来并落库。
|
||||
* 直传路径若留空摘要,客户端就只能退回「只验 zip 结构」,等于丢了完整性锚点。
|
||||
*/
|
||||
class WorkbenchClientPackageServiceTest {
|
||||
|
||||
private static final String PREFIX = WorkbenchClientPackageService.OBJECT_KEY_PREFIX;
|
||||
private static final String SHA = "b".repeat(64);
|
||||
|
||||
private final WorkbenchClientPackageMapper packageMapper = mock(WorkbenchClientPackageMapper.class);
|
||||
private final OssStorageService ossStorageService = mock(OssStorageService.class);
|
||||
|
||||
private WorkbenchClientPackageService service() {
|
||||
return new WorkbenchClientPackageService(packageMapper, ossStorageService);
|
||||
}
|
||||
|
||||
@BeforeAll
|
||||
static void initializeMybatisMetadata() {
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), WorkbenchClientPackageEntity.class);
|
||||
}
|
||||
|
||||
private static WorkbenchClientPackageEntity row(long id, String version, String objectKey) {
|
||||
WorkbenchClientPackageEntity entity = new WorkbenchClientPackageEntity();
|
||||
entity.setId(id);
|
||||
entity.setVersion(version);
|
||||
entity.setFileName("ShuFuAI-Workbench-" + version + ".zip");
|
||||
entity.setObjectKey(objectKey);
|
||||
entity.setFileSize(1234L);
|
||||
entity.setSha256(SHA);
|
||||
entity.setCreatedAt(LocalDateTime.of(2026, 10, 24, 10, 0));
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Test
|
||||
void presignUsesIndependentPrefixAndReturnsUploadUrl() {
|
||||
when(ossStorageService.presignWorkbenchClientUpload(anyString(), eq(180)))
|
||||
.thenReturn("https://oss.aishufu.top/client/workbench-client/versions/put");
|
||||
when(ossStorageService.getWorkbenchClientDownloadUrl(anyString()))
|
||||
.thenReturn("https://download.aishufu.top/client/workbench-client/versions/1.2.3.zip");
|
||||
|
||||
Map<String, Object> result = service().presignPackage("ShuFuAI-Workbench-1.2.3.zip", "1.2.3");
|
||||
|
||||
String objectKey = (String) result.get("object_key");
|
||||
assertTrue(objectKey.startsWith(PREFIX), "对象 key 必须落在独立前缀下: " + objectKey);
|
||||
assertTrue(objectKey.endsWith("-1.2.3.zip"), "对象 key 必须以版本号收尾: " + objectKey);
|
||||
assertEquals("1.2.3", result.get("version"));
|
||||
assertEquals("ShuFuAI-Workbench-1.2.3.zip", result.get("file_name"));
|
||||
assertEquals("https://oss.aishufu.top/client/workbench-client/versions/put", result.get("upload_url"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void presignRejectsNonZipAndBlankVersion() {
|
||||
assertThrows(BusinessException.class, () -> service().presignPackage("pkg.exe", "1.0.0"));
|
||||
assertThrows(BusinessException.class, () -> service().presignPackage("pkg.zip", " "));
|
||||
verifyNoInteractions(ossStorageService);
|
||||
}
|
||||
|
||||
@Test
|
||||
void confirmRecomputesSha256BeforeInsert() {
|
||||
String objectKey = PREFIX + "20261024100000123-1.2.3.zip";
|
||||
when(ossStorageService.workbenchClientObjectSize(objectKey)).thenReturn(1234L);
|
||||
when(ossStorageService.workbenchClientObjectSha256(objectKey)).thenReturn(SHA);
|
||||
when(ossStorageService.getWorkbenchClientDownloadUrl(objectKey))
|
||||
.thenReturn("https://download.aishufu.top/client/" + objectKey);
|
||||
when(packageMapper.selectCount(any())).thenReturn(0L);
|
||||
when(packageMapper.insert(any(WorkbenchClientPackageEntity.class))).thenAnswer(invocation -> {
|
||||
((WorkbenchClientPackageEntity) invocation.getArgument(0)).setId(99L);
|
||||
return 1;
|
||||
});
|
||||
when(packageMapper.selectById(99L)).thenReturn(row(99, "1.2.3", objectKey));
|
||||
|
||||
Map<String, Object> result = service().confirmPackage(
|
||||
objectKey, "ShuFuAI-Workbench-1.2.3.zip", "1.2.3");
|
||||
|
||||
assertEquals(SHA, result.get("sha256"), "返回行必须带服务端复算出的摘要");
|
||||
verify(ossStorageService).workbenchClientObjectSha256(objectKey);
|
||||
verify(packageMapper).insert(any(WorkbenchClientPackageEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void confirmRejectsVersionThatDoesNotMatchObjectKey() {
|
||||
String objectKey = PREFIX + "20261024100000123-1.2.3.zip";
|
||||
|
||||
assertThrows(BusinessException.class, () -> service().confirmPackage(
|
||||
objectKey, "ShuFuAI-Workbench-1.2.4.zip", "1.2.4"));
|
||||
|
||||
verifyNoInteractions(ossStorageService);
|
||||
verify(packageMapper, never()).insert(any(WorkbenchClientPackageEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void confirmRemovesOversizeObjectWithoutHashing() {
|
||||
String objectKey = PREFIX + "20261024100000123-1.2.3.zip";
|
||||
when(ossStorageService.workbenchClientObjectSize(objectKey)).thenReturn(513L * 1024 * 1024);
|
||||
|
||||
assertThrows(BusinessException.class, () -> service().confirmPackage(
|
||||
objectKey, "ShuFuAI-Workbench-1.2.3.zip", "1.2.3"));
|
||||
|
||||
verify(ossStorageService).removeWorkbenchClientObject(objectKey);
|
||||
verify(ossStorageService, never()).workbenchClientObjectSha256(anyString());
|
||||
verify(packageMapper, never()).insert(any(WorkbenchClientPackageEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void latestReturnsNullFieldsWhenTableIsEmpty() {
|
||||
when(packageMapper.selectOne(any())).thenReturn(null);
|
||||
|
||||
Map<String, Object> result = service().latestPackage();
|
||||
|
||||
assertNull(result.get("version"));
|
||||
assertNull(result.get("file_url"));
|
||||
assertNull(result.get("sha256"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteRemovesObjectOnlyWhenNoOtherRowReferencesIt() {
|
||||
WorkbenchClientPackageEntity target = row(9, "1.2.3", PREFIX + "20261024100000123-1.2.3.zip");
|
||||
when(packageMapper.selectBatchIds(anyList())).thenReturn(List.of(target));
|
||||
when(packageMapper.deleteById(9L)).thenReturn(1);
|
||||
when(packageMapper.selectCount(any())).thenReturn(0L);
|
||||
|
||||
int deleted = service().deletePackages(List.of(9L));
|
||||
|
||||
assertEquals(1, deleted);
|
||||
verify(ossStorageService).removeWorkbenchClientObject(target.getObjectKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
void deleteKeepsObjectWhenAnotherRowStillReferencesIt() {
|
||||
WorkbenchClientPackageEntity target = row(9, "1.2.3", PREFIX + "20261024100000123-1.2.3.zip");
|
||||
when(packageMapper.selectBatchIds(anyList())).thenReturn(List.of(target));
|
||||
when(packageMapper.deleteById(9L)).thenReturn(1);
|
||||
when(packageMapper.selectCount(any())).thenReturn(1L);
|
||||
|
||||
service().deletePackages(List.of(9L));
|
||||
|
||||
verify(ossStorageService, never()).removeWorkbenchClientObject(anyString());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user