Ver código fonte

功能文件代码优化

gaoshuaixing 4 anos atrás
pai
commit
a66a2f38ef

+ 1 - 1
electron/api.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const http = require('http');
 const path = require('path');
 const _ = require('lodash');
-const storage = require('./storage');
+const storage = require('./lib/storage');
 const socketIo = require('socket.io');
 const eLogger = require('./lib/eLogger').get();
 

+ 1 - 1
electron/config.js

@@ -2,7 +2,7 @@
 
 const path = require('path');
 const dayjs = require('dayjs');
-const storage = require('./storage');
+const storage = require('./lib/storage');
 
 const config = {
   developmentMode: {

+ 2 - 2
electron/autoUpdater.js → electron/lib/autoUpdater.js

@@ -2,10 +2,10 @@
 
 const updater = require("electron-updater");
 const autoUpdater = updater.autoUpdater;
-const config = require('./config');
+const config = require('../config');
 const path = require('path');
 const {app} = require('electron');
-const eLogger = require('./lib/eLogger').get();
+const eLogger = require('./eLogger').get();
 
 exports.setup = function () {
   const pkgInfo = require(path.join(app.getAppPath(), 'package.json'));

+ 0 - 0
electron/lanucher.js → electron/lib/lanucher.js


+ 3 - 3
electron/storage.js → electron/lib/storage.js

@@ -5,10 +5,10 @@ const lowdb = require('lowdb');
 const FileSync = require('lowdb/adapters/FileSync');
 const fs = require('fs');
 const getPort = require('get-port');
-const utils = require('../app/utils/utils');
-const storageKey = require('../app/const/storageKey');
+const utils = require('../../app/utils/utils');
+const storageKey = require('../../app/const/storageKey');
 const os = require('os');
-const pkg = require('../package.json');
+const pkg = require('../../package.json');
 const storageDb = 'db.json';
 
 exports.setup = function () {

+ 1 - 1
electron/tray.js → electron/lib/tray.js

@@ -2,7 +2,7 @@
 
 const {app, Tray, Menu} = require('electron');
 const path = require('path');
-const pkg = require('../package.json');
+const pkg = require('../../package.json');
 
 module.exports = () => {
   MAIN_WINDOW.on('close', (event) => {

+ 15 - 7
electron/setup.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const storage = require('./storage');
+const storage = require('./lib/storage');
 const config = require('./config');
 const is = require('electron-is');
 const api = require('./api');
@@ -10,17 +10,25 @@ const eLogger = require('./lib/eLogger');
 module.exports = () => {
   // 存储模块
   storage.setup();
+
   // 日志
   eLogger.setup();
+
   // 自动更新
-  const updateConfig = config.get('autoUpdate');
-  if ((is.windows() && updateConfig.windows) || (is.macOS() && updateConfig.macOS)
-    || (is.linux() && updateConfig.linux)) {
-    const autoUpdater = require('./autoUpdater');
-    autoUpdater.setup();
-  }
+  loadUpdate();
+
   // electron业务模块
   api.setup();
+
   // ipc模块
   ipc.setup();
 }
+
+function loadUpdate () {
+  const updateConfig = config.get('autoUpdate');
+  if ((is.windows() && updateConfig.windows) || (is.macOS() && updateConfig.macOS)
+    || (is.linux() && updateConfig.linux)) {
+    const autoUpdater = require('./lib/autoUpdater');
+    autoUpdater.setup();
+  }
+}

+ 3 - 3
main.js

@@ -1,11 +1,11 @@
 const {app, BrowserWindow, Menu} = require('electron')
 const path = require('path')
-const eggLauncher = require('./electron/lanucher')
+const eggLauncher = require('./electron/lib/lanucher')
 const setup = require('./electron/setup')
 const electronConfig = require('./electron/config')
-const storage = require('./electron/storage')
+const storage = require('./electron/lib/storage')
 const is = require('electron-is')
-const setTray = require('./electron/tray')
+const setTray = require('./electron/lib/tray')
 
 // main window
 global.MAIN_WINDOW = null