Merge branch 'master' of https://github.com/MajsoulPlus/majsoul-plus

MajsoulPlus · Apr 27, 2019 · 029af35 · 029af35
2 parents 69bfe5c + ae6bfb3
commit 029af35
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git 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)
diff --git a/index.js b/index.js
@@ -108,7 +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'
@@ -127,8 +126,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 === 'sha256/UMNIGcBbbIcru/0L2e1idl+aQS7PUHqsZDcrETqdMsc='
+    ) {
+      event.preventDefault()
+      callback(true) // eslint-disable-line standard/no-callback-literal
+    } else {
+      callback(false)
+    }
   }
 )
 

diff --git 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",