@smart100/spu-web-plugin 1.0.0 → 1.0.4

package/src/nativeApi.ts

@@ -1,12 +1,9 @@
-import { globalOptions, axios, getUser, Module } from './index'
-import { get, cloneDeep } from 'lodash-es'
-import login from './login'
-import { getIndextagSync } from './apaasSpuTrack'
+import { getUser } from './login'
 import core from './core'
 
 class NativeApi {
   // 已经注入api的或者不同域的就不再注入
-  checkIsCanInject (iframe: any) {
+  checkIsCanInject(iframe: any) {
     try {
       return !iframe?.contentWindow?.Module || !!iframe?.contentWindow?.Module
     } catch (err) {
@@ -16,16 +13,16 @@ class NativeApi {
     }
   }
 
-  injectApi (iframe: any, options: any) {
+  injectApi(iframe: any, options: any) {
     const modulekey = options.modulekey
     // const modulekey = 'demospu'
 
     const Module = {
       spuContainerType: '',
-      getContextSync () {
+      getContextSync() {
         return core.getContextSync(modulekey)
       },
-      getIndextagSync: getIndextagSync,
+      getIndextagSync: core.getIndextagSync.bind(core),
       checkPermission: core.checkPermission.bind(core),
       linkToPage: window?.Module?.linkToPage,
       linkToModule: window?.Module?.linkToModule,
@@ -39,7 +36,7 @@ class NativeApi {
     }
 
     const aPaaS = {
-      getUserInfoSync: login.getUser.bind(login),
+      getUserInfoSync: getUser,
       getToken: window?.aPaaS?.getToken
     }
 
@@ -48,7 +45,7 @@ class NativeApi {
     iframe.contentWindow.aPaaS = aPaaS
   }
 
-  inject (iframe: any, options: any) {
+  inject(iframe: any, options: any) {
     if (this.checkIsCanInject(iframe) && options?.modulekey) {
       this.injectApi(iframe, options)
     }

package/src/oss/OSSClient.ts

@@ -0,0 +1,20 @@
+import OSS from '../package/ali-oss/aliyun-oss-sdk.apaas.min.js'
+// const OSS = require('../package/ali-oss/aliyun-oss-sdk.apaas.min.js')
+
+import ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js'
+// const ObsClient = require('../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js')
+
+// import '../package/aws-sdk/aws-sdk.min.js'
+import 'aws-sdk/dist/aws-sdk.min.js'
+// var S3 = require('aws-sdk/clients/s3')
+// import S3 from 'aws-sdk/clients/s3'
+// import S3 from 'aws-sdk'
+// import S3 from 'aws-sdk/dist/aws-sdk.js'
+// import * as S3 from 'aws-sdk/dist/aws-sdk.js'
+// import AWS from '../package/aws-sdk/aws-sdk.min.js'
+// import * as AWS from 'aws-sdk'
+
+const AliClient = OSS
+const S3Client = window?.AWS?.S3
+
+export { AliClient, ObsClient, S3Client }

package/src/oss/downloadService.ts

@@ -1,16 +1,9 @@
-import OSS from '../package/ali-oss/aliyun-oss-sdk.apaas.min.js'
-// import * as OSS from '../package/ali-oss/aliyun-oss-sdk.apaas.min.js'
-// const OSS = require('../package/ali-oss/aliyun-oss-sdk.apaas.min.js')
-import ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js'
-// import * as ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js'
-// const ObsClient = require('../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js')
-
-import 'aws-sdk/dist/aws-sdk.min.js'
-
+import { AliClient, ObsClient, S3Client } from './OSSClient'
 import dayjs from 'dayjs'
 import cloudServ from '../cloudServ'
 import { initServToken } from './servtoken'
-import { axios, getUser } from '../index'
+import { axios } from '../axios'
+import { getUser } from '../login'
 // import { get } from 'lodash-es'
 // import qs from 'qs'
 
@@ -22,8 +15,6 @@ import { axios, getUser } from '../index'
 //   return path.split('/')
 // }
 
-// console.log(OSS)
-// debugger
 const getContentType = (suffix: string) => {
   const map: IAny = {
     '.jpg': 'image/jpeg',
@@ -68,61 +59,65 @@ const isIpUrl = (url: string) => {
 //   }
 // }
 
-type Cope = { width?: number, height?: number } | string | boolean
+type Cope = { width?: number | string; height?: number | string } | string | boolean
 
-interface IDownload {
-  type?: 'att' | 'img',
-  source: string,
-  datetime: string | number,
-  storagetype?: StorageType,
-  cope?: Cope,
-  filename?: string, // 下载文件名
-}
-
-
-const getNormalizeAliOssCopeMinio = (cope?: Cope) => {
-  let copeObj = ''
+const getAliyunCope = (cope?: Cope) => {
+  let str = ''
   if (cope) {
     if (cope === true) {
-      copeObj = 'image/resize,m_fixed,w_100,h_100'
+      str = 'image/resize,m_fixed,w_100,h_100'
     } else if (typeof cope === 'string') {
-      // 'image/resize,m_fixed,w_100,h_100'
-      copeObj = cope
+      str = cope
     } else if (cope.width || cope.height) {
-      copeObj = 'image/resize,m_fixed'
-      if (cope.width && !cope.height) {
-        copeObj += `,w_${cope.width},h_${cope.width}`
-      } else if (cope.height && !cope.width) {
-        copeObj += `,w_${cope.height},h_${cope.height}`
-      } else if (cope.width && cope.height) {
-        copeObj += `,w_${cope.width},h_${cope.height}`
+      str = 'image/resize,m_fixed'
+      if (cope.width) {
+        const width = String(cope.width).replace('px', '')
+        str += `,w_${width}`
+      }
+      if (cope.height) {
+        const height = String(cope.height).replace('px', '')
+        str += `,h_${height}`
       }
     }
   }
-  return copeObj
+  return str
 }
 
-const getNormalizeAliOssCope = (cope?: Cope) => {
-  let copeObj = ''
+const getCope = (cope?: Cope) => {
+  let str = ''
   if (cope) {
     if (cope === true) {
-      copeObj = 'image/resize,m_fixed,w_100,h_100'
+      str = 'image/resize,m_fixed,w_100,h_100'
     } else if (typeof cope === 'string') {
-      // 'image/resize,m_fixed,w_100,h_100'
-      copeObj = cope
+      str = cope
     } else if (cope.width || cope.height) {
-      copeObj = 'image/resize,m_fixed'
-      if (cope.width) {
-        copeObj += `,w_${cope.width}`
-      }
-      if (cope.height) {
-        copeObj += `,h_${cope.height}`
+      str = 'image/resize,m_fixed'
+      let width = ''
+      let height = ''
+      if (cope.width && !cope.height) {
+        width = String(cope.width).replace('px', '')
+        height = width
+      } else if (cope.height && !cope.width) {
+        height = String(cope.height).replace('px', '')
+        width = height
+      } else if (cope.width && cope.height) {
+        width = String(cope.width).replace('px', '')
+        height = String(cope.height).replace('px', '')
       }
+      str += `,w_${width},h_${height}`
     }
   }
-  return copeObj
+  return str
 }
 
+interface IDownload {
+  type?: 'att' | 'img'
+  source: string
+  datetime: string | number
+  storagetype?: StorageType
+  cope?: Cope
+  filename?: string // 下载文件名
+}
 
 // 根据文件信息最后生成一个云文件服务可以用的链接http://xxxxx.xxx.jpg
 const getUrl = async ({
@@ -144,15 +139,16 @@ const getUrl = async ({
   if (!filename) {
     filename = source
   }
-  const isAbsoluteUrl = !!source.match(/\/att\//) || !!source.match(/\/img\//) || !!source.match(/att\//) || !!source.match(/img\//)
+  const isAbsoluteUrl =
+    !!source.match(/\/att\//) || !!source.match(/\/img\//) || !!source.match(/att\//) || !!source.match(/img\//)
   const suffix = filename.slice(filename.lastIndexOf('.'))
   const date = dayjs(+datetime).format('YYYYMMDD')
   let objectKey = isAbsoluteUrl ? source : `${source.slice(0, 3)}/${type}/${date}/${tenantCode}/${source}`
-  const copeObj = provider?.isMinio ? getNormalizeAliOssCopeMinio(cope) : getNormalizeAliOssCope(cope)
+  const copeStr = provider?.isAliyun ? getAliyunCope(cope) : getCope(cope)
   const contentType = getContentType(suffix)
 
   if (provider?.isAliyun) {
-    const ossClient = new OSS({
+    const ossClient = new AliClient({
       // region: storageConfig.cloudserv_storage_storageendpoint,
       endpoint: storageConfig.cloudserv_storage_storageendpoint,
       accessKeyId: servToken.accesskeyid,
@@ -173,7 +169,7 @@ const getUrl = async ({
 
     const ossUrl = ossClient.signatureUrl(objectKey, {
       response: responseHeader,
-      process: copeObj
+      process: copeStr
     })
 
     // // 假阿里云会自动拼cloudserv_storage_storagebucket，这里要去掉
@@ -203,9 +199,9 @@ const getUrl = async ({
         // Expires: 3600,
         // Headers: headers
       }
-      if (contentType.startsWith('image') && copeObj) {
+      if (contentType.startsWith('image') && copeStr) {
         Params.QueryParams = {
-          'x-image-process': copeObj
+          'x-image-process': copeStr
         }
       }
       const res = obs.createSignedUrlSync(Params)
@@ -220,7 +216,6 @@ const getUrl = async ({
       throw Error(e)
     }
   } else if (provider?.isMinio) {
-    const S3 = window?.AWS?.S3
     const s3Params: IAny = {
       accessKeyId: servToken.accesskeyid,
       secretAccessKey: servToken.accesskeysecret,
@@ -233,7 +228,7 @@ const getUrl = async ({
     if (provider?.isMinio || isIpUrl(storageConfig.cloudserv_storage_storageurl)) {
       s3Params.s3ForcePathStyle = true
     }
-    const s3 = new S3(s3Params)
+    const s3 = new S3Client(s3Params)
 
     // awss3缩略图没方案处理
     const params = {
@@ -249,8 +244,8 @@ const getUrl = async ({
             console.error(err)
             reject(new Error(err))
           } else {
-            if (provider?.isMinio && copeObj) {
-              data = `${data}&x-oss-process=${copeObj}`
+            if (provider?.isMinio && copeStr) {
+              data = `${data}&x-oss-process=${copeStr}`
               // data = `${data}&x-oss-process=image/resize,m_fixed,w_100,h_`
             }
             resolve(data)
@@ -268,7 +263,6 @@ const getUrl = async ({
   }
 }
 
-
 const downloadFileByUrl = (url: string, filename: string) => {
   const aElm = document.createElement('a')
   aElm.innerHTML = filename
@@ -303,13 +297,16 @@ const downloadFile = async ({
   cope = '',
   filename = ''
 }: IDownload) => {
-
   if (!filename) {
     filename = source
   }
 
   const suffix = filename.slice(filename.lastIndexOf('.'))
-  const realFilename = filename.replace(suffix, '') + dayjs(+datetime).format('_YYYYMMDDHHmmssS') + String(Math.floor(Math.random() * 9000) + 1000) + suffix
+  const realFilename =
+    filename.replace(suffix, '') +
+    dayjs(+datetime).format('_YYYYMMDDHHmmssS') +
+    String(Math.floor(Math.random() * 9000) + 1000) +
+    suffix
 
   // console.log(filename)
   const url = await getUrl({
@@ -337,18 +334,21 @@ const downloadFile = async ({
   if (provider?.isAliyun) {
     downloadFileByUrl(url, filename)
   } else {
-    axios.get(url, {
-      responseType: 'blob',
-      isSendToken: false,
-      isShowErrorMessage: false
-    }).then((response: any) => {
-      // console.log(response)
-      // debugger
-      downloadFileByBlob(response.data, filename)
-    }).catch((e: any) => {
-      console.log(e)
-      throw Error(e)
-    })
+    axios
+      .get(url, {
+        responseType: 'blob',
+        isSendToken: false,
+        isShowErrorMessage: false
+      })
+      .then((response: any) => {
+        // console.log(response)
+        // debugger
+        downloadFileByBlob(response.data, filename)
+      })
+      .catch((e: any) => {
+        console.log(e)
+        throw Error(e)
+      })
   }
 }
 

package/src/oss/index.ts

@@ -1,8 +1,4 @@
-
 import downloadService from './downloadService'
 import uploadService from './uploadService'
 
-export {
-  downloadService,
-  uploadService
-}
+export { downloadService, uploadService }

package/src/oss/multiUpload.ts

@@ -90,7 +90,7 @@ export const obsMultiUpload = async (obs: any, file: File | Blob, options: IMult
   }
 }
 
-const executeTasks = async <T> (tasks: Array<ITask<T>>, parallel = 3): Promise<Array<T>> => {
+const executeTasks = async <T>(tasks: Array<ITask<T>>, parallel = 3): Promise<Array<T>> => {
   return new Promise((resolve, reject) => {
     const todos = tasks.slice(0, parallel)
     const pendings = tasks.slice(parallel)
@@ -109,9 +109,12 @@ const executeTasks = async <T> (tasks: Array<ITask<T>>, parallel = 3): Promise<A
       const todoIndex = tasks.findIndex((task) => {
         return task === todo
       })
-      return todo && todo()
-        .then((todoRes) => dealPending(todoRes, todoIndex))
-        .catch(reject)
+      return (
+        todo &&
+        todo()
+          .then((todoRes) => dealPending(todoRes, todoIndex))
+          .catch(reject)
+      )
     }
     if (!pendings.length) {
       const running = todos.map((todo) => {

package/src/oss/servtoken.ts

@@ -1,5 +1,4 @@
-// import { noBaseRequest } from '@/service/http'
-import { axios } from '../index'
+import { axios } from '../axios'
 
 export type ServToken = {
   accesskeyid: string
@@ -21,7 +20,7 @@ let xhr: Promise<ServToken> | null = null
 
 const getServToken = async () => {
   try {
-    const response: ServToken = await axios.get('/api/teapi/auth/servtoken', {}).then((res: any) => res.data)
+    const response: ServToken = await axios.get('/api/teapi/auth/servtoken').then((res: any) => res.data)
     // debugger
     return response
   } catch (e) {
@@ -71,8 +70,6 @@ export const initServToken = () => {
           .catch(() => {
             xhr = null
             isGetting = false
-            // return null
-            // eslint-disable-next-line prefer-promise-reject-errors
             reject(null)
           })
       } else {
@@ -82,50 +79,3 @@ export const initServToken = () => {
     }
   })
 }
-
-
-
-
-
-
-
-
-
-// // let last = 0
-// // let servtoken
-// let isRequesting = false
-// const getServToken = function () {
-//   let servtoken = wx.getStorageSync('servtoken')
-//   let last
-//   if (servtoken) {
-//     last = new Date(servtoken.expiration).getTime()
-//   }
-//   const now = Date.now()
-//   if (!servtoken || (last - now < (1000 * 60 * 5))) {
-//     wx.removeStorageSync('servtoken')
-//     if (!isRequesting) {
-//       isRequesting = true
-//       return request({
-//         url: `${api.HOST}/api/teapi/auth/servtoken`,
-//         method: 'get',
-//         isShowLoading: false
-//       }).then((res) => {
-//         wx.setStorageSync('servtoken', res.data.resp_data)
-//         isRequesting = false
-//         return res.data.resp_data
-//       })
-//     } else {
-//       return new Promise((resolve, reject) => {
-//         const fn = setInterval(() => {
-//           let servtoken = wx.getStorageSync('servtoken')
-//           if (servtoken) {
-//             resolve(servtoken)
-//             clearInterval(fn)
-//           }
-//         }, 200)
-//       })
-//     }
-//   } else {
-//     return Promise.resolve(servtoken)
-//   }
-// }

package/src/oss/uploadService.ts

@@ -1,35 +1,19 @@
-import OSS from '../package/ali-oss/aliyun-oss-sdk.apaas.min.js'
-// const OSS = require('../package/ali-oss/aliyun-oss-sdk.apaas.min.js')
-
-import ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js'
-// const ObsClient = require('../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js')
-
-// import '../package/aws-sdk/aws-sdk.min.js'
-import 'aws-sdk/dist/aws-sdk.min.js'
-// var S3 = require('aws-sdk/clients/s3')
-// import S3 from 'aws-sdk/clients/s3'
-// import S3 from 'aws-sdk'
-// import S3 from 'aws-sdk/dist/aws-sdk.js'
-// import * as S3 from 'aws-sdk/dist/aws-sdk.js'
-// import AWS from '../package/aws-sdk/aws-sdk.min.js'
-// import * as AWS from 'aws-sdk'
-
+import { AliClient, ObsClient, S3Client } from './OSSClient'
 import { v4 as uuidv4 } from 'uuid'
 import dayjs from 'dayjs'
 import co from 'co'
 
-import { getUser } from '../index'
+import { getUser } from '../login'
 import cloudServ from '../cloudServ'
 import { initServToken } from './servtoken'
 import { obsMultiUpload } from './multiUpload'
 
-
 interface IUpload {
-  type?: 'att' | 'img',
-  file: File,
-  source?: string,
-  datetime?: string | number,
-  storagetype?: StorageType,
+  type?: 'att' | 'img'
+  file: File
+  source?: string
+  datetime?: string | number
+  storagetype?: StorageType
   onprogress?: (p: number, _checkpoint?: IAny) => void
 }
 
@@ -39,7 +23,7 @@ const upload = async ({
   source = '',
   datetime = '',
   storagetype = 'storage',
-  onprogress,
+  onprogress
 }: IUpload) => {
   if (!file) throw Error('请传入文件')
   const storageConfig = cloudServ.get(storagetype)
@@ -50,10 +34,10 @@ const upload = async ({
   const provider = cloudServ.getProvider(storagetype)
   const tenantCode = getUser('tenantcode')
   const suffix = '.' + file.name.substring(file.name.lastIndexOf('.') + 1)
-  source = source ? source : (uuidv4() + suffix)
+  source = source ? source : uuidv4() + suffix
   datetime = datetime ? datetime : Date.now()
   const date = dayjs(+datetime).format('YYYYMMDD')
-  const objectKey = `${source.slice(0, 3)}/${type}/${date}/${tenantCode}/${source}`
+  const osskey = `${source.slice(0, 3)}/${type}/${date}/${tenantCode}/${source}`
 
   // console.log(file)
   // console.log(source)
@@ -63,7 +47,7 @@ const upload = async ({
   // debugger
   const promise = new Promise(async (resolve, reject) => {
     if (provider?.isAliyun) {
-      const ossClient = new OSS({
+      const ossClient = new AliClient({
         // region: storageConfig.cloudserv_storage_storageendpoint,
         endpoint: storageConfig.cloudserv_storage_storageendpoint,
         accessKeyId: servToken.accesskeyid,
@@ -73,7 +57,7 @@ const upload = async ({
         secure: true
       })
       co(function* () {
-        yield ossClient.multipartUpload(objectKey, file, {
+        yield ossClient.multipartUpload(osskey, file, {
           headers: {
             'Content-Disposition': 'filename="' + (file.name && encodeURIComponent(file.name)) // 阿里云提供的下载名字
           },
@@ -87,6 +71,7 @@ const upload = async ({
                 type: file.type,
                 date: date,
                 datetime: datetime,
+                storage: storagetype,
                 file
               })
             }
@@ -97,59 +82,56 @@ const upload = async ({
         reject(error)
       })
     } else if (provider?.isHuawei) {
-        const obs = new ObsClient({
-          access_key_id: servToken.accesskeyid,
-          secret_access_key: servToken.accesskeysecret,
-          server: storageConfig.cloudserv_storage_storageendpoint,
-          security_token: servToken.securitytoken
+      const obs = new ObsClient({
+        access_key_id: servToken.accesskeyid,
+        secret_access_key: servToken.accesskeysecret,
+        server: storageConfig.cloudserv_storage_storageendpoint,
+        security_token: servToken.securitytoken
+      })
+      // const obs = new ObsClient({
+      //   access_key_id: '75ISL4GWAOOO1USWUMRG',
+      //   secret_access_key: 'srn6eJ1BpFbjxoFrJgiQjeS65Z3eKC3rnqeyBBlL',
+      //   server: storageConfig.cloudserv_storage_storageendpoint,
+      //   security_token: 'gQ5jbi1zb3V0aHdlc3QtMogAsKjYcI5CQldRAvQQJysdkZ7tAt6arLsoWHFGCaco8s8FPk6wtbslHWhvg2SZh3QMM4aUA4FhPEWQt9A7gXoC_Lh4DpF6hhHIxUyACKgakNHNPdPegy5G9-sibBXkGueIY1X3K12tzpjbyd08esLKEEu-M_QmfDoDdkgOcyidITc-lOg5EzXb27f91Ym26u2mAMTaNjCLRulJ4rziLSW6IAprSx8LUkuQQE-wUz-tMzVL9oFiVykHz980o0Y0CNdCIwn98Y-xbMdslZ3U8raydy6Wnf2LchXc0ajvMix0gg-CV0tpA4cgiZFqPxwEDXSv42hvfccboWlpGmOVR3llHLUirrlgFod8rhm-Rmk6MIfQw4NA8rddow1Gx6g-MugFV5arMDLfsOhqeSFQRJWizb3q50zk6GcUFulewitxP8HSkXMGt_rDDYCcCEmdu15D3imX5431Mbdt0qCgxH80OPCDmFXw0xMOsggxE0PBVexVY2x3wHGeql3JNyevUZAhqlskNNu77ui2Vnp-ZbHMcxgDLcPuAULINId4V_QGdhAkDaxQk53AE237DAFXtlyWWaBRMsTNVnpq9mCXJup9pdBbjLRVAO4OxfYVnwwvl-w_mb-xCgOf5EPHqA_zbZF8z-ad6JjWgLOQCHaawE7kNGHIQwAgzneik33wP2jPlG1ak9KEWyXr1n2QMJCmDM3bIrRit5_8LLFoPjXcwurBjZ-AomM_ztOe34sdr357atlQcPD7a2xWtrvn9mnqqndg12m7QxnwkmJsOYK4ZO5Hoyb2vd_NX2Nd9PaSIVAcFw=='
+      // })
+      try {
+        const uploadRes = await obsMultiUpload(obs, file, {
+          bucket: storageConfig.cloudserv_storage_storagebucket,
+          key: osskey,
+          parallel: 3,
+          onProgress: (percent: number) => {
+            onprogress && onprogress(percent)
+          }
         })
-        // const obs = new ObsClient({
-        //   access_key_id: '75ISL4GWAOOO1USWUMRG',
-        //   secret_access_key: 'srn6eJ1BpFbjxoFrJgiQjeS65Z3eKC3rnqeyBBlL',
-        //   server: storageConfig.cloudserv_storage_storageendpoint,
-        //   security_token: 'gQ5jbi1zb3V0aHdlc3QtMogAsKjYcI5CQldRAvQQJysdkZ7tAt6arLsoWHFGCaco8s8FPk6wtbslHWhvg2SZh3QMM4aUA4FhPEWQt9A7gXoC_Lh4DpF6hhHIxUyACKgakNHNPdPegy5G9-sibBXkGueIY1X3K12tzpjbyd08esLKEEu-M_QmfDoDdkgOcyidITc-lOg5EzXb27f91Ym26u2mAMTaNjCLRulJ4rziLSW6IAprSx8LUkuQQE-wUz-tMzVL9oFiVykHz980o0Y0CNdCIwn98Y-xbMdslZ3U8raydy6Wnf2LchXc0ajvMix0gg-CV0tpA4cgiZFqPxwEDXSv42hvfccboWlpGmOVR3llHLUirrlgFod8rhm-Rmk6MIfQw4NA8rddow1Gx6g-MugFV5arMDLfsOhqeSFQRJWizb3q50zk6GcUFulewitxP8HSkXMGt_rDDYCcCEmdu15D3imX5431Mbdt0qCgxH80OPCDmFXw0xMOsggxE0PBVexVY2x3wHGeql3JNyevUZAhqlskNNu77ui2Vnp-ZbHMcxgDLcPuAULINId4V_QGdhAkDaxQk53AE237DAFXtlyWWaBRMsTNVnpq9mCXJup9pdBbjLRVAO4OxfYVnwwvl-w_mb-xCgOf5EPHqA_zbZF8z-ad6JjWgLOQCHaawE7kNGHIQwAgzneik33wP2jPlG1ak9KEWyXr1n2QMJCmDM3bIrRit5_8LLFoPjXcwurBjZ-AomM_ztOe34sdr357atlQcPD7a2xWtrvn9mnqqndg12m7QxnwkmJsOYK4ZO5Hoyb2vd_NX2Nd9PaSIVAcFw=='
-        // })
-        try {
-          const uploadRes = await obsMultiUpload(obs, file, {
-            bucket: storageConfig.cloudserv_storage_storagebucket,
-            key: objectKey,
-            parallel: 3,
-            onProgress: (percent: number) => {
-              onprogress && onprogress(percent)
-            }
+        if (uploadRes) {
+          resolve({
+            source,
+            filename: file.name,
+            type: file.type,
+            date: date,
+            datetime: datetime,
+            storage: storagetype,
+            file
           })
-          if (uploadRes) {
-            resolve({
-              source,
-              filename: file.name,
-              type: file.type,
-              date: date,
-              datetime: datetime,
-              file
-            })
-          }
-        } catch (e) {
-          console.error(e)
-          reject(e)
         }
-        // obs.putObject({
-        //   Bucket: cloudServ.cloudserv_storage_storagebucket,
-        //   Key: objectKey,
-        //   SourceFile: file
-        // }, (err, result) => {
-        //   result.CommonMsg.Status
-        //   console.error(err)
-        //   console.log(result)
-        //   debugger
-        // })
+      } catch (e) {
+        console.error(e)
+        reject(e)
+      }
+      // obs.putObject({
+      //   Bucket: cloudServ.cloudserv_storage_storagebucket,
+      //   Key: osskey,
+      //   SourceFile: file
+      // }, (err, result) => {
+      //   result.CommonMsg.Status
+      //   console.error(err)
+      //   console.log(result)
+      //   debugger
+      // })
     } else if (provider?.isMinio || provider?.isAwss3) {
-      // console.error(9874)
-      // console.log(S3)
-      // console.log(window.AWS)
-      const S3 = window?.AWS?.S3
       // debugger
       // debugger
-      const s3 = new S3({
+      const s3 = new S3Client({
         accessKeyId: servToken.accesskeyid,
         secretAccessKey: servToken.accesskeysecret,
         sessionToken: servToken.securitytoken,
@@ -160,13 +142,15 @@ const upload = async ({
       })
       const params = {
         Bucket: storageConfig.cloudserv_storage_storagebucket,
-        Key: objectKey,
+        Key: osskey,
         Body: file
       }
       const upload = s3.upload(params, {}).on('httpUploadProgress', (e: any) => {
         const precent: any = parseInt(e.loaded, 10) / parseInt(e.total, 10)
-        // console.log('httpUploadProgress', e)
-        onprogress && onprogress(precent.toFixed(2))
+        // console.log('httpUploadProgress')
+        // console.log(e)
+        // console.log(precent)
+        onprogress && onprogress(precent)
       })
       upload.send((err: any, data: any) => {
         if (err) {
@@ -174,11 +158,13 @@ const upload = async ({
           reject(err)
         } else {
           resolve({
+            key: osskey,
             source,
             filename: file.name,
             type: file.type,
             date: date,
             datetime: datetime,
+            storage: storagetype,
             file
           })
         }