上传文件的对象存储器兼容minio

src/api/modules/oldApi.js

@@ -164,8 +164,12 @@ const chapterQRCodeImg=params=>{
 	return http.post('/report/getSunCode',params)
 }
 //上传阿里云 oss获取临时票据
-const getOSSSign=()=>{
-	return http.get('/resource/oss/get_sts_token',{})
+/**
+ * @param {*} params.StorageSource number 1：oss 2：minio
+ * @returns 
+ */
+const getOSSSign=params=>{
+	return http.get('/resource/oss/get_sts_token',params)
 }
 
 /* 推送客户群设置 */

src/utils/common.js

@@ -54,7 +54,7 @@ export function getUrlParams(str=window.location.href,key) {
 
 /**
  * 
- * @param {*} objectStorageClient 1-走oss 2-走minio
+ * @param {*} objectStorageClient 1-走oss 2-走minio string
  * @param {*} file 上传文件
  * @param {*} temName 文件路径/文件名字
  * @param {*} options 文件路径/文件名字
@@ -65,8 +65,8 @@ export function getUrlParams(str=window.location.href,key) {
 // 上传文件 直接走对象存取服务器
 export function uploadFileDirect(objectStorageClient,file,temName,options={}){
   const objectStorageType= (objectStorageClient || JSON.parse(localStorage.getItem('dynamicOutLinks')).ObjectStorageClient)+""
-  console.log(objectStorageType,'objectStorageType');
-  return 
+  // console.log(objectStorageType,'objectStorageType');
+  // return 
   if(!objectStorageType){
     Message.error("ObjectStorageClient参数丢失")
     return new Promise((resolve,reject) => reject("ObjectStorageClient参数丢失"))
@@ -79,7 +79,7 @@ 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');
+  // console.log(objectStorageClient,file,temName,options,'objectStorageClient,file,temName,options');
   switch (objectStorageClient) {
     case "1":
       let ossOptions = {}
@@ -104,8 +104,9 @@ export function uploadFileDirect(objectStorageClient,file,temName,options={}){
 const handleUploadToOSS= (file,fileName,options={})=>{
   return new Promise(async (resolve,reject)=>{
     // 获取oss临时签名
-    const res=await getOSSSign()
-    if(res.Ret!==200) reject("获取oss临时签名错误")
+    const res=await getOSSSign({StorageSource:1})
+    // console.log(res);
+    if(res.Ret!==200) reject("获取阿里云oss临时签名错误")
     try {
 
       let oss_params = {
@@ -149,20 +150,23 @@ const handleUploadToOSS= (file,fileName,options={})=>{
 // minio sdk 文档 https://min.io/docs/minio/linux/developers/javascript/API.html
 const handleUploadToMinIO=(file,fileName,options={})=>{
   return new Promise(async (resolve,reject)=>{
-    // console.log(Minio);
+
+    const res=await getOSSSign({StorageSource:2})
+    // console.log(res);
+    if(res.Ret!==200) reject("获取minio临时签名错误")
+    // return
     const minioClient = new Minio.Client({
-      endPoint: '8.136.199.33',
-      port: 9000,
-      useSSL: false,
-      accessKey: 'eta',
-      secretKey: 'eta202309',
+      endPoint: res.Data.Endpoint.split(':')[0],
+      port: Number(res.Data.Port)||undefined,
+      useSSL: res.Data.UseSSL.toLocaleLowerCase()=="false"?false:true,
+      accessKey: res.Data.AccessKeyId,
+      secretKey: res.Data.SecretKeyId,
     })
-
+    console.log(minioClient);
     try {
       var metaData = {...{
         'Content-Type': file.type||'application/octet-stream',
         "Content-Length": file.size,
-        // example: 5678,
       },...options}
     
       minioClient.bucketExists("etastatic", function (err, exists) {
@@ -172,7 +176,7 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
           }
           if (!exists) {
             // 不存在桶，创建桶
-            minioClient.makeBucket('etastatic', function (err) {
+            minioClient.makeBucket('etastatic', res.Data.RegionId,function (err) {
               if (err) {
                 throw "minio 创建桶失败"+err
               }
@@ -186,7 +190,7 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
                 // 转化成数据流  minio接受数据流格式
                 bufferStream.end(Buffer.from(dataurl))
                 // console.log(bufferStream);
-                minioClient.putObject('etastatic', fileName, bufferStream, metaData, function (err, etag) {
+                minioClient.putObject('etastatic', fileName, bufferStream,file.size, metaData, function (err, etag) {
                   if (err){
                     throw "上传到minio失败："+err
                   }
@@ -196,7 +200,6 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
             })
           }
           if (exists) {
-            // console.log("exists");
             let reader = new FileReader();
             console.log(reader);
             reader.readAsArrayBuffer(file);
@@ -205,15 +208,12 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
               let bufferStream = new stream.PassThrough();
     
               bufferStream.end(Buffer.from(dataurl))
-              console.log(bufferStream);
-              // Using fPutObject API upload your file to the bucket europetrip.
               minioClient.putObject('etastatic', fileName, bufferStream, metaData, function (err, etag) {
                 if (err){
                   throw "上传到minio失败："+err
                 }
-                console.log(minioClient);
-                // let fileUrl = http://8.136.199.33:9000/etastatic/testOne.jpeg
-                resolve("http://8.136.199.33:9000/etastatic/testOne.jpeg")
+                let fileUrl = fileName.startsWith('/')?res.Data.ImgHost+fileName:res.Data.ImgHost+"/"+fileName
+                resolve(fileUrl)
               })
             }
           }

src/views/ppt_manage/newVersion/pptEnPublish.vue

@@ -440,7 +440,6 @@ export default {
       let t=new Date()
       let month=moment(t).format('YYYYMM')
       let day=moment(t).format('YYYYMMDD')
-      /* const temName=`ppt/${month}/${day}/${this.coverInfo.page.Title}.pptx` */
       const temName=`ppt/${month}/${day}/${createRandomCode(32)}.pptx`
 
       const options = {
@@ -461,11 +460,10 @@ export default {
         let clientType = this.$setting.dynamicOutLinks.ObjectStorageClient ||
                         this.$store.state.dynamicOutLinks.ObjectStorageClient ||
                         JSON.parse(localStorage.getItem('dynamicOutLinks')).ObjectStorageClient
-        // 上传到 对象存储器
+        // 上传到 对象存储器 阿里云、mino
         uploadFileDirect(clientType,data,temName,options).then(res=>{
           console.log('文件地址',url);
-          this.publishLoading&&this.publishLoading.close()
-          // this.publishPPT(url)
+          this.publishPPT(url)
         }).catch(err=>{
           console.error(err);
         })
@@ -524,7 +522,7 @@ export default {
     async handleUploadToOSS(file){
       console.log(file);
       // 获取oss临时签名
-      const res=await getOSSSign()
+      const res=await getOSSSign({StorageSource:1})
       if(res.Ret!==200) return
 
       let oss_params = {

src/views/ppt_manage/newVersion/pptPublish.vue

@@ -550,8 +550,7 @@ export default {
         // 上传到 对象存储器
         uploadFileDirect(clientType,data,temName,options).then(res=>{
           console.log('文件地址',url);
-          this.publishLoading&&this.publishLoading.close()
-          // this.publishPPT(url)
+          this.publishPPT(url)
         }).catch(err=>{
           console.error(err);
         })
@@ -627,7 +626,7 @@ export default {
     async handleUploadToOSS(file){
       console.log(file);
       // 获取oss临时签名
-      const res=await getOSSSign()
+      const res=await getOSSSign({StorageSource:1})
       if(res.Ret!==200) return
       
       let oss_params = {
@@ -652,7 +651,6 @@ export default {
       let t=new Date()
       let month=moment(t).format('YYYYMM')
       let day=moment(t).format('YYYYMMDD')
-      /* const temName=`ppt/${month}/${day}/${this.coverInfo.page.Title}.pptx` */
       const temName=`ppt/${month}/${day}/${createRandomCode(32)}.pptx`
       console.log('文件名',temName);
 

src/views/report_manage/editChapterReport.vue

@@ -430,33 +430,33 @@ export default {
   methods: {
     handelBeforeUploadAudio(e) {
       // console.log(e);
-      // if (
-      //   e.name.indexOf(".mp3") == -1 &&
-      //   e.name.indexOf(".wav") == -1 &&
-      //   e.name.indexOf(".wma") == -1 &&
-      //   e.name.indexOf(".m4a") == -1
-      // ) {
-      //   this.$message.warning("上传失败，上传音频格式不正确");
-      //   return false;
-      // }
+      if (
+        e.name.indexOf(".mp3") == -1 &&
+        e.name.indexOf(".wav") == -1 &&
+        e.name.indexOf(".wma") == -1 &&
+        e.name.indexOf(".m4a") == -1
+      ) {
+        this.$message.warning("上传失败，上传音频格式不正确");
+        return false;
+      }
     },
     async handleUpload(e) {
-      // const duration = await this.handleGetDuration(e.file);
-      // if (duration > 60 * 15) {
-      //   this.$message.warning("音频时长不得超过15分钟");
-      //   return;
-      // }
-      // this.aeForm.audioDuration = duration;
-      // this.aeForm.audioSize = e.file.size / 1024 / 1024; //单位MB
+      const duration = await this.handleGetDuration(e.file);
+      if (duration > 60 * 15) {
+        this.$message.warning("音频时长不得超过15分钟");
+        return;
+      }
+      this.aeForm.audioDuration = duration;
+      this.aeForm.audioSize = e.file.size / 1024 / 1024; //单位MB
       this.startUploadAudio = true;
 
-      // const t = new Date().getTime().toString();
-      // const temName = `static/yb/audio/${process.env.NODE_ENV}/${MD5(t)}.${
-      //   e.file.type.split("/")[1]
-      // }`;
-      const temName = `testOne.${
+      const t = new Date().getTime().toString();
+      const temName = `static/yb/audio/${process.env.NODE_ENV}/${MD5(t)}.${
         e.file.type.split("/")[1]
       }`;
+      // const temName = `testOne.${
+      //   e.file.type.split("/")[1]
+      // }`;
 
       let clientType = this.$setting.dynamicOutLinks.ObjectStorageClient ||
                         this.$store.state.dynamicOutLinks.ObjectStorageClient ||
@@ -468,7 +468,7 @@ export default {
       .finally(()=>{
         this.startUploadAudio = false;
       })
-      // const res = await getOSSSign();
+      // const res = await getOSSSign({StorageSource:1});
       // if (res.Ret === 200) {
         // this.handleUploadToOSS(e.file, res.Data);
       // }