askbot-dragon 1.7.49-beta → 1.7.52-beta

package/src/assets/js/AliyunlssUtil.js

@@ -1,117 +1,141 @@
-
-
-// const OSS = require('ali-oss');
-
-const OSS = window.OSS
-
-const getPrivateOssConfig = () =>{
-    let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
-    switch (mainSource) {
-        case "askbot":
-            return {
-                region: "oss-cn-zhangjiakou",
-                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-                bucket: "guoranopen-zjk",
-            }
-        case "lishi":
-            return {
-                region: "oss-ap-southeast-1",
-                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
-                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
-                bucket: "askbotopen-ls",
-            };
-    }
-}
-
-const ossConfig = {
-    region: "oss-cn-zhangjiakou",
-        //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-        // stsToken: '<Your securityToken(STS)>',
-        bucket: "guoranopen-zjk",
-};
-
-
-
-let IDX = 256, HEX = [], SIZE = 256, BUFFER;
-while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
-let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
-function uid(len) {
-    let i = 0, tmp = (len || 11);
-    if (!BUFFER || ((IDX + tmp) > SIZE * 2)) {
-        for (BUFFER = '', IDX = 0; i < SIZE; i++) {
-            BUFFER += HEX[Math.random() * 256 | 0];
-        }
-    }
-
-    return BUFFER.substring(IDX, IDX++ + tmp);
-}
-
-function dataFormat(fmt, date = new Date()) {
-    const o = {
-        "M+": date.getMonth() + 1, //月份
-        "d+": date.getDate(), //日
-        "h+": date.getHours(), //小时
-        "m+": date.getMinutes(), //分
-        "s+": date.getSeconds(), //秒
-        "q+": Math.floor((date.getMonth() + 3) / 3), //季度
-        "S": date.getMilliseconds() //毫秒
-    };
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
-    for (const k in o)
-        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-    return fmt;
-}
-
-function pathGenerate(filename) {
-    return "front-oss/" + mainId + '/' + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + filename;
-}
-
-
-async function upload(data) {
-    let ossClient = new OSS(getPrivateOssConfig());
-    // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
-    let objectKey = pathGenerate(data.name);
-    let result = await ossClient.put(objectKey, data);
-    console.debug(result);
-    return result;
-}
-
-async function multipartUpload(data, callback,extCallback) {
-    let ossClient = new OSS(getPrivateOssConfig());
-    // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
-    let objectKey = pathGenerate(data.name);
-    let res = await ossClient.multipartUpload(objectKey, data, {
-        progress: function (p, checkpoint) {
-            console.debug('progress callback', p, checkpoint);
-            // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
-            if (callback && callback instanceof Function) {
-                callback(p, checkpoint,data,extCallback);
-            }
-        }
-    });
-    return res;
-}
-
-function ossFileUrl(path, cname) {
-    let ossConfig = getPrivateOssConfig()
-    if (cname == null) {
-        return '//' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
-    } else {
-        return cname + '/' + path;
-    }
-}
-
-function uploadImageByBase64(blob) {
-    let ossClient = new OSS(getPrivateOssConfig());
-
-    // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形 式，实现将文件上传至当前Bucket或Bucket下的指定目录。
-    let objectKey = pathGenerate(new Date().getTime());
-    let result = ossClient.put(objectKey, blob);
-    console.debug(result);
-    return result;
-}
-
-export {upload, multipartUpload, ossFileUrl,uploadImageByBase64,ossConfig, getPrivateOssConfig}
+
+
+
+// const OSS = require('ali-oss');
+
+const OSS = window.OSS
+
+const getPrivateOssConfig = () =>{
+    let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
+    switch (mainSource) {
+        case "askbot":
+            return {
+                region: "oss-cn-zhangjiakou",
+                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+                bucket: "guoranopen-zjk",
+            }
+        case "lishi":
+            return {
+                region: "oss-ap-southeast-1",
+                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
+                bucket: "askbotopen-ls",
+            };
+    }
+}
+
+const ossConfig = {
+    region: "oss-cn-zhangjiakou",
+    //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+    accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+    accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+    // stsToken: '<Your securityToken(STS)>',
+    bucket: "guoranopen-zjk",
+};
+
+
+
+let IDX = 256, HEX = [], SIZE = 256, BUFFER;
+while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
+let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
+function uid (len) {
+    let i = 0, tmp = (len || 11);
+    if (!BUFFER || ((IDX + tmp) > SIZE * 2)) {
+        for (BUFFER = '', IDX = 0; i < SIZE; i++) {
+            BUFFER += HEX[Math.random() * 256 | 0];
+        }
+    }
+
+    return BUFFER.substring(IDX, IDX++ + tmp);
+}
+
+function dataFormat (fmt, date = new Date()) {
+    const o = {
+        "M+": date.getMonth() + 1, //月份
+        "d+": date.getDate(), //日
+        "h+": date.getHours(), //小时
+        "m+": date.getMinutes(), //分
+        "s+": date.getSeconds(), //秒
+        "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+        "S": date.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (const k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
+
+function pathGenerate (filename) {
+    return "front-oss/" + mainId + '/' + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + filename;
+}
+
+
+async function upload (data) {
+    let ossClient = new OSS(getPrivateOssConfig());
+    // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
+    let objectKey = pathGenerate(data.name);
+    let result = await ossClient.put(objectKey, data);
+    console.debug(result);
+    return result;
+}
+
+async function multipartUpload (data, callback, extCallback) {
+    if (process.env.VUE_APP_UPLOAD_PRIVATE) {
+        return new Promise((resolve) => {
+            let url = process.env.VUE_APP_UPLOAD_PRIVATE
+            let xhr = new XMLHttpRequest()
+            const formData = new FormData()
+            formData.append('file', data)
+            xhr.open("POST", url, true);
+            // xhr.setRequestHeader("Content-Type", "multipart/form-data")
+            xhr.onload = (res) => {
+                let reslout = JSON.parse(res.target.response)
+                resolve({
+                    code: reslout.code,
+                    res: {
+                        requestUrls: [reslout.data]
+                    },
+                    name: reslout.data
+                })
+            }
+            xhr.send(formData)
+        })
+
+    } else {
+        let ossClient = new OSS(getPrivateOssConfig());
+        // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
+        let objectKey = pathGenerate(data.name);
+        let res = await ossClient.multipartUpload(objectKey, data, {
+            progress: function (p, checkpoint) {
+                console.debug('progress callback', p, checkpoint);
+                // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
+                if (callback && callback instanceof Function) {
+                    callback(p, checkpoint, data, extCallback);
+                }
+            }
+        });
+        return res;
+    }
+}
+
+function ossFileUrl (path, cname) {
+    let ossConfig = getPrivateOssConfig()
+    if (cname == null) {
+        return '//' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
+    } else {
+        return cname + '/' + path;
+    }
+}
+
+function uploadImageByBase64 ( blob) {
+    let ossClient = new OSS(getPrivateOssConfig());
+
+    // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形 式，实现将文件上传至当前Bucket或Bucket下的指定目录。
+    let objectKey = pathGenerate(new Date().getTime());
+    let result = ossClient.put(objectKey, blob);
+    console.debug(result);
+    return result;
+}
+
+export { upload, multipartUpload, ossFileUrl, uploadImageByBase64, ossConfig , getPrivateOssConfig}

package/src/assets/js/Base64Util.js

@@ -1,22 +1,22 @@
-function base64toBlob(b64Data, contentType='', sliceSize=512) {
-    const byteCharacters = atob(b64Data);
-    const byteArrays = [];
-
-    for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
-        const slice = byteCharacters.slice(offset, offset + sliceSize);
-
-        const byteNumbers = new Array(slice.length);
-        for (let i = 0; i < slice.length; i++) {
-            byteNumbers[i] = slice.charCodeAt(i);
-        }
-
-        const byteArray = new Uint8Array(byteNumbers);
-
-        byteArrays.push(byteArray);
-    }
-
-    const blob = new Blob(byteArrays, {type: contentType});
-    return blob;
-}
-
-export {base64toBlob}
+function base64toBlob(b64Data, contentType='', sliceSize=512) {
+    const byteCharacters = atob(b64Data);
+    const byteArrays = [];
+
+    for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+        const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+        const byteNumbers = new Array(slice.length);
+        for (let i = 0; i < slice.length; i++) {
+            byteNumbers[i] = slice.charCodeAt(i);
+        }
+
+        const byteArray = new Uint8Array(byteNumbers);
+
+        byteArrays.push(byteArray);
+    }
+
+    const blob = new Blob(byteArrays, {type: contentType});
+    return blob;
+}
+
+export {base64toBlob}