Browse Source

更新上传地址

lex 2 years ago
parent
commit
cc94627081

+ 3 - 3
src/components/Tinymce/components/editorImage.vue

@@ -65,6 +65,7 @@ export default {
         name: "",
         name: "",
       },
       },
       ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/mall",
       ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/mall",
+      preUploadUrl: "https://mall.ks3-cn-beijing.ksyuncs.com",
     };
     };
   },
   },
   methods: {
   methods: {
@@ -95,7 +96,7 @@ export default {
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
           this.listObj[objKeyArr[i]].url =
           this.listObj[objKeyArr[i]].url =
-            this.ossUploadUrl + "/" + this.listObj[objKeyArr[i]].key;
+            this.preUploadUrl + "/" + this.listObj[objKeyArr[i]].key;
           this.listObj[objKeyArr[i]].hasSuccess = true;
           this.listObj[objKeyArr[i]].hasSuccess = true;
           return;
           return;
         }
         }
@@ -120,9 +121,8 @@ export default {
         let key = new Date().getTime() + file.name;
         let key = new Date().getTime() + file.name;
         let obj = {
         let obj = {
           filename: file.name,
           filename: file.name,
-             bucketName: this.bucket_name,
+          bucketName: this.bucket_name,
           postData: {
           postData: {
-
             filename: file.name,
             filename: file.name,
             acl: "public-read",
             acl: "public-read",
             key: key,
             key: key,

+ 7 - 8
src/components/Upload/multiUpload.vue

@@ -57,7 +57,8 @@ export default {
       dialogVisible: false,
       dialogVisible: false,
       dialogImageUrl: null,
       dialogImageUrl: null,
       useOss: true, //使用oss->true;使用MinIO->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,
+      preOssUploadUrl: `https://${this.bucket_name}ks3-cn-beijing.ksyuncs.com`,
       minioUploadUrl: "http://localhost:8080/minio/upload",
       minioUploadUrl: "http://localhost:8080/minio/upload",
     };
     };
   },
   },
@@ -96,7 +97,7 @@ export default {
         let key = new Date().getTime() + file.name;
         let key = new Date().getTime() + file.name;
         let obj = {
         let obj = {
           filename: file.name,
           filename: file.name,
-          bucketName:this.bucket_name,
+          bucketName: this.bucket_name,
           postData: {
           postData: {
             filename: file.name,
             filename: file.name,
             acl: "public-read",
             acl: "public-read",
@@ -119,7 +120,8 @@ export default {
               signature: response.data.signature,
               signature: response.data.signature,
               key: key,
               key: key,
               acl: "public-read", //此处需要与policy中的acl值保持一致,默认值:private。
               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,
               autoStart: true,
             };
             };
             var pluploadOptions = {
             var pluploadOptions = {
@@ -135,7 +137,7 @@ export default {
       });
       });
     },
     },
     handleUploadSuccess(res, file) {
     handleUploadSuccess(res, file) {
-      let url = this.ossUploadUrl + "/" + this.dataObj.key;
+      let url = this.preOssUploadUrl + "/" + this.dataObj.key;
       if (!this.useOss) {
       if (!this.useOss) {
         //不使用oss直接获取图片路径
         //不使用oss直接获取图片路径
         url = res.data.url;
         url = res.data.url;
@@ -153,7 +155,4 @@ export default {
   },
   },
 };
 };
 </script>
 </script>
-<style>
-</style>
-
-
+<style></style>

+ 7 - 8
src/components/Upload/singleUpload.vue

@@ -80,7 +80,8 @@ export default {
       },
       },
       dialogVisible: false,
       dialogVisible: false,
       useOss: true, //使用oss->true;使用MinIO->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,
+      preOssUploadUrl: `https://${this.bucket_name}ks3-cn-beijing.ksyuncs.com`,
       minioUploadUrl: "http://localhost:8080/minio/upload",
       minioUploadUrl: "http://localhost:8080/minio/upload",
     };
     };
   },
   },
@@ -107,7 +108,7 @@ export default {
         // let key = `20150115/${file.name}`
         // let key = `20150115/${file.name}`
         let obj = {
         let obj = {
           filename: file.name,
           filename: file.name,
-          bucketName:this.bucket_name,
+          bucketName: this.bucket_name,
           postData: {
           postData: {
             filename: file.name,
             filename: file.name,
             acl: "public-read",
             acl: "public-read",
@@ -135,7 +136,8 @@ export default {
 
 
               key: key,
               key: key,
               acl: "public-read", //此处需要与policy中的acl值保持一致,默认值:private。
               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,
               autoStart: true,
             };
             };
             console.log(ks3Options, "ks3Options");
             console.log(ks3Options, "ks3Options");
@@ -153,7 +155,7 @@ export default {
       });
       });
     },
     },
     handleUploadSuccess(res, file) {
     handleUploadSuccess(res, file) {
-      let url = this.ossUploadUrl + "/" + this.dataObj.key;
+      let url = this.preOssUploadUrl + "/" + this.dataObj.key;
       this.showFileList = true;
       this.showFileList = true;
       this.fileList.pop();
       this.fileList.pop();
       if (!this.useOss) {
       if (!this.useOss) {
@@ -166,7 +168,4 @@ export default {
   },
   },
 };
 };
 </script>
 </script>
-<style>
-</style>
-
-
+<style></style>