Skip to content

Commit 7b1924a

Browse files
committed
fix: dev version no update
1 parent bfcbe21 commit 7b1924a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

boot/src/main/java/com/reajason/javaweb/boot/controller/VersionController.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ public VersionController(RestTemplate restTemplate) {
3636

3737
@GetMapping
3838
public VersionInfo version() {
39+
if ("dev".equals(version)) {
40+
return VersionInfo.builder()
41+
.currentVersion(version)
42+
.latestVersion(version).build();
43+
}
3944
String latestVersion = getLatestGithubRelease();
4045
return VersionInfo.builder()
4146
.currentVersion(version)

web/src/components/version-badge.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import { CircleX, LoaderCircle, RefreshCcw } from "lucide-react";
44
import type React from "react";
55
import { useTranslation } from "react-i18next";
66
import { Button } from "./ui/button";
7-
import { TooltipContent, TooltipTrigger } from "./ui/tooltip";
8-
import { Tooltip } from "./ui/tooltip";
9-
import { TooltipProvider } from "./ui/tooltip";
7+
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./ui/tooltip";
8+
109
type VersionInfo = {
1110
currentVersion: string;
1211
latestVersion: string;
@@ -26,6 +25,7 @@ const VersionBadge: React.FC = () => {
2625
});
2726
const inProduction = env.MODE === "production";
2827
const { t } = useTranslation();
28+
const version = data?.currentVersion === "dev" ? data?.currentVersion : `v${data?.currentVersion}`;
2929

3030
return (
3131
<div className="flex items-center space-x-2">
@@ -81,7 +81,7 @@ const VersionBadge: React.FC = () => {
8181
size="sm"
8282
variant="ghost"
8383
>
84-
<span>v{data.currentVersion}</span>
84+
<span>{version}</span>
8585
</Button>
8686
)}
8787
</div>

0 commit comments

Comments
 (0)