ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

C端改造

Browse Source
This commit is contained in:
hongawen
2025-12-10 18:47:17 +08:00
parent 5708afb816
commit 4c477ae22a
61 changed files with 259 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
electron/preload/lifecycle.js
View File

@@ -125,34 +125,34 @@ class Lifecycle {
}
// 步骤5: 检测 Java 端口
this.logWindowManager.addLog('system', '▶ 步骤7: 检测可用的 Java 端口（从18092开始）...');
this.logWindowManager.addLog('system', '▶ 步骤7: 检测可用的 Java 端口（从18093开始）...');
this.startupManager.updateProgress('check-java-port', { mysqlPort: this.mysqlPort });
this.javaPort = await PortChecker.findAvailablePort(18092, 100);
this.javaPort = await PortChecker.findAvailablePort(18093, 100);
if (this.javaPort === -1) {
this.logWindowManager.addLog('error', 'Java 端口检测失败：18092-18191 全部被占用');
throw new Error('无法找到可用的后端服务端口（18092-18191 全部被占用）');
this.logWindowManager.addLog('error', 'Java 端口检测失败：18093-18192 全部被占用');
throw new Error('无法找到可用的后端服务端口（18093-18192 全部被占用）');
}
// 步骤5.5: 检测 WebSocket 端口
this.logWindowManager.addLog('system', '▶ 步骤8: 检测可用的 WebSocket 端口（从7777开始）...');
this.websocketPort = await PortChecker.findAvailablePort(7777, 100);
this.logWindowManager.addLog('system', '▶ 步骤8: 检测可用的 WebSocket 端口（从7778开始）...');
this.websocketPort = await PortChecker.findAvailablePort(7778, 100);
if (this.websocketPort === -1) {
this.logWindowManager.addLog('error', 'WebSocket 端口检测失败：7777-7876 全部被占用');
throw new Error('无法找到可用的 WebSocket 端口（7777-7876 全部被占用）');
this.logWindowManager.addLog('error', 'WebSocket 端口检测失败：7778-7877 全部被占用');
throw new Error('无法找到可用的 WebSocket 端口（7778-7877 全部被占用）');
}
if (this.javaPort !== 18092) {
this.logWindowManager.addLog('warn', `⚠ Java 默认端口 18092 已被占用，自动切换到端口: ${this.javaPort}`);
if (this.javaPort !== 18093) {
this.logWindowManager.addLog('warn', `⚠ Java 默认端口 18093 已被占用，自动切换到端口: ${this.javaPort}`);
} else {
this.logWindowManager.addLog('success', `✓ Java 将使用默认端口: ${this.javaPort}`);
}
if (this.websocketPort !== 7777) {
this.logWindowManager.addLog('warn', `⚠ WebSocket 默认端口 7777 已被占用，自动切换到端口: ${this.websocketPort}`);
if (this.websocketPort !== 7778) {
this.logWindowManager.addLog('warn', `⚠ WebSocket 默认端口 7778 已被占用，自动切换到端口: ${this.websocketPort}`);
} else {
this.logWindowManager.addLog('success', `✓ WebSocket 将使用默认端口: ${this.websocketPort}`);
}
@@ -434,8 +434,17 @@ class Lifecycle {
? path.join(__dirname, '..', 'build', 'extraResources', 'java', 'entrance.jar')
: path.join(process.resourcesPath, 'extraResources', 'java', 'entrance.jar');
// 获取日志路径（与 config-generator.js 中的 dataPath 保持一致）
const isDev2 = !process.resourcesPath;
const baseDir = isDev2
? path.join(__dirname, '..', '..')
: path.dirname(process.resourcesPath);
const dataPath = path.join(baseDir, 'NPQS9100_Data');
const logPath = path.join(dataPath, 'logs');
const javaProcess = this.javaRunner.runSpringBoot(jarPath, configPath, {
javaPort: this.javaPort
javaPort: this.javaPort,
logPath: logPath // 传递日志路径
});
// 监听Java进程输出