Jelajahi Sumber

根据环境区分配置

gaoshuaixing 5 tahun lalu
induk
melakukan
018ae4bc80
2 mengubah file dengan 8 tambahan dan 6 penghapusan
  1. 2 2
      electron/config.js
  2. 6 4
      main.js

+ 2 - 2
electron/config.js

@@ -42,7 +42,7 @@ const config = {
   }
 }
 
-exports.get = function (flag = '') {
+exports.get = function (flag = '', env = 'prod') {
   console.log('[config] [get] flag:', flag);
   if (flag === 'log') {
     return config.log;
@@ -58,7 +58,7 @@ exports.get = function (flag = '') {
   
   if (flag === 'egg') {
     const eggConfig = storage.getEggConfig();
-    if (eggConfig.port) {
+    if (env === 'prod' && eggConfig.port) {
       config.egg.port = eggConfig.port;
     }
     return config.egg;

+ 6 - 4
main.js

@@ -14,13 +14,15 @@ setup()
 // return
 
 // argv
-const eggConfig = electronConfig.get('egg')
+let ENV = 'prod'
 for (let i = 0; i < process.argv.length; i++) {
   const tmpArgv = process.argv[i]
   if (tmpArgv.indexOf('--env=') !== -1) {
-    eggConfig.env = tmpArgv.substr(6)
+    ENV = tmpArgv.substr(6)
   }
 }
+const eggConfig = electronConfig.get('egg', ENV)
+eggConfig.env = ENV
 
 if (process.mas) app.setName('electron-egg')
 
@@ -60,10 +62,10 @@ async function createWindow () {
   if (eggConfig.env === 'prod') {
     // hidden menu
     Menu.setApplicationMenu(null)
-    
+
     // dynamic port
     await storage.setDynamicPort()
-    eggConfig.port = electronConfig.get('egg').port
+    eggConfig.port = electronConfig.get('egg', eggConfig.env).port
   }
 
   // loding page