Bump Version

Merge CI Settings
Fix errors when parsing ncm files without metadata
2020-03-12 18:56:21 +08:00 · 2020-03-10 12:22:46 +08:00 · 2020-03-10 09:31:48 +08:00 · 2020-03-04 10:00:18 +08:00 · 2020-03-04 09:38:30 +08:00 · 2020-03-04 09:30:48 +08:00
15 changed files with 649 additions and 409 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,6 +15,7 @@ steps:
  - name: build
    image: node:lts
    commands:
+      - npm run fix-compatibility
      - npm run build
      - tar -czf legacy.tar.gz -C ./dist .
      - npm run build -- --modern
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,6 +1,6 @@
 module.exports = {
    presets: [
-        '@vue/cli-plugin-babel/preset'
+        '@vue/app'
    ],
    plugins: [
        ["component", {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,24 +1,32 @@
 {
  "name": "unlock-music",
-  "version": "1.3.0",
+  "version": "1.3.4",
+  "updateInfo": "修复解锁无元数据的ncm文件时会产生的错误",
+  "license": "MIT",
+  "description": "Unlock encrypted music file in browser.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ix64/unlock-music"
+  },
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
+    "build": "vue-cli-service build",
+    "fix-compatibility": "node ./src/fix-compatibility.js"
  },
  "dependencies": {
-    "browser-id3-writer": "^4.3.0",
+    "browser-id3-writer": "^4.4.0",
    "core-js": "^3.6.4",
-    "crypto-js": "^3.2.0",
+    "crypto-js": "^4.0.0",
    "element-ui": "^2.13.0",
-    "music-metadata-browser": "^2.0.3",
-    "register-service-worker": "^1.6.2",
+    "music-metadata-browser": "^2.0.4",
+    "register-service-worker": "^1.7.0",
    "vue": "^2.6.11"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.2.2",
-    "@vue/cli-plugin-pwa": "^4.2.2",
-    "@vue/cli-service": "^4.2.2",
+    "@vue/cli-plugin-babel": "^4.2.3",
+    "@vue/cli-plugin-pwa": "^4.2.3",
+    "@vue/cli-service": "^4.2.3",
    "babel-plugin-component": "^1.1.1",
    "vue-cli-plugin-element": "^1.0.1",
    "vue-template-compiler": "^2.6.11",
--- a/public/index.html
+++ b/public/index.html
@@ -2,17 +2,19 @@
 <html lang="zh-CN">
 <head>
    <meta charset="utf-8">
-    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta content="webkit" name="renderer">
+    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
    <meta content="width=device-width,initial-scale=1.0" name="viewport">
-    <script>var _paq = window._paq || [];
-    _paq.push(['setRequestMethod', 'POST'], ['trackPageView'], ['enableLinkTracking'], ['setSiteId', '2'],
-        ['setTrackerUrl', 'https://stats.ixarea.com/ixarea-stats/report']);
-    </script>
+    <!--@formatter:off-->
+    <script>var _paq=window._paq||[];_paq.push(["setRequestMethod","POST"],["trackPageView"],["enableLinkTracking"],["setSiteId","2"],["setTrackerUrl","https://stats.ixarea.com/ixarea-stats/report"]);</script>
+    <!--@formatter:on-->
    <script async src="https://stats.ixarea.com/ixarea-stats.js"></script>
    <title>音乐解锁 - By IXarea</title>
    <meta content="音乐,解锁,ncm,qmc,qmc0,qmc3,qmcflac,qmcogg,mflac,qq音乐,网易云音乐,加密" name="keywords"/>
    <meta content="音乐解锁 - 在任何设备上解锁已购的加密音乐！" name="description"/>
+    <!--@formatter:off-->
    <style>#loader{position:absolute;left:50%;top:50%;z-index:1010;margin:-75px 0 0 -75px;border:16px solid #f3f3f3;border-radius:50%;border-top:16px solid #3498db;width:120px;height:120px;animation:spin 2s linear infinite}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}#loader-mask{position:absolute;width:100%;height:100%;bottom:0;left:0;right:0;top:0;z-index:1009;background-color:rgba(242,246,252,0.88)}</style>
+    <!--@formatter:on-->
 </head>
 <body>

@@ -23,13 +25,46 @@
             src="https://stats.ixarea.com/ixarea-stats/report?idsite=2&rec=1&action_name=音乐解锁+-+By+IXarea"
             style="border:0"/>
    </noscript>
-    <strong>音乐解锁采用了一些新特性！建议使用
+    <div hidden id="loader-tips-outdated">
+        <h2>您可能在使用不受支持的<span style="color:#f00;">过时</span>浏览器，这可能导致此应用无法正常工作。</h2>
+        <h3>如果您使用双核浏览器，您可以尝试切换<span style="color:#f00;">“极速模式”</span>解决此问题。</h3>
+        <h3>或者，您可以尝试更换下方的几个浏览器之一。</h3>
+    </div>
+    <h3 hidden id="loader-tips-timeout">
+        音乐解锁采用了一些新特性！建议使用
+        <a href="https://www.microsoftedgeinsider.com/zh-cn/download" target="_blank">Microsoft Edge Chromium</a>
        <a href="https://www.google.cn/chrome/" target="_blank">Google Chrome</a>
        <a href="https://www.firefox.com.cn/" target="_blank">Mozilla Firefox</a>
-        <a href="https://www.microsoftedgeinsider.com/zh-cn/download" target="_blank">Mozilla Firefox</a>
        | <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
-    </strong>
+    </h3>
 </div>
 <div id="app"></div>
+<script>
+    (function () {
+        setTimeout(function () {
+            var ele = document.getElementById("loader-tips-timeout");
+            if (ele != null) {
+                ele.hidden = false;
+            }
+        }, 2000);
+
+        var ua = navigator && navigator.userAgent;
+        var detected = (function () {
+            var m;
+            if (!ua) return true;
+            if (/MSIE |Trident\//.exec(ua)) return true; // no IE
+            m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 16
+            if (m && Number(m[1]) < 16) return true;
+            m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 50
+            if (m && Number(m[1]) < 50) return true;
+            m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 38
+            return m && Number(m[1]) < 38;
+        })();
+        if (detected) {
+            document.getElementById('loader-tips-outdated').hidden = false;
+            document.getElementById("loader-tips-timeout").hidden = false;
+        }
+    })();
+</script>
 </body>
 </html>
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,39 +2,43 @@

    <el-container id="app">
        <el-main>
-            <x-upload v-on:handle_finish="showSuccess" v-on:handle_error="showFail"></x-upload>
+            <x-upload v-on:handle_error="showFail" v-on:handle_finish="showSuccess"></x-upload>

            <el-row id="app-control">
                <el-row style="padding-bottom: 1em; font-size: 14px">
                    歌曲命名格式：
-                    <el-radio name="format" v-model="download_format" label="1">歌曲名</el-radio>
-                    <el-radio name="format" v-model="download_format" label="2">歌手-歌曲名</el-radio>
-                    <el-radio name="format" v-model="download_format" label="3">歌曲名-歌手</el-radio>
-                    <el-checkbox v-model="instant_download" border>立即保存</el-checkbox>
+                    <el-radio label="1" name="format" v-model="download_format">歌手-歌曲名</el-radio>
+                    <el-radio label="2" name="format" v-model="download_format">歌曲名</el-radio>
+                    <el-radio label="3" name="format" v-model="download_format">歌曲名-歌手</el-radio>
+                    <el-radio label="4" name="format" v-model="download_format">同原文件名</el-radio>
+                </el-row>
+                <el-row>
+                    <el-button @click="handleDownloadAll" icon="el-icon-download" plain>下载全部</el-button>
+                    <el-button @click="handleDeleteAll" icon="el-icon-delete" plain type="danger">删除全部</el-button>
+                    <el-checkbox border style="margin-left: 1em" v-model="instant_download">立即保存</el-checkbox>
                </el-row>
-                <el-button @click="handleDownloadAll" icon="el-icon-download" plain>下载全部</el-button>
-                <el-button @click="handleDeleteAll" icon="el-icon-delete" plain type="danger">删除全部</el-button>
            </el-row>
            <audio :autoplay="playing_auto" :src="playing_url" controls/>

-            <x-preview :table-data="tableData" :download_format="download_format"
+            <x-preview :download_format="download_format" :table-data="tableData"
                       v-on:music_changed="changePlaying"></x-preview>

        </el-main>
        <el-footer id="app-footer">
            <el-row>
-                音乐解锁：移除已购音乐的加密保护。
-                目前支持网易云音乐(ncm)、QQ音乐(qmc, mflac, tkm)以及
-                <a href="https://github.com/ix64/unlock-music/blob/master/README.md" target="_blank">其他格式</a>。
+                <a href="https://github.com/ix64/unlock-music" target="_blank">音乐解锁</a>(v<span
+                    v-text="version"></span>)：移除已购音乐的加密保护。
                <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
            </el-row>
            <el-row>
-                <span>Copyright &copy; 2019</span>
-                <a href="https://github.com/ix64" target="_blank">MengYX</a>
+                目前支持网易云音乐(ncm)、QQ音乐(qmc, mflac, mgg, tkm)以及
+                <a href="https://github.com/ix64/unlock-music/blob/master/README.md" target="_blank">其他格式</a>。
+            </el-row>
+            <el-row>
+                <span>Copyright &copy; 2019</span> MengYX
                音乐解锁使用
                <a href="https://github.com/ix64/unlock-music/blob/master/LICENSE" target="_blank">MIT许可协议</a>
-                开放
-                <a href="https://github.com/ix64/unlock-music" target="_blank">源代码</a>
+                开放源代码
            </el-row>
        </el-footer>
    </el-container>
@@ -46,6 +50,7 @@
    import upload from "./component/upload"
    import preview from "./component/preview"
    import {DownloadBlobMusic, RemoveBlobMusic} from "./component/util"
+    import config from "../package"

    export default {
        name: 'app',
@@ -55,11 +60,12 @@
        },
        data() {
            return {
+                version: config.version,
                activeIndex: '1',
                tableData: [],
                playing_url: "",
                playing_auto: false,
-                download_format: '2',
+                download_format: '1',
                instant_download: false,
            }
        },
@@ -69,18 +75,39 @@
            });
        },
        methods: {
-            finishLoad() {
+            async finishLoad() {
                const mask = document.getElementById("loader-mask");
                if (!!mask) mask.remove();
-                this.$notify.info({
-                    title: '离线使用',
-                    message: '我们使用PWA技术，无网络也能使用<br/>' +
-                        '最近更新：提供实验性mgg支持<br/>' +
-                        '点击查看 <a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
-                    dangerouslyUseHTMLString: true,
-                    duration: 10000,
-                    position: 'top-left'
-                });
+                let updateInfo;
+                try {
+                    const resp = await fetch("https://stats.ixarea.com/collect/music/app-version", {
+                        method: "POST", headers: {"Content-Type": "application/json"},
+                        body: JSON.stringify({Version: this.version})
+                    });
+                    updateInfo = await resp.json();
+                } catch (e) {
+                }
+                if (!!updateInfo && !!updateInfo.Found) {
+                    this.$notify.warning({
+                        title: '发现更新',
+                        message: '发现新版本 v' + updateInfo.Version +
+                            '<br/>更新详情：' + updateInfo.Detail +
+                            '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
+                        dangerouslyUseHTMLString: true,
+                        duration: 15000,
+                        position: 'top-left'
+                    });
+                } else {
+                    this.$notify.info({
+                        title: '离线使用',
+                        message: '我们使用PWA技术，无网络也能使用' +
+                            '<br/>最近更新：' + config.updateInfo +
+                            '<br/><a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
+                        dangerouslyUseHTMLString: true,
+                        duration: 10000,
+                        position: 'top-left'
+                    });
+                }
            },
            showSuccess(data) {
                if (data.status) {
@@ -113,8 +140,8 @@
                });
                if (process.env.NODE_ENV === 'production') {
                    window._paq.push(["trackEvent", "Error", errInfo, filename]);
-                    console.error(errInfo, filename);
                }
+                console.error(errInfo, filename);
            },
            changePlaying(url) {
                this.playing_url = url;
--- a/src/component/util.js
+++ b/src/component/util.js
@@ -2,16 +2,19 @@ export function DownloadBlobMusic(data, format) {
    const a = document.createElement('a');
    a.href = data.file;
    switch (format) {
-        case "1":
-            a.download = data.title + "." + data.ext;
-            break;
        default:
-        case "2":
+        case "1":
            a.download = data.artist + " - " + data.title + "." + data.ext;
            break;
+        case "2":
+            a.download = data.title + "." + data.ext;
+            break;
        case "3":
            a.download = data.title + " - " + data.artist + "." + data.ext;
            break;
+        case "4":
+            a.download = data.rawFilename + "." + data.ext;
+            break;
    }
    document.body.append(a);
    a.click();
--- a/src/decrypt/common.js
+++ b/src/decrypt/common.js
@@ -9,7 +9,7 @@ export async function CommonDecrypt(file) {
    let rt_data;
    switch (raw_ext) {
        case "ncm":// Netease Mp3/Flac
-            rt_data = await NcmDecrypt.Decrypt(file.raw);
+            rt_data = await NcmDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
            break;
        case "mp3":// Raw Mp3
        case "flac"://Raw Flac
--- a/src/decrypt/ncm.js
+++ b/src/decrypt/ncm.js
@@ -2,10 +2,9 @@ const CryptoJS = require("crypto-js");
 const ID3Writer = require("browser-id3-writer");
 const CORE_KEY = CryptoJS.enc.Hex.parse("687a4852416d736f356b496e62617857");
 const META_KEY = CryptoJS.enc.Hex.parse("2331346C6A6B5F215C5D2630553C2728");
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer} from "./util"
-
-export async function Decrypt(file) {
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo} from "./util"

+export async function Decrypt(file, raw_filename, raw_ext) {
    const fileBuffer = await GetArrayBuffer(file);
    const dataView = new DataView(fileBuffer);

@@ -13,32 +12,34 @@ export async function Decrypt(file) {
        dataView.getUint32(4, true) !== 0x4d414446)
        return {status: false, message: "此ncm文件已损坏"};

-
    const keyDataObj = getKeyData(dataView, fileBuffer, 10);
    const keyBox = getKeyBox(keyDataObj.data);

    const musicMetaObj = getMetaData(dataView, fileBuffer, keyDataObj.offset);
    const musicMeta = musicMetaObj.data;
-
    let audioOffset = musicMetaObj.offset + dataView.getUint32(musicMetaObj.offset + 5, true) + 13;
    let audioData = new Uint8Array(fileBuffer, audioOffset);

    for (let cur = 0; cur < audioData.length; ++cur) audioData[cur] ^= keyBox[cur & 0xff];

-    if (musicMeta.format === undefined) musicMeta.format = DetectAudioExt(audioData, "mp3");

-    const mime = AudioMimeType[musicMeta.format];
+    if (musicMeta.album === undefined) musicMeta.album = "";

    const artists = [];
-    musicMeta.artist.forEach(arr => artists.push(arr[0]));
-    if (musicMeta.format === "mp3")
-        audioData = await writeID3(audioData, artists, musicMeta.musicName, musicMeta.album, musicMeta.albumPic)
+    if (!!musicMeta.artist) musicMeta.artist.forEach(arr => artists.push(arr[0]));
+    const info = GetFileInfo(artists.join(" & "), musicMeta.musicName, raw_filename);
+    if (artists.length === 0) artists.push(info.artist);

+    if (musicMeta.format === undefined) musicMeta.format = DetectAudioExt(audioData, "mp3");
+    if (musicMeta.format === "mp3")
+        audioData = await writeID3(audioData, artists, info.title, musicMeta.album, musicMeta.albumPic);
+
+    const mime = AudioMimeType[musicMeta.format];
    const musicData = new Blob([audioData], {type: mime});
    return {
        status: true,
-        title: musicMeta.musicName,
-        artist: artists.join(" & "),
+        title: info.title,
+        artist: info.artist,
        ext: musicMeta.format,
        album: musicMeta.album,
        picture: musicMeta.albumPic,
@@ -129,9 +130,7 @@ function getKeyBox(keyData) {
 function getMetaData(dataView, fileBuffer, offset) {
    const metaDataLen = dataView.getUint32(offset, true);
    offset += 4;
-    if (metaDataLen === 0) {
-        return {};
-    }
+    if (metaDataLen === 0) return {data: {}, offset: offset};

    const cipherText = new Uint8Array(fileBuffer, offset, metaDataLen).map(
        data => data ^ 0x63
@@ -145,9 +144,12 @@ function getMetaData(dataView, fileBuffer, offset) {
        },
        META_KEY,
        {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7}
-    );
-
-    const result = JSON.parse(plainText.toString(CryptoJS.enc.Utf8).slice(6));
+    ).toString(CryptoJS.enc.Utf8);
+    const labelIndex = plainText.indexOf(":");
+    let result = JSON.parse(plainText.slice(labelIndex + 1));
+    if (plainText.slice(0, labelIndex) === "dj") {
+        result = result.mainMusic;
+    }
    result.albumPic = result.albumPic.replace("http:", "https:");
    return {data: result, offset: offset};
 }
--- a/src/decrypt/qmc.js
+++ b/src/decrypt/qmc.js
@@ -1,5 +1,5 @@
 import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetCoverURL, GetFileInfo} from "./util";
-import {QmcMaskCreate58, QmcMaskGetDefault, QmcMaskDetectMgg, QmcMaskDetectMflac} from "./qmcMask";
+import {QmcMaskCreate58, QmcMaskDetectMflac, QmcMaskDetectMgg, QmcMaskGetDefault} from "./qmcMask";

 const musicMetadata = require("music-metadata-browser");

--- a/src/decrypt/qmcMask.js
+++ b/src/decrypt/qmcMask.js
@@ -115,7 +115,7 @@ export function QmcMaskDetectMflac(data) {
    for (let block_idx = 0; block_idx < search_len; block_idx += 128) {
        try {
            mask = new QmcMask(data.slice(block_idx, block_idx + 128));
-            if (!IsBytesEqual(FLAC_HEADER, mask.Decrypt(data.slice(0, FLAC_HEADER.length)))) break;
+            if (IsBytesEqual(FLAC_HEADER, mask.Decrypt(data.slice(0, FLAC_HEADER.length)))) break;
        } catch (e) {
        }
    }
--- a/src/decrypt/raw.js
+++ b/src/decrypt/raw.js
@@ -1,5 +1,5 @@
 const musicMetadata = require("music-metadata-browser");
-import {GetCoverURL, GetFileInfo, AudioMimeType, DetectAudioExt, GetArrayBuffer} from "./util";
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetCoverURL, GetFileInfo} from "./util";

 export async function Decrypt(file, raw_filename, raw_ext, detect = true) {
    let ext = raw_ext;
--- a/src/fix-compatibility.js
+++ b/src/fix-compatibility.js
@@ -0,0 +1,25 @@
+//TODO: Use other method to fix this
+// !! Only Temporary Solution
+// it seems like that @babel/plugin-proposal-object-rest-spread not working
+// to fix up the compatibility for Edge 18 and some older Chromium
+// now manually edit the dependency files
+
+const fs = require('fs');
+const filePath = "./node_modules/file-type/core.js";
+const regReplace = /{\s*([a-zA-Z0-9:,\s]*),\s*\.\.\.([a-zA-Z0-9]*)\s*};/m;
+if (fs.existsSync(filePath)) {
+    console.log("File Found!");
+    let data = fs.readFileSync(filePath).toString();
+    const regResult = regReplace.exec(data);
+    if (regResult != null) {
+        data = data.replace(regResult[0],
+            "Object.assign({ " + regResult[1] + " }, " + regResult[2] + ");"
+        );
+        fs.writeFileSync(filePath, data);
+        console.log("Object rest spread in file-type fixed!");
+    } else {
+        console.log("No fix needed.");
+    }
+} else {
+    console.log("File Not Found!");
+}
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -20,7 +20,8 @@ if (process.env.NODE_ENV === 'production') {
            console.log('New content is downloading.')
        },
        updated() {
-            console.log('New content is available; please refresh.')
+            console.log('New content is available.');
+            window.location.reload();
        },
        offline() {
            console.log('No internet connection found. App is running in offline mode.')
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,9 @@
 module.exports = {
    publicPath: '',
-    productionSourceMap: true
-};
+    productionSourceMap: false,
+    pwa: {
+        workboxOptions: {
+            skipWaiting: true
+        }
+    }
+};
Author	SHA1	Message	Date
MengYX	0c23249d76	Bump Version	2020-03-12 18:56:21 +08:00
MengYX	6502d2d067	Merge CI Settings	2020-03-10 12:22:46 +08:00
MengYX	24e1d33642	Fix errors when parsing ncm files without metadata	2020-03-10 09:31:48 +08:00
MengYX	a72804544f	Remove Source Map in production	2020-03-04 10:00:18 +08:00
MengYX	2aeb60d0a9	Update CI	2020-03-04 09:38:30 +08:00
MengYX	97ca09dbae	Bump Version	2020-03-04 09:30:48 +08:00
MengYX	e78118b4d0	Add fix-compatibility npm command	2020-03-04 09:29:05 +08:00
MengYX	37c60caa06	Update Dependencies	2020-03-04 08:37:54 +08:00
MengYX	fba020969b	Update Babel config	2020-03-04 08:37:39 +08:00
MengYX	790715726a	Add temporary solution to fix compatibility for Edge 18	2020-03-04 08:37:16 +08:00
MengYX	4ca45e1233	Merge branch 'pull/22'	2020-03-03 20:01:42 +08:00
MengYX	cfacb77d15	Optimize loader tips for outdated browser	2020-03-03 20:00:44 +08:00
任宝硕	5f7461e8aa	Update index.html	2020-03-03 16:41:45 +08:00
MengYX	aa98ec422c	Reformat Code	2020-03-01 23:36:16 +08:00
MengYX	d2ec667c19	Fix Update Check	2020-03-01 23:34:24 +08:00
任宝硕	94ee8eb3bd	Update index.html	2020-03-01 16:16:34 +08:00
任宝硕	c13f7fcced	对部分老旧浏览器进行显示调整 + 部分内容修复	2020-03-01 16:14:43 +08:00
MengYX	1d83898f08	#20 Add Support For Netease DJ Files	2020-02-29 19:52:41 +08:00
MengYX	98ca5bc8ff	Bump Version	2020-02-23 13:52:03 +08:00
MengYX	984b549448	#19 Add Download Type: Origin Filename	2020-02-23 13:45:30 +08:00
MengYX	9fd7177ebb	Add Update Check	2020-02-23 13:44:19 +08:00
MengYX	f7d19e62fd	Immediately Load Latest App	2020-02-23 13:42:50 +08:00
MengYX	86d59f4e6f	Update Dependencies	2020-02-23 13:42:20 +08:00
MengYX	3906572723	Optimize UI	2020-02-23 13:41:39 +08:00
MengYX	179f72687a	Fix Decrypt Mflac Error	2020-02-12 23:04:48 +08:00