Skip to content

Commit 5d9e004

Browse files
Peter XiePeter Xie
authored andcommitted
v1.1.2
1 parent 78fcf16 commit 5d9e004

File tree

8 files changed

+30
-11
lines changed

8 files changed

+30
-11
lines changed

app/public/scripts/home.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3342,6 +3342,9 @@ var view_layout;
33423342
return $('.QTGateConnect').accordion('refresh');
33433343
}
33443344
this.showActiveMail(false);
3345+
if (data.qtGateConnecting === 0) {
3346+
return this.reSendConnectMail(true);
3347+
}
33453348
if (data.qtGateConnecting === 2) {
33463349
return setTimeout(() => {
33473350
return this.getAvaliableRegion();

app/public/scripts/home.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3522,11 +3522,16 @@ module view_layout {
35223522
}
35233523

35243524
this.showActiveMail( false )
3525+
if ( data.qtGateConnecting === 0 ) {
3526+
return this.reSendConnectMail(true)
3527+
}
3528+
35253529
if ( data.qtGateConnecting === 2 ) {
35263530
return setTimeout (() => {
35273531
return this.getAvaliableRegion ()
35283532
}, 2000 )
35293533
}
3534+
35303535
const process = $ ( '#connectImformationProcess' )
35313536
let percent = 0
35323537
const doingProcessBar = () => {

app/server.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,11 @@ class localServer {
12471247
Async.each(testArray, (n, next) => {
12481248
this._smtpVerify(n, (err) => {
12491249
if (err > 0) {
1250-
err1 = err;
1250+
saveLog(`smtpVerify ERROR: err number = [${err}]`);
1251+
if ((!err1 || err === 8)) {
1252+
saveLog(`smtpVerify let err1 = err [${err}]`);
1253+
err1 = err;
1254+
}
12511255
return next();
12521256
}
12531257
next();

app/server.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,13 +1451,20 @@ export class localServer {
14511451
}))
14521452

14531453
Async.each ( testArray, ( n, next ) => {
1454+
14541455
this._smtpVerify ( n, ( err ) => {
1456+
14551457
if ( err > 0 ) {
1456-
err1 = err
1458+
saveLog ( `smtpVerify ERROR: err number = [${ err }]`)
1459+
if ( ( ! err1 || err === 8 )) {
1460+
saveLog ( `smtpVerify let err1 = err [${ err }]`)
1461+
err1 = err
1462+
}
1463+
14571464
return next ()
14581465
}
14591466
next ()
1460-
if ( !_ret ) {
1467+
if ( ! _ret ) {
14611468
_ret = true
14621469
imapData = n
14631470
saveLog ( `smtpVerify success! imapData = [${ JSON.stringify ( n )}]`)

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ const appReady = () => {
417417
protocol: 'file:',
418418
slashes: true
419419
}));
420-
}, 5000);
420+
}, 2000);
421421
});
422422
}
423423
else {

index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,10 +476,10 @@ const appReady = () => {
476476
protocol: 'file:',
477477
slashes: true
478478
}))
479-
}, 5000 )
479+
}, 2000 )
480480
})
481481
} else {
482-
saveLog (`app.once ( 'ready') have localServer1 & createWindow()`)
482+
saveLog ( `app.once ( 'ready') have localServer1 & createWindow()` )
483483
createWindow ()
484484
}
485485

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "qtgate",
3-
"version": "1.1.0",
3+
"version": "1.1.2",
44
"license": "MIT",
55
"description": "QTGate desktop client",
66
"scripts": {
@@ -18,7 +18,7 @@
1818
},
1919
"build": {
2020
"squirrelWindows": {
21-
"remoteReleases": "https://github.com/QTGate/atOPN/releases/download/0.2.0/"
21+
"remoteReleases": "https://github.com/QTGate/atOPN/releases/download/0.1.0/"
2222
},
2323
"appId": "com.qtgate.client",
2424
"win": {
@@ -60,13 +60,13 @@
6060
"cookie-parser": "^1.4.3",
6161
"express": "^4.16.2",
6262
"jquery": "^3.2.1",
63+
"net-ping": "^1.2.1",
6364
"node-uuid": "^1.4.8",
6465
"nodemailer": "^4.4.1",
6566
"openpgp": "^2.6.0",
6667
"portastic": "^1.0.1",
6768
"pug": "^2.0.0-rc.4",
68-
"socket.io": "^2.0.4",
6969
"raw-socket": "^1.5.1",
70-
"net-ping": "^1.2.1"
70+
"socket.io": "^2.0.4"
7171
}
7272
}

0 commit comments

Comments
 (0)