|
@@ -54,7 +54,7 @@ export function getUrlParams(str=window.location.href,key) {
|
|
|
|
|
|
/**
|
|
|
*
|
|
|
- * @param {*} objectStorageClient 1-走oss 2-走minio string
|
|
|
+ * @param {*} objectStorageClient oss-走oss 2-走minio string
|
|
|
* @param {*} file 上传文件
|
|
|
* @param {*} temName 文件路径/文件名字
|
|
|
* @param {*} options 文件路径/文件名字
|
|
@@ -64,7 +64,7 @@ export function getUrlParams(str=window.location.href,key) {
|
|
|
|
|
|
// 上传文件 直接走对象存取服务器
|
|
|
export function uploadFileDirect(objectStorageClient,file,temName,options={}){
|
|
|
- const objectStorageType= (objectStorageClient || JSON.parse(localStorage.getItem('dynamicOutLinks')).ObjectStorageClient)+""
|
|
|
+ const objectStorageType= (objectStorageClient || JSON.parse(localStorage.getItem('dynamicOutLinks')).ObjectStorageClient)
|
|
|
// console.log(objectStorageType,'objectStorageType');
|
|
|
// return
|
|
|
if(!objectStorageType){
|
|
@@ -79,9 +79,9 @@ export function uploadFileDirect(objectStorageClient,file,temName,options={}){
|
|
|
Message.error("temName参数错误")
|
|
|
return new Promise((resolve,reject) => reject("temName参数错误"))
|
|
|
}
|
|
|
- // console.log(objectStorageClient,file,temName,options,'objectStorageClient,file,temName,options');
|
|
|
- switch (objectStorageClient) {
|
|
|
- case "1":
|
|
|
+ // console.log(objectStorageType,file,temName,options,'objectStorageType,file,temName,options');
|
|
|
+ switch (objectStorageType) {
|
|
|
+ case "oss":
|
|
|
let ossOptions = {}
|
|
|
if(options.OSS){
|
|
|
ossOptions=options.OSS
|
|
@@ -89,7 +89,7 @@ export function uploadFileDirect(objectStorageClient,file,temName,options={}){
|
|
|
|
|
|
return handleUploadToOSS(file,temName,ossOptions)
|
|
|
// break;
|
|
|
- case "2":
|
|
|
+ case "minio":
|
|
|
let minioOptions = {}
|
|
|
if(options.MINIO){
|
|
|
minioOptions=options.MINIO
|