fix:Close the app

shanhexi · shanhexi · commit a29275d23cbc · 2023-10-24T11:10:32.000+08:00
diff --git a/chat2db-client/src/layouts/index.tsx b/chat2db-client/src/layouts/index.tsx
@@ -6,7 +6,6 @@ import { v4 as uuidv4 } from 'uuid';
 import { getAntdThemeConfig, injectThemeVar } from '@/theme';
 import { IVersionResponse } from '@/typings';
 import miscService from '@/service/misc';
-import configService from '@/service/config';
 import antdEnUS from 'antd/locale/en_US';
 import antdZhCN from 'antd/locale/zh_CN';
 import { useTheme } from '@/hooks';
@@ -34,7 +33,7 @@ declare global {
     electronApi?: {
       startServerForSpawn: () => void;
       quitApp: () => void;
-      beforeQuitApp: (fn: () => void) => void;
+      setBaseURL: (baseUrl:string) => void;
       registerAppMenu: (data:any) => void;
     };
   }
@@ -111,10 +110,9 @@ function AppContainer() {
     window.electronApi?.registerAppMenu({
       version: __APP_VERSION__,
     })
-    
-    window.electronApi?.beforeQuitApp(()=>{
-      configService.stopJavaService()
-    })
+    // 把关闭java服务的的方法传给electron
+    window.electronApi?.setBaseURL?.(window._BaseURL)
+    // console.log(window.electronApi)
   }
 
   // 初始化indexedDB
diff --git a/chat2db-client/src/main/index.js b/chat2db-client/src/main/index.js
@@ -10,6 +10,8 @@ const { loadMainResource } = require('./utils');
 
 let mainWindow = null;
 
+let baseUrl = null;
+
 function createWindow() {
   mainWindow = new BrowserWindow({
     minWidth: 1080,
@@ -31,7 +33,7 @@ function createWindow() {
   // 关闭window时触发下列事件.
   mainWindow.on('closed', function (event) {
     event.preventDefault();
-    // mainWindow = null;
+    mainWindow = null;
   });
 
   // 监听打开新窗口事件 用默认浏览器打开
@@ -56,9 +58,9 @@ app.on('ready', () => {
   registerAnalysis();
 
   app.on('activate', function () {
-    // if (mainWindow === null) {
-    // }
-    createWindow();
+    if (mainWindow === null) {
+      createWindow();
+    }
   });
 });
 
@@ -69,8 +71,18 @@ app.on('window-all-closed', () => {
 });
 
 app.on('before-quit', () => {
-  // 退出应用前触发before-quit-app
-  // mainWindow.webContents.send('before-quit-app');
+  if(baseUrl){
+    try {
+      const request = net.request({
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        method: 'POST',
+        url: `${baseUrl}/api/system/stop`,
+      });
+      request.end();
+    } catch (error) {}
+  }
 });
 
 ipcMain.handle('get-product-name', () => {
@@ -87,3 +99,9 @@ ipcMain.on('quit-app', () => {
 ipcMain.on('register-app-menu', (event, orgs) => {
   registerAppMenu(mainWindow, orgs);
 });
+
+ipcMain.on('set-base-url',(event,_baseUrl)=>{
+  baseUrl = _baseUrl;
+})
+
+
diff --git a/chat2db-client/src/main/preload.js b/chat2db-client/src/main/preload.js
@@ -43,10 +43,8 @@ contextBridge.exposeInMainWorld('electronApi', {
   quitApp: () => {
     ipcRenderer.send('quit-app');
   },
-  beforeQuitApp: (callback) => {
-    ipcRenderer.on('before-quit-app', () => {
-      callback();
-    });
+  setBaseURL: (baseUrl) => {
+    ipcRenderer.send('set-base-url', baseUrl);
   },
   registerAppMenu: (menuProps) => {
     ipcRenderer.send('register-app-menu', menuProps);
