Skip to content

Commit

Permalink
Patch bugs (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
qinyang912 authored Nov 26, 2018
1 parent 5626c8b commit c40fb78
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
21 changes: 2 additions & 19 deletions fe/rishiqingWeb.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,23 @@
* @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');
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 = '';
}
};

Expand Down
4 changes: 2 additions & 2 deletions native/update.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rishiqing-electron",
"version": "3.1.9",
"version": "3.1.10",
"author": "北京创仕科锐信息技术有限责任公司",
"electronVersion": "3.0.10",
"main": "main.js",
Expand Down

0 comments on commit c40fb78

Please sign in to comment.