chore: 升级部分包

rishiqing · Dec 9, 2019 · b226a12 · b226a12
1 parent c7c1a91
commit b226a12
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 94 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 <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;">
+      <div class="traffic-lights mac">
           <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">
@@ -17,7 +17,7 @@
       </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">
+      <div class="traffic-lights">
         <span class="minimize" @click="minimize">
           <img src="../../assets/img/win-minimize.svg">
         </span>
@@ -828,7 +828,12 @@ body.win .welcome-page:before {
   right: 0;
   height: 10px;
 }
-
+.traffic-lights {
+  -webkit-app-region: no-drag;
+}
+.traffic-lights * {
+  -webkit-app-region: no-drag;
+}
 .traffic-lights.mac {
   position: absolute;
   left: 0;

diff --git a/fe/modules/index/pub/Welcome.vue b/fe/modules/index/pub/Welcome.vue
@@ -225,4 +225,4 @@ export default {
   margin-left: 40px;
 }
 
-</style>
+</style>
diff --git 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>
+</style>
diff --git 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()
+render()
diff --git a/fe/modules/preference/pub/Server.vue b/fe/modules/preference/pub/Server.vue
@@ -60,4 +60,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>
diff --git 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');
@@ -70,8 +69,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 () {
@@ -94,8 +93,8 @@ class Main {
     });
     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') {
@@ -138,7 +137,7 @@ class Main {
         this.mainWindow.hide();
       }
       e.preventDefault();
-    } 
+    }
   }
 
   _onNewWindow (event, url, frameName, disposition, options) {
@@ -150,7 +149,7 @@ class Main {
       options.webPreferences = Object.assign({}, options.webPreferences, {
         plugins: true,
         webSecurity: false,
-        nodeIntegration: false,
+        nodeIntegration: true,
         minimumFontSize: 12
       });
     }
@@ -161,4 +160,4 @@ class Main {
   }
 }
 
-new Main();
+new Main();
diff --git a/native/mainDb.js b/native/mainDb.js
@@ -6,7 +6,9 @@ const { EventEmitter } = require('events');
 const env       = require('../common/env');
 
 const ServerConfigOfficiel = {
+  dev: 'http://beta.rishiqing.com',
   beta: 'https://beta.rishiqing.com',
+  debug: 'http://beta.rishiqing.com',
   release: 'https://www.rishiqing.com'
 };
 
@@ -122,7 +124,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 +171,4 @@ class MainDb {
   }
 }
 
-module.exports = new MainDb();
+module.exports = new MainDb();
diff --git 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();
+module.exports = new Icon();
diff --git 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();
+module.exports = new Util();