diff --git a/electron/preload/index.js b/electron/preload/index.js index cdc098f..b231244 100644 --- a/electron/preload/index.js +++ b/electron/preload/index.js @@ -2,13 +2,14 @@ ** preload为预加载模块,该文件将会在程序启动时加载 ** *************************************************/ + const { logger } = require('ee-core/log'); const { trayService } = require('../service/os/tray'); const { securityService } = require('../service/os/security'); const { autoUpdaterService } = require('../service/os/auto_updater'); function preload() { // 示例功能模块,可选择性使用和修改 - console.log('preload functions'); + logger.info('[preload] load'); trayService.create(); securityService.create(); autoUpdaterService.create(); diff --git a/electron/preload/lifecycle.js b/electron/preload/lifecycle.js index 396be77..a18a2cc 100644 --- a/electron/preload/lifecycle.js +++ b/electron/preload/lifecycle.js @@ -1,5 +1,6 @@ 'use strict'; +const { logger } = require('ee-core/log'); const { getConfig } = require('ee-core/config'); const { getMainWindow } = require('ee-core/electron'); @@ -9,23 +10,21 @@ class Lifecycle { * core app have been loaded */ async ready() { - // do some things - console.log('[lifecycle] ready'); + logger.info('[lifecycle] ready'); } /** * electron app ready */ async electronAppReady() { - // do some things - console.log('[lifecycle] electron-app-ready'); + logger.info('[lifecycle] electron-app-ready'); } /** * main window have been loaded */ async windowReady() { - console.log('[lifecycle] window-ready'); + logger.info('[lifecycle] window-ready'); // 延迟加载,无白屏 const { windowsOption } = getConfig(); if (windowsOption.show == false) { @@ -41,11 +40,11 @@ class Lifecycle { * before app close */ async beforeClose() { - console.log('[lifecycle] before-close'); + logger.info('[lifecycle] before-close'); } } - Lifecycle.toString = () => '[class Lifecycle]'; + module.exports = { Lifecycle }; \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 78276bd..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "compilerOptions": { - "target": "es6", - "module": "commonjs", - "useDefineForClassFields": true, - "skipLibCheck": true, - "types": ["node"], - "esModuleInterop": true, - - /* Bundler mode */ - "moduleResolution": "node", // node - "resolveJsonModule": true, - "isolatedModules": true, - - /* Linting */ - "strict": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitAny": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "forceConsistentCasingInFileNames": true, - }, - "include": [ - "./electron/**/*" - ] -} - \ No newline at end of file