From 90aafaba10f6c0d84d3509f5fab33bd902952a23 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Mon, 20 Jan 2025 09:56:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4IM=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron-builder-prod.yml | 15 ++++++++++----- electron-builder-test.yml | 15 ++++++++++----- electron-builder-yc.yml | 15 ++++++++++----- electron-builder-yc2.yml | 15 ++++++++++----- electron-builder-yy.yml | 15 ++++++++++----- electron-builder.yml | 15 ++++++++++----- package.json | 3 +-- src/main/index.js | 7 ++++--- src/preload/index.js | 4 ++-- 9 files changed, 67 insertions(+), 37 deletions(-) diff --git a/electron-builder-prod.yml b/electron-builder-prod.yml index 67e3c68..4eea1f2 100644 --- a/electron-builder-prod.yml +++ b/electron-builder-prod.yml @@ -6,6 +6,11 @@ directories: win: executableName: 文枢课堂 icon: resources/logo2.ico + target: + - target: nsis + arch: + - x64 + - ia32 files: - '!**/.vscode/*' - '!src/*' @@ -47,8 +52,8 @@ publish: electronDownload: mirror: https://npmmirror.com/mirrors/electron/ # 额外依赖打包到输出目录 -extraFiles: - - from: ./node_modules/im_electron_sdk/lib/ - to: ./resources - filter: - - '**/*' +#extraFiles: +# - from: ./node_modules/im_electron_sdk/lib/ +# to: ./resources +# filter: +# - '**/*' diff --git a/electron-builder-test.yml b/electron-builder-test.yml index 6159547..dfa1de5 100644 --- a/electron-builder-test.yml +++ b/electron-builder-test.yml @@ -13,6 +13,11 @@ asarUnpack: win: executableName: AIx icon: resources/logo2.ico + target: + - target: nsis + arch: + - x64 + - ia32 nsis: oneClick: false allowToChangeInstallationDirectory: true @@ -46,8 +51,8 @@ publish: electronDownload: mirror: https://npmmirror.com/mirrors/electron/ # 额外依赖打包到输出目录 -extraFiles: - - from: ./node_modules/im_electron_sdk/lib/ - to: ./resources - filter: - - '**/*' +#extraFiles: +# - from: ./node_modules/im_electron_sdk/lib/ +# to: ./resources +# filter: +# - '**/*' diff --git a/electron-builder-yc.yml b/electron-builder-yc.yml index 89158a2..6ed8ad7 100644 --- a/electron-builder-yc.yml +++ b/electron-builder-yc.yml @@ -6,6 +6,11 @@ directories: win: executableName: 永川中小学AI教学系统 icon: resources/yc-logo.png + target: + - target: nsis + arch: + - x64 + - ia32 files: - '!**/.vscode/*' - '!src/*' @@ -47,8 +52,8 @@ publish: electronDownload: mirror: https://npmmirror.com/mirrors/electron/ # 额外依赖打包到输出目录 -extraFiles: - - from: ./node_modules/im_electron_sdk/lib/ - to: ./resources - filter: - - '**/*' +#extraFiles: +# - from: ./node_modules/im_electron_sdk/lib/ +# to: ./resources +# filter: +# - '**/*' diff --git a/electron-builder-yc2.yml b/electron-builder-yc2.yml index 3f9322a..ce77b6d 100644 --- a/electron-builder-yc2.yml +++ b/electron-builder-yc2.yml @@ -6,6 +6,11 @@ directories: win: executableName: 实训教学 icon: resources/yc-logo.png + target: + - target: nsis + arch: + - x64 + - ia32 files: - '!**/.vscode/*' - '!src/*' @@ -47,8 +52,8 @@ publish: electronDownload: mirror: https://npmmirror.com/mirrors/electron/ # 额外依赖打包到输出目录 -extraFiles: - - from: ./node_modules/im_electron_sdk/lib/ - to: ./resources - filter: - - '**/*' +#extraFiles: +# - from: ./node_modules/im_electron_sdk/lib/ +# to: ./resources +# filter: +# - '**/*' diff --git a/electron-builder-yy.yml b/electron-builder-yy.yml index b0511ec..46a0498 100644 --- a/electron-builder-yy.yml +++ b/electron-builder-yy.yml @@ -6,6 +6,11 @@ directories: win: executableName: 育人酉数平台 icon: resources/yy-logo.png + target: + - target: nsis + arch: + - x64 + - ia32 files: - '!**/.vscode/*' - '!src/*' @@ -47,8 +52,8 @@ publish: electronDownload: mirror: https://npmmirror.com/mirrors/electron/ # 额外依赖打包到输出目录 -extraFiles: - - from: ./node_modules/im_electron_sdk/lib/ - to: ./resources - filter: - - '**/*' +#extraFiles: +# - from: ./node_modules/im_electron_sdk/lib/ +# to: ./resources +# filter: +# - '**/*' diff --git a/electron-builder.yml b/electron-builder.yml index 3f52b2f..a974581 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -13,6 +13,11 @@ asarUnpack: win: executableName: AIx icon: resources/logo2.ico + target: + - target: nsis + arch: + - x64 + - ia32 nsis: oneClick: false allowToChangeInstallationDirectory: true @@ -46,8 +51,8 @@ publish: electronDownload: mirror: https://npmmirror.com/mirrors/electron/ # 额外依赖打包到输出目录 -extraFiles: - - from: ./node_modules/im_electron_sdk/lib/ - to: ./resources - filter: - - '**/*' +#extraFiles: +# - from: ./node_modules/im_electron_sdk/lib/ +# to: ./resources +# filter: +# - '**/*' diff --git a/package.json b/package.json index 152587e..36ad7fb 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "hfmath": "^0.0.2", "html-to-image": "^1.11.11", "html2canvas": "^1.4.1", - "im_electron_sdk": "^8.0.5904", "js-cookie": "^3.0.5", "jsencrypt": "^3.3.2", "jsondiffpatch": "0.6.0", @@ -141,4 +140,4 @@ "vue-tsc": "^1.8.25", "windicss": "^3.5.6" } -} +} \ No newline at end of file diff --git a/src/main/index.js b/src/main/index.js index c886b8e..5f124d0 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -4,7 +4,7 @@ import { electronApp, optimizer, is } from '@electron-toolkit/utils' import icon from '../../resources/icon.png?asset' import File from './file' import Logger from './logger' // 日志封装 -import chat from './chat' // chat封装 +// import chat from './chat' // chat封装 import Store from './store' // Store封装 import updateInit from './update' @@ -56,6 +56,7 @@ switch (import.meta.env.MODE) { break default: logoIco = '../../resources/logo2.ico' + break } //登录窗口 function createLoginWindow() { @@ -292,14 +293,14 @@ app.on('window-all-closed', () => { // 监听全局事件 function handleAll() { - const chatInstance = chat.initialize() // im-chat 实例 + // const chatInstance = chat.initialize() // im-chat 实例 // 新窗口创建-监听 ipcMain.handle('new-window', (e, data) => { const { id, type } = data const win = BrowserWindow.fromId(id) win.type = type // 绑定独立标识 remote.enable(win.webContents) // 开启远程服务 - chatInstance.enable(win.webContents) // 开启im-chat + // chatInstance.enable(win.webContents) // 开启im-chat console.log(`主进程 [${type}]: 窗口注册-远程代理-完毕(${Date.now()})`) }) // 用于监听-状态管理变化-同步所有窗口 diff --git a/src/preload/index.js b/src/preload/index.js index ffdb7a0..a840ca5 100644 --- a/src/preload/index.js +++ b/src/preload/index.js @@ -1,10 +1,10 @@ import { contextBridge } from 'electron' import { electronAPI } from '@electron-toolkit/preload' -import TimRender from 'im_electron_sdk/dist/renderer' // im渲染部分实例 +// import TimRender from 'im_electron_sdk/dist/renderer' // im渲染部分实例 // Custom APIs for renderer const api = { preloadPath: __dirname, // 当前preload地址 - getTimRender: () => new TimRender(), // im渲染部分实例 + // getTimRender: () => new TimRender(), // im渲染部分实例 } // Use `contextBridge` APIs to expose Electron APIs to // renderer only if context isolation is enabled, otherwise