From fa77c6cc6b1d66c73e50a0add861c5cda244af66 Mon Sep 17 00:00:00 2001 From: zdg Date: Fri, 30 Aug 2024 17:29:15 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e38c806..68b1853 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "1.1.1", + "version": "1.1.6", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "example.com", From b5d41050aea627b029c9f6c068277252fe5f216f Mon Sep 17 00:00:00 2001 From: zdg Date: Mon, 2 Sep 2024 11:14:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=85=B1=E4=BA=AB-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=20session=20local=20=E6=B0=B8?= =?UTF-8?q?=E4=B9=85=E5=92=8C=E4=B8=B4=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/store.js | 42 ++++++++++++++++++++++------------ src/renderer/src/utils/tool.js | 19 +++++++++++---- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/main/store.js b/src/main/store.js index 9bb6fcf..b2fd745 100644 --- a/src/main/store.js +++ b/src/main/store.js @@ -8,25 +8,39 @@ Store.initRenderer() // 默认共享数据 const defaultData = { - model: 'select', // 悬浮球-当前模式 - showBoardAll: false, // 全屏画板-是否显示 - isPdfWin: false, // pdf窗口是否打开 - isToolWin: false, // 工具窗口是否打开 - curSubjectNode: { - data: {}, // 当前教材节点 （包含当前教材 单元） - querySearch: {} // 查询资源所需参数 - } + session: { // 缓存(临时sessionStorage) + model: 'select', // 悬浮球-当前模式 + showBoardAll: false, // 全屏画板-是否显示 + isPdfWin: false, // pdf窗口是否打开 + isToolWin: false, // 工具窗口是否打开 + curSubjectNode: { + data: {}, // 当前教材节点 （包含当前教材 单元） + querySearch: {} // 查询资源所需参数 + } + }, + local: { // 本地(永久localStorage) + + }, } // 初始化 export function initialize(){ - const store = new Store({ - name: 'cache-store', // 存储文件名 + // 缓存数据-sessionStore + const sessionStore = new Store({ + name: 'session-store', // 存储文件名 fileExtension: 'ini', // 文件后缀名 - encryptionKey: 'Eihrjwi7h104h2Kub423' // 数据加密-防止用户直接改配置 + encryptionKey: 'BvPLmgCC4DSIG0KkTec5' // 数据加密-防止用户直接改配置 }) - store.clear() // 先清除-所有缓存数据 - store.set(defaultData) // 初始化-默认数据 - return store + sessionStore.clear() // 先清除-所有缓存数据 + sessionStore.set(defaultData.session) // 初始化-默认数据 + + // 缓存数据-localStore + const localStore = new Store({ + name: 'local-store', // 存储文件名 + fileExtension: 'ini', // 文件后缀名 + encryptionKey: '6CyoHQmUaPmLzvVsh' // 数据加密-防止用户直接改配置 + }) + localStore.set(defaultData.local) // 初始化-默认数据 + return {sessionStore, localStore} } export default { initialize } \ No newline at end of file diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js index 4476094..1abade6 100644 --- a/src/renderer/src/utils/tool.js +++ b/src/renderer/src/utils/tool.js @@ -21,12 +21,21 @@ const toolState = useToolState() // 获取store状态 // 暴露Remote中的属性 export const ipcMain = Remote?.ipcMain || {} -// 暴露Store存储对象 -export const store = Store ? new Store({ - name: 'cache-store', // 存储文件名 - fileExtension: 'ini', // 文件后缀名 - encryptionKey: 'Eihrjwi7h104h2Kub423' // 数据加密-防止用户直接改配置 + +// 暴露sessionStore存储对象 +export const sessionStore = Store ? new Store({ + name: 'session-store', // 存储文件名 + fileExtension: 'ini', // 文件后缀名 + encryptionKey: 'BvPLmgCC4DSIG0KkTec5' // 数据加密-防止用户直接改配置 }) : {} + +// 暴露localStore存储对象 +export const localStore = Store ? new Store({ + name: 'local-store', // 存储文件名 + fileExtension: 'ini', // 文件后缀名 + encryptionKey: '6CyoHQmUaPmLzvVsh' // 数据加密-防止用户直接改配置 +}) : {} + /** * 获取静态资源，开发和生产环境 * @param {*} url From 3f4e9c35b0502f9d8919c75a9c7dd54171a29e91 Mon Sep 17 00:00:00 2001 From: zdg Date: Mon, 2 Sep 2024 13:51:25 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=B4=A9=E6=BA=83=E7=AD=89=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/index.js | 40 ++++++++++++++++++++++++++++--- src/main/logger.js | 52 ++++++++++++++++++++++++++++++++++++++++ src/main/store.js | 23 ++++++++++++++---- src/renderer/src/main.js | 6 ++++- 4 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 src/main/logger.js diff --git a/src/main/index.js b/src/main/index.js index 6381e86..3f475be 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -3,15 +3,17 @@ import { join } from 'path' import { electronApp, optimizer, is } from '@electron-toolkit/utils' import icon from '../../resources/icon.png?asset' import File from './file' -import chat from './chat' // chat封装 -import Store from './store' // Store封装 +import Logger from './logger' // 日志封装 +import chat from './chat' // chat封装 +import Store from './store' // Store封装 import updateInit from './update' - // 代理 electron/remote // 第一步：引入remote import remote from '@electron/remote/main' // 第二步： 初始化remote remote.initialize() +// 日志配置-初始化(日志直接绑定到console上) +Logger.initialize() // 持久化数据-初始化 Store.initialize() @@ -153,6 +155,7 @@ async function createLinkWin(data) { // 初始化完成 app.on('ready', () => { + appWatchError() // 监听app错误 process.env.LANG = 'en_US.UTF-8' // 设置应用程序用户模型标识符 electronApp.setAppUserModelId('com.electron') @@ -259,3 +262,34 @@ function handleAll() { win.webContents.send('pinia-state-set', storeName, jsonStr) }) } + +// app 崩溃监听器 +function appWatchError() { + // 渲染进程崩溃 + app.on('renderer-process-crashed', (event, webContents, killed) => { + console.error( + `APP-ERROR:renderer-process-crashed; event: ${JSON.stringify(event)}; webContents:${JSON.stringify( + webContents + )}; killed:${JSON.stringify(killed)}` + ) + }) + + // GPU进程崩溃 + app.on('gpu-process-crashed', (event, killed) => { + console.error(`APP-ERROR:gpu-process-crashed; event: ${JSON.stringify(event)}; killed: ${JSON.stringify(killed)}`) + }) + + // 渲染进程结束 + app.on('render-process-gone', async (event, webContents, details) => { + console.error( + `APP-ERROR:render-process-gone; event: ${JSON.stringify(event)}; webContents:${JSON.stringify( + webContents + )}; details:${JSON.stringify(details)}` + ) + }) + + // 子进程结束 + app.on('child-process-gone', async (event, details) => { + console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`) + }) +} \ No newline at end of file diff --git a/src/main/logger.js b/src/main/logger.js new file mode 100644 index 0000000..03b6db3 --- /dev/null +++ b/src/main/logger.js @@ -0,0 +1,52 @@ +/** + * @description 日志配置 + * @author zdg + * @date 2021-07-05 14:07:01 + */ +// import log from 'electron-log' +import log from 'electron-log/main' +import { app } from 'electron' +import path from 'path' + +// 关闭控制台打印 +// 日志控制台等级，默认值：false +log.transports.console.level = false +// log.transports.console.level = 'info' +// 日志文件等级，默认值：false +log.transports.file.level = 'info' +// 日志文件名，默认：main.log +// log.transports.file.fileName = 'main.log'; +// 日志大小，默认：1048576（1M），达到最大上限后，备份文件并重命名为：main.old.log，有且仅有一个备份文件 +log.transports.file.maxSize = 10 * 1024 * 1024; // 文件最大不超过 10M +// 自定义日志文件滚动策略 +log.transports.file.rollSize = 10 * 1024 * 1024; // 10MB +// 日志格式，默认：[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}]{scope} {text} +log.transports.file.format = '[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}]{scope} {text}' +let date = new Date() +let dateStr = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() +// 文件位置及命名方式 +// 默认位置为：C:\Users\[user]\AppData\Roaming\[appname]\electron_log\ +// 文件名为：年-月-日.log +// 自定义文件保存位置为安装目录下 \log\年-月-日.log +// log.transports.file.resolvePathFn = () => 'logs\\' + dateStr+ '.log'; +log.transports.file.resolvePathFn = () => path.join(app.getPath('userData'), `logs/${dateStr}.log`) + +// 有六个日志级别error, warn, info, verbose, debug, silly。默认是silly +export const logger = { + error: (...args) => log.error(...args), + warn: (...args) => log.warn(...args), + info: (...args) => log.info(...args), + verbose: (...args) => log.verbose(...args), + debug: (...args) => log.debug(...args), + silly: (...args) => log.silly(...args) +} +export function initialize(bool = true, type = 'all') { + log.initialize() // 为渲染器进行初始化 + if (bool) { // 是否替换默认的console + if (type == 'all') Object.assign(console, log.functions) + else { // 替换指定类型 + console[type] = log[type] + } + } +} +export default { initialize } \ No newline at end of file diff --git a/src/main/store.js b/src/main/store.js index b2fd745..c37f8f5 100644 --- a/src/main/store.js +++ b/src/main/store.js @@ -19,7 +19,6 @@ const defaultData = { } }, local: { // 本地(永久localStorage) - }, } @@ -29,7 +28,15 @@ export function initialize(){ const sessionStore = new Store({ name: 'session-store', // 存储文件名 fileExtension: 'ini', // 文件后缀名 - encryptionKey: 'BvPLmgCC4DSIG0KkTec5' // 数据加密-防止用户直接改配置 + encryptionKey: 'BvPLmgCC4DSIG0KkTec5', // 数据加密-防止用户直接改配置 + beforeEachMigration: (store, context) => { // 版本迁移回调 + console.log(`[session-store] 迁移从 ${context.fromVersion} → ${context.toVersion}`); + }, + migrations: { // 版本变化 + '0.0.0': store => { + // store.set('debugPhase', true); + } + } }) sessionStore.clear() // 先清除-所有缓存数据 sessionStore.set(defaultData.session) // 初始化-默认数据 @@ -38,9 +45,17 @@ export function initialize(){ const localStore = new Store({ name: 'local-store', // 存储文件名 fileExtension: 'ini', // 文件后缀名 - encryptionKey: '6CyoHQmUaPmLzvVsh' // 数据加密-防止用户直接改配置 + encryptionKey: '6CyoHQmUaPmLzvVsh', // 数据加密-防止用户直接改配置 + beforeEachMigration: (store, context) => { // 版本迁移回调 + console.log(`[local-store] 迁移从 ${context.fromVersion} → ${context.toVersion}`); + }, + migrations: { // 版本变化 + '0.0.0': store => { + // store.set('debugPhase', true); + } + } }) - localStore.set(defaultData.local) // 初始化-默认数据 + localStore.set(defaultData.local) // 初始化-默认数据 return {sessionStore, localStore} } export default { initialize } \ No newline at end of file diff --git a/src/renderer/src/main.js b/src/renderer/src/main.js index f3a9a67..da34555 100644 --- a/src/renderer/src/main.js +++ b/src/renderer/src/main.js @@ -12,10 +12,14 @@ import 'virtual:windi.css' import { store } from '@/store' import App from './App.vue' import router from './router' +import log from 'electron-log/renderer' // 渲染进程日志-文件记录 + +if(process.env.NODE_ENV != 'development') { // 非开发环境，将日志打印到日志文件 + Object.assign(console, log.functions) // 渲染进程日志-控制台替换 +} const app = createApp(App) - app.use(router) .use(store) .use(ElementPlus, { locale: zhLocale }).mount('#app') \ No newline at end of file From 1d808950b5cfa06740a061d159f0169a01d725a1 Mon Sep 17 00:00:00 2001 From: zdg Date: Mon, 2 Sep 2024 16:33:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/components/pdf/index.vue | 9 --------- src/renderer/src/views/classBegins/index.vue | 7 +++++-- src/renderer/src/views/tool/components/board.vue | 4 ++-- src/renderer/src/views/tool/sphere.vue | 7 ++++--- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/renderer/src/components/pdf/index.vue b/src/renderer/src/components/pdf/index.vue index ae43c6e..64a8671 100644 --- a/src/renderer/src/components/pdf/index.vue +++ b/src/renderer/src/components/pdf/index.vue @@ -383,16 +383,7 @@ defineExpose({ savaDataStore }) watchEffect(() => { - setTimeout(() => { - console.log(toolState,'监听') - - }, 300) if(toolState.isPdfWin){ - // if(toolState.isToolWin){ - // ispointer.value=false - // }else{ - // ispointer.value=true - // } watchToolState() //监听工具栏 } }) diff --git a/src/renderer/src/views/classBegins/index.vue b/src/renderer/src/views/classBegins/index.vue index a1b4ec3..afd9920 100644 --- a/src/renderer/src/views/classBegins/index.vue +++ b/src/renderer/src/views/classBegins/index.vue @@ -104,9 +104,12 @@ const switchPageMode = () => { } } onMounted(async () => { + const isDev = process.env.NODE_ENV == 'development' toolState.isPdfWin=true //设置打开pdf窗口 - pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线上 - // pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地 + if (isDev) + pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地 + else + pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线上 textbookId.value = route.query.textbookId pdfObj.bookId=textbookId.value //初始化获取接口数据 diff --git a/src/renderer/src/views/tool/components/board.vue b/src/renderer/src/views/tool/components/board.vue index c6d4144..6aa1686 100644 --- a/src/renderer/src/views/tool/components/board.vue +++ b/src/renderer/src/views/tool/components/board.vue @@ -29,7 +29,7 @@ onMounted(async() => { const handleMode = (newVal, oldVal) => { if(toolStore.isPdfWin){ if(newVal=='clear'){ - emit('update:modelValue', oldVal) + setTimeout(() => emit('update:modelValue', oldVal), 10) } return } @@ -47,7 +47,7 @@ const handleMode = (newVal, oldVal) => { case 'clear': // 清空画布 if(oldVal){ FabricVue.history?.clean() - emit('update:modelValue', oldVal) + setTimeout(() => emit('update:modelValue', oldVal), 10) } break diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue index f5c55ce..7b6030c 100644 --- a/src/renderer/src/views/tool/sphere.vue +++ b/src/renderer/src/views/tool/sphere.vue @@ -51,8 +51,9 @@ import imChat from './components/imChat.vue' // im-chat-子组件 import vDrag from './directive/drag' // 自定义指令-拖拽 import vIgnore from './directive/ignore' // 自定义指令-穿透 import { useToolState } from '@/store/modules/tool' // 数据状态-缓存 -import { ipcMsgSend, ipcHandle, ipcMain, ipcMsgInvoke } from '@/utils/tool' // 相关工具 +import { ipcMsgSend, ipcMain, sessionStore } from '@/utils/tool' // 相关工具 import MsgEnum from '@/plugins/imChat/msgEnum' // 消息头-相关定义(nuem) + const route = useRoute(); const tabActive = ref('select') // 工具栏当前选中项 const isFold = ref(false) // 折叠工具栏 @@ -82,7 +83,8 @@ const btnList = [ // 工具栏按钮列表 // === 页面加载完毕 === onMounted(async() => { if (!electron) return // 浏览器端 - getClassInfo() // 获取课堂详情 ex3 + // console.log(sessionStore) + // getClassInfo() // 获取课堂详情 ex3 setTimeout(() => { resetStatus() // 开启重置状态-监听 }, 200); @@ -104,7 +106,6 @@ const getClassInfo = async () => { const tabChange = (val) => { const bool = !toolStore.isPdfWin && !toolStore.showBoardAll if(bool) toolStore.showBoardAll = true - // ipcMsgSend('tool-sphere:close') toolStore.model = val // 存储当前tab } // logo 点击-事件 折叠|展开 From 22239090ea2a55a8cc61077debd4d98e15694187 Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Mon, 2 Sep 2024 16:57:54 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix=EF=BC=9A=E9=9A=90=E8=97=8F=E6=8E=89?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=B8=AD=E5=BF=83=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/classManage/basicGroup.vue | 10 ++-- .../src/views/classManage/classInfo.vue | 10 ++-- src/renderer/src/views/classManage/index.vue | 11 +++-- .../src/views/classManage/studentList.vue | 48 +++++++++---------- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/renderer/src/views/classManage/basicGroup.vue b/src/renderer/src/views/classManage/basicGroup.vue index 9fd48be..9e59f66 100644 --- a/src/renderer/src/views/classManage/basicGroup.vue +++ b/src/renderer/src/views/classManage/basicGroup.vue @@ -1,10 +1,10 @@