From 2163c6b585ab654e1b3d987c65a2fbe2fc3a42e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com>
Date: Mon, 26 Oct 2026 15:13:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(workbench-client):=20=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E5=BC=BA=E6=A0=A1=E9=AA=8C=E7=BA=AF=E6=95=B0=E5=AD=97=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=B9=B6=E5=BD=92=E4=B8=80=E5=8C=96=E5=AD=98=E9=87=8F?=
=?UTF-8?q?=20v=20=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
客户端按 x.y.z 逐段比较,v1.0.112 会被严格解析器判非法,检查更新永远回「已是最新」。
- presign/confirm 只接受 ^\d+\.\d+\.\d+$,带 v 前缀、两段或后缀直接拒绝
- V178 剥离存量 v/V 前缀,冲突时中止迁移
- 后管上传表单同步校验并提示格式
---
.../records/WorkbenchClientPackagePage.vue | 6 +--
.../pages/records/workbench-client-model.ts | 9 +++-
.../tests/align-workbench-client.test.ts | 2 +
.../tests/pure/workbench-client-model.test.ts | 13 ++++--
.../WorkbenchClientPackageService.java | 9 ++++
...orkbench_client_version_strip_v_prefix.sql | 45 +++++++++++++++++++
.../WorkbenchClientPackageServiceTest.java | 14 ++++++
7 files changed, 90 insertions(+), 8 deletions(-)
create mode 100644 backend-java/src/main/resources/db/V178__workbench_client_version_strip_v_prefix.sql
diff --git a/admin-frontend-vue/src/pages/records/WorkbenchClientPackagePage.vue b/admin-frontend-vue/src/pages/records/WorkbenchClientPackagePage.vue
index 7d190b87b..fff4f564c 100644
--- a/admin-frontend-vue/src/pages/records/WorkbenchClientPackagePage.vue
+++ b/admin-frontend-vue/src/pages/records/WorkbenchClientPackagePage.vue
@@ -129,7 +129,7 @@ async function submitUpload() {
return
}
if (!isValidWorkbenchClientVersion(newVersion.value)) {
- uploadMsg.value = `版本号不能超过 ${WORKBENCH_CLIENT_VERSION_MAX_LENGTH} 个字符`
+ uploadMsg.value = '版本号必须是纯数字 x.y.z 格式(如 1.0.113),不能带 v 前缀或其他后缀'
return
}
if (!pickedFile.value) {
@@ -242,8 +242,8 @@ onMounted(load)
上传数富AI工作台客户端 ZIP 包后,客户端会从公开版本接口自动检测到新版本并升级;服务端会复算 sha256 供客户端校验。
-
- 客户端按版本号判断是否需要升级,必填
+
+ 客户端按版本号判断是否需要升级,必填;不要带 v 前缀
diff --git a/admin-frontend-vue/src/pages/records/workbench-client-model.ts b/admin-frontend-vue/src/pages/records/workbench-client-model.ts
index 348c4c902..50a5a007d 100644
--- a/admin-frontend-vue/src/pages/records/workbench-client-model.ts
+++ b/admin-frontend-vue/src/pages/records/workbench-client-model.ts
@@ -51,10 +51,15 @@ export function parseWorkbenchClientPackageUpload(payload: unknown): WorkbenchCl
return item ? toWorkbenchClientPackageItem(item) : null
}
-/** 版本号必填且不超过后端列宽;客户端要靠它比较是否需要升级。 */
+/**
+ * 版本号必填、纯数字 x.y.z、且不超过后端列宽。
+ * 客户端按数字逐段比较,v 前缀/两段/后缀会让严格解析器判非法 ⇒ 检查更新永远回「已是最新」。
+ */
export function isValidWorkbenchClientVersion(value: string): boolean {
const normalized = typeof value === 'string' ? value.trim() : ''
- return normalized.length > 0 && normalized.length <= WORKBENCH_CLIENT_VERSION_MAX_LENGTH
+ return normalized.length > 0
+ && normalized.length <= WORKBENCH_CLIENT_VERSION_MAX_LENGTH
+ && /^\d+\.\d+\.\d+$/.test(normalized)
}
/** 字节数展示:0=未知展示为 -,其余按 KB/MB/GB 人性化。 */
diff --git a/admin-frontend-vue/tests/align-workbench-client.test.ts b/admin-frontend-vue/tests/align-workbench-client.test.ts
index 73896acfd..e814451ba 100644
--- a/admin-frontend-vue/tests/align-workbench-client.test.ts
+++ b/admin-frontend-vue/tests/align-workbench-client.test.ts
@@ -21,6 +21,7 @@ test('align_workbench_client_page_wiring', () => {
assert.match(page, /uploadWorkbenchClientPackage/, '上传走工作台客户端包直传链路')
assert.match(page, /label="版本号" required/, '上传弹窗要求填写版本号')
assert.match(page, /请填写版本号/, '未填版本号时提示')
+ assert.match(page, /不能带 v 前缀/, '版本号格式校验提示与上传接口契约一致')
assert.match(page, /仅支持 \.zip 格式/, '格式校验提示')
assert.match(page, /上传成功,客户端已可检测到新版本/, '成功提示说明客户端已能检测更新')
// 列表:当前生效标记、sha256、下载、删除、空态。
@@ -53,6 +54,7 @@ test('align_workbench_client_model_parsers', () => {
assert.match(model, /r\.object_key \?\? r\.objectKey/, '兼容 snake/camel 对象 key')
assert.match(model, /r\.sha256/, '解析 sha256')
assert.match(model, /isValidWorkbenchClientVersion/, '版本号必填校验')
+ assert.match(model, /\^\\d\+\\\.\\d\+\\\.\\d\+\$/, '版本号仅接受纯数字 x.y.z')
})
test('align_workbench_client_guide_registered', () => {
diff --git a/admin-frontend-vue/tests/pure/workbench-client-model.test.ts b/admin-frontend-vue/tests/pure/workbench-client-model.test.ts
index 178ab003b..7bc5db5af 100644
--- a/admin-frontend-vue/tests/pure/workbench-client-model.test.ts
+++ b/admin-frontend-vue/tests/pure/workbench-client-model.test.ts
@@ -66,12 +66,19 @@ describe('workbench-client model:列表解析', () => {
})
describe('workbench-client model:版本号与大小', () => {
- it('版本号必填且不超过后端列宽', () => {
+ it('版本号必须是纯数字 x.y.z,且不超过后端列宽', () => {
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)
+ expect(isValidWorkbenchClientVersion('1.0.112')).toBe(true)
+ // v 前缀/两段/后缀会让客户端比较失效(2026-10-26 线上实录)
+ expect(isValidWorkbenchClientVersion('v1.0.112')).toBe(false)
+ expect(isValidWorkbenchClientVersion('V1.0.112')).toBe(false)
+ expect(isValidWorkbenchClientVersion('1.0')).toBe(false)
+ expect(isValidWorkbenchClientVersion('1.0.112-beta')).toBe(false)
+ expect(isValidWorkbenchClientVersion('release-x')).toBe(false)
+ expect(isValidWorkbenchClientVersion('1'.repeat(WORKBENCH_CLIENT_VERSION_MAX_LENGTH - 4) + '.0.0')).toBe(true)
+ expect(isValidWorkbenchClientVersion('1'.repeat(WORKBENCH_CLIENT_VERSION_MAX_LENGTH - 3) + '.0.0')).toBe(false)
})
it('大小展示与旧页面口径一致', () => {
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/workbenchclient/service/WorkbenchClientPackageService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/workbenchclient/service/WorkbenchClientPackageService.java
index dfa5ba8fb..3758a7cf7 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/workbenchclient/service/WorkbenchClientPackageService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/workbenchclient/service/WorkbenchClientPackageService.java
@@ -52,6 +52,12 @@ public class WorkbenchClientPackageService {
/** 版本号长度上限,与 biz_workbench_client_package.version VARCHAR(64) 对齐。 */
private static final int MAX_VERSION_LENGTH = 64;
+ /**
+ * 发布版本号必须是不带前缀的纯数字 x.y.z:客户端按数字逐段比较,
+ * "v1.0.112" / "1.0.112-beta" 会让严格解析器判为非法或比较失效。
+ */
+ private static final Pattern VERSION_PATTERN = Pattern.compile("\\d+\\.\\d+\\.\\d+");
+
/** 直传预签名默认有效期:90MB 级包在慢公网入口上传时,3 分钟窗口会在途过期。 */
private static final int DEFAULT_PRESIGN_EXPIRY_SECONDS = 3600;
@@ -486,6 +492,9 @@ public class WorkbenchClientPackageService {
if (normalized.length() > MAX_VERSION_LENGTH) {
throw new BusinessException("版本号不能超过 " + MAX_VERSION_LENGTH + " 个字符");
}
+ if (!VERSION_PATTERN.matcher(normalized).matches()) {
+ throw new BusinessException("版本号必须是纯数字 x.y.z 格式(如 1.0.112),不能带 v 前缀或其他后缀");
+ }
return normalized;
}
diff --git a/backend-java/src/main/resources/db/V178__workbench_client_version_strip_v_prefix.sql b/backend-java/src/main/resources/db/V178__workbench_client_version_strip_v_prefix.sql
new file mode 100644
index 000000000..55db35e76
--- /dev/null
+++ b/backend-java/src/main/resources/db/V178__workbench_client_version_strip_v_prefix.sql
@@ -0,0 +1,45 @@
+-- =============================================================
+-- 迁移 V178__workbench_client_version_strip_v_prefix
+--
+-- 1. 变更目的:把存量「工作台客户端包」版本号里的 v/V 前缀剥掉。
+-- 客户端按纯数字 x.y.z 逐段比较(见 docs/AI工作台客户端-版本更新对接文档.md 4.1),
+-- "v1.0.112" 会让严格解析器判非法 ⇒ 检查更新永远回「已是最新」。
+-- 2026-10-26 起上传接口已在 requireVersion 强校验纯数字 x.y.z,本迁移只清存量。
+--
+-- 2. 口径:
+-- - 只剥「v/V 紧跟数字」的行(v1.0.112 → 1.0.112),其他历史格式原样保留;
+-- - 先自检剥完后是否撞 uk_workbench_client_version(V176 唯一键),有冲突就抛 1048
+-- 中止,由人工决定保留哪一行,迁移不静默删数据;
+-- - object_key 里的 -v1.0.112.zip 不动:客户端只用 file_url 原样下载,key 不是版本判据。
+--
+-- 3. 影响表与数据量:biz_workbench_client_package,KB 级字典表,当前 2 行。
+--
+-- 4. 回滚(如需):不可逆。v 前缀已无业务意义;恢复只能人工按审计记录回填。
+-- =============================================================
+
+CREATE TEMPORARY TABLE IF NOT EXISTS `_v178_gate` (`must_be_zero` INT NOT NULL);
+
+-- 闸门 1:剥前缀后若与既有版本撞唯一键,中止(不静默丢行)
+INSERT INTO `_v178_gate`
+SELECT IF(COUNT(*) = 0, 0, NULL)
+FROM (
+ SELECT normalized.version
+ FROM (
+ SELECT CASE WHEN version REGEXP '^[vV][0-9]' THEN SUBSTRING(version, 2) ELSE version END AS version
+ FROM `biz_workbench_client_package`
+ ) normalized
+ GROUP BY normalized.version
+ HAVING COUNT(*) > 1
+) duplicated;
+
+UPDATE `biz_workbench_client_package`
+SET `version` = SUBSTRING(`version`, 2)
+WHERE `version` REGEXP '^[vV][0-9]';
+
+-- 闸门 2:迁移后不允许再存在 v/V+数字开头的版本
+INSERT INTO `_v178_gate`
+SELECT IF(COUNT(*) = 0, 0, NULL)
+FROM `biz_workbench_client_package`
+WHERE `version` REGEXP '^[vV][0-9]';
+
+DROP TEMPORARY TABLE `_v178_gate`;
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/workbenchclient/service/WorkbenchClientPackageServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/workbenchclient/service/WorkbenchClientPackageServiceTest.java
index fc4396386..e18a54991 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/workbenchclient/service/WorkbenchClientPackageServiceTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/workbenchclient/service/WorkbenchClientPackageServiceTest.java
@@ -144,6 +144,20 @@ class WorkbenchClientPackageServiceTest {
verifyNoInteractions(ossStorageService);
}
+ @Test
+ void rejectsVersionsOutsideNumericXyzContract() {
+ // 客户端按纯数字 x.y.z 解析;v 前缀/两段/后缀都会让它判成非法或不升级(2026-10-26 线上实录)
+ for (String bad : List.of("v1.0.112", "V1.0.112", "1.0", "1.0.112-beta", "release-x")) {
+ BusinessException ex = assertThrows(BusinessException.class,
+ () -> service().presignPackage("pkg.zip", bad), "应拒绝版本号: " + bad);
+ assertTrue(ex.getMessage().contains("x.y.z"), ex.getMessage());
+ }
+ assertThrows(BusinessException.class,
+ () -> service().confirmPackage(PREFIX + "20261024100000123-v1.0.112.zip",
+ "ShuFuAI-Workbench-v1.0.112.zip", "v1.0.112"));
+ verifyNoInteractions(ossStorageService);
+ }
+
@Test
void confirmRecomputesSha256BeforeInsert() {
String objectKey = PREFIX + "20261024100000123-1.2.3.zip";