Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f2bf83a50 | |||
| b3d77ba14d |
@@ -1,2 +1,2 @@
|
||||
VITE_h5_client_url=http://192.168.11.200:18900
|
||||
VITE_h5_client_url=http://192.168.11.200:19080
|
||||
VITE_HsAppCode=1
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
VITE_h5_client_url=https://bqwlg.ii999.live:20038
|
||||
VITE_HsAppCode=1
|
||||
@@ -1,2 +1,2 @@
|
||||
VITE_h5_client_url=http://10.101.27.243:18900
|
||||
VITE_h5_client_url=http://10.102.9.139:18901
|
||||
VITE_HsAppCode=1
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
VITE_h5_client_url=http://172.22.33.66:18900
|
||||
VITE_HsAppCode=1
|
||||
@@ -1,4 +0,0 @@
|
||||
VITE_h5_client_url=https://aiagent.szgas.com.cn
|
||||
### VITE_h5_client_url=https://bqw-120.ii999.live:20038
|
||||
#VITE_h5_client_url=http://127.0.0.1:18901
|
||||
VITE_HsAppCode=1
|
||||
3
.gitignore
vendored
@@ -6,6 +6,3 @@ out
|
||||
*.log*
|
||||
package-lock.json
|
||||
.cursor
|
||||
./.idea
|
||||
./.idea/**
|
||||
.idea/
|
||||
|
||||
@@ -32,11 +32,3 @@ $ npm run build:mac
|
||||
# For Linux
|
||||
$ npm run build:linux
|
||||
```
|
||||
|
||||
npm install -g electron-icon-builder
|
||||
|
||||
electron-icon-builder --input=./build/icon.png --output=./build/icons
|
||||
|
||||
```shell
|
||||
npm install -g electron-icon-builder
|
||||
```
|
||||
|
||||
|
Before Width: | Height: | Size: 121 KiB |
BIN
build/icon.ico
|
Before Width: | Height: | Size: 353 KiB After Width: | Height: | Size: 281 KiB |
BIN
build/icon.png
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 121 KiB |
|
Before Width: | Height: | Size: 264 KiB |
|
Before Width: | Height: | Size: 60 KiB |
BIN
build/icons/1024x1024.png
Normal file
|
After Width: | Height: | Size: 352 KiB |
BIN
build/icons/128x128.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
build/icons/16x16.png
Normal file
|
After Width: | Height: | Size: 628 B |
BIN
build/icons/24x24.png
Normal file
|
After Width: | Height: | Size: 1.0 KiB |
BIN
build/icons/256x256.png
Normal file
|
After Width: | Height: | Size: 37 KiB |
BIN
build/icons/32x32.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
build/icons/48x48.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
build/icons/512x512.png
Normal file
|
After Width: | Height: | Size: 118 KiB |
BIN
build/icons/64x64.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 239 KiB |
|
Before Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 479 B |
|
Before Width: | Height: | Size: 817 B |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 83 KiB |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 353 KiB |
|
Before Width: | Height: | Size: 239 KiB After Width: | Height: | Size: 352 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 479 B After Width: | Height: | Size: 628 B |
|
Before Width: | Height: | Size: 817 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 37 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 353 KiB After Width: | Height: | Size: 353 KiB |
@@ -1,44 +0,0 @@
|
||||
appId: com.huashiai.dify-market-manager-gui
|
||||
compression: maximum
|
||||
productName: 智能体平台
|
||||
directories:
|
||||
buildResources: build
|
||||
files:
|
||||
- '!**/.vscode/*'
|
||||
- '!src/*'
|
||||
- '!electron.vite.config.{js,ts,mjs,cjs}'
|
||||
- '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
|
||||
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
|
||||
asarUnpack:
|
||||
- resources/**
|
||||
win:
|
||||
executableName: 智能体平台
|
||||
nsis:
|
||||
artifactName: ${name}-${version}-setup.${ext}
|
||||
shortcutName: ${productName}
|
||||
uninstallDisplayName: ${productName}
|
||||
createDesktopShortcut: always
|
||||
mac:
|
||||
entitlementsInherit: build/entitlements.mac.plist
|
||||
extendInfo:
|
||||
- NSCameraUsageDescription: Application requests access to the device's camera.
|
||||
- NSMicrophoneUsageDescription: Application requests access to the device's microphone.
|
||||
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
|
||||
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
|
||||
notarize: false
|
||||
dmg:
|
||||
artifactName: ${name}-${version}.${ext}
|
||||
linux:
|
||||
target:
|
||||
- AppImage
|
||||
- deb
|
||||
maintainer: huashiai.org
|
||||
category: Utility
|
||||
appImage:
|
||||
artifactName: ${name}-${version}.${ext}
|
||||
npmRebuild: false
|
||||
publish:
|
||||
provider: generic
|
||||
url: ""
|
||||
electronDownload:
|
||||
mirror: http://172.22.33.66:18900/update_files
|
||||
@@ -1,44 +0,0 @@
|
||||
appId: com.huashiai.dify-market-manager-gui
|
||||
compression: maximum
|
||||
productName: 深燃智能体平台
|
||||
directories:
|
||||
buildResources: build
|
||||
files:
|
||||
- '!**/.vscode/*'
|
||||
- '!src/*'
|
||||
- '!electron.vite.config.{js,ts,mjs,cjs}'
|
||||
- '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
|
||||
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
|
||||
asarUnpack:
|
||||
- resources/**
|
||||
win:
|
||||
executableName: 深燃智能体平台
|
||||
nsis:
|
||||
artifactName: ${name}-${version}-setup.${ext}
|
||||
shortcutName: ${productName}
|
||||
uninstallDisplayName: ${productName}
|
||||
createDesktopShortcut: always
|
||||
mac:
|
||||
entitlementsInherit: build/entitlements.mac.plist
|
||||
extendInfo:
|
||||
- NSCameraUsageDescription: Application requests access to the device's camera.
|
||||
- NSMicrophoneUsageDescription: Application requests access to the device's microphone.
|
||||
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
|
||||
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
|
||||
notarize: false
|
||||
dmg:
|
||||
artifactName: ${name}-${version}.${ext}
|
||||
linux:
|
||||
target:
|
||||
- AppImage
|
||||
- deb
|
||||
maintainer: huashiai.org
|
||||
category: Utility
|
||||
appImage:
|
||||
artifactName: ${name}-${version}.${ext}
|
||||
npmRebuild: false
|
||||
publish:
|
||||
provider: generic
|
||||
url: ""
|
||||
electronDownload:
|
||||
mirror: https://npmmirror.com/mirrors/electron/
|
||||
@@ -1,6 +1,6 @@
|
||||
appId: com.szgas.dify-market-manager-gui
|
||||
appId: com.huashiai.dify-market-manager-gui
|
||||
compression: maximum
|
||||
productName: 深燃智能体平台
|
||||
productName: 龙岗区百千万AI智能体共创平台
|
||||
directories:
|
||||
buildResources: build
|
||||
files:
|
||||
@@ -12,7 +12,7 @@ files:
|
||||
asarUnpack:
|
||||
- resources/**
|
||||
win:
|
||||
executableName: 深圳燃气智能体平台
|
||||
executableName: 龙岗区百千万AI智能体共创平台
|
||||
nsis:
|
||||
artifactName: ${name}-${version}-setup.${ext}
|
||||
shortcutName: ${productName}
|
||||
@@ -32,7 +32,7 @@ linux:
|
||||
target:
|
||||
- AppImage
|
||||
- deb
|
||||
maintainer: szgas.org
|
||||
maintainer: huashiai.org
|
||||
category: Utility
|
||||
appImage:
|
||||
artifactName: ${name}-${version}.${ext}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
// electron.vite.config.mjs
|
||||
import { resolve } from "path";
|
||||
import { defineConfig, externalizeDepsPlugin } from "electron-vite";
|
||||
import vue from "@vitejs/plugin-vue";
|
||||
var electron_vite_config_default = defineConfig({
|
||||
main: {
|
||||
plugins: [externalizeDepsPlugin()]
|
||||
},
|
||||
preload: {
|
||||
plugins: [externalizeDepsPlugin()]
|
||||
},
|
||||
renderer: {
|
||||
resolve: {
|
||||
alias: {
|
||||
"@renderer": resolve("src/renderer/src")
|
||||
}
|
||||
},
|
||||
plugins: [vue()]
|
||||
}
|
||||
});
|
||||
export {
|
||||
electron_vite_config_default as default
|
||||
};
|
||||
32
package.json
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"name": "SZGAS_AIAgent",
|
||||
"name": "dify-market-manager-gui",
|
||||
"version": "1.0.0",
|
||||
"description": "深圳燃气 AI智能体",
|
||||
"description": "百千万AI智能体共创平台",
|
||||
"main": "./out/main/index.js",
|
||||
"author": "szgas.com",
|
||||
"homepage": "https://szgas.com",
|
||||
"author": "huashiai.com",
|
||||
"homepage": "https://huashiai.com",
|
||||
"scripts": {
|
||||
"format": "prettier --write .",
|
||||
"lint": "eslint --cache .",
|
||||
@@ -12,7 +12,6 @@
|
||||
"dev": "electron-vite --mode 13_27",
|
||||
"dev:11_120_test": "electron-vite --mode 11_120_test",
|
||||
"dev:lgzs": "electron-vite --mode lgzs",
|
||||
"dev:shenranqi": "electron-vite --mode shenranqi",
|
||||
"dev:lgzs_test": "electron-vite --mode lgzs_test",
|
||||
"dev:lg_mirror": "electron-vite --mode lg_mirror",
|
||||
"package": "electron-forge package",
|
||||
@@ -23,12 +22,11 @@
|
||||
"build:unpack": "npm run build && electron-builder --dir",
|
||||
"build:win": "electron-vite build --mode 11.120 && electron-builder --win ",
|
||||
"build:win_11_120": "electron-vite build --mode 11_120 && electron-builder --win ",
|
||||
"build:win_shenranqi": "electron-vite build --mode shenranqi && electron-builder --win ",
|
||||
"build:win_13_27": "electron-vite build --mode 13_27 && electron-builder --win ",
|
||||
"build:win_lgzs": "electron-vite build --mode lgzs && electron-builder --win ",
|
||||
"build:win_lgzs_test": "electron-vite build --mode lgzs_test && electron-builder --win ",
|
||||
"build:win_jiangsu": "electron-vite build --mode jiangsu && electron-builder --win ",
|
||||
"build:win_nanshan": "electron-vite build --mode nanshan && electron-builder --win",
|
||||
"build:win_pinshan": "electron-vite build --mode pinshan && electron-builder --win",
|
||||
"build:win_huashiai": "electron-vite build --mode huashiai && electron-builder --win",
|
||||
"build:win_internet": "npm run build --mode internet && electron-builder --win",
|
||||
"build:mac": "npm run build && electron-builder --mac",
|
||||
@@ -37,24 +35,6 @@
|
||||
"build:icon": "./node_modules/.bin/electron-icon-builder --input=./build/icon.png --output=./build/",
|
||||
"make": "electron-forge make"
|
||||
},
|
||||
"build": {
|
||||
"protocols": [{
|
||||
"name": "aiAgent Protocol",
|
||||
"schemes": ["aiAgent"]
|
||||
}],
|
||||
"win": {
|
||||
"target": "nsis",
|
||||
"signingHashAlgorithms": ["sha256"]
|
||||
},
|
||||
"mac": {
|
||||
"extendInfo": {
|
||||
"CFBundleURLTypes": [{
|
||||
"CFBundleURLName": "MyApp Protocol",
|
||||
"CFBundleURLSchemes": ["myapp"]
|
||||
}]
|
||||
}
|
||||
}
|
||||
},
|
||||
"permissions": [
|
||||
"audioCapture",
|
||||
"videoCapture"
|
||||
@@ -73,8 +53,6 @@
|
||||
"xe-utils": "^3.7.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@electron-forge/cli": "^6.2.1",
|
||||
"@electron-forge/maker-deb": "^6.2.1",
|
||||
"@electron-toolkit/eslint-config": "^2.0.0",
|
||||
"@electron-toolkit/eslint-config-prettier": "^3.0.0",
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
|
||||
|
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 352 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 611 B After Width: | Height: | Size: 628 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 37 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 239 KiB |
|
Before Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 479 B |
|
Before Width: | Height: | Size: 817 B |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 83 KiB |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 244 KiB |
|
Before Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 611 B |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 4.6 KiB |
@@ -1,7 +1,7 @@
|
||||
import { app, shell, BrowserWindow, ipcMain, Menu, session, screen, dialog } from 'electron'
|
||||
import { electronApp, optimizer } from '@electron-toolkit/utils'
|
||||
import Store from 'electron-store'
|
||||
import { createWindow, createDrageWindow, unregisterAllShortcuts, getMainWindow,createOAuthWindow } from './window.js'
|
||||
import { createWindow, createDrageWindow, unregisterAllShortcuts, getMainWindow } from './window.js'
|
||||
import { setupIPC } from './ipc.js'
|
||||
import { createTray, destroyTray,clearBrowserCache } from './tray.js'
|
||||
import XEUtils from 'xe-utils'
|
||||
@@ -15,17 +15,10 @@ import { setStoreValue, getStoreValue ,deleteStore} from './store.js'
|
||||
import AutoLaunch from 'auto-launch'
|
||||
import axios from 'axios'
|
||||
|
||||
const PROTOCOL_NAME = 'aiAgent'
|
||||
|
||||
import WebSocketClient from './utils/WebSocketClient';
|
||||
|
||||
let wsClient=null
|
||||
|
||||
const isDebugger=getStoreValue("isDebugger");
|
||||
if (isDebugger==null||isDebugger==''){
|
||||
setStoreValue("isDebugger",0)
|
||||
}
|
||||
|
||||
// 延迟创建WebSocket连接,等待应用完全启动后再连接
|
||||
function createWebSocketClient() {
|
||||
try {
|
||||
@@ -170,81 +163,6 @@ function cleanupCacheDirectories() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 注册自定义协议为系统默认处理程序
|
||||
*/
|
||||
function registerDeepLinkProtocol() {
|
||||
try {
|
||||
if (process.platform === 'win32') {
|
||||
if (process.defaultApp) {
|
||||
app.setAsDefaultProtocolClient(PROTOCOL_NAME, process.execPath, [path.resolve(process.argv[1])])
|
||||
} else {
|
||||
app.setAsDefaultProtocolClient(PROTOCOL_NAME)
|
||||
}
|
||||
} else {
|
||||
app.setAsDefaultProtocolClient(PROTOCOL_NAME)
|
||||
}
|
||||
logger.info(`已注册自定义协议: ${PROTOCOL_NAME}`)
|
||||
} catch (error) {
|
||||
logger.error('注册自定义协议失败:', error)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 从命令行参数提取深链地址与 code 参数
|
||||
* 返回对象 { url, code };未找到返回 null
|
||||
*/
|
||||
function extractDeepLinkFromArgs(args = []) {
|
||||
try {
|
||||
const protoPrefix = `${PROTOCOL_NAME.toLowerCase()}://`
|
||||
const found = (args || []).find(
|
||||
(arg) => typeof arg === 'string' && arg.toLowerCase().startsWith(protoPrefix)
|
||||
)
|
||||
if (!found) return null
|
||||
|
||||
let code = null
|
||||
try {
|
||||
const u = new URL(found)
|
||||
const params = new URLSearchParams(u.search || '')
|
||||
code = params.get('code')
|
||||
} catch (e) {
|
||||
const m = found.match(/[?&]code=([^&]+)/i)
|
||||
code = m ? decodeURIComponent(m[1]) : null
|
||||
}
|
||||
|
||||
return { url: found, code }
|
||||
} catch (error) {
|
||||
logger.error('提取深链地址失败:', error)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理深链地址
|
||||
*/
|
||||
function handleDeepLink(payload) {
|
||||
try {
|
||||
const url = typeof payload === 'string' ? payload : payload?.url
|
||||
const code = typeof payload === 'object' ? payload?.code : null
|
||||
logger.info('Deep link URL:', url)
|
||||
if (code) {
|
||||
logger.info('Deep link code:', code)
|
||||
}
|
||||
const mainWindow = BrowserWindow.getAllWindows()[0] || getMainWindow()
|
||||
if (mainWindow) {
|
||||
const h5_client_url=getStoreValue("h5_client_url")+"/pc_client/autologin?code="+code
|
||||
|
||||
logger.info("==================================== mainWindow.loadURL:"+h5_client_url)
|
||||
// 加载存储的 URL
|
||||
mainWindow.loadURL(h5_client_url)
|
||||
mainWindow.show()
|
||||
mainWindow.focus()
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error('处理深链地址失败:', error)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 单应用启动实现
|
||||
* 请求单一实例锁,
|
||||
@@ -263,10 +181,6 @@ if (!gotTheLock) {
|
||||
// 监听第二个实例被运行时
|
||||
app.on('second-instance', (event, commandLine, workingDirectory) => {
|
||||
logger.info('检测到第二个实例启动,激活现有实例')
|
||||
const deeplink = extractDeepLinkFromArgs(commandLine)
|
||||
if (deeplink) {
|
||||
handleDeepLink(deeplink)
|
||||
}
|
||||
// 当有第二个实例被运行时,激活之前的实例并将焦点置于其窗口
|
||||
const windows = BrowserWindow.getAllWindows()
|
||||
if (windows.length > 0) {
|
||||
@@ -282,8 +196,6 @@ if (!gotTheLock) {
|
||||
app.whenReady().then(() => {
|
||||
logger.info('应用已准备就绪,开始初始化...');
|
||||
|
||||
registerDeepLinkProtocol()
|
||||
|
||||
// 清理缓存目录
|
||||
cleanupCacheDirectories()
|
||||
|
||||
@@ -301,8 +213,6 @@ if (!gotTheLock) {
|
||||
optimizer.watchWindowShortcuts(window)
|
||||
})
|
||||
|
||||
|
||||
|
||||
// 根据存储的状态决定是否创建悬浮窗口
|
||||
if (getStoreValue('showDrageWindow')) {
|
||||
createDrageWindow()
|
||||
@@ -337,18 +247,6 @@ if (!gotTheLock) {
|
||||
})
|
||||
|
||||
logger.info('应用初始化完成');
|
||||
|
||||
const initialDeeplink = extractDeepLinkFromArgs(process.argv)
|
||||
if (initialDeeplink) {
|
||||
handleDeepLink(initialDeeplink)
|
||||
}
|
||||
})
|
||||
|
||||
app.on('open-url', (event, url) => {
|
||||
logger.info('Opened with URL:', url)
|
||||
event.preventDefault()
|
||||
// 处理url,例如解析参数并打开相应窗口
|
||||
logger.info('Opened with URL:', url)
|
||||
})
|
||||
|
||||
// 修改窗口关闭行为
|
||||
|
||||
@@ -25,6 +25,7 @@ export function setupIPC() {
|
||||
logger.info('=======================================initClientData')
|
||||
logger.info(data)
|
||||
|
||||
setStoreValue("h5_data", data);
|
||||
setStoreValue("token", data.token);
|
||||
setStoreValue("dify_access_token:", data.dify_access_token);
|
||||
setStoreValue("dify_refresh_token", data.dify_refresh_token);
|
||||
|
||||
@@ -90,7 +90,7 @@ export function createTray() {
|
||||
tray = new Tray(icon)
|
||||
|
||||
// 设置托盘图标的提示文本
|
||||
tray.setToolTip('深圳燃气 AI智能体')
|
||||
tray.setToolTip('Dify Market Manager')
|
||||
|
||||
// 创建右键菜单
|
||||
const contextMenu = Menu.buildFromTemplate([
|
||||
@@ -124,19 +124,7 @@ export function createTray() {
|
||||
click: () => {
|
||||
createConfigWindow()
|
||||
}
|
||||
},
|
||||
{
|
||||
label: '打开日志目录',
|
||||
click: () => {
|
||||
try {
|
||||
const configDir = app.getPath('userData')
|
||||
logger.info('打开配置文件目录:', configDir)
|
||||
shell.openPath(configDir)
|
||||
} catch (error) {
|
||||
logger.error('打开配置文件目录失败:', error)
|
||||
}
|
||||
}
|
||||
},
|
||||
]
|
||||
},
|
||||
{ type: 'separator' },
|
||||
@@ -156,6 +144,8 @@ export function createTray() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
{ type: 'separator' },
|
||||
|
||||
@@ -81,7 +81,7 @@ class WebSocketClient {
|
||||
|
||||
setTimeout(() => {
|
||||
this.lockReconnect = false;
|
||||
// this.createConnect(); // 重新获取本地缓存并创建连接
|
||||
this.createConnect(); // 重新获取本地缓存并创建连接
|
||||
}, this.reconnectInterval);
|
||||
}
|
||||
|
||||
|
||||
@@ -13,11 +13,12 @@ import {checkForUpdates} from "./utils/updateUtils"
|
||||
import dayjs from 'dayjs'
|
||||
|
||||
let mainWindow = null
|
||||
let oauthWindow = null
|
||||
let difyfullScreenWindow = null
|
||||
let drageWindow = null
|
||||
let apiConfigWindow = null
|
||||
let configWindow = null
|
||||
|
||||
let cookieLogTimer = null
|
||||
import { clearAllSessionData } from './utils/cacheUtils.js'
|
||||
// 权限授权
|
||||
async function checkMediaAccess(mediaType){
|
||||
@@ -52,49 +53,6 @@ async function checkAndApplyDeviceAccessPrivilege() {
|
||||
}
|
||||
}
|
||||
|
||||
export async function createOAuthWindow(){
|
||||
logger.info('创建授权窗口')
|
||||
|
||||
Menu.setApplicationMenu(null)
|
||||
|
||||
// Create the browser window.
|
||||
oauthWindow = new BrowserWindow({
|
||||
width: 1480,
|
||||
height: 980,
|
||||
minWidth: 1480,
|
||||
minHeight: 980,
|
||||
show: false,
|
||||
media: {
|
||||
audio: true,
|
||||
video: true
|
||||
},
|
||||
icon: icon,
|
||||
webPreferences: {
|
||||
nodeIntegration: false,
|
||||
nodeIntegrationInWorker: true,
|
||||
preload: join(__dirname, '../preload/index.js'),
|
||||
// sandbox: false
|
||||
}
|
||||
})
|
||||
|
||||
// 检查本地存储中是否已有 h5_client_url
|
||||
const existingH5ClientUrl = getStoreValue("h5_client_url")
|
||||
if (!existingH5ClientUrl || existingH5ClientUrl.trim() === '') {
|
||||
// 只有当值不存在或为空时,才设置默认值
|
||||
// setStoreValue("h5_client_url", "http://work.ii999.live:20040")
|
||||
// setStoreValue("h5_client_url", "http://10.102.8.56:18900")
|
||||
// setStoreValue("h5_client_url", "http://68.66.24.160:18900")
|
||||
setStoreValue("h5_client_url", import.meta.env.VITE_h5_client_url)
|
||||
}
|
||||
|
||||
const h5_client_url=getStoreValue("h5_client_url")+"/pc_client/autologin"
|
||||
|
||||
logger.info("==================================== mainWindow.loadURL:"+h5_client_url)
|
||||
// 加载存储的 URL
|
||||
oauthWindow.loadURL(h5_client_url)
|
||||
|
||||
|
||||
}
|
||||
|
||||
export async function createWindow() {
|
||||
// 如果窗口已经存在,直接显示并返回
|
||||
@@ -107,15 +65,10 @@ export async function createWindow() {
|
||||
|
||||
Menu.setApplicationMenu(null)
|
||||
|
||||
// createOAuthWindow()
|
||||
// return
|
||||
|
||||
// Create the browser window.
|
||||
mainWindow = new BrowserWindow({
|
||||
width: 1480,
|
||||
height: 980,
|
||||
minWidth: 1480,
|
||||
minHeight: 980,
|
||||
width: 420,
|
||||
height: 900,
|
||||
show: false,
|
||||
media: {
|
||||
audio: true,
|
||||
@@ -226,7 +179,7 @@ export async function createWindow() {
|
||||
setStoreValue("h5_client_url", import.meta.env.VITE_h5_client_url)
|
||||
}
|
||||
|
||||
const h5_client_url=getStoreValue("h5_client_url")+"/pc_client/"
|
||||
const h5_client_url=getStoreValue("h5_client_url")+"/h5_client/"
|
||||
|
||||
logger.info("==================================== mainWindow.loadURL:"+h5_client_url)
|
||||
// 加载存储的 URL
|
||||
@@ -389,6 +342,7 @@ export async function createNewWindow(url, access_token, refresh_token,sandbox=f
|
||||
show: false,
|
||||
icon: icon,
|
||||
webPreferences: {
|
||||
partition: 'persist:my-shared-session',
|
||||
contextIsolation: false,
|
||||
nodeIntegration: true,
|
||||
nodeIntegrationInWorker: true,
|
||||
@@ -406,12 +360,13 @@ export async function createNewWindow(url, access_token, refresh_token,sandbox=f
|
||||
})
|
||||
|
||||
const hs_version = getStoreValue("hs_version")
|
||||
const dify_csrf_token = getStoreValue("dify_csrf_token")
|
||||
|
||||
const cookieStatements = [
|
||||
`document.cookie = "access_token=${access_token}";`,
|
||||
`document.cookie = "refresh_token=${refresh_token}";`,
|
||||
`document.cookie = "csrf_token=${csrf_token}";`,
|
||||
`document.cookie = "hs_version=${hs_version}";`
|
||||
`document.cookie = "access_token=${access_token}; path=/";`,
|
||||
`document.cookie = "refresh_token=${refresh_token}; path=/";`,
|
||||
`document.cookie = "csrf_token=${dify_csrf_token}; path=/";`,
|
||||
`document.cookie = "hs_version=${hs_version}; path=/";`
|
||||
].join('\n');
|
||||
|
||||
const localStorageStatements = [
|
||||
@@ -445,7 +400,7 @@ export async function createNewWindow(url, access_token, refresh_token,sandbox=f
|
||||
`
|
||||
}
|
||||
|
||||
code=code+`;document.cookie="hs_version=${hs_version}";`
|
||||
code=code+`;document.cookie="hs_version=${hs_version}; path=/";`
|
||||
|
||||
difyfullScreenWindow.webContents.on('did-finish-load', () => {
|
||||
difyfullScreenWindow.webContents
|
||||
@@ -455,6 +410,7 @@ export async function createNewWindow(url, access_token, refresh_token,sandbox=f
|
||||
.catch((error) => {
|
||||
console.error('Error:', error)
|
||||
})
|
||||
startCookieLogger(2000)
|
||||
let times = 0
|
||||
let timer = setInterval(() => {
|
||||
if (times > 3) {
|
||||
@@ -498,6 +454,10 @@ export async function createNewWindow(url, access_token, refresh_token,sandbox=f
|
||||
difyfullScreenWindow.on('closed', () => {
|
||||
logger.info('主窗口已关闭')
|
||||
difyfullScreenWindow = null
|
||||
if (cookieLogTimer) {
|
||||
clearInterval(cookieLogTimer)
|
||||
cookieLogTimer = null
|
||||
}
|
||||
})
|
||||
|
||||
difyfullScreenWindow.webContents.on('did-navigate', (event, url) => {
|
||||
@@ -639,6 +599,93 @@ export async function createNewWindow(url, access_token, refresh_token,sandbox=f
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取并打印全屏窗口的 Cookie 数据
|
||||
* 每次调用从当前页面会话中读取 Cookie 并输出到控制台
|
||||
*/
|
||||
export async function logDifyFullScreenCookies() {
|
||||
try {
|
||||
if (!difyfullScreenWindow || difyfullScreenWindow.isDestroyed()) {
|
||||
return
|
||||
}
|
||||
const wc = difyfullScreenWindow.webContents
|
||||
const currentURL = wc.getURL()
|
||||
const sess = wc.session
|
||||
let cookies = []
|
||||
if (currentURL && typeof currentURL === 'string' && currentURL.length > 0) {
|
||||
cookies = await sess.cookies.get({ url: currentURL })
|
||||
} else {
|
||||
cookies = await sess.cookies.get({})
|
||||
}
|
||||
const simplified = cookies.map(c => ({
|
||||
name: c.name,
|
||||
value: c.value,
|
||||
domain: c.domain,
|
||||
path: c.path,
|
||||
httpOnly: c.httpOnly,
|
||||
secure: c.secure,
|
||||
sameSite: c.sameSite
|
||||
}))
|
||||
|
||||
logger.info('difyfullScreenWindow cookies:', simplified)
|
||||
|
||||
const needSync = new Set(['access_token', 'csrf_token', 'refresh_token'])
|
||||
for (const c of cookies) {
|
||||
if (needSync.has(c.name)) {
|
||||
|
||||
if (c.name === 'access_token') {
|
||||
setStoreValue('dify_access_token', c.value)
|
||||
} else if (c.name === 'csrf_token') {
|
||||
setStoreValue('dify_csrf_token', c.value)
|
||||
} else if (c.name === 'refresh_token') {
|
||||
setStoreValue('dify_refresh_token', c.value)
|
||||
}
|
||||
await setCookieToMainWindow(c.name, c.value)
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error('获取 Cookie 失败:', error)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 启动 Cookie 轮询打印
|
||||
* 以指定间隔定时获取并打印 Cookie,默认 2000ms
|
||||
* 如果已在运行则不会重复启动
|
||||
*/
|
||||
export function startCookieLogger(intervalMs = 2000) {
|
||||
if (cookieLogTimer) {
|
||||
return
|
||||
}
|
||||
cookieLogTimer = setInterval(() => {
|
||||
logDifyFullScreenCookies()
|
||||
}, intervalMs)
|
||||
}
|
||||
|
||||
/**
|
||||
* 将指定名称和值的 Cookie 写入主窗口
|
||||
*/
|
||||
async function setCookieToMainWindow(name, value) {
|
||||
try {
|
||||
if (!mainWindow || mainWindow.isDestroyed()) {
|
||||
return
|
||||
}
|
||||
const targetBase = getStoreValue('h5_client_url') || ''
|
||||
const targetUrl = targetBase ? `${targetBase}/` : (mainWindow.webContents.getURL() || 'http://localhost/')
|
||||
const msess = mainWindow.webContents.session
|
||||
await msess.cookies.set({
|
||||
url: targetUrl,
|
||||
name,
|
||||
value,
|
||||
path: '/'
|
||||
})
|
||||
await mainWindow.webContents.executeJavaScript(`document.cookie = "${name}=${value}; path=/";`)
|
||||
logger.info(`已写入主窗口 Cookie: ${name}`)
|
||||
} catch (error) {
|
||||
logger.error('写入主窗口 Cookie 失败:', error)
|
||||
}
|
||||
}
|
||||
|
||||
export function createDrageWindow() {
|
||||
logger.info('开始创建悬浮窗口')
|
||||
|
||||
@@ -659,6 +706,7 @@ export function createDrageWindow() {
|
||||
alwaysOnTop: true,
|
||||
autoHideMenuBar: true,
|
||||
webPreferences: {
|
||||
partition: 'persist:my-shared-session',
|
||||
contextIsolation: false,
|
||||
nodeIntegration: true,
|
||||
nodeIntegrationInWorker: true,
|
||||
@@ -748,8 +796,6 @@ export async function tokenExpireTimer(){
|
||||
const LOG_INTERVAL = 60000; // 日志打印间隔,60秒打印一次
|
||||
|
||||
const tokenExpireTimer = setInterval(async () => {
|
||||
return false;
|
||||
|
||||
const currentTime = Date.now();
|
||||
const lastActiveTime = getStoreValue("lastActiveTime")||null
|
||||
|
||||
@@ -858,6 +904,7 @@ export function createConfigWindow() {
|
||||
parent: getMainWindow(),
|
||||
modal: true,
|
||||
webPreferences: {
|
||||
partition: 'persist:my-shared-session',
|
||||
contextIsolation: false,
|
||||
nodeIntegration: true,
|
||||
nodeIntegrationInWorker: true,
|
||||
|
||||
@@ -4,13 +4,18 @@ import { electronAPI } from '@electron-toolkit/preload'
|
||||
// Custom APIs for renderer
|
||||
const api = {}
|
||||
|
||||
// Use `contextBridge` APIs to expose Electron APIs to
|
||||
// renderer only if context isolation is enabled, otherwise
|
||||
// just add to the DOM global.
|
||||
if (process.contextIsolated) {
|
||||
try {
|
||||
contextBridge.exposeInMainWorld('electron', electronAPI)
|
||||
contextBridge.exposeInMainWorld('api', api)
|
||||
|
||||
ipcRenderer.on('data-from-main', (event, key,value) => {
|
||||
localStorage.setItem(key, value)
|
||||
})
|
||||
localStorage.setItem(key, value);
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
}
|
||||
|
||||