|
@@ -64,14 +64,14 @@ export default {
|
|
|
policy: "",
|
|
|
signature: "",
|
|
|
key: "",
|
|
|
- ossaccessKeyId: "",
|
|
|
- dir: "",
|
|
|
- host: "",
|
|
|
- // callback:'',
|
|
|
+ KSSAccessKeyId: "",
|
|
|
+ // dir: "",
|
|
|
+ acl:'public-read',
|
|
|
+ name:'',
|
|
|
},
|
|
|
dialogVisible: false,
|
|
|
useOss: true, //使用oss->true;使用MinIO->false
|
|
|
- ossUploadUrl: "http://daya.ks3-cn-beijing.ksyuncs.com",
|
|
|
+ ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/daya",
|
|
|
minioUploadUrl: "http://localhost:8080/minio/upload",
|
|
|
};
|
|
|
},
|
|
@@ -91,19 +91,25 @@ export default {
|
|
|
//不使用oss不需要获取策略
|
|
|
return true;
|
|
|
}
|
|
|
- console.log(file);
|
|
|
+ console.log(file,'掉用beforeUpload');
|
|
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- let key = new Date().getTime()+file.name
|
|
|
- policy({fileName:file.name,postData:{ "acl":"public-read","key":key,unknowValueField:[]}})
|
|
|
+ // let key = '20150115/中文/'+new Date().getTime()+file.name
|
|
|
+ let key = '20150115/${filename}'
|
|
|
+ let obj = {filename:file.name,postData:{'filename':file.name, "acl":"public-read","key":key,unknowValueField:[]}}
|
|
|
+ console.log(obj,'obj')
|
|
|
+ policy(obj)
|
|
|
.then((response) => {
|
|
|
_self.dataObj.policy = response.data.policy;
|
|
|
_self.dataObj.signature = response.data.signature;
|
|
|
- _self.dataObj.ossaccessKeyId = response.data.accessKeyId;
|
|
|
- _self.dataObj.key = response.data.dir + "/${filename}";
|
|
|
- _self.dataObj.dir = response.data.dir;
|
|
|
- _self.dataObj.host = response.data.host;
|
|
|
+ _self.dataObj.KSSAccessKeyId = response.data.kssAccessKeyId;
|
|
|
+ _self.dataObj.key = key;
|
|
|
+ _self.dataObj.name = file.name;
|
|
|
+ _self.dataObj.acl = 'public-read'
|
|
|
+
|
|
|
+ // _self.dataObj.host = response.data.host;
|
|
|
// _self.dataObj.callback = response.data.callback;
|
|
|
+
|
|
|
var ks3Options = {
|
|
|
KSSAccessKeyId: response.data.kssAccessKeyId,
|
|
|
policy: response.data.policy,
|
|
@@ -111,14 +117,15 @@ export default {
|
|
|
bucket_name: "daya",
|
|
|
key: key,
|
|
|
acl: "public-read", //此处需要与policy中的acl值保持一致,默认值:private。
|
|
|
- uploadDomain: "http://daya.ks3-cn-beijing.ksyuncs.com", //北京region
|
|
|
- autoStart: false,
|
|
|
+ uploadDomain: "https://ks3-cn-beijing.ksyuncs.com/daya", //北京region
|
|
|
+ autoStart: true,
|
|
|
};
|
|
|
+ console.log(ks3Options,'ks3Options')
|
|
|
var pluploadOptions = {
|
|
|
drop_element: document.body,
|
|
|
};
|
|
|
- var tempUpload = new ks3FileUploader(ks3Options, pluploadOptions);
|
|
|
- tempUpload.uploader.start()
|
|
|
+ var tempUpload = new ks3FileUploader(ks3Options);
|
|
|
+ // tempUpload.uploader.start()
|
|
|
resolve(true);
|
|
|
})
|
|
|
.catch((err) => {
|
|
@@ -128,10 +135,10 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
handleUploadSuccess(res, file) {
|
|
|
- console.log(res, file);
|
|
|
this.showFileList = true;
|
|
|
this.fileList.pop();
|
|
|
- let url = this.dataObj.host + "/" + this.dataObj.dir + "/" + file.name;
|
|
|
+ let url = file.url;
|
|
|
+ console.log(url)
|
|
|
if (!this.useOss) {
|
|
|
//不使用oss直接获取图片路径
|
|
|
url = res.data.url;
|