Merge branch 'fine_music_score' into jenkins

src/components/Tinymce/components/editorImage.vue

@@ -64,8 +64,8 @@ export default {
         acl: "public-read",
         name: "",
       },
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/mall",
-      preUploadUrl: "https://mall.ks3-cn-beijing.ksyuncs.com",
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/mall",
+      ossUploadUrl: "https://mall.ks3-cn-beijing.ksyuncs.com",
     };
   },
   methods: {
@@ -96,7 +96,7 @@ export default {
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
           this.listObj[objKeyArr[i]].url =
-            this.preUploadUrl + "/" + this.listObj[objKeyArr[i]].key;
+            this.ossUploadUrl + "/" + this.listObj[objKeyArr[i]].key;
           this.listObj[objKeyArr[i]].hasSuccess = true;
           return;
         }

src/components/Upload/multiUpload.vue

@@ -57,8 +57,8 @@ export default {
       dialogVisible: false,
       dialogImageUrl: null,
       useOss: true, //使用oss->true;使用MinIO->false
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
-      preOssUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
       minioUploadUrl: "http://localhost:8080/minio/upload",
     };
   },
@@ -137,7 +137,7 @@ export default {
       });
     },
     handleUploadSuccess(res, file) {
-      let url = this.preOssUploadUrl + "/" + this.dataObj.key;
+      let url = this.ossUploadUrl + "/" + this.dataObj.key;
       if (!this.useOss) {
         //不使用oss直接获取图片路径
         url = res.data.url;

src/components/Upload/singleUpload.vue

@@ -80,8 +80,8 @@ export default {
       },
       dialogVisible: false,
       useOss: true, //使用oss->true;使用MinIO->false
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
-      preOssUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name,
+      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com`,
       minioUploadUrl: "http://localhost:8080/minio/upload",
     };
   },
@@ -155,7 +155,7 @@ export default {
       });
     },
     handleUploadSuccess(res, file) {
-      let url = this.preOssUploadUrl + "/" + this.dataObj.key;
+      let url = this.ossUploadUrl + "/" + this.dataObj.key;
       this.showFileList = true;
       this.fileList.pop();
       if (!this.useOss) {