@smart100/spu-web-plugin 0.0.36 → 0.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",
@@ -39,6 +39,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@smart100/wxworksuite-plugin": "^0.0.12",
+    "aws-sdk": "^2.1692.0",
     "axios": "^1.6.0",
     "co": "^4.6.0",
     "dayjs": "^1.11.10",

package/src/axios.ts

@@ -9,6 +9,7 @@ import { get } from 'lodash-es'
 import { loadding } from './components/loadding'
 import login from './login'
 import core from './core'
+import urlquery from './urlquery'
 
 interface Response {
   code: number | string
@@ -67,6 +68,13 @@ const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
       }
     }
 
+    // 平台的业务接口开了开发者模式后，header带上debug方便查看接口的ide日志
+    if (type !== 'spu' && urlquery.isdebugger && config.url.indexOf('api/teapi/dy-biz/') > -1) {
+      if (config?.headers) {
+        config.headers.debug = 'true'
+      }
+    }
+
     return config
   }, error => {
     return Promise.reject(error)

package/src/cloudServ.ts

@@ -30,38 +30,23 @@ class CloudServ {
     lsProxy.removeItem(this.CLOUD_SERVE_KEY)
   }
 
-  private getProvider (sign: StorageType = 'storage') {
+  public getProvider (sign: StorageType = 'storage'): IAny | null {
     const storage: NormalizedCloudServItem | null = this.get(sign)
     if (!storage) {
-      return false
+      return null
+    }
+    const name = storage.cloudserv_storage_provider
+    return {
+      name: name,
+      isAliyun: name === 'aliyun',
+      isAzure: name === 'azure',
+      isAwss3: name === 'awss3',
+      isHuawei: name === 'huawei',
+      isMinio: name === 'minio'
     }
-    return storage.cloudserv_storage_provider
-  }
-
-
-  public isAliyun (sign: StorageType = 'storage') {
-    return this.getProvider(sign) === 'aliyun'
-  }
-
-  public isAzure (sign: StorageType = 'storage') {
-    return this.getProvider(sign) === 'azure'
-  }
-
-  public isAwss3 (sign: StorageType = 'storage') {
-    return this.getProvider(sign) === 'awss3'
-  }
-
-  public isHuawei (sign: StorageType = 'storage') {
-    return this.getProvider(sign) === 'huawei'
   }
 }
 
-export default new CloudServ()
-
-
-
-
-
-
-
+const cloudServ = new CloudServ()
 
+export default cloudServ

package/src/index.ts

@@ -9,7 +9,7 @@ import { initAxios, spuAxios, axios } from './axios'
 import { initSpuConfig, spuConfig } from './spuConfig'
 import { globalConfig } from './globalConfig'
 import { downloadService, uploadService } from './oss'
-import { getUniqueid, functionCheck, setTitle, getSpuContainerType, isInApp } from './utils'
+import { getUniqueid, functionCheck, setTitle, getSpuContainerType, isInApp, isdebugger, isvirtuallocation } from './utils'
 import urlquery from './urlquery'
 import AMapLoader from './AMapLoader'
 import login from './login'
@@ -39,6 +39,8 @@ const globalOptions: any = {
 
 const install = (app: any, options: any) => {
 
+  initStorageProxy(globalOptions)
+
   urlquery.init()
 
   // console.log(app)
@@ -49,7 +51,7 @@ const install = (app: any, options: any) => {
   console.log('@smart100/spu-web-plugin globalOptions: ', globalOptions)
   // setTimeout(() => {
   //   console.error('test888')
-  // }, 1000)
+  // }, 5000)
 
   // if (install.installed) return
   // install.installed = true
@@ -65,7 +67,6 @@ const install = (app: any, options: any) => {
   //   console.error('This plugin requires Vue App Instance')
   // }
 
-  initStorageProxy(globalOptions)
   initAxios(globalOptions)
   initSpuConfig(globalOptions)
 
@@ -141,8 +142,6 @@ const wxworkSuite = {
   isWxworkApp
 }
 
-
-
 const Module = {
   getModuleData: core.getModuleData.bind(core),
   getEnvname: login.getEnvname.bind(login),
@@ -153,6 +152,8 @@ const Module = {
 }
 
 
+
+
 export {
   SPUWebPlugin as default,
   globalOptions,
@@ -183,5 +184,7 @@ export {
   Module,
   components,
   expandexp,
-  wxworkSuite
+  wxworkSuite,
+  isdebugger,
+  isvirtuallocation
 }

package/src/login.ts

@@ -329,7 +329,7 @@ class Login {
     let loginRole: 'center' | 'tenant' = 'tenant' // center | tenant
     if (token) {
       const jwtInfo = this.jwtDecode(token)
-      if (jwtInfo?.LoginUser?.centerRole || jwtInfo?.LoginUser?.appId === '100') {
+      if (jwtInfo?.LoginUser?.centerRole) {
         // 产品运营中心登录
         loginRole = 'center'
       }

package/src/oss/downloadService.ts

@@ -5,8 +5,10 @@ import ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.
 // 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 dayjs from 'dayjs'
-import CloudServ from '../cloudServ'
+import cloudServ from '../cloudServ'
 import { initServToken } from './servtoken'
 import { axios, getUser } from '../index'
 // import { get } from 'lodash-es'
@@ -33,6 +35,13 @@ const getContentType = (suffix: string) => {
   return map[suffix.toLowerCase()] || ''
 }
 
+// 如果url是ip则返回true，是域名则返回false
+const isIpUrl = (url: string) => {
+  // 匹配ip的正则表达式
+  const reg = /((\w+):\/\/)?(\d+)\.(\d+)\.(\d+)\.(\d+)/
+  return reg.test(url)
+}
+
 // interface UrlInfo {
 //   [propName: string]: {
 //     url: string
@@ -71,6 +80,28 @@ interface IDownload {
 }
 
 
+const getNormalizeAliOssCopeMinio = (cope?: Cope) => {
+  let copeObj = ''
+  if (cope) {
+    if (cope === true) {
+      copeObj = 'image/resize,m_fixed,w_100,h_100'
+    } else if (typeof cope === 'string') {
+      // 'image/resize,m_fixed,w_100,h_100'
+      copeObj = 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}`
+      }
+    }
+  }
+  return copeObj
+}
+
 const getNormalizeAliOssCope = (cope?: Cope) => {
   let copeObj = ''
   if (cope) {
@@ -92,6 +123,7 @@ const getNormalizeAliOssCope = (cope?: Cope) => {
   return copeObj
 }
 
+
 // 根据文件信息最后生成一个云文件服务可以用的链接http://xxxxx.xxx.jpg
 const getUrl = async ({
   type = 'img',
@@ -101,14 +133,13 @@ const getUrl = async ({
   storagetype = 'storage',
   cope = ''
 }: IDownload) => {
-  const cloudServStorage = CloudServ.get(storagetype)
-  if (!cloudServStorage) throw Error('无可用存储设置')
+  const storageConfig = cloudServ.get(storagetype)
+  if (!storageConfig) throw Error('无可用存储设置')
   const servToken = await initServToken()
   if (!servToken) throw Error('无可用servToken')
 
-  const isAliYun = CloudServ.isAliyun(storagetype)
-  const isHuawei = CloudServ.isHuawei(storagetype)
   const tenantCode = getUser('tenantcode')
+  const provider = cloudServ.getProvider(storagetype)
 
   if (!filename) {
     filename = source
@@ -117,17 +148,17 @@ const getUrl = async ({
   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 = getNormalizeAliOssCope(cope)
+  const copeObj = provider?.isMinio ? getNormalizeAliOssCopeMinio(cope) : getNormalizeAliOssCope(cope)
   const contentType = getContentType(suffix)
 
-  if (isAliYun) {
+  if (provider?.isAliyun) {
     const ossClient = new OSS({
-      // region: cloudServ.cloudserv_storage_storageendpoint,
-      endpoint: cloudServStorage.cloudserv_storage_storageendpoint,
+      // region: storageConfig.cloudserv_storage_storageendpoint,
+      endpoint: storageConfig.cloudserv_storage_storageendpoint,
       accessKeyId: servToken.accesskeyid,
       accessKeySecret: servToken.accesskeysecret,
       stsToken: servToken.securitytoken,
-      bucket: cloudServStorage.cloudserv_storage_storagebucket,
+      bucket: storageConfig.cloudserv_storage_storagebucket,
       secure: true
     })
 
@@ -152,11 +183,11 @@ const getUrl = async ({
     // }
 
     return ossUrl
-  } else if (isHuawei) {
+  } else if (provider?.isHuawei) {
     const obs = new ObsClient({
       access_key_id: servToken.accesskeyid,
       secret_access_key: servToken.accesskeysecret,
-      server: cloudServStorage.cloudserv_storage_storageendpoint,
+      server: storageConfig.cloudserv_storage_storageendpoint,
       security_token: servToken.securitytoken
     })
     // 修复地址里面有//就不能下载了
@@ -166,7 +197,7 @@ const getUrl = async ({
     try {
       const Params: IAny = {
         // Method: 'get',
-        Bucket: cloudServStorage.cloudserv_storage_storagebucket,
+        Bucket: storageConfig.cloudserv_storage_storagebucket,
         Key: objectKey
         // Headers: responseHeader
         // Expires: 3600,
@@ -188,8 +219,52 @@ const getUrl = async ({
       console.error(e)
       throw Error(e)
     }
+  } else if (provider?.isMinio) {
+    const S3 = window?.AWS?.S3
+    const s3Params: IAny = {
+      accessKeyId: servToken.accesskeyid,
+      secretAccessKey: servToken.accesskeysecret,
+      sessionToken: servToken.securitytoken,
+      signatureVersion: 'v4',
+      endpoint: storageConfig.cloudserv_storage_storageendpoint,
+      region: storageConfig.cloudserv_storage_region
+    }
+    // minio和url为ip的需要将存储桶后置
+    if (provider?.isMinio || isIpUrl(storageConfig.cloudserv_storage_storageurl)) {
+      s3Params.s3ForcePathStyle = true
+    }
+    const s3 = new S3(s3Params)
+
+    // awss3缩略图没方案处理
+    const params = {
+      Expires: 60 * 60 * 24 * 7,
+      Bucket: storageConfig.cloudserv_storage_storagebucket,
+      Key: objectKey[0] === '/' ? objectKey.slice(1) : objectKey
+    }
+
+    const getSignedUrlPro = () => {
+      return new Promise((resolve, reject) => {
+        s3.getSignedUrl('getObject', params, (err: any, data: any) => {
+          if (err) {
+            console.error(err)
+            reject(new Error(err))
+          } else {
+            if (provider?.isMinio && copeObj) {
+              data = `${data}&x-oss-process=${copeObj}`
+              // data = `${data}&x-oss-process=image/resize,m_fixed,w_100,h_`
+            }
+            resolve(data)
+            console.log(data)
+          }
+        })
+      })
+    }
+
+    const signedUrl = await getSignedUrlPro()
+    // console.log(signedUrl)
+    return signedUrl
   } else {
-    throw Error('暂不支持非阿里云OSS/华为云OBS存储类型')
+    throw Error(`暂不支持${provider?.name}存储类型`)
   }
 }
 
@@ -258,9 +333,8 @@ const downloadFile = async ({
   //   throw Error(e)
   // })
 
-  const isAliYun = CloudServ.isAliyun(storagetype)
-  // const isHuawei = CloudServ.isHuawei(storagetype)
-  if (isAliYun) {
+  const provider = cloudServ.getProvider(storagetype)
+  if (provider?.isAliyun) {
     downloadFileByUrl(url, filename)
   } else {
     axios.get(url, {

package/src/oss/multiUpload.ts

@@ -1,17 +1,17 @@
 interface IMultiUploadOptions {
-    bucket: string
-    key: string
-    partSize?: number
-    parallel: number
-    onProgress?: (number: number) => void
+  bucket: string
+  key: string
+  partSize?: number
+  parallel: number
+  onProgress?: (number: number) => void
 }
 interface IUploadPartRes {
-    PartNumber: number
-    ETag: string
+  PartNumber: number
+  ETag: string
 }
 
 interface ITask<T> {
-    (): Promise<T>
+  (): Promise<T>
 }
 
 export const obsMultiUpload = async (obs: any, file: File | Blob, options: IMultiUploadOptions) => {
@@ -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)

package/src/oss/uploadService.ts

@@ -1,14 +1,25 @@
 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 { v4 as uuidv4 } from 'uuid'
 import dayjs from 'dayjs'
 import co from 'co'
 
 import { getUser } from '../index'
-import CloudServ from '../cloudServ'
+import cloudServ from '../cloudServ'
 import { initServToken } from './servtoken'
 import { obsMultiUpload } from './multiUpload'
 
@@ -31,13 +42,12 @@ const upload = async ({
   onprogress,
 }: IUpload) => {
   if (!file) throw Error('请传入文件')
-  const cloudServStorage = CloudServ.get(storagetype)
-  if (!cloudServStorage) throw Error('无可用存储设置')
+  const storageConfig = cloudServ.get(storagetype)
+  if (!storageConfig) throw Error('无可用存储设置')
   const servToken = await initServToken()
   if (!servToken) throw Error('无可用servToken')
 
-  const isAliYun = CloudServ.isAliyun(storagetype)
-  const isHuawei = CloudServ.isHuawei(storagetype)
+  const provider = cloudServ.getProvider(storagetype)
   const tenantCode = getUser('tenantcode')
   const suffix = '.' + file.name.substring(file.name.lastIndexOf('.') + 1)
   source = source ? source : (uuidv4() + suffix)
@@ -48,21 +58,20 @@ const upload = async ({
   // console.log(file)
   // console.log(source)
   // console.log(datetime)
+  // console.log(provider)
+  // console.log(storageConfig)
+  // debugger
   const promise = new Promise(async (resolve, reject) => {
-    if (isAliYun) {
+    if (provider?.isAliyun) {
       const ossClient = new OSS({
-        // region: cloudServ.cloudserv_storage_storageendpoint,
-        endpoint: cloudServStorage.cloudserv_storage_storageendpoint,
+        // region: storageConfig.cloudserv_storage_storageendpoint,
+        endpoint: storageConfig.cloudserv_storage_storageendpoint,
         accessKeyId: servToken.accesskeyid,
         accessKeySecret: servToken.accesskeysecret,
         stsToken: servToken.securitytoken,
-        bucket: cloudServStorage.cloudserv_storage_storagebucket,
+        bucket: storageConfig.cloudserv_storage_storagebucket,
         secure: true
       })
-      // promise.cancel = () => {
-      //   ossClient.cancel()
-      //   reject(new Error('Cancel'))
-      // }
       co(function* () {
         yield ossClient.multipartUpload(objectKey, file, {
           headers: {
@@ -87,22 +96,22 @@ const upload = async ({
         console.error(error)
         reject(error)
       })
-    } else if (isHuawei) {
+    } else if (provider?.isHuawei) {
         const obs = new ObsClient({
           access_key_id: servToken.accesskeyid,
           secret_access_key: servToken.accesskeysecret,
-          server: cloudServStorage.cloudserv_storage_storageendpoint,
+          server: storageConfig.cloudserv_storage_storageendpoint,
           security_token: servToken.securitytoken
         })
         // const obs = new ObsClient({
         //   access_key_id: '75ISL4GWAOOO1USWUMRG',
         //   secret_access_key: 'srn6eJ1BpFbjxoFrJgiQjeS65Z3eKC3rnqeyBBlL',
-        //   server: cloudServ.cloudserv_storage_storageendpoint,
+        //   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: cloudServStorage.cloudserv_storage_storagebucket,
+            bucket: storageConfig.cloudserv_storage_storagebucket,
             key: objectKey,
             parallel: 3,
             onProgress: (percent: number) => {
@@ -133,8 +142,49 @@ const upload = async ({
         //   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({
+        accessKeyId: servToken.accesskeyid,
+        secretAccessKey: servToken.accesskeysecret,
+        sessionToken: servToken.securitytoken,
+        region: storageConfig.cloudserv_storage_region,
+        endpoint: storageConfig.cloudserv_storage_storageendpoint,
+        signatureVersion: 'v4',
+        s3ForcePathStyle: provider?.isMinio ? true : undefined
+      })
+      const params = {
+        Bucket: storageConfig.cloudserv_storage_storagebucket,
+        Key: objectKey,
+        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))
+      })
+      upload.send((err: any, data: any) => {
+        if (err) {
+          console.error(err)
+          reject(err)
+        } else {
+          resolve({
+            source,
+            filename: file.name,
+            type: file.type,
+            date: date,
+            datetime: datetime,
+            file
+          })
+        }
+      })
     } else {
-      throw Error('暂不支持非阿里云OSS/华为云OBS存储类型')
+      throw Error(`暂不支持${provider?.name}存储类型`)
     }
   })
 

package/src/types/global.d.ts

@@ -51,3 +51,10 @@ interface ITenantInfo {
   cloudserv: ICloudServ
   productversionlist: IProductVersion[]
 }
+
+interface Window {
+  AWS: any;
+}
+
+declare module 'uuid'
+declare module 'co'

package/src/types/index.d.ts

@@ -96,3 +96,5 @@ export const Module: any
 export const components: any
 export const expandexp: (options: any) => void
 export const wxworkSuite: any
+export const isdebugger: () => boolean
+export const isvirtuallocation: () => boolean

package/src/urlquery.ts

@@ -54,4 +54,6 @@ class Urlquery {
   // }
 }
 
-export default new Urlquery()
+const urlquery = new Urlquery()
+
+export default urlquery

package/src/utils.ts

@@ -1,4 +1,5 @@
 import { getUser } from './index'
+import urlquery from './urlquery'
 
 const isIOS = () => {
   const ua = navigator.userAgent
@@ -61,11 +62,21 @@ const isInApp = (): boolean => {
   }
 }
 
+const isdebugger = (): boolean => {
+  return urlquery.isdebugger
+}
+
+const isvirtuallocation = (): boolean => {
+  return urlquery.isvirtuallocation
+}
+
 export {
   isIOS,
   getUniqueid,
   functionCheck,
   setTitle,
   getSpuContainerType,
-  isInApp
+  isInApp,
+  isdebugger,
+  isvirtuallocation
 }