Merge branch 'master' of http://222.186.21.35:32012/jianguo/wx

.gitignore

@@ -10,6 +10,7 @@ lerna-debug.log*
 node_modules
 dist
 dist-ssr
+release
 *.local
 
 # Editor directories and files

dist-electron/main.js

@@ -0,0 +1,20 @@
+const { app: e, BrowserWindow: t } = require("electron"), i = require("path");
+function o() {
+  const n = new t({
+    width: 1200,
+    height: 800,
+    webPreferences: {
+      nodeIntegration: !0,
+      contextIsolation: !1
+    }
+  });
+  process.env.NODE_ENV === "development" ? (n.loadURL("http://localhost:5173"), n.webContents.openDevTools()) : n.loadFile(i.join(__dirname, "../dist/index.html"));
+}
+e.whenReady().then(() => {
+  o(), e.on("activate", () => {
+    t.getAllWindows().length === 0 && o();
+  });
+});
+e.on("window-all-closed", () => {
+  process.platform !== "darwin" && e.quit();
+});

dist-electron/preload.js

@@ -0,0 +1 @@
+window.electron = require("electron");

electron/main.js

@@ -0,0 +1,38 @@
+const { app, BrowserWindow } = require('electron')
+const path = require('path')
+
+function createWindow() {
+  const win = new BrowserWindow({
+    width: 1200,
+    height: 800,
+    webPreferences: {
+      nodeIntegration: true,
+      contextIsolation: false
+    }
+  })
+
+  // 开发环境下加载 Vite 开发服务器
+  if (process.env.NODE_ENV === 'development') {
+    win.loadURL('http://localhost:5173')
+    win.webContents.openDevTools()
+  } else {
+    // 生产环境下加载打包后的文件
+    win.loadFile(path.join(__dirname, '../dist/index.html'))
+  }
+}
+
+app.whenReady().then(() => {
+  createWindow()
+
+  app.on('activate', () => {
+    if (BrowserWindow.getAllWindows().length === 0) {
+      createWindow()
+    }
+  })
+})
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit()
+  }
+}) 

package.json

@@ -3,13 +3,39 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
+  "main": "electron/main.js",
   "scripts": {
     "dev": "vite --mode development",
     "dev:test": "vite --mode test",
     "build": "vite build",
     "build:dev": "vite build --mode development",
     "build:prod": "vite build --mode production",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "electron:dev": "vite --mode development & electron .",
+    "electron:build": "vite build && electron-builder",
+    "electron:preview": "electron ."
+  },
+  "build": {
+    "appId": "com.wx.chat",
+    "productName": "WX Chat",
+    "directories": {
+      "output": "release"
+    },
+    "files": [
+      "dist/**/*",
+      "electron/**/*"
+    ],
+    "win": {
+      "target": [
+        "nsis"
+      ]
+    },
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true,
+      "createDesktopShortcut": true,
+      "createStartMenuShortcut": true
+    }
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
@@ -25,8 +51,11 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.1",
+    "electron": "^35.2.0",
+    "electron-builder": "^26.0.12",
     "sass": "^1.86.3",
     "sass-embedded": "^1.86.3",
-    "vite": "^6.2.0"
+    "vite": "^6.2.0",
+    "vite-plugin-electron": "^0.29.0"
   }
 }

src/utils/request.js

@@ -1,8 +1,11 @@
 import axios from 'axios'
 import { fetchEventSource } from '@microsoft/fetch-event-source'
 
+// 判断是否在 Electron 环境中
+const isElectron = window && window.process && window.process.type
+
 const service = axios.create({
-  baseURL: process.env.VITE_APP_BASE_API,
+  baseURL: isElectron ? process.env.VITE_APP_BASE_API : import.meta.env.VITE_APP_BASE_API,
   timeout: 30000
 })
 
@@ -38,7 +41,8 @@ service.interceptors.response.use(
 export const sseRequest = (config) => {
   return new Promise((resolve) => {
     try {
-      const url = new URL(`${config.url}`, window.location.origin)
+      const baseURL = isElectron ? process.env.VITE_APP_BASE_API : import.meta.env.VITE_APP_BASE_API
+      const url = new URL(`${config.url}`, baseURL)
       const ctrl = new AbortController()
       let messageQueue = []
       let resolveQueue = null
@@ -49,11 +53,22 @@ export const sseRequest = (config) => {
           headers: {
             'Authorization': config.headers?.Authorization || `Bearer ${localStorage.getItem('token')}`,
             'Content-Type': 'application/json',
-            'Accept': 'text/event-stream'
+            'Accept': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+            'Connection': 'keep-alive'
           },
           body: JSON.stringify(config.params),
           signal: ctrl.signal,
           openWhenHidden: true,
+          credentials: 'include',
+          keepalive: true,
+          retry: 1000,
+          onopen(response) {
+            if (response.ok && response.headers.get('content-type')?.includes('text/event-stream')) {
+              return;
+            }
+            throw new Error(`Failed to open SSE connection: ${response.status} ${response.statusText}`);
+          },
           onmessage: (event) => {
             try {
               const data = JSON.parse(event.data)

vite.config.js

@@ -2,6 +2,7 @@ import { fileURLToPath, URL } from 'node:url'
 
 import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
+import electron from 'vite-plugin-electron'
 // import vueDevTools from 'vite-plugin-vue-devtools'
 
 // https://vite.dev/config/
@@ -17,6 +18,9 @@ export default defineConfig(({ command, mode }) => {
   return {
     plugins: [
       vue(),
+      electron({
+        entry: 'electron/main.js',
+      }),
       // vueDevTools(),
     ],
     resolve: {