From 13eb6604dd95dea5fca4b81bf6b4455c2bcbf416 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期一, 31 八月 2026 10:56:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/tcm-training
---
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/system/service/AppVersionSettingsAppService.java | 26 ++++++++++++++++++++++++++
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/system/controller/AppVersionController.java | 5 +++--
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/system/controller/AppVersionController.java b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/system/controller/AppVersionController.java
index 015f1be..c6455ff 100644
--- a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/system/controller/AppVersionController.java
+++ b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/system/controller/AppVersionController.java
@@ -31,8 +31,9 @@
*/
@GetMapping("/check")
public ApiResponse<AppVersionCheckVO> checkUpdate(@RequestParam String platform,
- @RequestParam Integer currentVersionCode,
+ @RequestParam(required = false) Integer currentVersionCode,
@RequestParam(required = false) String currentVersionNo) {
- return ApiResponse.ok(appVersionSettingsAppService.checkUpdate(platform, currentVersionCode, currentVersionNo));
+// return ApiResponse.ok(appVersionSettingsAppService.checkUpdate(platform, currentVersionCode, currentVersionNo));
+ return ApiResponse.ok(appVersionSettingsAppService.checkUpdateNew(platform));
}
}
diff --git a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/system/service/AppVersionSettingsAppService.java b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/system/service/AppVersionSettingsAppService.java
index ce43d2c..54cb396 100644
--- a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/system/service/AppVersionSettingsAppService.java
+++ b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/system/service/AppVersionSettingsAppService.java
@@ -99,6 +99,32 @@
return vo;
}
+ public AppVersionCheckVO checkUpdateNew(String platform) {
+
+ String normalizedPlatform = normalizePlatform(platform);
+ AppVersionConfig latest = latest();
+ AppVersionCheckVO vo = new AppVersionCheckVO();
+ if (latest == null) {
+ vo.setHasUpdate(Boolean.FALSE);
+ return vo;
+ }
+
+ String downloadUrl = AppVersionConfig.PLATFORM_ANDROID.equals(normalizedPlatform)
+ ? normalizeOptionalText(latest.getAndroidFileUrl())
+ : normalizeOptionalText(latest.getIosFileUrl());
+ boolean hasUpdate = downloadUrl != null;
+ vo.setHasUpdate(hasUpdate);
+ if (!hasUpdate) {
+ return vo;
+ }
+ vo.setLatestVersionNo(latest.getVersionNo());
+ vo.setLatestVersionCode(defaultNumber(latest.getVersionCode()));
+ vo.setForceUpdate(integerToBoolean(latest.getForceUpdate()));
+ vo.setUpdateNotice(latest.getUpdateNotice());
+ vo.setDownloadUrl(downloadUrl);
+ return vo;
+ }
+
/**
* 判断后台最新版本是否高于当前 APP，兼容原生 versionCode 与展示 versionNo 不一致的历史包。
*/
--
Gitblit v1.7.1