diff --git a/.env.prod b/.env.prod
index 4c0f215..cb7d259 100644
--- a/.env.prod
+++ b/.env.prod
@@ -3,4 +3,4 @@
FT_NODE_ENV=prod
FT_WS_URL=ws://192.168.100.168:8080/ws
-FT_PROXY=http://192.168.1.168
\ No newline at end of file
+FT_PROXY=http://127.0.0.1:8080
\ No newline at end of file
diff --git a/.env.test b/.env.test
index e45cade..37ec341 100644
--- a/.env.test
+++ b/.env.test
@@ -2,5 +2,5 @@
FT_NODE_ENV=test
-FT_WS_URL=ws://192.168.1.200:8080/ws
+FT_WS_URL=ws://192.168.100.168:8080/ws
FT_PROXY=http://192.168.1.200:8080
\ No newline at end of file
diff --git a/increment-version.js b/increment-version.js
index 3239813..a1db336 100644
--- a/increment-version.js
+++ b/increment-version.js
@@ -1,3 +1,4 @@
+import { execSync } from 'node:child_process'
import fs from 'node:fs'
import path, { dirname } from 'node:path'
import { fileURLToPath } from 'node:url'
@@ -10,6 +11,7 @@ const packagePath = path.resolve(__dirname, 'package.json')
const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf-8'))
// 读取命令行参数(默认使用 'patch')
+// eslint-disable-next-line node/prefer-global/process
const versionType = process.argv[2] || 'patch'
// 递增版本
@@ -21,3 +23,21 @@ if (!newVersion) {
packageJson.version = newVersion
fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2))
console.log(`Version updated to: ${newVersion}`)
+
+// 新增:自动提交 package.json 到远程仓库
+try {
+ // 将 package.json 添加到暂存区
+ execSync('git add package.json')
+ console.log('Added package.json to staging area.')
+
+ // 提交更改
+ execSync(`git commit -m "fix: Update version to V${newVersion}"`)
+ console.log(`Committed changes with message: Update version to ${newVersion}`)
+
+ // 推送到远程仓库
+ execSync('git push')
+ console.log('Pushed changes to remote repository.')
+}
+catch (error) {
+ console.error('Failed to commit and push changes:', error.message)
+}
diff --git a/src/app.vue b/src/app.vue
index b10a753..4edf297 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -1,5 +1,22 @@
diff --git a/src/env.d.ts b/src/env.d.ts
index 77a85e8..91c2d53 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -10,6 +10,8 @@ interface ImportMeta {
readonly env: ImportMetaEnv
}
+declare const __APP_VERSION__: string;
+
declare module '*.vue' {
import type { DefineComponent } from 'vue'
diff --git a/src/views/main/index.vue b/src/views/main/index.vue
index bb4fe6c..a20d178 100644
--- a/src/views/main/index.vue
+++ b/src/views/main/index.vue
@@ -16,6 +16,7 @@ const router = useRouter()
const systemStore = useSystemStore() // 使用 systemStore
const checkVisible = ref(false)
+console.log(import.meta.env.FT_NODE_ENV)
const cancel = () => {
checkVisible.value = false
@@ -24,7 +25,7 @@ const cancel = () => {
const getStatus = async () => {
await getDeviceStatus().then((res: any) => {
systemStore.updateSystemStatus(res)
- if (!systemStore.systemStatus.selfTestCompleted) {
+ if (!systemStore.systemStatus.selfTestCompleted && import.meta.env.FT_NODE_ENV !== 'test') {
ElMessageBox.confirm('检测到您还未完成自检,是否开始自检?', '提示', {
type: 'warning',
confirmButtonText: '确定',
diff --git a/vite.config.ts b/vite.config.ts
index 148617d..9f1a968 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -84,7 +84,7 @@ export default defineConfig({
host: '0.0.0.0',
proxy: {
'/api': {
- target: 'http://192.168.1.199:8080',
+ target: '192.168.100.168:8080',
// target: 'http://192.168.1.200:8080',
// secure: false,
changeOrigin: true, // 是否跨域