mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2025-12-12 21:02:49 +00:00
Squashed commit of the following:
commit f30a8c658a90020ec020fc702c680b2ee8562b70
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 11:35:16 2025 +0800
数据库缺少openapi微服务网关配置
commit e84d7726d2bbe60bacf759375c15aa74888a816c
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 10:20:09 2025 +0800
后台接口地址修改
commit 0f398026982aefe55a0113be688fa1339a8161ac
Author: JEECG <445654970@qq.com>
Date: Thu Jul 31 09:56:24 2025 +0800
docker自动化部署命令
commit a014a3ed0e81900e879bcce7bae7afcf68e15227
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 21:55:16 2025 +0800
v3.8.2 优化一键docker启动前后端
commit 5720d1a01ecdf003cbc7a29aedba4ca1bd88a96c
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 19:26:38 2025 +0800
升级版本号到3.8.2
commit 5eed6ac6d2145a50f6e0ea650fc3a3c2de1aee0a
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:49:29 2025 +0800
升级版本号到3.8.2
commit 0cfa1e223ae0907d0d25849484390dcfadd717c9
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:28:10 2025 +0800
v3.8.2 系统通知改造支持分类
commit 219869f4c01b848d31ab1a1d41f9613ae8762f5b
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:25:58 2025 +0800
v3.8.2 版本前端代码
commit e6edde963a4c65762d3ffd0b6f3257e138e54964
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:25:46 2025 +0800
v3.8.2 版本后端代码
commit c44b66128e5e89636be67a484875eef393824504
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 18:23:09 2025 +0800
XXL-JOB(2.4.0 及以上)已被移除,分片参数获取方式变更。
commit 9356b0474191a8ee038b9653c4051db25fb20922
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 10:57:52 2025 +0800
升级online到3.8.2-beta
commit d0a094f9a311e6d58b873681d483849ed848fa0b
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 10:57:31 2025 +0800
升级mybatis-plus到3.5.12、升级jsqlparser到4.9
commit 73eb62573798907d775f499994764469bbbc4f45
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 09:51:34 2025 +0800
升级jimureport到v2.1.1
commit 74880705b8f0baf0478277604f15ae61e1b1a842
Author: JEECG <445654970@qq.com>
Date: Wed Jul 30 09:18:46 2025 +0800
升级online到3.8.2-beta
# Conflicts:
# jeecg-boot/jeecg-boot-base-core/pom.xml
# jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
# jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
# jeecg-boot/pom.xml
92 lines
2.5 KiB
Vue
92 lines
2.5 KiB
Vue
import type {BrowserWindowConstructorOptions} from 'electron';
|
||
import {app, BrowserWindow, dialog} from 'electron';
|
||
import path from 'path';
|
||
import {_PATHS} from '../paths';
|
||
import {$env, isDev} from '../env';
|
||
import {createTray} from './tray';
|
||
|
||
// 创建窗口
|
||
export function createBrowserWindow(options?: BrowserWindowConstructorOptions) {
|
||
const win = new BrowserWindow({
|
||
width: 1200,
|
||
height: 800,
|
||
webPreferences: {
|
||
preload: path.join(_PATHS.preloadRoot, 'index.js'),
|
||
nodeIntegration: false,
|
||
contextIsolation: true,
|
||
},
|
||
// 应用图标
|
||
icon: isDev ? _PATHS.appIcon : void 0,
|
||
...options,
|
||
});
|
||
// update-begin--author:liaozhiyang---date:20250725---for:【JHHB-13】桌面应用消息通知
|
||
if (process.platform === 'darwin') { // 仅 macOS 生效
|
||
if (app.dock) {
|
||
app.dock.setIcon(path.join(_PATHS.electronRoot, './icons/mac/dock.png').replace(/[\\/]dist[\\/]/, '/'));
|
||
}
|
||
}
|
||
// update-end--author:liaozhiyang---date:20250725---for:【JHHB-13】桌面应用消息通知
|
||
// 设置窗口打开处理器
|
||
win.webContents.setWindowOpenHandler(({url}) => {
|
||
const win = createBrowserWindow();
|
||
win.loadURL(url);
|
||
// 阻止创建新窗口,因为已经被接管
|
||
return {action: 'deny'};
|
||
});
|
||
|
||
// 当 beforeunload 阻止窗口关闭时触发
|
||
win.webContents.on('will-prevent-unload', () => {
|
||
const choice = dialog.showMessageBoxSync(win, {
|
||
type: 'question',
|
||
title: '确认关闭吗?',
|
||
message: '系统可能不会保存您所做的更改。',
|
||
buttons: ['关闭', '取消'],
|
||
defaultId: 1,
|
||
cancelId: 1,
|
||
noLink: true,
|
||
});
|
||
// 用户选择了关闭,直接销毁窗口
|
||
if (choice === 0) {
|
||
win.destroy();
|
||
}
|
||
});
|
||
|
||
return win;
|
||
}
|
||
|
||
// 创建主窗口、系统托盘
|
||
export function createMainWindow() {
|
||
const win = createIndexWindow()
|
||
|
||
// 设置系统托盘图标
|
||
createTray(win);
|
||
|
||
// 主窗口尝试关闭时,默认不直接退出应用,而是隐藏到托盘
|
||
win.on('close', (event) => {
|
||
event.preventDefault();
|
||
win.hide();
|
||
});
|
||
|
||
return win;
|
||
}
|
||
|
||
// 创建索引窗口
|
||
export function createIndexWindow() {
|
||
const win = createBrowserWindow({
|
||
width: 1600,
|
||
height: 1000,
|
||
title: $env.VITE_GLOB_APP_TITLE!,
|
||
});
|
||
|
||
// 开发环境加载Vite服务,生产加载打包文件
|
||
if (isDev) {
|
||
win.loadURL($env.VITE_DEV_SERVER_URL!)
|
||
// 开发环境下,自动打开调试工具
|
||
// win.webContents.openDevTools()
|
||
} else {
|
||
win.loadFile(path.join(_PATHS.publicRoot, 'index.html'));
|
||
}
|
||
|
||
return win;
|
||
}
|