Merge branch 'fine_music_score' into ponline

src/components/Tinymce/components/editorImage.vue

@@ -64,7 +64,8 @@ export default {
         acl: "public-read",
         name: "",
       },
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/mall",
+      // ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/mall",
+      ossUploadUrl: "https://mall.ks3-cn-beijing.ksyuncs.com",
     };
   },
   methods: {
@@ -120,9 +121,8 @@ export default {
         let key = new Date().getTime() + file.name;
         let obj = {
           filename: file.name,
-             bucketName: this.bucket_name,
+          bucketName: this.bucket_name,
           postData: {
-
             filename: file.name,
             acl: "public-read",
             key: key,

src/components/Upload/multiUpload.vue

@@ -57,7 +57,8 @@ export default {
       dialogVisible: false,
       dialogImageUrl: null,
       useOss: true, //使用oss->true;使用MinIO->false
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/"+this.bucket_name,
+      // 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",
     };
   },
@@ -96,7 +97,7 @@ export default {
         let key = new Date().getTime() + file.name;
         let obj = {
           filename: file.name,
-          bucketName:this.bucket_name,
+          bucketName: this.bucket_name,
           postData: {
             filename: file.name,
             acl: "public-read",
@@ -119,7 +120,8 @@ export default {
               signature: response.data.signature,
               key: key,
               acl: "public-read", //此处需要与policy中的acl值保持一致，默认值：private。
-              uploadDomain: "https://ks3-cn-beijing.ksyuncs.com/"+this.bucket_name, //北京region
+              uploadDomain:
+                "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name, //北京region
               autoStart: true,
             };
             var pluploadOptions = {
@@ -153,7 +155,4 @@ export default {
   },
 };
 </script>
-<style>
-</style>
-
-
+<style></style>

src/components/Upload/singleUpload.vue

@@ -80,7 +80,8 @@ export default {
       },
       dialogVisible: false,
       useOss: true, //使用oss->true;使用MinIO->false
-      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/"+ this.bucket_name,
+      // 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",
     };
   },
@@ -107,7 +108,7 @@ export default {
         // let key = `20150115/${file.name}`
         let obj = {
           filename: file.name,
-          bucketName:this.bucket_name,
+          bucketName: this.bucket_name,
           postData: {
             filename: file.name,
             acl: "public-read",
@@ -135,7 +136,8 @@ export default {
 
               key: key,
               acl: "public-read", //此处需要与policy中的acl值保持一致，默认值：private。
-              uploadDomain: "https://ks3-cn-beijing.ksyuncs.com/"+this.bucket_name, //北京region
+              uploadDomain:
+                "https://ks3-cn-beijing.ksyuncs.com/" + this.bucket_name, //北京region
               autoStart: true,
             };
             console.log(ks3Options, "ks3Options");
@@ -166,7 +168,4 @@ export default {
   },
 };
 </script>
-<style>
-</style>
-
-
+<style></style>