askbot-dragon 88.0.36 → 888.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "88.0.36",
+  "version": "888.0.01",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/assets/js/AliyunlssUtil.js

@@ -5,12 +5,12 @@
 const OSS = window.OSS
 
 const ossConfig={
-    region: "oss-cn-zhangjiakou",
-        //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-        // stsToken: '<Your securityToken(STS)>',
-        bucket: "guoranopen-zjk",
+    region: "oss-ap-southeast-1",
+    //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+    accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+    accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
+    // stsToken: '<Your securityToken(STS)>',
+    bucket: "askbotopen-ls",
 };
 
 let IDX = 256, HEX = [], SIZE = 256, BUFFER;

package/src/components/ConversationContainer.vue

@@ -67,7 +67,6 @@
 import TextMessage from '@/components/message/TextMessage'
 import FormTemplate from "@/components/formTemplate";
 
-import FormTemplate from "@/components/formTemplate";
 /* import TextMessage from "@/components/message/TextMessage";*/
 
   // import FormTemplate from '@/components/formTemplate'

package/src/components/MyEditor.vue

@@ -36,20 +36,19 @@
 
 <script>
 import { v4 as uuidv4 } from "uuid";
-// import { multipartUpload, ossFileUrl } from "./utils/AliyunIssUtil";
-import { putObject } from "../assets/js/obsBrowser";
+import { multipartUpload, ossFileUrl } from "./utils/AliyunIssUtil";
 
 export default {
     props: ["value", "placeholder", "havToolbar"],
     data () {
         return {
             ossConfig: {
-                region: "oss-cn-zhangjiakou",
+                region: "oss-ap-southeast-1",
                 //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
                 // stsToken: '<Your securityToken(STS)>',
-                bucket: "guoranopen-zjk",
+                bucket: "askbotopen-ls",
             },
             ischecked: false,
             text: ''
@@ -159,15 +158,14 @@ export default {
             let imgInfo = {
                 url: '',
             }
-            // let res = multipartUpload(
-            //     this.ossConfig,
-            //     file,
-            //     null,
-            //     imgInfo
-            // );
-            let res = putObject(file)
+            let res = multipartUpload(
+                this.ossConfig,
+                file,
+                null,
+                imgInfo
+            );
             res.then(resp => {
-                imgInfo.url = resp.url
+                imgInfo.url = ossFileUrl(this.ossConfig, resp.name)
                 resolve({
                     name: resp.name,
                     default: imgInfo.url

package/src/components/askVideo.vue

@@ -1,142 +1,139 @@
 <template>
-    <div
-            v-loading="loading"
-            :element-loading-text="showProgress"
-            id="dragon-video"
-    >
-        <!-- <video-player
-          class="video-player vjs-custom-skin"
-          x5-video-player-type="h5"
-          :options="videoOptions(msg.content,msg.type)"
-          @pause="statechanged"
-        /> -->
-        <video
-                controls="controls"
-                :controlslist="nodownload&&'nodownload'"
-                :raw-controls="true"
-                x5-video-player-type="h5-page"
-                style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 25px;max-width: 230px;padding-left: 10px"
-                preload
-                :poster="videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'"
-                class="video-player vjs-custom-skin"
-                :id="msg.id+'key'">
-          <source :src="videoSrc"/>
-        </video>
-      <div id="output"></div>
-    </div>
+  <div
+          v-loading="loading"
+          :element-loading-text="showProgress"
+          id="dragon-video"
+  >
+      <!-- <video-player
+        class="video-player vjs-custom-skin"
+        x5-video-player-type="h5"
+        :options="videoOptions(msg.content,msg.type)"
+        @pause="statechanged"
+      /> -->
+      <video
+              controls="controls"
+              :controlslist="nodownload&&'nodownload'"
+              :raw-controls="true"
+              x5-video-player-type="h5-page"
+              style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 25px;max-width: 230px;padding-left: 10px"
+              preload
+              :poster="videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'"
+              class="video-player vjs-custom-skin"
+              :id="msg.id+'key'">
+        <source :src="videoSrc"/>
+      </video>
+    <div id="output"></div>
+  </div>
 </template>
 <script>
-    import { putObject } from "../assets/js/obsBrowser";
-
-    export default {
-        name: "ask_video",
-        props: ["msg", "url", "localUrl", "progress", "nodownload"],
-        data() {
-            return {
-              videoSrc:'',
-              poster:''
-            }
-        },
-        watch: {
-        },
-        computed: {
-            showProgress() {
-                return parseInt(this.progress * 100);
-            },
-            loading() {
-                return this.url == null || this.url === "";
-            },
-            src() {
-                return this.url ? this.url : this.localUrl;
-            }
-        },
-      mounted() {
-          this.$nextTick(()=>{
-            let videoSrc = this.url ? this.url : this.localUrl
-            let newVideoSrc = videoSrc.replace("https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com","https://static.guoranbot.com")
-            this.videoSrc = newVideoSrc
-            console.debug('newVideoSrc',this.videoSrc,videoSrc)
-            this.poster = this.videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'
-            console.debug('poster',this.poster)
-          })
+  import {ossConfig,uploadImageByBase64} from "../assets/js/AliyunlssUtil";
 
+  export default {
+      name: "ask_video",
+      props: ["msg", "url", "localUrl", "progress", "nodownload"],
+      data() {
+          return {
+            videoSrc:'',
+            poster:''
+          }
+      },
+      watch: {
       },
-      methods:{
-        getImage(){
-          let that = this
-          var video,output;
-          var scale = 0.8;
+      computed: {
+          showProgress() {
+              return parseInt(this.progress * 100);
+          },
+          loading() {
+              return this.url == null || this.url === "";
+          },
+          src() {
+              return this.url ? this.url : this.localUrl;
+          }
+      },
+    mounted() {
+        this.$nextTick(()=>{
+          let videoSrc = this.url ? this.url : this.localUrl
+          let newVideoSrc = videoSrc.replace("https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com","https://static.guoranbot.com")
+          this.videoSrc = newVideoSrc
+          console.debug('newVideoSrc',this.videoSrc,videoSrc)
+          this.poster = this.videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'
+          console.debug('poster',this.poster)
+        })
 
-          var initialize = function() {
-            let id = that.msg.keyId+'key'
-            output = document.getElementById("output");
-            video = document.getElementById(id);
-            video.addEventListener('loadeddata',captureImage);
-          };
+    },
+    methods:{
+      getImage(){
+        let that = this
+        var video,output;
+        var scale = 0.8;
 
-          var captureImage = function() {
-            var canvas = document.createElement("canvas");
-            canvas.width = video.videoWidth * scale;
-            canvas.height = video.videoHeight * scale;
-            canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
-            /*var img = document.createElement("img");
-            img.crossOrigin = 'anonymous'
-            img.src = canvas.toDataURL("image/png");*/
-            let reg = /\.(png|jpg|gif)$/
-            console.debug('img.src',output)
-            let base64 = canvas.toDataURL("image/png")
-            let blob = that.dataURLtoFile(base64,'name')
-            // 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){
-                that.poster = res.url
-                if (!reg.test(that.poster)){
-                  that.poster +='.png'
-                }
+        var initialize = function() {
+          let id = that.msg.keyId+'key'
+          output = document.getElementById("output");
+          video = document.getElementById(id);
+          video.addEventListener('loadeddata',captureImage);
+        };
+
+        var captureImage = function() {
+          var canvas = document.createElement("canvas");
+          canvas.width = video.videoWidth * scale;
+          canvas.height = video.videoHeight * scale;
+          canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
+          /*var img = document.createElement("img");
+          img.crossOrigin = 'anonymous'
+          img.src = canvas.toDataURL("image/png");*/
+          let reg = /\.(png|jpg|gif)$/
+          console.debug('img.src',output)
+          let base64 = canvas.toDataURL("image/png")
+          let blob = that.dataURLtoFile(base64,'name')
+          let promise = uploadImageByBase64(ossConfig,blob);
+          promise.then((res)=>{
+            console.debug("upload base64 reslut",res);
+            if (res&&res.url){
+              that.poster = res.url
+              if (!reg.test(that.poster)){
+                that.poster +='.png'
               }
-              console.debug('poster',that.poster)
-            });
-          };
+            }
+            console.debug('poster',that.poster)
+          });
+        };
 
-          initialize();
-        },
-        dataURLtoFile(dataurl, filename) {
-          var arr = dataurl.split(',');
-          var mime = arr[0].match(/:(.*?);/)[1];
-          var bstr = atob(arr[1]);
-          var n = bstr.length;
-          var u8arr = new Uint8Array(n);
-          while(n--){
-            u8arr[n] = bstr.charCodeAt(n);
-          }
-          //转换成file对象
-          return new File([u8arr], filename, {type:mime});
-          //转换成成blob对象
-          /*return new Blob([u8arr],{type:'image/png'});*/
+        initialize();
+      },
+      dataURLtoFile(dataurl, filename) {
+        var arr = dataurl.split(',');
+        var mime = arr[0].match(/:(.*?);/)[1];
+        var bstr = atob(arr[1]);
+        var n = bstr.length;
+        var u8arr = new Uint8Array(n);
+        while(n--){
+          u8arr[n] = bstr.charCodeAt(n);
         }
+        //转换成file对象
+        return new File([u8arr], filename, {type:mime});
+        //转换成成blob对象
+        /*return new Blob([u8arr],{type:'image/png'});*/
       }
-
     }
+
+  }
 </script>
 <style scoped lang="less">
 video::-webkit-media-controls-mute-button { display: none !important;}
 #dragon-video{
-  position: relative;
-  #outputVideo{
-    position: absolute;
-    top: 0px;
-    /deep/img{
-      width: calc(100vw - 139px);
-      border-radius: 25px;
-      max-width: 230px;
-      height: 160px;
-    }
-
+position: relative;
+#outputVideo{
+  position: absolute;
+  top: 0px;
+  /deep/img{
+    width: calc(100vw - 139px);
+    border-radius: 25px;
+    max-width: 230px;
+    height: 160px;
   }
+
+}
 }
 
 </style>

package/src/components/formTemplate.vue

@@ -869,7 +869,6 @@ 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() {
@@ -945,12 +944,12 @@ export default {
       fileType:['PICTURE','VIDEO','AUDIO'],
       loading:'',
       ossConfig: {
-        region: "oss-cn-zhangjiakou",
+        region: "oss-ap-southeast-1",
         //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+        accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+        accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
         // stsToken: '<Your securityToken(STS)>',
-        bucket: "guoranopen-zjk",
+        bucket: "askbotopen-ls",
       },
       hideUploadEdit:false,
       limitNum:1,
@@ -1636,43 +1635,40 @@ export default {
         }
       }
     },
-    uploadImgFun(content,name,fileCon,file){
+    uploadImgFun (content, name, fileCon, file) {
       console.log(fileCon)
       let imageData = {
-        urls:[]
+        urls: []
       }
       let imageInfo = {
-        name:"",
-        status:'',
-        url:''
-      }
-      // let res = multipartUpload(
-      //         this.ossConfig,
-      //         file,
-      //         null,
-      //         imageInfo
-      // );
-      let resp = putObject(file);
-      resp.then((res) => {
+        name: "",
+        status: '',
+        url: ''
+      }
+      let res = multipartUpload(
+        this.ossConfig,
+        file,
+        null,
+        imageInfo
+      );
+      res.then((res) => {
         console.log("upload result:", res);
         // let filePath = res.name;
-        let obj = {
-          name:file.name,
-          url:res.url,
-          status:'success'
-        }
-        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++){
-          if (this.extInfoFieldValue[this.filedId][j].content && this.extInfoFieldValue[this.filedId][j].content === content){
-            this.$set(this.extInfoFieldValue[this.filedId],j,imageInfo)
+        imageData.urls.push({
+          name: file.name,
+          url: ossFileUrl(this.ossConfig, res.name),
+          status: 'success'
+        })
+        imageInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imageInfo.status = 'success'
+        imageInfo.name = file.name
+        for (let j = 0; j < this.extInfoFieldValue[this.filedId].length; j++) {
+          if (this.extInfoFieldValue[this.filedId][j].content && this.extInfoFieldValue[this.filedId][j].content === content) {
+            this.$set(this.extInfoFieldValue[this.filedId], j, imageInfo)
             delete this.extInfoFieldValue[this.filedId][j].content
           }
         }
-        this.fileUpload=false
+        this.fileUpload = false
       }).catch((err) => {
         console.debug("upload err", err);
       });
@@ -2557,7 +2553,7 @@ export default {
     onCancel() {
       this.showArea = false;
     },
-    aliyunOssRequest(data){
+    aliyunOssRequest (data) {
 
       this.loading = this.$loading({
         lock: true,
@@ -2568,9 +2564,9 @@ export default {
       let file = data.file;
       console.debug("upload file:", file);
       let imgInfo = {
-        status:'',
-        url:'',
-        name:''
+        status: '',
+        url: '',
+        name: ''
       }
       /* let imageData = {
          id:cid,
@@ -2581,14 +2577,13 @@ export default {
            progress: 0,
          },
        };*/
-      // let res = multipartUpload(
-      //         this.ossConfig,
-      //         file,
-      //         null,
-      //         imgInfo
-      // );
-      let ress = putObject(file)
-      ress.then((res) => {
+      let res = multipartUpload(
+        this.ossConfig,
+        file,
+        null,
+        imgInfo
+      );
+      res.then((res) => {
         console.debug("upload result:", res);
         // let filePath = res.name;
         /* imageData.content.progress = 1;
@@ -2596,14 +2591,14 @@ export default {
                  ossFileUrl(this.ossConfig, res.name)
          );
          console.log('imageData',imageData)*/
-        imgInfo.url = res.url
-        imgInfo.status='success'
-        if (data.file){
+        imgInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imgInfo.status = 'success'
+        if (data.file) {
           imgInfo.name = data.file.name
           imgInfo.uid = data.file.uid
         }
-        if (!this.extInfoFieldValue[this.filedId]){
-          this.$set(this.extInfoFieldValue,this.filedId,[])
+        if (!this.extInfoFieldValue[this.filedId]) {
+          this.$set(this.extInfoFieldValue, this.filedId, [])
         }
         this.extInfoFieldValue[this.filedId].push(imgInfo)
         this.loading.close()

package/src/components/utils/ckeditor.js

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