From 164decf2541f6d4f7dc3a8dd8075dae9fcc5b204 Mon Sep 17 00:00:00 2001 From: Handle Date: Tue, 16 Apr 2019 03:02:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=B9=E8=BF=9B=EF=BC=9A=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E5=8F=AA=E4=BC=9A=E8=87=AA=E5=8A=A8=E4=BF=A1=E4=BB=BB?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=9A=84=E4=B8=8D=E5=AE=89=E5=85=A8=E8=AF=81?= =?UTF-8?q?=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.js | 13 ++++++++++--- package.json | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 5110e7f..fad2e88 100644 --- a/index.js +++ b/index.js @@ -108,7 +108,8 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' server.get('*', Util.processRequest) -electronApp.commandLine.appendSwitch('ignore-certificate-errors') +// electronApp.commandLine.appendSwitch('ignore-certificate-errors') + electronApp.commandLine.appendSwitch( 'autoplay-policy', 'no-user-gesture-required' @@ -127,8 +128,14 @@ electronApp.on('window-all-closed', () => { electronApp.on( 'certificate-error', (event, webContents, url, error, certificate, callback) => { - event.preventDefault() - callback(true) // eslint-disable-line standard/no-callback-literal + if ( + certificate.fingerprint === '8f27c5f7a0a209da7948db0d2fcd42bac89a1005' + ) { + event.preventDefault() + callback(true) // eslint-disable-line standard/no-callback-literal + } else { + callback(false) + } } ) diff --git a/package.json b/package.json index 23798dc..c783968 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "majsoul-plus-client", - "version": "1.12.0-beta.3", + "version": "1.12.0-beta.4", "productName": "Majsoul Plus", "author": "MajsoulPlus Team", "description": "Majsoul Plus", From e2c886c1a42283e9cba31476daee42a2b0d0dab8 Mon Sep 17 00:00:00 2001 From: Handle Date: Tue, 16 Apr 2019 03:09:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=B9=E8=BF=9B=EF=BC=9A=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E5=8F=AA=E4=BC=9A=E8=87=AA=E5=8A=A8=E4=BF=A1=E4=BB=BB?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=9A=84=E4=B8=8D=E5=AE=89=E5=85=A8=E8=AF=81?= =?UTF-8?q?=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/index.js b/index.js index fad2e88..a1ed73c 100644 --- a/index.js +++ b/index.js @@ -108,8 +108,6 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' server.get('*', Util.processRequest) -// electronApp.commandLine.appendSwitch('ignore-certificate-errors') - electronApp.commandLine.appendSwitch( 'autoplay-policy', 'no-user-gesture-required' @@ -129,7 +127,7 @@ electronApp.on( 'certificate-error', (event, webContents, url, error, certificate, callback) => { if ( - certificate.fingerprint === '8f27c5f7a0a209da7948db0d2fcd42bac89a1005' + certificate.fingerprint === 'sha256/UMNIGcBbbIcru/0L2e1idl+aQS7PUHqsZDcrETqdMsc=' ) { event.preventDefault() callback(true) // eslint-disable-line standard/no-callback-literal From 5bc145d8aefb549cf6c9fdfa149aa912a1ca6229 Mon Sep 17 00:00:00 2001 From: Handle Date: Fri, 19 Apr 2019 11:48:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84README=EF=BC=9A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=AE=A8=E8=AE=BAQQ=E7=BE=A4=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.MD b/README.MD index ab01d88..48e6239 100644 --- a/README.MD +++ b/README.MD @@ -95,3 +95,9 @@ ![License AGPL-3.0](https://img.shields.io/github/license/iamapig120/majsoul-plus-client.svg) 注：软件图标、图像、SVG 矢量图形均不遵循以上协议，您不可以将这些内容用于雀魂 Plus 以外的内容 + +# 参与讨论 + +使用答疑，资源分享，约战交流 QQ群 [660996459](https://jq.qq.com/?_wv=1027&k=5PMNS8D) + +开发问题，技术疑问，批判一番 QQ群 [106475557](https://jq.qq.com/?_wv=1027&k=5iayYP5) From ae6bfb35b6ae77a7f5977bc10758b5fd142da4bb Mon Sep 17 00:00:00 2001 From: Handle Date: Fri, 19 Apr 2019 11:55:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=94=B9=E8=BF=9B=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20=E5=8F=82=E4=B8=8E=E8=AE=A8=E8=AE=BA=20=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index 48e6239..c90d10c 100644 --- a/README.MD +++ b/README.MD @@ -96,7 +96,7 @@ 注：软件图标、图像、SVG 矢量图形均不遵循以上协议，您不可以将这些内容用于雀魂 Plus 以外的内容 -# 参与讨论 +## 参与讨论 使用答疑，资源分享，约战交流 QQ群 [660996459](https://jq.qq.com/?_wv=1027&k=5PMNS8D)