From 8bf3073f34bf4d0507dee267c14bedeb088a7a63 Mon Sep 17 00:00:00 2001
From: lumozx <969671691@qq.com>
Date: Mon, 16 Dec 2019 16:04:21 +0800
Subject: [PATCH] Update 7.1.4 (#60)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 升级部分包

* fix: 为解决electron的无边框早macos 10.15.1的拖拽BUG，只用有边框

BUG:https://github.com/electron/electron/issues/21034

* fix: 使用https

* fix: 解决同源策略，可以修复右键功能

* fix: 解决mac qq选中整个content截图白屏的问题，实际上这是qq的问题，识图的截图方式依然存在白屏问题

* chore: 升级版本

* chore: 还原功能，记录问题

调试发现，qq截图白屏是new tray执行的原因，只要tray顺利执行，那么qq弹框截屏就白屏

* feat: 增加回到日事清功能

* fix: 升级@sentry/electron解决提示getName被废弃警告的问题
---
 download.js                          |   6 +-
 electron-builder.js                  |   4 +-
 fe/modules/index/Index.vue           | 151 +-------------
 fe/modules/index/pub/Welcome.vue     |   2 +-
 fe/modules/preference/Preference.vue |  14 +-
 fe/modules/preference/main.js        |  16 +-
 fe/modules/preference/pub/Server.vue |   2 +-
 fe/modules/utils/config.js           |   6 +-
 main.js                              |  40 ++--
 native/hotkey.js                     |   6 +-
 native/mainDb.js                     |   7 +-
 native/menu/icon.js                  |   5 +-
 native/menu/index.js                 |   1 +
 native/menu/macTemplate.js           |   6 +-
 native/menu/tray.js                  | 291 ++++++++++++++-------------
 native/menu/winTemplate.js           |   8 +-
 native/util.js                       |  60 +++---
 package.json                         |  55 ++---
 page.js                              |   7 +-
 19 files changed, 282 insertions(+), 405 deletions(-)

diff --git a/download.js b/download.js
index bf34804..6393f45 100644
--- a/download.js
+++ b/download.js
@@ -75,9 +75,9 @@ class Download extends Page {
     if (!isExist) return fileName;
     const extname = path.extname(fileName);
     const basename = path.basename(fileName, extname);
-    
+
     let count = 0;
-    
+
     while (isExist) {
       isExist = this.isFileExist(`${basename}(${++count})${extname}`);
     }
@@ -154,4 +154,4 @@ class Download extends Page {
   }
 }
 
-module.exports = new Download();
\ No newline at end of file
+module.exports = new Download();
diff --git a/electron-builder.js b/electron-builder.js
index a8dda56..051796f 100644
--- a/electron-builder.js
+++ b/electron-builder.js
@@ -16,7 +16,9 @@ const output = process.platform === 'darwin' ? `package-${process.env.CHANNEL}`
 
 try {
   rimraf.sync(output);
-} catch (e) {}
+} catch (e) {
+  console.log(e)
+}
 
 builder.build({
   config: {
diff --git a/fe/modules/index/Index.vue b/fe/modules/index/Index.vue
index d09601e..621384c 100644
--- a/fe/modules/index/Index.vue
+++ b/fe/modules/index/Index.vue
@@ -1,34 +1,5 @@
 <template>
   <div id="index">
-    <div class="drag-bar-mac" style="-webkit-app-region: drag;" @dblclick.stop="full($event)">
-      <div class="traffic-lights mac" style="-webkit-app-region: no-drag;">
-          <span class="close" @click="close">
-            <img src="../../assets/img/mac-traffic-light-close.svg" class="normal">
-            <img src="../../assets/img/mac-traffic-light-close-hover.svg" class="hover">
-          </span>
-          <span class="minimize" @click="minimize">
-            <img src="../../assets/img/mac-traffic-light-minimize.svg" class="normal">
-            <img src="../../assets/img/mac-traffic-light-minimize-hover.svg" class="hover">
-          </span>
-          <span class="zoom" @click="zoom">
-            <img src="../../assets/img/mac-traffic-light-zoom.svg" class="normal">
-            <img src="../../assets/img/mac-traffic-light-zoom-hover.svg" class="hover">
-          </span>
-      </div>
-    </div>
-    <div class="drag-bar-win" style="-webkit-app-region: drag;" @dblclick.stop="full($event)">
-      <div class="traffic-lights" style="-webkit-app-region: no-drag">
-        <span class="minimize" @click="minimize">
-          <img src="../../assets/img/win-minimize.svg">
-        </span>
-        <span class="zoom" @click="zoom">
-          <img src="../../assets/img/win-zoom.svg">
-        </span>
-        <span class="close" @click="close">
-          <img src="../../assets/img/win-close.svg">
-        </span>
-      </div>
-    </div>
     <iframe id="main-iframe" allowFullscreen="true" ref="mainIframe" @load="iframeLoad"></iframe>
     <div id="loading" ref="loading" v-show="loadingDisplay">
       <div class="loading-splash" ref="loadingSplash" v-show="loadingSplashDisplay">
@@ -716,8 +687,8 @@ body.win .welcome-page:before {
   bottom: 0;
   border: none;
   width: 100%;
-  top: 30px;
-  height: calc(100% - 30px);
+  top: 0px;
+  height: 100%;
 }
 #loading {
   position: absolute;
@@ -804,122 +775,4 @@ body.win .welcome-page:before {
   margin-top: -6px;
   margin-left: 18px;
 }
-.drag-bar-mac {
-  display: none;
-}
-.drag-bar-mac .drag-bar {
-  position: absolute;
-  left: 80px;
-  top: 0;
-  height: 56px;
-  width: calc(50% - 285px);
-}
-.drag-bar-mac .drag-bar-2 {
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 10px;
-}
-.drag-bar-mac .drag-bar-3 {
-  position: absolute;
-  left: 0;
-  top: 46px;
-  right: 0;
-  height: 10px;
-}
-
-.traffic-lights.mac {
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 30px;
-  display: flex;
-  z-index: 2;
-  justify-content: space-between;
-  width: 76px;
-  align-items: center;
-  padding: 0 12px;
-  user-select: none;
-}
-.traffic-lights.mac > span {
-  display: inline-block;
-  height: 12px;
-  width: 12px;
-  border-radius: 50%;
-}
-.traffic-lights.mac > span img {
-  height: 12px;
-  width: 12px;
-  vertical-align: top;
-}
-.traffic-lights.mac > span img.hover {
-  display: none;
-}
-.traffic-lights.mac:hover img.normal {
-  display: none;
-}
-.traffic-lights.mac:hover img.hover {
-  display: inline-block;
-}
-
-.drag-bar-win {
-  display: none;
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 30px;
-  background:linear-gradient(180deg,rgba(88,157,228,1) 0%,rgba(77,140,202,1) 100%);
-  z-index: 2;
-}
-.drag-bar-win .traffic-lights {
-  position: absolute;
-  right: 0;
-  top: 0;
-  height: 30px;
-  display: flex;
-  z-index: 1;
-  justify-content: space-between;
-  width: 140px;
-  align-items: center;
-  padding: 0 18px;
-  user-select: none;
-}
-.drag-bar-win .traffic-lights > span {
-  display: flex;
-  height: 100%;
-  width: 12px;
-  align-items: center;
-  justify-content: center;
-}
-.drag-bar-win .traffic-lights > span img {
-  vertical-align: top;
-}
-.drag-bar-win .traffic-lights > span.minimize img {
-  vertical-align: bottom;
-}
-body.mac .drag-bar-mac {
-  user-select:none;
-  display: block;
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  height: 30px;
-  background:linear-gradient(180deg,rgba(88,157,228,1) 0%,rgba(77,140,202,1) 100%);
-  z-index: 2;
-}
-
-body.win {
-  background: #5A98D4;
-}
-body.win .drag-bar-win {
-  user-select:none;
-  display: block;
-}
-body.win .traffic-lights.mac {
-  display: none;
-}
-
 </style>
diff --git a/fe/modules/index/pub/Welcome.vue b/fe/modules/index/pub/Welcome.vue
index b602c54..1e11b48 100644
--- a/fe/modules/index/pub/Welcome.vue
+++ b/fe/modules/index/pub/Welcome.vue
@@ -225,4 +225,4 @@ export default {
   margin-left: 40px;
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/fe/modules/preference/Preference.vue b/fe/modules/preference/Preference.vue
index 7ab3b9b..1a57491 100755
--- a/fe/modules/preference/Preference.vue
+++ b/fe/modules/preference/Preference.vue
@@ -35,7 +35,7 @@ const { testProxy } = electron.remote.require('./native/proxy')
 async function getConfig() {
 	const proxyConfig = await mainDb.getProxyConfig()
 	const serverConfig = await mainDb.getServerConfig()
-	const cacheSize = await getCacheSize()
+	const cacheSize = await session.getCacheSize()
 	const downloadConfig = await mainDb.getDownloadConfig()
 	const hotkeyConfig = await mainDb.getHotKeyConfig()
 	const isAutoLaunch = autoLaunch.isEnabled()
@@ -48,13 +48,7 @@ async function getConfig() {
 	isAutoLaunch,
 	}
 }
-async function getCacheSize() {
-  return new Promise((resolve) => {
-    session.getCacheSize((size) => {
-      resolve(size)
-    })
-  })
-}
+
 export default {
   name: "preference",
   components: {
@@ -128,7 +122,7 @@ export default {
 		async onRestore() {
 			mainDb.restore()
 			autoLaunch.disable()
-			const config = await getConfig()
+      const config = await getConfig()
 			this.proxyConfig = config.proxyConfig
 			this.serverConfig = {
 				enablePrivate: config.serverConfig. enablePrivate,
@@ -271,4 +265,4 @@ ul {
   color: #3B3B3B;
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/fe/modules/preference/main.js b/fe/modules/preference/main.js
index 32e4cc3..09ec92c 100755
--- a/fe/modules/preference/main.js
+++ b/fe/modules/preference/main.js
@@ -13,17 +13,11 @@ webFrame.setZoomFactor(1)
 webFrame.setVisualZoomLevelLimits(1, 1)
 webFrame.setLayoutZoomLevelLimits(0, 0)
 
-async function getCacheSize() {
-  return new Promise((resolve) => {
-    session.getCacheSize((size) => {
-      resolve(size)
-    })
-  })
-}
+
 async function getConfig() {
   const proxyConfig = await mainDb.getProxyConfig()
   const serverConfig = await mainDb.getServerConfig()
-  const cacheSize = await getCacheSize()
+  const cacheSize = await session.getCacheSize()
   const downloadConfig = await mainDb.getDownloadConfig()
   const hotkeyConfig = await mainDb.getHotKeyConfig()
   const isAutoLaunch = autoLaunch.isEnabled()
@@ -37,11 +31,11 @@ async function getConfig() {
   }
 }
 async function render () {
-	const res = await getConfig()
+  const res = await getConfig()
 	await store.commit('SAVR_CON',res)
 	new Vue({
-	  store,
+    store,
     render: h => h(Preference)
   }).$mount('#preference')
 }
-render()
\ No newline at end of file
+render()
diff --git a/fe/modules/preference/pub/Server.vue b/fe/modules/preference/pub/Server.vue
index ab74621..9fae5b9 100644
--- a/fe/modules/preference/pub/Server.vue
+++ b/fe/modules/preference/pub/Server.vue
@@ -60,4 +60,4 @@ export default {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/fe/modules/utils/config.js b/fe/modules/utils/config.js
index 8cd7ae4..55e1583 100755
--- a/fe/modules/utils/config.js
+++ b/fe/modules/utils/config.js
@@ -2,9 +2,9 @@ import electron from 'electron'
 const package_json        = electron.remote.require('./package.json')
 const env = package_json.env//dev是开发环境，release是发布环境, beta是beta环境
 const PREFIX_URL = {
-  dev: 'http://beta.rishiqing.com',
-  beta: 'http://beta.rishiqing.com',
-  debug: 'http://beta.rishiqing.com',
+  dev: 'https://beta.rishiqing.com',
+  beta: 'https://beta.rishiqing.com',
+  debug: 'https://beta.rishiqing.com',
   release: 'https://www.rishiqing.com',
 }
 
diff --git a/main.js b/main.js
index ab40044..75bc5ac 100644
--- a/main.js
+++ b/main.js
@@ -4,7 +4,6 @@ const electron      = require('electron');
 const pkg           = require('./package.json');
 const Menu          = require('./native/menu');
 const Update        = require('./native/update');
-const path          = require('path');
 const download      = require('./download');
 const preference    = require('./preference');
 const mainDb        = require('./native/mainDb');
@@ -24,6 +23,10 @@ const {
 // 所以这里把这个禁止给解除了
 app.commandLine.appendSwitch('autoplay-policy', 'no-user-gesture-required');
 
+//https://github.com/electron/electron/issues/18214
+//与webSecurity: false一起解决同源策略，官方说的仅仅使用webSecurity: false是没用的
+app.commandLine.appendSwitch('disable-site-isolation-trials')
+
 if (process.platform !== 'darwin') app.setAppUserModelId('release.rishiqing.electron'); // 在这里设置appId，win10才能正常推送通知
 
 process.on('uncaughtException', (err) => {
@@ -70,8 +73,8 @@ class Main {
     await this._createWindow();
     download.initWindow();
     preference.initWindow();
-    const u = new Update(this.mainWindow);
-    const m = new Menu(this.mainWindow);
+    new Update(this.mainWindow);
+    new Menu(this.mainWindow);
   }
 
   async _createWindow () {
@@ -81,21 +84,21 @@ class Main {
       minHeight:630,
       width: sizeDb.width,
       height: sizeDb.height,
-      "title":"日事清",
-      'webPreferences': {
-        'plugins': true,
-        'webSecurity': false,
-        'nodeIntegration': true,
-        'minimumFontSize': 12
+      title:"日事清",
+      webPreferences: {
+        plugins: true,
+        webSecurity: false,
+        nodeIntegration: true,
+        minimumFontSize: 12
       },
-      frame: false,
+      frame: true,
       backgroundColor: '#ffffff',
       icon: nativeImage.createFromPath(__dirname + '/res/rishiqing.png') // 必须使用绝对路径，相对路径，在打包之后，icon无法显示
     });
     this.mainWindow.mainDb = mainDb;
     const webContents = this.mainWindow.webContents;
-    const userAgent = webContents.getUserAgent() + ' rishiqing-pc/' + pkg.version;
-    webContents.setUserAgent(userAgent);
+    const userAgent = webContents.userAgent + ' rishiqing-pc/' + pkg.version;
+    webContents.userAgent = userAgent;
     pkg.env === 'dev' ? this.mainWindow.loadURL(`http://localhost:8080/index`) : this.mainWindow.loadURL(`file://${__dirname}/dist/index/index.html`);
     // 打开调试窗口
     if (pkg.env === 'dev' || pkg.env === 'debug') {
@@ -105,6 +108,9 @@ class Main {
     this.mainWindow.on('resize', this._onResize.bind(this));
     webContents.on('new-window', this._onNewWindow.bind(this));
     webContents.session.on('will-download', this._onWillDownload.bind(this));
+    mainDb.event.on(mainDb.EVENTS.ContentBack, () => {
+      this._onBack()
+    })
   }
 
   _onWindowAllClosed () {
@@ -115,6 +121,10 @@ class Main {
     app.exit(0);
   }
 
+  _onBack () {
+    pkg.env === 'dev' ? this.mainWindow.loadURL(`http://localhost:8080/index`) : this.mainWindow.loadURL(`file://${__dirname}/dist/index/index.html`);
+  }
+
   _onResize () {
     const size = this.mainWindow.getSize();
     const width = size[0];
@@ -138,7 +148,7 @@ class Main {
         this.mainWindow.hide();
       }
       e.preventDefault();
-    } 
+    }
   }
 
   _onNewWindow (event, url, frameName, disposition, options) {
@@ -150,7 +160,7 @@ class Main {
       options.webPreferences = Object.assign({}, options.webPreferences, {
         plugins: true,
         webSecurity: false,
-        nodeIntegration: false,
+        nodeIntegration: true,
         minimumFontSize: 12
       });
     }
@@ -161,4 +171,4 @@ class Main {
   }
 }
 
-new Main();
\ No newline at end of file
+new Main();
diff --git a/native/hotkey.js b/native/hotkey.js
index 1c28f45..7b1a65f 100644
--- a/native/hotkey.js
+++ b/native/hotkey.js
@@ -1,4 +1,4 @@
-const { globalShortcut, app } = require('electron');
+const { globalShortcut } = require('electron');
 const mainDb = require('./mainDb');
 const util = require('./util');
 const env = require('../common/env');
@@ -19,7 +19,7 @@ const NotRegisterMap = {
     hide: true
   },
   win: {
-    
+
   }
 };
 
@@ -51,4 +51,4 @@ mainDb.event.on(mainDb.EVENTS.HotkeyConfigChange, async function() {
 module.exports = async function hotkey() {
   const config = await mainDb.getHotKeyConfig()
   await configHotkey(config);
-}
\ No newline at end of file
+}
diff --git a/native/mainDb.js b/native/mainDb.js
index 8c0f382..a0b7fb4 100644
--- a/native/mainDb.js
+++ b/native/mainDb.js
@@ -6,7 +6,9 @@ const { EventEmitter } = require('events');
 const env       = require('../common/env');
 
 const ServerConfigOfficiel = {
+  dev: 'https://beta.rishiqing.com',
   beta: 'https://beta.rishiqing.com',
+  debug: 'https://beta.rishiqing.com',
   release: 'https://www.rishiqing.com'
 };
 
@@ -68,6 +70,7 @@ class MainDb {
       ProxyConfigChange: 'proxy-config-change',
       DownloadConfigChange: 'download-config-change',
       HotkeyConfigChange: 'hotkey-config-change',
+      ContentBack:'content-back'
     };
   }
   constructor () {
@@ -122,7 +125,7 @@ class MainDb {
     return Object.assign({}, Status, config);
   }
 
-  updateWindowSize (data) { // { width, height } 
+  updateWindowSize (data) { // { width, height }
     this.db.update({ type: 'main-window-size' }, { $set: Object.assign({ version: VERSION.windowSize }, data) }, { upsert: true });
   }
 
@@ -169,4 +172,4 @@ class MainDb {
   }
 }
 
-module.exports = new MainDb();
\ No newline at end of file
+module.exports = new MainDb();
diff --git a/native/menu/icon.js b/native/menu/icon.js
index 6bd096f..b981fc5 100644
--- a/native/menu/icon.js
+++ b/native/menu/icon.js
@@ -1,6 +1,7 @@
 const {
   systemPreferences,
   nativeImage,
+  nativeTheme
 } = require('electron');
 const { EventEmitter } = require('events');
 const path = require('path');
@@ -27,7 +28,7 @@ class Icon {
   getImage() {
     let tray_icon;
     if (env.isMac) {
-      if (systemPreferences.isDarkMode()) {
+      if (nativeTheme.shouldUseDarkColors) {
         tray_icon = '../../res/tray_mac_drak_mode@2x.png';
       } else {
         tray_icon = '../../res/tray_mac@2x.png';
@@ -48,4 +49,4 @@ class Icon {
   }
 }
 
-module.exports = new Icon();
\ No newline at end of file
+module.exports = new Icon();
diff --git a/native/menu/index.js b/native/menu/index.js
index 55cf99a..00e28cf 100644
--- a/native/menu/index.js
+++ b/native/menu/index.js
@@ -30,6 +30,7 @@ async function buildTemplate(template) {
       }
     }
     if (tmp.submenu && tmp.submenu.length > 0) {
+      // eslint-disable-next-line require-atomic-updates
       tmp.submenu = await buildMenuList(tmp.submenu);
     }
     return tmp;
diff --git a/native/menu/macTemplate.js b/native/menu/macTemplate.js
index 599832c..6b9683a 100644
--- a/native/menu/macTemplate.js
+++ b/native/menu/macTemplate.js
@@ -92,6 +92,10 @@ const MacTemplate = [
         label: '全选',
         accelerator: 'Command+A',
         selector: 'selectAll:'
+      },{
+        label: '回到日事清',
+        accelerator: 'Command+B',
+        click:function () {mainDb.event.emit(mainDb.EVENTS.ContentBack)}
       }
     ]
   },
@@ -111,4 +115,4 @@ const MacTemplate = [
   }
 ];
 
-module.exports = MacTemplate;
\ No newline at end of file
+module.exports = MacTemplate;
diff --git a/native/menu/tray.js b/native/menu/tray.js
index f626d12..259472e 100644
--- a/native/menu/tray.js
+++ b/native/menu/tray.js
@@ -1,145 +1,146 @@
-const electron    = require('electron');
-const {ipcMain}   = require('electron');
-const download    = require('../../download');
-const util        = require('../util');
-const path        = require('path');
-const EVENTS      = require('../../common/notification_event');
-const env         = require('../../common/env');
-const Icon        = require('./icon');
-const autoLaunch  = require('../autoLaunch');
-const mainDb      = require('../mainDb');
-
-const {
-  Tray,
-  app,
-  Menu,
-} = electron;
-
-class TrayClass {
-  constructor (mainWindow) {
-    this.mainWindow = mainWindow;
-    this.webContents = mainWindow.webContents;
-    this.mainWindow.on('focus', this.onMainWindowFocused.bind(this));
-    this.initAppIcon();
-    this.initNotificationEvent();
-    this.initBalloonEvent();
-    this.initEvent();
-    setTimeout(() => {
-      this.clearOldStartConfig();
-    }, 0)
-  }
-  initAppIcon () {
-    this.appIcon = new Tray(Icon.getImage());
-    this.appIcon.setToolTip('日事清');
-    if (env.isMac) {
-      this.appIcon.setPressedImage(Icon.getPressedImage());
-    }
-  }
-  // 图标闪烁
-  twinkle() {
-    this.stopTwinkle();
-    this.twinkleTimer = setInterval(() => {
-      this.appIcon.setImage(Icon.getEmptyImage());
-      setTimeout(() => {
-        this.appIcon.setImage(Icon.getImage());
-      }, 300)
-    }, 600);
-  }
-  // 停止闪烁
-  stopTwinkle() {
-    if (this.twinkleTimer) {
-      clearInterval(this.twinkleTimer);
-      this.twinkleTimer = null;
-    }
-    this.appIcon.setImage(Icon.getImage());
-  }
-  initNotificationEvent () {
-    ipcMain.on(EVENTS.Notification_Come, this.onNotificationCome.bind(this));
-    ipcMain.on(EVENTS.Notification_Show_Message, this.onNotificationShow.bind(this));
-    ipcMain.on(EVENTS.Notification_Show_Window, this.onNotificationShowWindow.bind(this));
-  }
-  initBalloonEvent () {
-    this.appIcon.on('balloon-show', this.onBalloonShow.bind(this));
-    this.appIcon.on('balloon-click', this.onBalloonClick.bind(this));
-    this.appIcon.on('balloon-closed', this.onBalloonClosed.bind(this));
-  }
-  initEvent () {
-    this.appIcon.on('click', () => {
-      const result = util.showWindow();
-      if (env.platform === 'win') {
-        if (!result) this.mainWindow.hide();
-      }
-    });
-    // mac系统需要监听操作系统的主题变化
-    if (env.isMac) {
-      Icon.event.on(Icon.EVENTS.ThemeChange, () => {
-        this.appIcon.setImage(Icon.getImage());
-      })
-    }
-  }
-  // 清理windows旧版本的的开机启动配置
-  async clearOldStartConfig() {
-    if (env.platform !== 'win') return;
-    const status = await mainDb.getStatus();
-    // 如果状态里记录的已经清理过旧的自启动配置
-    // 则直接返回
-    // 防止部分机子由于没有读取注册表权限的问题，而导致app崩溃
-    if (status.clearOldStartConfig) return;
-    mainDb.setAsClearOldStartConfig();
-    const startOnBoot = require("./startOnBoot");
-    const old_key_1 = 'rishiqing_startOnBoot'; // 之前版本保存自动启动地址的key
-    const old_key_2 = 'rishiqing_V3'; // 新版的自启动key
-    startOnBoot.getAutoStartValue(old_key_1, (value) => {
-      if (value) {
-        startOnBoot.disableAutoStart(old_key_1);
-        autoLaunch.enable();
-      }
-    });
-    startOnBoot.getAutoStartValue(old_key_2, (value) => {
-      if (value) {
-        startOnBoot.disableAutoStart(old_key_2);
-        autoLaunch.enable();
-      }
-    });
-  }
-  setContextMenu(m) {
-    this.appIcon.setContextMenu(m);
-  }
-  // 显示 tray 通知
-  showBalloon (title, content) {
-    this.appIcon.displayBalloon({
-      title: title || '',
-      content: content || ''
-    });
-  }
-  onBalloonShow () {
-    this.webContents.send(EVENTS.Notification_Show_reply, 'show');
-  }
-  onBalloonClick () {
-    util.showWindow();
-    this.webContents.send(EVENTS.Notification_Click_reply, 'click');
-  }
-  onBalloonClosed () {
-    this.webContents.send(EVENTS.Notification_Close_reply, 'close');
-  }
-  // 通知来的时候，需要让tray图标闪烁
-  onNotificationCome() {
-    if (this.mainWindow.isFocused()) return;
-    this.twinkle();
-  }
-  onNotificationShow (event, arg) {
-    if (this.mainWindow.isFocused()) return;
-    if (arg) {
-      this.showBalloon(arg.title || '', arg.content || '');
-    }
-  }
-  onNotificationShowWindow () {
-    util.showWindow();
-  }
-
-  onMainWindowFocused() {
-    this.stopTwinkle();
-  }
-}
-
-module.exports = TrayClass;
+const electron    = require('electron');
+const {ipcMain}   = require('electron');
+const download    = require('../../download');
+const util        = require('../util');
+const path        = require('path');
+const EVENTS      = require('../../common/notification_event');
+const env         = require('../../common/env');
+const Icon        = require('./icon');
+const autoLaunch  = require('../autoLaunch');
+const mainDb      = require('../mainDb');
+
+const {
+  Tray,
+  app,
+  Menu,
+} = electron;
+
+class TrayClass {
+  constructor (mainWindow) {
+    this.mainWindow = mainWindow;
+    this.webContents = mainWindow.webContents;
+    this.mainWindow.on('focus', this.onMainWindowFocused.bind(this));
+    this.initAppIcon();
+    this.initNotificationEvent();
+    this.initBalloonEvent();
+    this.initEvent();
+    setTimeout(() => {
+      this.clearOldStartConfig();
+    }, 0)
+  }
+  initAppIcon () {
+    // 调试发现，qq截图白屏是new tray执行的原因，只要tray顺利执行，那么qq弹框截屏就白屏
+    this.appIcon = new Tray(Icon.getImage());
+    this.appIcon.setToolTip('日事清');
+    if (env.isMac) {
+      this.appIcon.setPressedImage(Icon.getPressedImage());
+    }
+  }
+  // 图标闪烁
+  twinkle() {
+    this.stopTwinkle();
+    this.twinkleTimer = setInterval(() => {
+      this.appIcon.setImage(Icon.getEmptyImage());
+      setTimeout(() => {
+        this.appIcon.setImage(Icon.getImage());
+      }, 300)
+    }, 600);
+  }
+  // 停止闪烁
+  stopTwinkle() {
+    if (this.twinkleTimer) {
+      clearInterval(this.twinkleTimer);
+      this.twinkleTimer = null;
+    }
+    this.appIcon.setImage(Icon.getImage());
+  }
+  initNotificationEvent () {
+    ipcMain.on(EVENTS.Notification_Come, this.onNotificationCome.bind(this));
+    ipcMain.on(EVENTS.Notification_Show_Message, this.onNotificationShow.bind(this));
+    ipcMain.on(EVENTS.Notification_Show_Window, this.onNotificationShowWindow.bind(this));
+  }
+  initBalloonEvent () {
+    this.appIcon.on('balloon-show', this.onBalloonShow.bind(this));
+    this.appIcon.on('balloon-click', this.onBalloonClick.bind(this));
+    this.appIcon.on('balloon-closed', this.onBalloonClosed.bind(this));
+  }
+  initEvent () {
+    this.appIcon.on('click', () => {
+      const result = util.showWindow();
+      if (env.platform === 'win') {
+        if (!result) this.mainWindow.hide();
+      }
+    });
+    // mac系统需要监听操作系统的主题变化
+    if (env.isMac) {
+      Icon.event.on(Icon.EVENTS.ThemeChange, () => {
+        this.appIcon.setImage(Icon.getImage());
+      })
+    }
+  }
+  // 清理windows旧版本的的开机启动配置
+  async clearOldStartConfig() {
+    if (env.platform !== 'win') return;
+    const status = await mainDb.getStatus();
+    // 如果状态里记录的已经清理过旧的自启动配置
+    // 则直接返回
+    // 防止部分机子由于没有读取注册表权限的问题，而导致app崩溃
+    if (status.clearOldStartConfig) return;
+    mainDb.setAsClearOldStartConfig();
+    const startOnBoot = require("./startOnBoot");
+    const old_key_1 = 'rishiqing_startOnBoot'; // 之前版本保存自动启动地址的key
+    const old_key_2 = 'rishiqing_V3'; // 新版的自启动key
+    startOnBoot.getAutoStartValue(old_key_1, (value) => {
+      if (value) {
+        startOnBoot.disableAutoStart(old_key_1);
+        autoLaunch.enable();
+      }
+    });
+    startOnBoot.getAutoStartValue(old_key_2, (value) => {
+      if (value) {
+        startOnBoot.disableAutoStart(old_key_2);
+        autoLaunch.enable();
+      }
+    });
+  }
+  setContextMenu(m) {
+    this.appIcon.setContextMenu(m);
+  }
+  // 显示 tray 通知
+  showBalloon (title, content) {
+    this.appIcon.displayBalloon({
+      title: title || '',
+      content: content || ''
+    });
+  }
+  onBalloonShow () {
+    this.webContents.send(EVENTS.Notification_Show_reply, 'show');
+  }
+  onBalloonClick () {
+    util.showWindow();
+    this.webContents.send(EVENTS.Notification_Click_reply, 'click');
+  }
+  onBalloonClosed () {
+    this.webContents.send(EVENTS.Notification_Close_reply, 'close');
+  }
+  // 通知来的时候，需要让tray图标闪烁
+  onNotificationCome() {
+    if (this.mainWindow.isFocused()) return;
+    this.twinkle();
+  }
+  onNotificationShow (event, arg) {
+    if (this.mainWindow.isFocused()) return;
+    if (arg) {
+      this.showBalloon(arg.title || '', arg.content || '');
+    }
+  }
+  onNotificationShowWindow () {
+    util.showWindow();
+  }
+
+  onMainWindowFocused() {
+    this.stopTwinkle();
+  }
+}
+
+module.exports = TrayClass;
diff --git a/native/menu/winTemplate.js b/native/menu/winTemplate.js
index 10cd7b5..4bb3dfa 100644
--- a/native/menu/winTemplate.js
+++ b/native/menu/winTemplate.js
@@ -24,7 +24,13 @@ const WinTemplate = [
     }
   },
   { label: 'Item2', type: 'separator' },
+  {
+    label: '回到日事清',
+    type: 'normal',
+    click:function () {mainDb.event.emit(mainDb.EVENTS.ContentBack)}
+  },
+  { label: 'Item2', type: 'separator' },
   { label: '退出', type: 'normal',click:() => { global.force_close = true; app.quit(); }}
 ];
 
-module.exports = WinTemplate;
\ No newline at end of file
+module.exports = WinTemplate;
diff --git a/native/util.js b/native/util.js
index 3f01d9e..807e55e 100644
--- a/native/util.js
+++ b/native/util.js
@@ -68,35 +68,36 @@ class Util {
     }
   }
 
-  clearCache() {
-    dialog.showMessageBox({
+  async clearCache() {
+    const res = dialog.showMessageBox({
       type: 'warning',
       buttons: ['确定', '取消'],
       defaultId: 0,
       title: '确认清除缓存?',
       message: '清除缓存可能导致您退出日事清账号,需要重启后生效'
-    }, function(response) {
-      if (response === 1) return;
-      if (response === 0) {
-        // 只清除cookies，会清除用户的登录状态
-        session.defaultSession.clearStorageData({
-          storages: ['cookies'] // 清理 cookie
-        })
-        // 清除网络缓存文件
-        session.defaultSession.clearCache(function() {
-          const notify = new Notification({
-            title: '缓存已清理',
-            body: '需要重启软件后生效'
-          });
-          notify.show();
-        })
-      }
     })
+    if(res.response === 1) {
+      return
+    }
+    if(res.response === 0) {
+      // 只清除cookies，会清除用户的登录状态
+      session.defaultSession.clearStorageData({
+        storages: ['cookies'] // 清理 cookie
+      })
+      // 清除网络缓存文件
+      session.defaultSession.clearCache(function() {
+        const notify = new Notification({
+          title: '缓存已清理',
+          body: '需要重启软件后生效'
+        });
+        notify.show();
+      })
+    }
   }
 
   // 给定一个server链接，测试这个server是否可用
   testServer(server) {
-    return new Promise(function(resolve, reject) {
+    return new Promise(function(resolve) {
       const testUrl = url.resolve(server, '/task/login/authAjax');
       const request = net.request(testUrl);
       let isTimeout = false
@@ -113,7 +114,9 @@ class Util {
         response.on('data', (chunk) => {
           try{
             data = JSON.parse(chunk.toString())
-          } catch(e) {}
+          } catch(e) {
+            console.log(e)
+          }
         })
         response.on('end', () => {
           clearTimeout(timer)
@@ -142,20 +145,21 @@ class Util {
     });
   }
 
-  showNetworkErrorDialog(message) {
-    dialog.showMessageBox(this.mainWindow, {
+  async showNetworkErrorDialog(message) {
+    const res = await dialog.showMessageBox(this.mainWindow, {
       type: 'error',
       defaultId: 0,
       cancelId: 1,
       buttons: ['打开偏好设置', '取消'],
       message: `${message}`
-    }, function(result) {
-      if (result === 1) return;
-      if (result === 0) {
-        preference.open()
-      }
     })
+    if(res.response === 1) {
+      return
+    }
+    if(res.response === 0) {
+      preference.open()
+    }
   }
 }
 
-module.exports = new Util();
\ No newline at end of file
+module.exports = new Util();
diff --git a/package.json b/package.json
index 6d4f4c4..1148adf 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "rishiqing-electron",
-  "version": "3.2.4",
+  "version": "3.3.0",
   "author": "北京创仕科锐信息技术有限责任公司",
-  "electronVersion": "3.0.10",
+  "electronVersion": "7.1.4",
   "main": "main.js",
-  "env": "beta",
+  "env": "dev",
   "debug-url": "http://localhost:99/app",
   "debug-server": "http://localhost:99",
   "MIN_WINDOW_WIDTH": 1218,
@@ -36,33 +36,34 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@sentry/electron": "0.13.0",
-    "electron-updater": "4.0.4",
+    "@sentry/electron": "1.1.0",
+    "electron-updater": "4.2.0",
     "is-gzip": "2.0.0",
-    "lodash": "4.17.4",
-    "md5-file": "3.2.3",
+    "lodash": "4.17.15",
+    "md5-file": "4.0.0",
     "nedb": "1.8.0",
-    "portfinder": "1.0.19",
-    "proxy-chain": "0.2.5",
-    "request": "2.72.0",
-    "winreg": "1.2.2"
+    "portfinder": "1.0.25",
+    "proxy-chain": "0.3.2",
+    "request": "2.88.0",
+    "winreg": "1.2.4",
+    "core-js": "^3.5.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.0.0",
-    "@vue/cli-plugin-eslint": "^3.0.0",
-    "@vue/cli-service": "^3.0.0",
-    "aliyun-sdk": "^1.11.2",
-    "babel-eslint": "^10.0.1",
-    "cross-env": "^5.1.1",
-    "electron-builder": "^20.36.2",
-    "electron-winstaller": "^2.3.4",
-    "eslint": "^5.8.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "rimraf": "^2.6.2",
-    "rishiqing-deploy": "^2.0.8",
-    "vue": "^2.5.22",
-    "vue-template-compiler": "^2.5.21",
-    "vuex": "^3.0.1",
-    "yargs": "^4.1.0"
+    "@vue/cli-plugin-babel": "^4.1.1",
+    "@vue/cli-plugin-eslint": "^4.1.1",
+    "@vue/cli-service": "^4.1.1",
+    "aliyun-sdk": "^1.12.3",
+    "babel-eslint": "^10.0.3",
+    "cross-env": "^6.0.3",
+    "electron-builder": "^21.2.0",
+    "electron-winstaller": "^4.0.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.0.1",
+    "rimraf": "^3.0.0",
+    "rishiqing-deploy": "^2.0.9",
+    "vue": "^2.6.10",
+    "vue-template-compiler": "^2.6.10",
+    "vuex": "^3.1.2",
+    "yargs": "^15.0.2"
   }
 }
diff --git a/page.js b/page.js
index 3c172c8..b8d3677 100644
--- a/page.js
+++ b/page.js
@@ -1,5 +1,4 @@
 const electron      = require('electron');
-const path          = require('path');
 const packageJson   = require('./package.json');
 const BrowserWindow = electron.BrowserWindow;
 
@@ -19,6 +18,10 @@ class Page {
       maximizable: false,
       minimizable: false,
       autoHideMenuBar: true,
+      webPreferences: {
+        nodeIntegration: true,
+        webSecurity: false,
+      },
       show: false // 初始化的时候不显示
     }, this.config));
     this.window.on('close', this._onWindowClose.bind(this));
@@ -44,4 +47,4 @@ class Page {
   }
 }
 
-module.exports = Page
\ No newline at end of file
+module.exports = Page