askbot-dragon 1.5.59-beta → 1.5.60-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.5.59-beta",
+  "version": "1.5.60-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -13,6 +13,8 @@
     "audio-loader": "^1.0.3",
     "ckeditor": "^4.12.1",
     "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",
@@ -30,7 +32,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,7 +23,7 @@
         });
       }
     </script>
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/ckeditor5-build-classic/0.4.4/ckeditor.js"></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图标 -->
@@ -48,12 +48,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/hammer.js

@@ -3,15 +3,6 @@ export function zoomElement (el) {
 	let store = {
 		scale: 1
 	};
-	if (!el){
-		return
-	}
-	let scale = 1;
-	if (el.style.transform){
-		let transForm = el.style.transform;
-		var values = transForm.split('(')[1].split(')')[0].split(',');
-		scale = values[0] ? values[0] : 1
-	}
 	// 缩放事件的处理
 	el.addEventListener('touchstart', function (event) {
 		let touches = event.touches;
@@ -76,15 +67,13 @@ export function zoomElement (el) {
 				newScale = 3;
 			}
 			// 最小缩放比例限制
-			if(newScale < scale) {
-				newScale = scale;
+			if(newScale < 1) {
+				newScale = 1;
 			}
 			// 记住使用的缩放值
 			store.scale = newScale;
 			// 图像应用缩放效果
 			el.style.transform = 'scale(' + newScale + ')';
-			el.style.transformOrigin = 'top left'
-
 		}
 	});
 	document.addEventListener('touchend', function () {

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/assets/less/converSationContainer/common.less

@@ -35,13 +35,6 @@
     border-radius: 6px;
     background-color: #bfceec !important;
 }
-@media screen and (max-width: 767px){
-    ::-webkit-scrollbar {
-        width: 0;
-        height: 0;
-        background-color:@system_bordercolor_4;
-    }
-}
 
 // 弹窗body
 .el-dialog__body{

package/src/components/AnswerDocknowledge.vue

@@ -244,18 +244,7 @@ export default {
                 }
                 this.$refs.previewPdf.fileType = type
                 this.$refs.previewPdf.tagIds = item.tagIds
-                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false ;
-                let index = url.indexOf("?");
-                let newFileInOssPath = url;
-                if (index !== -1){
-                  newFileInOssPath =  url.substring(0, url.indexOf("?"))
-                }
-                let fileName = newFileInOssPath.substring(newFileInOssPath.lastIndexOf('.'))
-                if (fileName === '.doc' || fileName === '.docx' || fileName === '.txt'|| fileName === '.html'){
-                  this.$refs.previewPdf.fileName = fileName;
-                } else {
-                  this.$refs.previewPdf.fileName = '';
-                }
+                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false 
                 if(item.tagIds && item.tagIds.length != 0) {
                   this.$refs.previewPdf.loading = false
                   return

package/src/components/ConversationContainer.vue

@@ -34,7 +34,7 @@
     </div> -->
 
     <text-message :text="text" @submitClick="submitClick"></text-message>
-     <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge"></answer-docknowledge>
+    <!-- <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge"></answer-docknowledge> -->
     <!--    <voice-component @closeVoice="closeVoice">
       <div slot="voiceTip">
         松开发送
@@ -105,7 +105,7 @@ import AnswerVoice from "@/components/AnswerVoice";
 // import ChatContent from "./chatContent";
 // import FeedBack from '@/components/feedBack'
 // 知识类型
-import AnswerDocknowledge from "./AnswerDocknowledge.vue";
+// import AnswerDocknowledge from "./AnswerDocknowledge.vue";
 export default {
   name: 'ConversationContainer',
   components: {
@@ -131,7 +131,7 @@ export default {
     // FormTemplate,
     // FileType,
     // ChatContent,
-    AnswerDocknowledge,
+    // AnswerDocknowledge,
   },
   props: {
     messages: Array
@@ -188,48 +188,17 @@ export default {
       answerDocknowledge:
       // {"content":{"knowledgeId":"64915d6e098ec248701da267","actionType":"answer_doc_knowledge","text":"跳舞不仅要有实力，还要有好的穿搭，本文针对街舞爱好者提供了穿搭指南，给你带来灵感和帮助！","list":[{"tagIds":[],"format":"html","updateTime":"2023-06-20 16:03:58","source":"WECHAT","url":"https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/137993c6d830416696bbd771fc61d423/1937/2023/06/20/16/03/微信同步/52720/501775e41a724d7da06e66b3b4686407.html","knowledgeId":"64915d6e098ec248701da267","from":"跳舞要有范儿，穿搭占一半！快来get你的街舞穿搭指南~"}],"renderType":0,"type":0,"isKnowledgeSummary":true},"type":"answer_doc_knowledge","sessionId":1687251699065,"keyId":"1a079f48-ace3-4064-89b4-8a292c6a8a93_________","isKnowledgeSummary":true},
 
-          {
-            "conditionList": null,
-            "apiKey": null,
-            "effectiveTime": null,
-            "intentId": null,
-            "msgId": null,
-            "actionCategory": null,
-            "id": null,
-            "type": "answer_doc_knowledge",
-            "nodeId": null,
-            "content": {
-              "knowledgeId": null,
-              "actionType": "answer_doc_knowledge",
-              "images": null,
-              "knowledgePartId": null,
-              "srcContentId": null,
-              "text": "新能源车是指采用新型能源的轿车、客车、货车等机动车辆，包括纯电动汽车、插电式混合动力汽车和燃料电池汽车。根据数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场将继续保持高速增长，销售量有望超过200万辆。政府对新能源汽车实行补贴政策，同时逐步放松对新能源车的限购和限行政策。此外，中国汽车企业在新能源车领域的技术研发能力也不断提升，各大品牌纷纷推出新能源车型，采用更优秀的动力电池和电控系统，提高了车辆的续航里程。因此，新能源车市场发展前景广阔。",
-              "list": [
-                {
-                  "owner": null,
-                  "tagId": "6525183560177f6223d52a14",
-                  "enterprise": null,
-                  "tagIds": [
-                    "6525183560177f6223d52a14"
-                  ],
-                  "format": "docx",
-                  "srcContentId": "99cada54a02161f979acc28c5b8b913e",
-                  "updateTime": "2023-10-10 17:24:05",
-                  "source": "CORP_LOCAL_FILE",
-                  "srcContent": "新能源车指的是采用新型能源的轿车、客车、货车等机动车辆。目前主要的新能源车包括纯电动汽车、插电式混合动力汽车、燃料电池汽车等。以下是对新能源车的分析报告：市场发展趋势：随着环保和能源安全意识的增强，新能源车市场呈现快速发展态势。数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场仍将保持高速增长，销售量有望达到200万辆以上。政策扶持力度加大：我国政府对新能源汽车实行补贴政策，以鼓励消费者选择绿色出行方式。此外，对新能源车限购、限行等政策也逐步放松。政策扶持的加大将进一步促进新能",
-                  "url": "http://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/43aadcaac45f4be19b63fd18ca68f2e6/2023/10/10/17/23/a27c5c1dd534d180c5512c907d5c9888/新能源车分析报告 (1).docx?uploadId=0921CB01AB5847E8BEF44730EE5DACF7",
-                  "knowledgeId": "6525182f002ff5198983a90c",
-                  "knowledgePartId": "YfHmGIsBvcIPGxbfkvwK",
-                  "from": "新能源车分析报告 (1)",
-                  "introduction": "新能源车指的是采用新型能源的轿车、客车、货车等机动车辆。目前主要的新能源车包括纯电动汽车、插电式混合动力汽车、燃料电池汽车等。以下是对新能源车的分析报告：市场发展趋势：随着环保和能源安全意识的增强，新能源车市场呈现快速发展态势。数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场仍将保持高速增长，销售量有望达到200万辆以上。政策扶持力度加大：我国政府对新能源汽车实行补贴政策，以鼓励消费者选择绿色出行方式。此外，对新能源车限购、限行等政策也逐步放松。政策扶持的加大将进一步促进新能"
-                }
-              ],
-              "renderType": 0,
-              "type": 0,
-              "srcContent": null
-            }
-          },
+      {
+        "content": {
+          "images": [{ url: 'https://static.guoranbot.com/images/knowledge/e0f6898c6b0d47fa98e8f71ceab1bde8/安全标志--禁止标志.png' }],
+          "actionType": "answer_doc_knowledge",
+          "text": "中国的省份名称有湖北省、广西壮族自治区等。",
+          "list": [{ "tagIds": [], "format": "yqhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-14 20:15:50", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/14/19/54/31/acc2421dcfd04db39eba0c37e7d3b580.html", "knowledgeId": "643940bb6cbe816b83ebbaaf", "knowledgePartId": "lPexf4cBYkmDoUE2eSUt", "from": "2.3 科室", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagIds": [], "format": "feishuhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-13 23:19:48", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/13/22/20/40/0e48cc7b15b34d2f84fe49fd1a89d606.html", "knowledgeId": "643817509ab4545bef50db64", "knowledgePartId": "NeYze4cBh77-s6lwjWOl", "from": "2.12 重要异常科室对照", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagIds": ['12312313123'], "format": "yqhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-13 23:19:02", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/13/22/20/18/5cdf1295ec1649f6ab73948aa82ea810.html", "knowledgeId": "643817509ab4545bef50db58", "knowledgePartId": "Hvcye4cBYkmDoUE21h6V", "from": "2.3 科室", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagId": "6475eab868110215ab821a7c", "tagIds": ["6475eab868110215ab821a7c"], "format": "xlsx", "srcContentId": "0bf639060655ff3ec217484a2fc7827d", "updateTime": "2023-05-30 20:28:21", "source": "CORP_LOCAL_FILE", "srcContent": "产品:外观,解释:VX50有两种套餐可下单： 套餐一：只购买VX50终端设备，不包含摄像头、麦克风 套餐二：除购买VX50终端设备外，可选购SC701云台摄像头及MC30/MC31麦克风", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/5ecf2fcd704541149201ab9c1c31162d/2023/05/30/20/11/85b7b2a5f61e2b060387656e88c02d50/VX30与VX50对比表.xlsx", "knowledgeId": "6475e7eac724c54c46cbfa2d", "knowledgePartId": "T_uhbIgB3v-0X8BLeDAh", "from": "VX30与VX50对比表", "introduction": "产品:外观,解释:VX50有两种套餐可下单： 套餐一：只购买VX50终端设备，不包含摄像头、麦克风 套餐二：除购买VX50终端设备外，可选购SC701云台摄像头及MC30/MC31麦克风" },],
+          "renderType": 0,
+          "type": 0
+        },
+        "type": "answer_doc_knowledge"
+      },
       ActionAiGuideObj: {
         // 智能引导
         type: "answer_intellect_guide",

package/src/components/askVideo.vue

@@ -25,7 +25,7 @@
     </div>
 </template>
 <script>
-    import {ossConfig,uploadImageByBase64} from "../assets/js/AliyunlssUtil";
+    import { putObject } from "../assets/js/obsBrowser";
 
     export default {
         name: "ask_video",
@@ -85,7 +85,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/associationIntention.vue

@@ -233,7 +233,7 @@
         this.$emit("onRadioClick", id, name, apikey,optionApiKey);
       },
       onImageClick(url){
-        this.$emit('onImageClick', encodeURI(url))
+        this.$emit('onImageClick',url)
       },
       msgContent(content){
         console.debug('215',content)

package/src/components/formTemplate.vue

@@ -833,6 +833,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() {
@@ -1598,21 +1599,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++){
@@ -2498,13 +2502,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;
@@ -2512,7 +2517,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