fix: 修复ws相关逻辑

This commit is contained in:
DLmaster361
2025-09-11 21:57:24 +08:00
parent ed81cc65ce
commit a33e2675dd
10 changed files with 542 additions and 345 deletions

View File

@@ -42,6 +42,7 @@ import { ref, onMounted } from 'vue'
import { getConfig } from '@/utils/config'
import { getMirrorUrl } from '@/config/mirrors'
import router from '@/router'
import { connectAfterBackendStart } from '@/composables/useWebSocket'
@@ -185,6 +186,15 @@ async function startBackendService() {
if (!result.success) {
throw new Error(`后端服务启动失败: ${result.error}`)
}
// 后端启动成功建立WebSocket连接
console.log('后端启动成功正在建立WebSocket连接...')
const wsConnected = await connectAfterBackendStart()
if (!wsConnected) {
console.warn('WebSocket连接建立失败但继续进入应用')
} else {
console.log('WebSocket连接建立成功')
}
}
// 组件挂载时开始自动流程

View File

@@ -7,7 +7,34 @@
>
<!-- <div class="header-actions">-->
<!-- <a-button size="large" type="primary" @click="handleSkipToHome">-->
<!-- <a-button size="large" type="prim try {
const result = await window.electronAPI.startBackend()
if (result.success) {
if (serviceStepRef.value) {
serviceStepRef.value.serviceProgress = 100
serviceStepRef.value.serviceStatus = '后端服务启动成功正在建立WebSocket连接...'
}
// 后端启动成功建立WebSocket连接
console.log('后端启动成功正在建立WebSocket连接...')
const wsConnected = await connectAfterBackendStart()
if (!wsConnected) {
console.warn('WebSocket连接建立失败但继续进入应用')
} else {
console.log('WebSocket连接建立成功')
}
if (serviceStepRef.value) {
serviceStepRef.value.serviceStatus = '后端服务启动成功,即将进入主页...'
}
stepStatus.value = 'finish'
console.log('后端服务启动成功延迟1秒后自动进入主页')
// 延迟1秒后自动进入主页
setTimeout(() => {
handleEnterApp()
}, 1000)
} else {ndleSkipToHome">-->
<!-- 跳转至首页仅开发用-->
<!-- </a-button>-->
<!-- <a-button-->
@@ -119,6 +146,7 @@ import GitStep from './GitStep.vue'
import BackendStep from './BackendStep.vue'
import DependenciesStep from './DependenciesStep.vue'
import ServiceStep from './ServiceStep.vue'
import { connectAfterBackendStart } from '@/composables/useWebSocket'
@@ -408,6 +436,19 @@ async function startBackendService() {
if (result.success) {
if (serviceStepRef.value) {
serviceStepRef.value.serviceProgress = 100
serviceStepRef.value.serviceStatus = '后端服务启动成功正在建立WebSocket连接...'
}
// 后端启动成功建立WebSocket连接
console.log('后端手动启动成功正在建立WebSocket连接...')
const wsConnected = await connectAfterBackendStart()
if (!wsConnected) {
console.warn('WebSocket连接建立失败但继续进入应用')
} else {
console.log('WebSocket连接建立成功')
}
if (serviceStepRef.value) {
serviceStepRef.value.serviceStatus = '后端服务启动成功,即将进入主页...'
}
stepStatus.value = 'finish'