From dd6eddd6fc652f7ed6fc9c4e7f26c4c0be34d09c Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Sat, 14 Nov 2020 15:37:27 +0800
Subject: [PATCH] update

---
 src/main/index.js | 47 ++++++++++++++++-------------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 7f9e79f..7cfb2ba 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -2,6 +2,14 @@
 const { app, BrowserWindow, protocol, ipcMain, dialog } = require('electron')
 const path = require('path')
 
+
+const gotTheLock = app.requestSingleInstanceLock();
+
+if (!gotTheLock) {
+  app.quit();
+  return;
+}
+
 let mainWindow;
 function createWindow() {
   // Create the browser window.
@@ -16,13 +24,6 @@ function createWindow() {
     },
     // frame: false,
   })
-
-  // const startUrl = url.format({
-  //   pathname: path.join(__dirname, './dist/index.html'),
-  //   protocol: 'file:',
-  //   slashes: true
-  // });
-  // console.log('startUrl:', startUrl)
   // and load the index.html of the app.
   // mainWindow.loadFile('./dist/index.html')
   // mainWindow.loadURL('http://47.104.91.134:9000');
@@ -40,17 +41,6 @@ function createWindow() {
 // Some APIs can only be used after this event occurs.
 app.whenReady().then(() => {
   createWindow()
-  protocol.interceptFileProtocol('file', (request, callback) => {
-    const reqUrl = request.url.replace(/file:[/\\]*/, '');
-    // 
-    let url = reqUrl;
-    const urls = reqUrl.split(/\/static\//);
-    if (urls.length > 1) {
-      url = path.resolve(__dirname, 'dist/static', urls.slice(1).join('/static/'));
-    }
-    // console.log('incomming url: ', reqUrl, '  resolved url:', url);
-    callback({ path: url });
-  })
   app.on('activate', function () {
     // On macOS it's common to re-create a window in the app when the
     // dock icon is clicked and there are no other windows open.
@@ -65,19 +55,14 @@ app.on('window-all-closed', function () {
   if (process.platform !== 'darwin') app.quit()
 })
 
-const gotTheLock = app.requestSingleInstanceLock()
-if (!gotTheLock) {
-  app.quit()
-} else {
-  app.on('second-instance', (event, commandLine, workingDirectory) => {
-    // 当运行第二个实例时,将会聚焦到mainWindow这个窗口
-    if (mainWindow) {
-      if (mainWindow.isMinimized()) mainWindow.restore()
-      mainWindow.focus()
-      mainWindow.show()
-    }
-  })
-}
+app.on('second-instance', (event, commandLine, workingDirectory) => {
+  // 当运行第二个实例时,将会聚焦到mainWindow这个窗口
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore()
+    mainWindow.focus()
+    mainWindow.show()
+  }
+})
 
 // In this file you can include the rest of your app's specific main process
 // code. You can also put them in separate files and require them here.