From 5d97780e34ffe6f8f254e165a471908b1623e5a8 Mon Sep 17 00:00:00 2001 From: ReaJason Date: Mon, 24 Mar 2025 16:21:44 +0800 Subject: [PATCH] fix: dev version no update --- .../javaweb/boot/controller/VersionController.java | 5 +++++ web/src/components/version-badge.tsx | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java b/boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java index d6827921..349a1b89 100644 --- a/boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java +++ b/boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java @@ -36,6 +36,11 @@ public class VersionController { @GetMapping public VersionInfo version() { + if ("dev".equals(version)) { + return VersionInfo.builder() + .currentVersion(version) + .latestVersion(version).build(); + } String latestVersion = getLatestGithubRelease(); return VersionInfo.builder() .currentVersion(version) diff --git a/web/src/components/version-badge.tsx b/web/src/components/version-badge.tsx index 86041f53..40bebcc6 100644 --- a/web/src/components/version-badge.tsx +++ b/web/src/components/version-badge.tsx @@ -4,9 +4,8 @@ import { CircleX, LoaderCircle, RefreshCcw } from "lucide-react"; import type React from "react"; import { useTranslation } from "react-i18next"; import { Button } from "./ui/button"; -import { TooltipContent, TooltipTrigger } from "./ui/tooltip"; -import { Tooltip } from "./ui/tooltip"; -import { TooltipProvider } from "./ui/tooltip"; +import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./ui/tooltip"; + type VersionInfo = { currentVersion: string; latestVersion: string; @@ -26,6 +25,7 @@ const VersionBadge: React.FC = () => { }); const inProduction = env.MODE === "production"; const { t } = useTranslation(); + const version = data?.currentVersion === "dev" ? data?.currentVersion : `v${data?.currentVersion}`; return (
@@ -81,7 +81,7 @@ const VersionBadge: React.FC = () => { size="sm" variant="ghost" > - v{data.currentVersion} + {version} )}