askbot-dragon 1.5.47 → 1.5.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.5.47",
+  "version": "1.5.48",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -10,6 +10,8 @@
     "ali-oss": "^6.2.1",
     "audio-loader": "^1.0.3",
     "core-js": "^3.6.5",
+    "element-ui": "^2.15.14",
+    "esdk-obs-browserjs": "^3.23.5",
     "install": "^0.13.0",
     "jquery": "^3.5.1",
     "lodash": "^4.17.21",
@@ -27,7 +29,6 @@
     "@vue/cli-plugin-eslint": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
     "babel-eslint": "^10.1.0",
-    "element-ui": "^2.15.10",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.12.2",

package/public/index.html

@@ -23,6 +23,7 @@
         });
       }
     </script>
+<!--    <script src="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/ckeditor5-build-classic/0.4.4/ckeditor.js"></script>-->
     <!-- 项目图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/font_1566110_3hu6pyd938i.css"/>
     <!-- guoran图标 -->
@@ -46,12 +47,12 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf.worker.min.js" integrity="sha512-6UHd2tcWIvg5hIYHXb3lnNO61tWfriGen6KddwGYTSUUazWGYESTHDDxJFEQkCy1cSL//yXKc1gcL+51/DTLFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf_viewer.min.js" integrity="sha512-tYEGuMBQkCfSlBKJ3dNgS06wbb/MNE6nO2poZ1Y5brix8NajGcDcfEvuL38wJDOTkq0j5ojASNmrzv/8/wgGHQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf_viewer.min.css" integrity="sha512-Jf9DLkegLgARLR151csVkPvcVt4cOUhslrSZwiTAe9mqFL/BbYRDmxCOioCtbHifEgjsBFbrVhOMQ3mYPDLrqQ==" crossorigin="anonymous" referrerpolicy="no-referrer" /> -->
-    
-    
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/pdfJS2.1.266/pdf.min.js"  referrerpolicy="no-referrer"></script>
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/pdfJS2.1.266/pdf.worker.min.js"  referrerpolicy="no-referrer"></script>
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/pdfJS2.1.266/pdf_viewer.js"  referrerpolicy="no-referrer"></script>
-    <link rel="stylesheet" href="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/pdfJS2.1.266/pdf_viewer_01.css" referrerpolicy="no-referrer" />
+
+
+    <script src="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/pdfJS2.1.266/pdf.min.js"  referrerpolicy="no-referrer"></script>
+    <script src="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/pdfJS2.1.266/pdf.worker.min.js" referrerpolicy="no-referrer"></script>
+    <script src="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/pdfJS2.1.266/pdf_viewer.js"  referrerpolicy="no-referrer"></script>
+    <link rel="stylesheet" href="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/pdfJS2.1.266/pdf_viewer_01.css" referrerpolicy="no-referrer" />
     <!-- hammer.js -->
     <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.min.js" integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
     <style>

package/src/assets/js/obsBrowser.js

@@ -0,0 +1,63 @@
+// 创建ObsClient实例
+import ObsClient from 'esdk-obs-browserjs';
+const obsClient = new ObsClient({
+    access_key_id: "EE4MAFWH4YLQSQF7NNIP",
+    secret_access_key: "Dq9giqqwZoX77dqSIzhA1Yhhe9tarA3LRBGBF4eO",
+    server : 'https://obs.cn-east-3.myhuaweicloud.com',
+    timeout : 1000
+});
+let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
+let IDX = 256, HEX = [], SIZE = 256, BUFFER;
+while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
+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;
+}
+async function putObject(file,callback){
+    let fileUrl = ''
+    let objName = (process.env.VUE_APP_ENV === 'development' ? 'dev_' : 'pro_') + file.name;
+    let fileName = "front-oss/" + mainId + '/' + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + objName;
+    await obsClient.putObject({
+        Bucket: 'askbot-uat',
+        Key : fileName,
+        SourceFile : file,
+        ACL : obsClient.enums.AclPublicRead,
+        ProgressCallback: callback
+    }).then(function(result) {
+        if(result.CommonMsg.Status < 300){
+            console.log('Create object:' + JSON.stringify(result) + ' successfully!\n',process.env.VUE_APP_ENV);
+            let domain = process.env.VUE_APP_ENV ==='development' ? 'https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/' : ''
+            fileUrl = {
+                url: domain + fileName,
+                name:file.name
+            }
+        }
+    });
+    return fileUrl
+}
+
+export {
+    putObject
+}

package/src/components/MyEditor.vue

@@ -36,7 +36,8 @@
 
 <script>
 import { v4 as uuidv4 } from "uuid";
-import { multipartUpload, ossFileUrl } from "./utils/AliyunIssUtil";
+// import { multipartUpload, ossFileUrl } from "./utils/AliyunIssUtil";
+import { putObject } from "../assets/js/obsBrowser";
 
 export default {
     props: ["value", "placeholder", "havToolbar"],
@@ -154,14 +155,15 @@ export default {
             let imgInfo = {
                 url: '',
             }
-            let res = multipartUpload(
-                this.ossConfig,
-                file,
-                null,
-                imgInfo
-            );
+            // let res = multipartUpload(
+            //     this.ossConfig,
+            //     file,
+            //     null,
+            //     imgInfo
+            // );
+            let res = putObject(file)
             res.then(resp => {
-                imgInfo.url = ossFileUrl(this.ossConfig, resp.name)
+                imgInfo.url = resp.url
                 resolve({
                     name: resp.name,
                     default: imgInfo.url

package/src/components/askVideo.vue

@@ -26,7 +26,7 @@
     </div>
 </template>
 <script>
-    import {ossConfig,uploadImageByBase64} from "../assets/js/AliyunlssUtil";
+    import { putObject } from "../assets/js/obsBrowser";
 
     export default {
         name: "ask_video",
@@ -86,7 +86,10 @@
             console.debug('img.src',output)
             let base64 = canvas.toDataURL("image/png")
             let blob = that.dataURLtoFile(base64,'name')
-            let promise = uploadImageByBase64(ossConfig,blob);
+            // let promise = uploadImageByBase64(ossConfig,blob);
+            const file = new File([blob], 'name', { type: 'text/plain', lastModified: Date.now() });
+            console.debug('file',file)
+            let promise = putObject(file);
             promise.then((res)=>{
               console.debug("upload base64 reslut",res);
               if (res&&res.url){

package/src/components/formTemplate.vue

@@ -869,6 +869,7 @@ import Tree from '../components/tree'
 import selectPopup from '../components/popup'
 import fileListView from './fielListView.vue'
 import { uniqueData } from './utils/math_utils'
+import { putObject } from "../assets/js/obsBrowser";
 export default {
   name: "formTemplate",
   data() {
@@ -1645,21 +1646,24 @@ export default {
         status:'',
         url:''
       }
-      let res = multipartUpload(
-              this.ossConfig,
-              file,
-              null,
-              imageInfo
-      );
-      res.then((res) => {
+      // let res = multipartUpload(
+      //         this.ossConfig,
+      //         file,
+      //         null,
+      //         imageInfo
+      // );
+      let resp = putObject(file);
+      resp.then((res) => {
         console.log("upload result:", res);
         // let filePath = res.name;
-        imageData.urls.push({
+        let obj = {
           name:file.name,
-          url:ossFileUrl(this.ossConfig, res.name),
+          url:res.url,
           status:'success'
-        })
-        imageInfo.url = ossFileUrl(this.ossConfig, res.name)
+        }
+        imageData.urls.push(obj)
+        // imageInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imageInfo.url = res.url;
         imageInfo.status='success'
         imageInfo.name=file.name
         for (let j=0;j<this.extInfoFieldValue[this.filedId].length;j++){
@@ -2571,13 +2575,14 @@ export default {
            progress: 0,
          },
        };*/
-      let res = multipartUpload(
-              this.ossConfig,
-              file,
-              null,
-              imgInfo
-      );
-      res.then((res) => {
+      // let res = multipartUpload(
+      //         this.ossConfig,
+      //         file,
+      //         null,
+      //         imgInfo
+      // );
+      let ress = putObject(file)
+      ress.then((res) => {
         console.debug("upload result:", res);
         // let filePath = res.name;
         /* imageData.content.progress = 1;
@@ -2585,7 +2590,7 @@ export default {
                  ossFileUrl(this.ossConfig, res.name)
          );
          console.log('imageData',imageData)*/
-        imgInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imgInfo.url = res.url
         imgInfo.status='success'
         if (data.file){
           imgInfo.name = data.file.name

package/src/components/pdfPosition.vue

@@ -687,15 +687,21 @@ export default {
                     // this.currentPageAllLine[i].allLines.lines.push(item.extractInfo.lines)
                     this.currentPageAllLine[i].allLines.push({
                         pageCount: index,
-                        lines: item.extractInfo.lines
+                        lines: item.extractInfo.lines ? item.extractInfo.lines  : [{
+                            content:"测试内容填充，不必理会",
+                            location:item.extractInfo.location
+                        }]
                     })
                 } else {
                     this.currentPageAllLine.push({
                         page: item.page,
                         allLines: [{
-                            pageCount: index,
-                            lines: item.extractInfo.lines
-                        }],
+                                pageCount: index,
+                                lines: item.extractInfo.lines ? item.extractInfo.lines : [{
+                                content:"测试内容填充，不必理会",
+                                location:item.extractInfo.location
+                            }]
+                        }]
                     })
                 }
             })

package/src/components/utils/ckeditor.js

@@ -1,14 +1,15 @@
 /* eslint-disable */
-import {multipartUpload, ossFileUrl} from "./AliyunIssUtil";
+// import {multipartUpload, ossFileUrl} from "./AliyunIssUtil";
 import { v4 as uuidv4 } from "uuid";
-const ossConfig = {
-        region: "oss-cn-zhangjiakou",
-        //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-        // stsToken: '<Your securityToken(STS)>',
-        bucket: "guoranopen-zjk",
-    }
+import { putObject } from "../../assets/js/obsBrowser";
+// const ossConfig = {
+//         region: "oss-cn-zhangjiakou",
+//         //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+//         accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+//         accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+//         // stsToken: '<Your securityToken(STS)>',
+//         bucket: "guoranopen-zjk",
+//     }
 class MyUploadAdapter {
     constructor( loader , editor ) {
         // 要在上载期间使用的文件加载器实例
@@ -55,14 +56,16 @@ class MyUploadAdapter {
         let imgInfo = {
             url:'',
         }
-        let res = multipartUpload(
-            ossConfig,
-            file,
-            null,
-            imgInfo
-        );
+        // let res = multipartUpload(
+        //     ossConfig,
+        //     file,
+        //     null,
+        //     imgInfo
+        // );
+        let res = putObject(file);
         res.then(resp=>{
-            imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            // imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            imgInfo.url = resp.url;
             let root =  this.editor.model.document.getRoot()
             let children = root.getChildren()
             for(let child of children){