config

electron/config.js

@@ -3,43 +3,39 @@
 const path = require('path');
 const dayjs = require('dayjs');
 
-exports.get = function () {
-  const _config = {
-    log: {
-      file: {
-        fileName: path.join(__dirname, '../logs/electron-' + dayjs().format('YYYY-MM-DD') + '.log'),
-        level: 'silly', // error, warn, info, verbose, debug, silly
-        format: '[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}] {text}',
-        maxSize: '1048576' // 1048576 (1mb) by default.
-      }
-    },
-    windowsOption: {
-      width: 800,
-      height: 600,
-      minWidth: 800,
-      minHeight: 600,
-      webPreferences: {
-        //webSecurity: false,
-        nodeIntegration: true,
-        preload: path.join(__dirname, 'preload.js')
-      },
-      //frame: false,
-      //titleBarStyle: 'hidden'
-    },
-    egg: {
-      title: 'electron-egg',
-      env: 'prod',
-      port: 7068,
-      hostname: '0.0.0.0',
-      workers: 1
+const config = {
+  log: {
+    file: {
+      fileName: path.normalize('./logs/electron-' + dayjs().format('YYYY-MM-DD') + '.log'),
+      level: 'silly', // error, warn, info, verbose, debug, silly
+      format: '[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}] {text}',
+      maxSize: '1048576' // 1048576 (1mb) by default.
     }
+  },
+  windowsOption: {
+    width: 800,
+    height: 600,
+    minWidth: 800,
+    minHeight: 600,
+    webPreferences: {
+      //webSecurity: false,
+      nodeIntegration: true,
+      preload: path.join(__dirname, 'preload.js')
+    },
+    //frame: false,
+    //titleBarStyle: 'hidden'
+  },
+  egg: {
+    title: 'electron-egg',
+    env: 'prod',
+    port: 7068,
+    hostname: '0.0.0.0',
+    workers: 1
   }
+}
 
-  return _config;
-};
-
-exports.setup = function () {
-  return true;
+exports.get = function () {
+  return config;
 };
 
 exports = module.exports;

electron/index.js

@@ -1,15 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-module.exports = () => {
-  const files = fs.readdirSync(__dirname);
-  for (let i = 0; i < files.length; i++) {
-    const filename = files[i];
-    if (path.extname(filename) === '.js' && filename !== 'index.js') {
-      console.log('[ electron ] setup', path.basename(filename, '.js'));
-      require(`./${filename}`).setup();
-    }
-  }
-}

electron/lanucher.js

@@ -56,20 +56,12 @@ exports.start = function (argv) {
     });
 };
 
-exports.stop = function () {
-    return true;
-};
-
-exports.setup = function () {
-  return true;
-};
-
 function stringify(obj, ignore) {
-    const result = {};
-    Object.keys(obj).forEach(key => {
-      if (!ignore.includes(key)) {
-        result[key] = obj[key];
-      }
-    });
-    return JSON.stringify(result);
+  const result = {};
+  Object.keys(obj).forEach(key => {
+    if (!ignore.includes(key)) {
+      result[key] = obj[key];
+    }
+  });
+  return JSON.stringify(result);
 }

electron/logger.js → electron/setup.js

@@ -1,20 +1,24 @@
 'use strict';
-const ELog = require('electron-log')
+
+global.ELog = require('electron-log')
 const config = require('./config')
 
-exports.setup = function () {
+module.exports = () => {
+  logger();
+}
+
+function logger () {
   let logConfig = config.get().log;
   for (let transport in logConfig) {
     const configInfo = logConfig[transport];
     if (transport === 'file') {
       ELog.transports.file.level = configInfo.level;
       ELog.transports.file.file = configInfo.fileName;
+      ELog.transports.file.fileName = configInfo.fileName;
       ELog.transports.file.format = configInfo.format;
       ELog.transports.file.maxSize = configInfo.maxSize;
     }
   }
-  global.ELog = ELog;
-  return true;
-};
 
-exports = module.exports;
+  return true;
+};

main.js

@@ -2,18 +2,19 @@ const {app, BrowserWindow, Menu, shell} = require('electron')
 const path = require('path')
 const getPort = require('get-port')
 const eggLauncher = require('./electron/lanucher')
-const setup = require('./electron/index')
+const setup = require('./electron/setup')
 const config = require('./electron/config').get()
 
 setup()
 
+//return
 // 主窗口
 global.MAIN_WINDOW = null
 
 for (let i = 0; i < process.argv.length; i++) {
-  const tmpArgv = process.argv[i];
+  const tmpArgv = process.argv[i]
   if (tmpArgv.indexOf('--env=') !== -1) {
-    config.egg.env = tmpArgv.substr(6);
+    config.egg.env = tmpArgv.substr(6)
   }
 }
 
@@ -21,8 +22,8 @@ if (process.mas) app.setName('electron-egg')
 
 app.on('web-contents-created', (e, webContents) => {
     webContents.on('new-window', (event, url) => {
-        event.preventDefault();
-        shell.openExternal(url);
+        event.preventDefault()
+        shell.openExternal(url)
     });
 });
 
@@ -46,15 +47,15 @@ async function createWindow () {
     startServer(config.egg)
   }, 100)
 
-  return MAIN_WINDOW;
+  return MAIN_WINDOW
 }
 
 async function startServer (options) {
-  let startRes = null;
+  let startRes = null
   options.port = await getPort({port: options.port})
-  ELog.info('config.egg', options);
+  ELog.info('config.egg', options)
   startRes = await eggLauncher.start(options).then((res) => res, (err) => err)
-  ELog.info('startRes:', startRes);
+  ELog.info('startRes:', startRes)
   if (startRes === 'success') {
     let url = 'http://localhost:' + options.port
     MAIN_WINDOW.loadURL(url)
@@ -65,7 +66,6 @@ async function startServer (options) {
 } 
 
 async function initialize () {
-  // loadFiles()
   app.whenReady().then(() => {
     createWindow()
     app.on('activate', function () {