From bf0ca329ec3ddd0ae0039e6c76c137521bfd0bd6 Mon Sep 17 00:00:00 2001
From: gaoshuaixing <530353222@qq.com>
Date: Tue, 29 Jun 2021 10:49:06 +0800
Subject: [PATCH] 1.10.0

---
 electron/apis/example.js  |  3 +--
 electron/{ => lib}/api.js | 53 +++------------------------------------
 electron/setup.js         |  4 +--
 main.js                   |  7 +++---
 package.json              |  4 +--
 update.md                 |  7 ++++++
 6 files changed, 19 insertions(+), 59 deletions(-)
 rename electron/{ => lib}/api.js (60%)
 create mode 100644 update.md

diff --git a/electron/apis/example.js b/electron/apis/example.js
index edffd08..4b6c70f 100644
--- a/electron/apis/example.js
+++ b/electron/apis/example.js
@@ -18,8 +18,7 @@ exports.openDir = function (dir = '') {
     return false;
   }
   dir = getElectronPath(dir);
-  //shell.openPath(dir);
-  shell.openItem(dir);
+  shell.openPath(dir);
   return true;
 }
 
diff --git a/electron/api.js b/electron/lib/api.js
similarity index 60%
rename from electron/api.js
rename to electron/lib/api.js
index 20a423f..3b3d36c 100644
--- a/electron/api.js
+++ b/electron/lib/api.js
@@ -4,9 +4,9 @@ const fs = require('fs');
 const http = require('http');
 const path = require('path');
 const _ = require('lodash');
-const storage = require('./lib/storage');
+const storage = require('./storage');
 const socketIo = require('socket.io');
-const eLogger = require('./lib/eLogger').get();
+const eLogger = require('./eLogger').get();
 // const {app} = require('electron');
 
 const apis = {};
@@ -64,9 +64,6 @@ exports.setup = async function () {
   io.on('connection', (socket) => {
     socket.on('ipc', (message, callback) => {
       eLogger.info('[ api ] [setup] socket id:' + socket.id + ' message cmd: ' + message.cmd);
-      
-      // const filepath = message;
-      // const fileObj = require(`./apis/${filepath}`);
       const data = apis[message.cmd](...message.params);
       if (data && typeof data.then === 'function') { // 判断是否是异步
         data.then((data) => {
@@ -93,54 +90,12 @@ exports.setup = async function () {
   return true;
 };
 
-// function setApi() {
-//   // fs读文件的时候，用path正规化 [打包读文件问题]
-//   const apiDir = path.normalize(__dirname + '/apis');
-//   eLogger.info('[setApi] apiDir: ', apiDir);
-//   const fileArr = fs.readdirSync(apiDir);
-//   eLogger.info('[setApi] fileArr: ', fileArr);
-//   for (let i = 0; i < fileArr.length; i++) {
-//     let filename = fileArr[i];
-//     if (path.extname(filename) === '.js' && filename !== 'index.js') {
-//       const name = path.basename(filename, '.js');
-//       const fileObj = require(`./apis/${filename}`);
-//       _.map(fileObj, function(fn, method) {
-//         let methodName = getApiName(name, method);
-//         apis[methodName] = fn;
-//         eLogger.info('[setApi] method Name', methodName);
-//       });
-//     }
-//   }
-  
-//   return true;
-// }
-
-// function setApi() {
-//   // fs读文件的时候，用path正规化 [打包读文件问题]
-//   const apiDir = path.normalize(__dirname + '/apis');
-//   eLogger.info('[setApi] apiDir: ', apiDir);
-//   // const baseDir = app.getAppPath();
-//   // const apiDir = path.join(baseDir, 'electron/apis');
-//   fs.readdirSync(apiDir).forEach(function(filename) {
-//     if (path.extname(filename) === '.js' && filename !== 'index.js') {
-//       const name = path.basename(filename, '.js');
-//       // require文件的时候，用相对路径并且不能path处理 [打包读文件问题]
-//       const fileObj = require(`./apis/${filename}`);
-//       _.map(fileObj, function(fn, method) {
-//         let methodName = getApiName(name, method);
-//         apis[methodName] = fn;
-//         //eLogger.info('[setApi] method Name', methodName);
-//       });
-//     }
-//   });
-// }
-
 function setApi() {
-  const apiDir = path.normalize(__dirname + '/apis');
+  const apiDir = path.normalize(__dirname + '/../apis');
   fs.readdirSync(apiDir).forEach(function(filename) {
     if (path.extname(filename) === '.js' && filename !== 'index.js') {
       const name = path.basename(filename, '.js');
-      const fileObj = require(`./apis/${filename}`);
+      const fileObj = require(`../apis/${filename}`);
       _.map(fileObj, function(fn, method) {
         let methodName = getApiName(name, method);
         apis[methodName] = fn;
diff --git a/electron/setup.js b/electron/setup.js
index 1886282..0c8207c 100644
--- a/electron/setup.js
+++ b/electron/setup.js
@@ -3,7 +3,7 @@
 const storage = require('./lib/storage');
 const config = require('./config');
 const is = require('electron-is');
-const api = require('./api');
+const api = require('./lib/api');
 const ipc = require('./ipc');
 const eLogger = require('./lib/eLogger');
 
@@ -21,7 +21,7 @@ module.exports = () => {
   api.setup();
 
   // ipc模块
-  //ipc.setup();
+  ipc.setup();
 }
 
 function loadUpdate () {
diff --git a/main.js b/main.js
index ff0a63c..8c97f55 100644
--- a/main.js
+++ b/main.js
@@ -13,7 +13,6 @@ global.CAN_QUIT = false;
 
 // Initialize 
 setup()
-//return
 
 // argv
 let ENV = 'prod'
@@ -70,9 +69,9 @@ async function createWindow () {
   // egg server
   await startServer(eggConfig)
 
-  process.on('uncaughtException', function(err) {
-    eLogger.error(err);
-  });
+  // process.on('uncaughtException', function(err) {
+  //   eLogger.error(err);
+  // });
 
   return MAIN_WINDOW
 }
diff --git a/package.json b/package.json
index a53db68..6bbc10b 100755
--- a/package.json
+++ b/package.json
@@ -99,8 +99,8 @@
     "egg-bin": "^4.12.3",
     "egg-ci": "^1.11.0",
     "egg-mock": "^3.21.0",
-    "electron": "8.4.1",
-    "electron-builder": "22.7.0",
+    "electron": "^12.0.10",
+    "electron-builder": "^22.10.4",
     "eslint": "^5.13.0",
     "eslint-config-egg": "^7.1.0",
     "eslint-plugin-prettier": "^3.0.1",
diff --git a/update.md b/update.md
new file mode 100644
index 0000000..45fec46
--- /dev/null
+++ b/update.md
@@ -0,0 +1,7 @@
+## 1.10.0
+1. 优化代码结构。
+2. 升级electron到12版本。
+3. 升级electron-builder，支持Mac M1芯片架构。
+4. 增加快捷键功能模块和demo。
+5. 修复ejs bug。
+6. 修复引入路径bug。
\ No newline at end of file