From 0529c2747a6cb074db497889dfdbca99d5898eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E7=BB=A7=E9=A3=8E?= <1914007838@qq.com>
Date: Tue, 25 Jun 2024 10:16:11 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/.gitignore           |  3 ++-
 web/src/utils/upgrade.ts | 13 +++++++------
 web/vite.config.ts       |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/.gitignore b/web/.gitignore
index 455b613..8cef918 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -21,4 +21,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-public/version
+# 构建版本文件，无需上传git
+public/version-build
diff --git a/web/src/utils/upgrade.ts b/web/src/utils/upgrade.ts
index 6ca9e67..a571863 100644
--- a/web/src/utils/upgrade.ts
+++ b/web/src/utils/upgrade.ts
@@ -5,8 +5,9 @@ import {ElNotification} from "element-plus";
 import fs from "fs";
 
 // 是否显示升级提示信息框
-export const IS_SHOW_UPGRADE_SESSION_KEY = 'isShowUpgrade';
-const versionKey = 'DVADMIN3_VERSION'
+const IS_SHOW_UPGRADE_SESSION_KEY = 'isShowUpgrade';
+const VERSION_KEY = 'DVADMIN3_VERSION'
+const VERSION_FILE_NAME = 'version-build'
 
 export function showUpgrade  () {
     const isShowUpgrade = Session.get(IS_SHOW_UPGRADE_SESSION_KEY) ?? false
@@ -28,13 +29,13 @@ export async function checkVersion(){
         return
     }
     // 获取线上版本号 t为时间戳，防止缓存
-    await axios.get(`/version?t=${new Date().getTime()}`).then(res => {
+    await axios.get(`/${VERSION_FILE_NAME}?t=${new Date().getTime()}`).then(res => {
         const {status, data} = res || {}
         if (status === 200) {
             // 获取当前版本号
-            const localVersion = Local.get(versionKey)
+            const localVersion = Local.get(VERSION_KEY)
             // 将当前版本号持久缓存至本地
-            Local.set(versionKey, data)
+            Local.set(VERSION_KEY, data)
             // 当用户本地存在版本号并且和线上版本号不一致时，进行页面刷新操作
             if (localVersion && localVersion !== data) {
                 // 本地缓存版本号和线上版本号不一致，弹出升级提示框
@@ -50,5 +51,5 @@ export async function checkVersion(){
 export function generateVersionFile (){
     // 生成版本文件到public目录下version文件中
     const version = `${process.env.npm_package_version}.${new Date().getTime()}`;
-    fs.writeFileSync('public/version', version);
+    fs.writeFileSync(`public/${VERSION_FILE_NAME}`, version);
 }
diff --git a/web/vite.config.ts b/web/vite.config.ts
index d91057f..ed6dec2 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -3,7 +3,7 @@ import { resolve } from 'path';
 import { defineConfig, loadEnv, ConfigEnv } from 'vite';
 import vueSetupExtend from 'vite-plugin-vue-setup-extend';
 import vueJsx from '@vitejs/plugin-vue-jsx'
-import { generateVersionFile } from "./src/utils/upgrade";
+import { generateVersionFile } from "/@/utils/upgrade";
 
 const pathResolve = (dir: string) => {
 	return resolve(__dirname, '.', dir);