askbot-dragon 1.6.20-beta → 1.6.22-beta

package/src/components/pdfPosition.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="pdf_view" id="pdf_view" :style="{
+    <div class="pdf_view" ref="pdfView" @scroll="pdfScroll" :style="{
         marginTop: isPC ? '50px' : '',
         marginBottom: tagIds.length > 1 ? '60px' : '0px',
         height: setHeight
@@ -17,7 +17,6 @@
                 </el-option>
             </el-select>
         </div>
-        <div class="pdf_container_view" id="pdf_container_view" @scroll="pdfScroll"  ref="pdfView"></div>
         <div class="btn_footer" v-if="tagIds.length > 1 && !isPC">
             <div class="prev" @click="prev">上一段</div>
             <div class="next" @click="next">下一段</div>
@@ -45,11 +44,10 @@ if (pdfjsLib) {
     // 'pdfjs-dist/build/pdf.worker';
 }
 const { TextLayerBuilder } = window['pdfjs-dist/web/pdf_viewer']
-const CSS_UNITS = 96.0 / 72.0
 // import { zoomElement } from '../assets/js/hammer'
 export default {
     name: 'pdfView',
-    props: ['tagIds', 'isMessageRecord','fileName', "knowledgeItem"],
+    props: ['tagIds', 'isMessageRecord'],
     data () {
         return {
             url: '',
@@ -96,7 +94,6 @@ export default {
             },
             isTouchMoved: false,
             transformSalce: null,
-            defaultTransform:0.8,
             isPC: false,
             handScale: 'auto',
             scaleList: [
@@ -261,9 +258,6 @@ export default {
                 this.contentView.style.paddingBottom = '60px'
                 // contentView.style.overflowY = 'auto'
                 this.$refs.pdfView.appendChild(this.contentView);
-                if (this.knowledgeItem && (this.knowledgeItem.source === 'CORP_LOCAL_FILE' || this.knowledgeItem.source === 'YUQUE' || this.knowledgeItem.source === 'FEISHU') && (this.knowledgeItem.visitorWatermarkValue || this.knowledgeItem.textWatermarkValue)){
-                  this.watermark()
-                }
             }
             this.renderPages(pageIndex)
         },
@@ -287,12 +281,12 @@ export default {
             const { pdfPage, pageNo, dom } = page;
             // dom 元素已存在，无须重新渲染，直接返回
             if ((dom && dom.children.length != 0) || page.loading) {
-              return;
+                return;
             }
             page.loading = true
             const viewport = pdfPage.getViewport({
-              scale: this.scale,
-              rotation: this.rotation,
+                scale: this.scale,
+                rotation: this.rotation,
             });
             // 创建新的canvas
             const canvas = document.createElement('canvas');
@@ -383,10 +377,6 @@ export default {
                 page.dom = await pageDom;
                 page.loading = false
                 this.contentView.appendChild(pageDom);
-                let pdf_view = document.getElementsByClassName('pdf_view');
-                if (pdf_view && pdf_view[0]){
-                  pdf_view[0].style.backgroundImage = 'none'
-                }
                 if (this.transformSalce !== null) {
                     this.contentView.style.transform = `scale(${this.transformSalce}, ${this.transformSalce})`
                 }
@@ -453,8 +443,8 @@ export default {
                 startNum = Math.ceil(scrollTop / (that.pageSize.height + that.PAGE_INTVERVAL))
                 endNum = startNum + Math.ceil(height / (that.pageSize.height + that.PAGE_INTVERVAL))
             }
-            for (let pageIndex = startNum; pageIndex <= endNum; pageIndex++) {
-                if (pageIndex > 0 && pageIndex <= that.pages.length) {
+            for (let pageIndex = startNum; pageIndex < endNum; pageIndex++) {
+                if (pageIndex > 0 && pageIndex < that.pages.length) {
                     that.loadPdfData(pageIndex)
                 }
             }
@@ -697,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
+                            }]
+                        }]
                     })
                 }
             })
@@ -846,164 +842,6 @@ export default {
             this.contentView.style.transform = 'scale(' + this.transformSalce + ')';
             // this.getpdfResloutePage(this.cachePdf[0])
         },
-        //添加水印
-        watermark() {
-          //默认设置
-          var defaultSettings = {
-            watermark_txt:"",
-            watermark_x: 0,//水印起始位置x轴坐标
-            watermark_y: 0,//水印起始位置Y轴坐标
-            watermark_rows: 0,//水印行数
-            watermark_cols: 0,//水印列数
-            watermark_x_space: 40,//水印x轴间隔
-            watermark_y_space: 60,//水印y轴间隔
-            watermark_color: 'black',//水印字体颜色
-            watermark_alpha: .3,//水印透明度
-            watermark_fontsize: 12,//水印字体大小
-            watermark_font: '微软雅黑',//水印字体
-            watermark_width: 100,//水印宽度
-            watermark_height: 80,//水印长度
-            watermark_angle: 20,//水印倾斜度数***
-            visitorWatermark_txt:""
-          };
-          if(this.knowledgeItem.textWatermarkValue){
-            defaultSettings.watermark_txt = this.knowledgeItem.textWatermarkValue;
-          }
-          if (this.knowledgeItem.visitorWatermarkValue){
-            defaultSettings.visitorWatermark_txt = this.knowledgeItem.visitorWatermarkValue
-          }
-          //采用配置项替换默认值，作用类似jquery.extend
-          if (arguments.length === 1 && typeof arguments[0] === "object") {
-            console.log("arguments = " + JSON.stringify(arguments[0]));
-            // 获取参数配置
-            var src = arguments[0];
-            for (let key in src) {
-              if (src[key] && defaultSettings[key] && src[key] === defaultSettings[key])
-                continue;
-              else if (src[key])
-                defaultSettings[key] = src[key];
-            }
-          }
-          var oTemp = document.createDocumentFragment();
-          //获取页面最大宽度
-          console.debug('pdf_view',document.getElementById('pdf_view'))
-          let scrollWidth = document.getElementById('pdf_view').scrollWidth;
-          let clientWidth = document.getElementById('pdf_view').clientWidth;
-          var page_width = Math.max(scrollWidth, clientWidth);
-
-          var cutWidth = page_width * 0.0150;
-
-          page_width = page_width - cutWidth;
-
-          //获取页面最大高度
-          let height = parseInt(this.totalPageCount * this.pageSize.height)
-          var page_height = Math.max(document.getElementById('pdf_container_view').scrollHeight,height);
-
-          console.debug('page_height',page_height,this.totalPageCount * this.pageSize.height);
-
-          // var page_height = document.body.scrollHeight+document.body.scrollTop;
-
-          //如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
-
-          if (defaultSettings.watermark_cols == 0 || (parseInt(defaultSettings.watermark_x + defaultSettings
-              .watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_x_space *
-              (defaultSettings.watermark_cols - 1)) > page_width)) {
-            defaultSettings.watermark_cols = parseInt((page_width - defaultSettings.watermark_x + defaultSettings
-                .watermark_x_space) / (defaultSettings.watermark_width + defaultSettings
-                .watermark_x_space));
-            defaultSettings.watermark_x_space = parseInt((page_width - defaultSettings.watermark_x -
-                defaultSettings
-                    .watermark_width * defaultSettings.watermark_cols) / (defaultSettings.watermark_cols - 1));
-          }
-
-          //如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
-
-          if (defaultSettings.watermark_rows == 0 || (parseInt(defaultSettings.watermark_y + defaultSettings
-
-              .watermark_height * defaultSettings.watermark_rows + defaultSettings.watermark_y_space * (
-
-              defaultSettings.watermark_rows - 1)) > page_height)) {
-
-            defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height -
-
-                defaultSettings
-
-                    .watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space));
-
-            defaultSettings.watermark_y_space = parseInt(((page_height - defaultSettings.watermark_y) -
-
-                defaultSettings
-
-                    .watermark_height * defaultSettings.watermark_rows) / (defaultSettings.watermark_rows - 1));
-
-          }
-
-          var x;
-
-          var y;
-
-          for (var i = 0; i < defaultSettings.watermark_rows; i++) {
-            y = defaultSettings.watermark_y + (defaultSettings.watermark_y_space + defaultSettings.watermark_height) * i;
-            for (var j = 0; j < defaultSettings.watermark_cols; j++) {
-              x = defaultSettings.watermark_x + (defaultSettings.watermark_width + defaultSettings.watermark_x_space) * j;
-
-              var mask_div = document.createElement('div');
-              mask_div.id = 'mask_div' + i + j;
-              mask_div.className = 'mask_div';
-
-              //注意看这里加了图片水印
-              mask_div.style.webkitTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
-              mask_div.style.MozTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
-              mask_div.style.msTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
-              mask_div.style.OTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
-              mask_div.style.transform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
-              mask_div.style.visibility = "";
-              mask_div.style.position = "absolute";
-              //奇偶行错开，这样水印就不对齐，显的不呆板
-              console.debug('x',x)
-              if (i % 2 != 0) {
-                mask_div.style.left = x + 'px';
-                if (j % 2 != 0 && this.knowledgeItem.visitorWatermarkValue){
-                  mask_div.appendChild(document.createTextNode(defaultSettings.visitorWatermark_txt));
-                } else {
-                  if (!this.knowledgeItem.textWatermarkValue){
-                    mask_div.appendChild(document.createTextNode(defaultSettings.visitorWatermark_txt));
-                  } else {
-                    mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
-                  }
-                }
-              } else {
-                mask_div.style.left = x + 'px';
-                if (j % 2 != 0 && this.knowledgeItem.textWatermarkValue){
-                  mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
-                } else {
-                  if (!this.knowledgeItem.visitorWatermarkValue){
-                    mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
-                  } else {
-                    mask_div.appendChild(document.createTextNode(defaultSettings.visitorWatermark_txt));
-                  }
-                }
-              }
-
-              mask_div.style.top = y + 'px';
-              mask_div.style.overflow = "hidden";
-              mask_div.style.zIndex = "9999";
-              mask_div.style.pointerEvents = 'none'; //让水印不遮挡页面的点击事件
-              mask_div.style.opacity = defaultSettings.watermark_alpha;
-              mask_div.style.fontSize = defaultSettings.watermark_fontsize;
-              mask_div.style.fontFamily = defaultSettings.watermark_font;
-              mask_div.style.color = defaultSettings.watermark_color;
-              mask_div.style.textAlign = "center";
-              mask_div.style.width = defaultSettings.watermark_width + 'px';
-              mask_div.style.height = defaultSettings.watermark_height + 'px';
-              mask_div.style.display = "block";
-              oTemp.appendChild(mask_div);
-            }
-          }
-          let pageDom = document.getElementById('pdf_container_view')
-          pageDom.appendChild(oTemp);
-
-      },
     },
     computed: {
         perviewUrl () {
@@ -1031,11 +869,8 @@ export default {
                 if (value && value.length) {
                     // 在 pdf_view 下创建 所有canvs的容器
                     this.contentView = document.createElement('div')
-                    this.contentView.setAttribute('id','contentView')
                     this.contentView.style.transformOrigin = '0px 0px 0px'
-                    this.contentView.setAttribute('id','contentView');
-
-                  this.$http.get('/knowledge-api/knowledge/knowledge-part-location-info/list?ids=' + value.join(',')).then(res => {
+                    this.$http.get('/knowledge-api/knowledge/knowledge-part-location-info/list?ids=' + value.join(',')).then(res => {
                         // res.data = {"data":[{"id":"64591b7d8bb8ab1b91c65f24","knowledgeId":"64591a9c8da27649473f3b4b","mainId":"fb348d095c0b4fd7bbd37826563dac7d","page":3,"total":18,"pageHeight":540.0,"pageWidth":960.00946,"publicPageFileUrl":"https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/fb348d095c0b4fd7bbd37826563dac7d/2023/05/08/11/55/18/64591b638bb8ab1b91c65eed/3.pdf","extractInfo":{"location":[280.488,161.32,398.71573,61.99298],"content":"黄花城水长城旅游区位于北京市怀柔区九渡河镇境内，距北京市区65公里，是以奇而著称，融山川、碧水、古长城为一体的旅游休闲胜地。而这里的“三绝景”更是引人入","lines":[{"content":"黄花城水长城旅游区位于北京市怀柔区九渡河镇境内，距","location":[280.488,161.32,398.71573,15.9869995]},{"content":"北京市区65公里，是以奇而著称，融山川、碧水、古长","location":[283.691,184.30899,392.3055,15.9869995]},{"content":"城为一体的旅游休闲胜地。而这里的“三绝景”更是引人入","location":[282.699,207.32599,394.3033,15.9869995]}],"tagId":null}}],"code":"0","msg":null,"traceId":null}
                         // res.data = {"data":[{"id":"64590ce1eb1320043401cc90","knowledgeId":"64590cd5017b461d67e282e1","mainId":"fb348d095c0b4fd7bbd37826563dac7d","page":2,"total":5,"pageHeight":841.8898,"pageWidth":595.30396,"publicPageFileUrl":"https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/fb348d095c0b4fd7bbd37826563dac7d/2023/05/08/10/53/20/64590ce0eb1320043401cc7b/2.pdf","extractInfo":{"location":[89.32981,638.1907,415.15512,98.63251],"content":":北京地铁 13\r号线 :藤黄\r色 :西直门站—\r东直门站 :17 :41.\r5 :6\r准\rB :2002年\r09月\r28日 ","lines":[{"content":":北京地铁 13\r号线 ","location":[89.32981,638.1907,99.44599,98.63251]},{"content":":藤黄\r色 ","location":[188.7758,638.1907,46.79959,98.63251]},{"content":":西直门站—\r东直门站 ","location":[235.5754,638.1907,86.09996,98.63251]},{"content":":17 ","location":[321.67535,638.1907,36.200012,98.63251]},{"content":":41.\r5 ","location":[357.87537,638.1907,39.400696,98.63251]},{"content":":6\r准\rB ","location":[397.27606,638.1907,41.099,98.63251]},{"content":":2002年\r09月\r28日 ","location":[438.37506,638.1907,66.10986,98.63251]}],"tagId":null}}],"code":"0","msg":null,"traceId":null}
                         // res.data = {"data":[{"id":"64591b7d8bb8ab1b91c65f24","knowledgeId":"64591a9c8da27649473f3b4b","mainId":"fb348d095c0b4fd7bbd37826563dac7d","page":3,"total":18,"pageHeight":540.0,"pageWidth":960.00946,"publicPageFileUrl":"https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/fb348d095c0b4fd7bbd37826563dac7d/2023/05/08/11/55/18/64591b638bb8ab1b91c65eed/3.pdf","extractInfo":{"location":[280.488,161.32,398.71573,61.99298],"content":"黄花城水长城旅游区位于北京市怀柔区九渡河镇境内，距北京市区65公里，是以奇而著称，融山川、碧水、古长城为一体的旅游休闲胜地。而这里的“三绝景”更是引人入","lines":[{"content":"黄花城水长城旅游区位于北京市怀柔区九渡河镇境内，距","location":[280.488,161.32,398.71573,15.9869995]},{"content":"北京市区65公里，是以奇而著称，融山川、碧水、古长","location":[283.691,184.30899,392.3055,15.9869995]},{"content":"城为一体的旅游休闲胜地。而这里的“三绝景”更是引人入","location":[282.699,207.32599,394.3033,15.9869995]}],"tagId":null}}],"code":"0","msg":null,"traceId":null}
@@ -1201,9 +1036,9 @@ export default {
                             // tagIds 会按照gpt识别的生成有序的数组，前端直接按照下标的顺序取就可以了
                             // 缓存拿到的所有数据
                             this.cachePdf = res.data.data
-                            let publicPageFileUrl = res.data.data && res.data.data[0] ? res.data.data[0].publicPageFileUrl : ''
+                            let publicPageFileUrl = res.data.data[0].publicPageFileUrl
                             this.currentPage = 0
-                            if (publicPageFileUrl && publicPageFileUrl.substring(publicPageFileUrl.lastIndexOf('.')) === '.pdf') {
+                            if (publicPageFileUrl.substring(publicPageFileUrl.lastIndexOf('.')) === '.pdf') {
                                 this.preViewType = 'pdf'
                                 this.setPageAllLine(this.cachePdf)
                                 this.getpdfResloutePage(res.data.data[0])
@@ -1224,16 +1059,11 @@ export default {
                                         xhr.onload = ({ currentTarget }) => {
                                             // 请求完成
                                             if (currentTarget.status === 200) {   // 返回200
-                                                let pdf_view = document.getElementsByClassName('pdf_view');
-                                                if (pdf_view && pdf_view[0]){
-                                                  pdf_view[0].style.backgroundImage = 'none'
-                                                }
                                                 this.contentView.innerHTML = currentTarget.response
                                                 this.contentView.style.padding = '10px'
                                                 // this.contentView.style.position = 'relative'
                                                 this.$refs.pdfView.style.backgroundColor = '#FFFFFF'
                                                 this.$refs.pdfView.appendChild(this.contentView)
-
                                                 let allTr = Array.from(this.$refs.pdfView.getElementsByTagName('tr'))
                                                 this.allTr = []
                                                 for (let index = 0; index < allTr.length; index++) {
@@ -1276,14 +1106,10 @@ export default {
     width: 100%;
     height: calc(100% - 110px);
     overflow: auto;
-    //overflow-y: scroll;
     background-color: #f5f7fb;
     // margin-bottom: 60px;
     box-sizing: border-box;
-    background-image: url('https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif');
-    background-position: center;
-    background-size: 50px;
-    background-repeat: no-repeat;
+
     // position: relative;
     // > div {
     //     width: 100%;
@@ -1472,12 +1298,6 @@ export default {
             background: rgba(221, 222, 223, 1);
         }
     }
-  .pdf_container_view{
-    height: 100%;
-    width: 100%;
-    position: relative;
-    overflow: auto;
-  }
 }
 </style>
 <style lang="less">

package/src/components/previewPdf.vue

@@ -54,7 +54,7 @@
     </div>
     <div id="drawer_content_pre">
       <template v-if="tagIds && tagIds.length != 0 && drawer">
-        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName" :knowledgeItem="watermark" ref="pdfPosition"></pdfPosition>
+        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord"></pdfPosition>
       </template>
       <template v-else>
         <div v-if="fileType == 'VIDEO'" style="width: 100%;">
@@ -97,7 +97,6 @@ export default {
             tagIds: [],
             // '6454aa1a70573a6ead6f0f7d', '6454aa1a70573a6ead6f0f81',
             loading:true,
-          fileName:''
         }
     },
     mounted() {
@@ -118,9 +117,6 @@ export default {
         sourceFileType:{
           type: String,
           default: '',
-        },
-        watermark:{
-          type: Object
         }
     },
     components:{
@@ -130,20 +126,9 @@ export default {
       drawer(value) {
         if(value) {
           this.$nextTick(() =>{
-            if (this.tagIds && this.tagIds.length != 0){
-              zoomElement(document.getElementById('pdf_container_view'))
-            }
+            zoomElement(document.getElementById('drawer_content_pre'))
           })
         }
-        setTimeout(() => {
-          let previewIframe = document.getElementsByClassName('preview_iframe')
-          Array.from(previewIframe).forEach(item =>{
-            item.onload = () =>{
-              console.debug('previewIframe 106',previewIframe,this.drawer)
-              item.style.backgroundImage = 'none'
-            }
-          })
-        })
       }
     },
     computed:{
@@ -158,10 +143,8 @@ export default {
             //     }
             // }
             url = url + this.url
-            url += '&officePreviewType=pdf'
-            if(this.watermark) {
-              url = this.watermark.textWatermarkValue ? (url += '&textWatermarkValue=' + this.watermark.textWatermarkValue) : url
-              url = this.watermark.visitorWatermarkValue ? (url += '&visitorWatermarkValue=' + this.watermark.visitorWatermarkValue) : url
+            if(this.sourceFileType == '.ppt' || this.sourceFileType == '.pptx') {
+                url += '&officePreviewType=pdf'
             }
             return url
         },
@@ -299,6 +282,10 @@ export default {
     overflow: auto;
     height: calc(100% - 50px);
     background: #FFF;
+    background-image: url('https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif');
+    background-position: center;
+    background-size: 50px;
+    background-repeat: no-repeat;
   }
 }
 @media screen and (min-width: 768px) {

package/src/components/utils/ckeditor.js

@@ -1,6 +1,7 @@
 /* eslint-disable */
 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访问
@@ -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){

package/src/components/utils/ckeditorImageUpload/command.js

@@ -1,5 +1,6 @@
 import Command from "@ckeditor/ckeditor5-core/src/command";
 import { multipartUpload, ossFileUrl } from "../AliyunIssUtil";
+import { putObject } from "../../../assets/js/obsBrowser";
 const ossConfig = {
     region: "oss-cn-zhangjiakou",
     //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
@@ -91,15 +92,16 @@ export default class ImageCommand extends Command {
         let imgInfo = {
             url: '',
         }
-        let res = multipartUpload(
-            ossConfig,
-            file,
-            null,
-            imgInfo
-        );
+        // let res = multipartUpload(
+        //     ossConfig,
+        //     file,
+        //     null,
+        //     imgInfo
+        // );
+        let res = putObject(file)
         console.log(res,'resprespresp');
         res.then(resp => {
-            imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            imgInfo.url = resp.url;
             console.log(resp,'resprespresp');
             console.log(imgInfo)
             resolve({

package/src/components/utils/ckeditorfileUpload/common.js

@@ -1,15 +1,6 @@
 import Command from "@ckeditor/ckeditor5-core/src/command";
-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";
 
 function findListener(askPluginListeners, type) {
     for (let i = 0, len = askPluginListeners.length; i < len; i++) {
@@ -165,14 +156,16 @@ export default class FileCommand extends Command {
         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;
             resolve({
                 name: resp.name,
                 default: imgInfo.url