哆啦好梦 há 2 anos atrás
pai
commit
ad8e7f8896
3 ficheiros alterados com 26 adições e 18 exclusões
  1. 4 4
      electron/jobs/example.js
  2. 2 2
      electron/jobs/test.js
  3. 20 12
      electron/preload/index.js

+ 4 - 4
electron/jobs/example.js

@@ -1,14 +1,14 @@
 
 const Utils = require('ee-core/module/utils');
 const Loader = require('ee-core/module/loader');
-const { logger } = require('ee-core/module/log');
+const Log = require('ee-core/module/log');
 const test = Loader.requireModule('./test');
 
 // logger.info("[renderer] process: ", process);
-logger.info("[child] process: ", process);
+Log.info("[child] process: ", process);
 
 let baseDir = Utils.getBaseDir();
-logger.info('[example] baseDir -------- ', baseDir);
+Log.info('[example] baseDir -------- ', baseDir);
 
 let helloRes = test.hello();
-logger.info('[example] helloRes -------- ', helloRes);
+Log.info('[example] helloRes -------- ', helloRes);

+ 2 - 2
electron/jobs/test.js

@@ -1,8 +1,8 @@
 const path = require('path');
-const { logger } = require('ee-core/module/log');
+const Log = require('ee-core/module/log');
 
 exports.hello = function () {
-  logger.info('[test]  hello--------');
+  Log.info('[test]  hello--------');
 
   return 'hello';
 }

+ 20 - 12
electron/preload/index.js

@@ -9,7 +9,7 @@
 const path = require('path');
 const Jobs = require('ee-core/module/jobs');
 const Utils = require('ee-core/module/Utils');
-const { logger } = require('ee-core/module/log');
+const Log = require('ee-core/module/log');
 
 /**
  * 预加载模块入口
@@ -28,6 +28,14 @@ module.exports = async (app) => {
   awakenAddon.create();
   autoUpdaterAddon.create();
 
+  // Object.keys(Log.logger)
+  // let personKeys3 = []
+  // for (var prop in Log.logger) {
+  //   personKeys3.push(prop)
+  // }
+  // console.log('logger:', personKeys3);
+  Log.info('dddddddddd')
+
   // pm
   // ProcessManager.openWindow();
   // const exampleFile = path.join(app.config.baseDir, 'jobs', 'example.js');
@@ -41,15 +49,15 @@ module.exports = async (app) => {
   // let res = require('../jobs/example') 
   // console.log('res:', res);
 
-  let opt = {
-    dev: true,
-    type: 'child', // renderer 
-    path: 'example.js',
-    winOptions: {
-      show: true
-    },
-    childOptions: {}
-  }
-  let myJob = new Jobs();
-  myJob.create('exampleJob', opt);
+  // let opt = {
+  //   dev: true,
+  //   type: 'child', // renderer 
+  //   path: 'example.js',
+  //   winOptions: {
+  //     show: true
+  //   },
+  //   childOptions: {}
+  // }
+  // let myJob = new Jobs();
+  // myJob.create('exampleJob', opt);
 }