diff --git a/fe/rishiqingWeb.js b/fe/rishiqingWeb.js index 495f420..2239560 100644 --- a/fe/rishiqingWeb.js +++ b/fe/rishiqingWeb.js @@ -2,7 +2,7 @@ * @Author: qinyang * @Date: 2017-12-02 10:13:54 * @Last Modified by: qinyang -* @Last Modified time: 2018-11-21 20:43:33 +* @Last Modified time: 2018-11-26 19:21:03 */ var package = require('../package.json'); var os = require('os'); @@ -10,32 +10,15 @@ var nativeNotify = require('./nativeNotify'); var notification = require('./notification'); var $ = require('jquery'); var electron = require('electron'); -var SentryEvent = require('../common/sentry_event'); var platform = process.platform; var $mainIframe = document.querySelector('#main-iframe'); var mainBroswerWindow = electron.remote.BrowserWindow.fromId(1); -var ipcRenderer = electron.ipcRenderer; -var webContents = mainBroswerWindow.webContents; var db = mainBroswerWindow.mainDb; var dealLogin = function (canAutoLogin) { if (!canAutoLogin) { $('.welcome-page').removeClass('hide'); - var Cookies = webContents.session.cookies - Cookies.get({ - name: 'version', - }, function(error, cookies) { - ipcRenderer.send(SentryEvent.Sentry_Add_Breadcrumb, { - category: 'version_cookies', - message: JSON.stringify(cookies), - level: 'error' - }); - ipcRenderer.send(SentryEvent.Sentry_Capture_Message, 'Client_Can_Auto_Login_Error'); - $mainIframe.src = ''; - }) - // webContents.session.clearStorageData({ - // storages: ['cookies'] // 清理cookie - // }); + $mainIframe.src = ''; } }; diff --git a/native/update.js b/native/update.js index f7ff48c..aef59a0 100644 --- a/native/update.js +++ b/native/update.js @@ -41,8 +41,8 @@ class Update { setAutoUpdate () { autoUpdater.on('update-downloaded', function (info) { const notify = new Notification({ - title: '日事清PC端有版本更新啦~~', - body: `${info.version} 已经发布,退出之后将自动更新` + title: `日事清V${info.version} 已准备就绪!`, + body: `请退出当前应用,以便完成更新!` }); notify.show(); }); diff --git a/package.json b/package.json index f55eef2..f7eb0c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rishiqing-electron", - "version": "3.1.9", + "version": "3.1.10", "author": "北京创仕科锐信息技术有限责任公司", "electronVersion": "3.0.10", "main": "main.js",