@smart100/spu-web-plugin 1.0.25-beta.5 → 1.0.25-beta.7

package/src/core.js

@@ -1,5 +1,6 @@
 import { globalOptions } from './index'
-import { axios } from './axios'
+import { apaasAxios } from './axios'
+import { axiosCache } from './axiosCache'
 import { get, cloneDeep } from 'lodash-es'
 import { urlquery } from './urlquery'
 import { getToken, getUser, getRefreshToken, getTokenExpires } from './login'
@@ -83,16 +84,38 @@ class Core {
       // debugger
       let res
       try {
-        res = await axios.post(
-          `${smartcenter}/api/smartcenter/biz/getTenantWebAndApiDefined`,
+        // res = await apaasAxios.post(
+        //   `${smartcenter}/api/smartcenter/biz/getTenantWebAndApiDefined`,
+        //   {
+        //     envid: envId,
+        //     tenantcode: tenantCode
+        //   },
+        //   {
+        //     isShowLoading: false
+        //   }
+        // )
+        res = await axiosCache(
           {
-            envid: envId,
-            tenantcode: tenantCode
+            strategy: 'default',
+            async checkcachesave(res) {
+              // console.log(res)
+              // debugger
+              return Array.isArray(res?.data?.list)
+            }
           },
+          apaasAxios,
           {
-            isShowLoading: false
+            url: `${smartcenter}/api/smartcenter/biz/getTenantWebAndApiDefined`,
+            method: 'post',
+            isShowLoading: false,
+            data: {
+              envid: envId,
+              tenantcode: tenantCode
+            }
           }
         )
+        // console.log(res)
+        // debugger
       } catch (err) {
         console.error(err)
       }

package/src/envService.ts

@@ -1,6 +1,6 @@
 import { get, cloneDeep } from 'lodash-es'
 import { lsProxy } from './storageProxy'
-import { axios } from './axios'
+import { apaasAxios } from './axios'
 import { decrypt } from './crypt'
 import { toggleHttpOrHttps } from './utils'
 import { getData, setData, removeData } from './storageCache'
@@ -54,7 +54,7 @@ async function requestEnvdata(envName: string): Promise<IAny | null> {
         ? 'https://mconfig.xuantongkeji.com'
         : 'http://mconfig.xuantongkeji.com:8015'
     try {
-      const res = await axios.get(`${hostsRoot}/multiplatconfig/env/${envName}`, {
+      const res = await apaasAxios.get(`${hostsRoot}/multiplatconfig/env/${envName}`, {
         isShowLoading: false,
         isSendToken: false
       })

package/src/globalConfig.ts

@@ -1,4 +1,5 @@
-import { axios } from './axios'
+import { apaasAxios } from './axios'
+import { axiosCache } from './axiosCache'
 import { cloneDeep } from 'lodash-es'
 
 class GlobalConfig {
@@ -9,9 +10,28 @@ class GlobalConfig {
   public async getFun(): Promise<any> {
     if (!this.isload) {
       try {
-        const res = await axios.post('/api/pemission/rolepermission/globalconfig/getglobalconfigbytype', {
-          configtype: '1'
-        })
+        // const res = await apaasAxios.post(
+        //   '/api/pemission/rolepermission/globalconfig/getglobalconfigbytype',
+        //   {
+        //     configtype: '1'
+        //   }
+        // )
+        const res = await axiosCache(
+          {
+            strategy: 'default',
+            async checkcachesave(res: any) {
+              return !!(res.code === 200 && res.data)
+            }
+          },
+          apaasAxios,
+          {
+            url: '/api/pemission/rolepermission/globalconfig/getglobalconfigbytype',
+            method: 'post',
+            data: {
+              configtype: '1'
+            }
+          }
+        )
         // console.log(res)
         // debugger
         if (res.code === 200) {

package/src/index.ts

@@ -3,10 +3,12 @@ import { merge } from 'lodash-es'
 import { v4 as getUuid } from 'uuid'
 import { installStorageProxy, lsProxy, ssProxy } from './storageProxy'
 import { getLocation, getDistance, getAddress } from './map/index'
-import { installAxios, spuAxios, axios, decryptAxiosResponseData } from './axios'
+import { installAxios, spuAxios, apaasAxios, normalAxios, decryptAxiosResponseData } from './axios'
+import { installAxiosCache, axiosCache } from './axiosCache'
 import { installSpuConfig, spuConfig } from './spuConfig'
 import { globalConfig } from './globalConfig'
 import { downloadService, uploadService } from './oss'
+import { installOssCache } from './oss/cache'
 import { getServToken } from './oss/servtoken'
 import { getCloudServ } from './oss/cloudServ'
 import {
@@ -16,7 +18,8 @@ import {
   isInApp,
   isdebugger,
   isvirtuallocation,
-  getServerTime
+  getServerTime,
+  isOnline
 } from './utils'
 import { encrypt, decrypt } from './crypt'
 import { installUrlquery } from './urlquery'
@@ -59,6 +62,10 @@ const getDefaultGlobalOptions = () => {
     storageproxyprefix: '',
     isfixapptokenexpired: false, // 是否修复apptoken过期问题 目前版本暂时不默认修复 等门户引擎验证通过之后 再改成默认修复
     isoptimizesingleloginlogic: false, // 是否优化判断不重复走单点登录的逻辑 暂时只在超表上优化
+    osscache: {
+      flag: false,
+      cachetime: 60 * 1000 * 60 * 2 // 默认缓存2小时
+    },
     singleLoginCallback: null,
     router: null
   }
@@ -74,10 +81,13 @@ const install = (app: any, options: any) => {
   installStorageProxy(globalOptions)
   installUrlquery()
   installAxios(globalOptions)
+  installAxiosCache()
   installSpuConfig(globalOptions)
   installWxworksuitePlugin() // 安装企微第三方应用插件
   installAuth(globalOptions)
+  installOssCache(globalOptions)
   installApaasSpuTrack()
+
   installTest(globalOptions)
 
   console.log(`@smart100/spu-web-plugin@${version} install!`)
@@ -87,7 +97,7 @@ const install = (app: any, options: any) => {
   console.log(globalOptions)
 
   // setTimeout(() => {
-  //   console.error('888')
+  //   console.error('8877778')
   // }, 1000)
 
   // if (install.installed) return
@@ -118,10 +128,12 @@ export {
   getLocation,
   getDistance,
   getAddress,
+  normalAxios,
   spuAxios,
-  axios,
-  axios as apaasAxios,
+  apaasAxios,
+  apaasAxios as axios, // 兼容之前导出
   decryptAxiosResponseData,
+  axiosCache,
   spuConfig,
   globalConfig,
   downloadService,
@@ -132,6 +144,7 @@ export {
   getUuid,
   functionCheck,
   getServerTime,
+  isOnline,
   encrypt,
   decrypt,
   setTitle,

package/src/login.ts

@@ -1,7 +1,7 @@
 import { get, cloneDeep } from 'lodash-es'
 import jwtDecode from 'jwt-decode'
 import { lsProxy } from './storageProxy'
-import { axios } from './axios'
+import { apaasAxios } from './axios'
 import cloudServ from './oss/cloudServ'
 import core, { Module } from './core'
 import { urlquery } from './urlquery'
@@ -283,7 +283,7 @@ function getLoginState() {
 // 有可能是中心角色请求失败 兼容不报错
 async function getAndSetUserInfo() {
   try {
-    const accountinfo = await axios
+    const accountinfo = await apaasAxios
       .post('/api/teapi/rolepermission/account/getaccountinfo', {
         positionid: getUser('positioncode') || '',
         deviceinfo: '',
@@ -333,7 +333,7 @@ function formatTenant(tenant: ITenantInfo) {
 
 async function getAndSetTenant(tenantcode?: string) {
   try {
-    const tenantsRes: null | ITenantInfo[] = await axios
+    const tenantsRes: null | ITenantInfo[] = await apaasAxios
       .get('/api/auth/tenantlist', {})
       .then((res: any) => {
         return res?.data?.tenants
@@ -380,7 +380,7 @@ function updateToken() {
   const token = getToken()
   const refreshtoken = getRefreshToken()
   const sendToken = checkLoginByToken(token) ? token : refreshtoken
-  return axios
+  return apaasAxios
     .get('/api/auth/refreshtoken', {
       params: {
         refreshtoken: sendToken
@@ -647,12 +647,22 @@ async function singleLogin(query: IAny) {
         // 旧：判断当前单点登录的 token/refreshtoken/tokenexpires 是否与本地缓存的一致
         // 新：解析当前单点登录 token 中的 mbcode、tenantcode，如果与缓存的一致，说明本次登录与上次登录是同个人同个租户
         // 新逻辑暂时只用于超表
-        if (globalOptions.modulekey === 'litheformspu' && globalOptions.isoptimizesingleloginlogic) {
-          if (curUser?.memberCode === cacheUser?.memberCode && curUser?.tenantCode === cacheUser?.tenantCode) {
+        if (
+          globalOptions.modulekey === 'litheformspu' &&
+          globalOptions.isoptimizesingleloginlogic
+        ) {
+          if (
+            curUser?.memberCode === cacheUser?.memberCode &&
+            curUser?.tenantCode === cacheUser?.tenantCode
+          ) {
             isneedlogin = false
           }
         } else {
-          if (token === getToken() && refreshtoken === getRefreshToken() && tokenexpires === getTokenExpires()) {
+          if (
+            token === getToken() &&
+            refreshtoken === getRefreshToken() &&
+            tokenexpires === getTokenExpires()
+          ) {
             isneedlogin = false
           }
         }
@@ -713,7 +723,7 @@ async function singleLogin(query: IAny) {
   } else {
     flag = false
     setBaseInfo() // 传递的token过期依然写入 如果不写入的话 有可能之前的token本来没过期 页面依然可用
-    console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires/envname 是否非法或过期。')
+    console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires 是否非法或过期。')
   }
 
   // 单点登录成功

package/src/map/index.ts

@@ -2,7 +2,7 @@ import { urlquery } from '../urlquery'
 import { cloneDeep, isObject } from 'lodash-es'
 import { mapService } from './MapService'
 import { getAMapKey } from './AMapKey'
-import { axios } from '../axios'
+import { apaasAxios } from '../axios'
 import { delay } from '../utils'
 import { wgs84ToGcj02, BMapTransformBD09ToGCJ02Points, getPoiPhoneNumber } from './utils'
 
@@ -117,7 +117,7 @@ const getIPLocationByIpaas = async (ip?: string): Promise<Location> => {
   return new Promise((resolve, reject) => {
     const AMapKey = getAMapKey()
 
-    axios
+    apaasAxios
       .post(
         'https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001815271',
         {
@@ -167,7 +167,7 @@ const getAddressByIpaas = async (position: Location): Promise<string> => {
     if (position) {
       try {
         const AMapKey = getAMapKey()
-        const result = await axios.post(
+        const result = await apaasAxios.post(
           'https://silkroad.wxchina.com/api/openapi/publishEvent?topic=xw-listener&subtopic=xw-listener&apicaseid=6684389338001809906',
           {
             longitude: position.longitude,

package/src/oss/cache.ts

@@ -0,0 +1,178 @@
+import cloudServ from './cloudServ'
+import localforage from 'localforage'
+import type { IDownload } from './downloadService'
+import type { IUpload } from './uploadService'
+import { getAliyunCope, getCope } from './downloadService'
+import { globalOptions } from '../index'
+
+interface ICacheData {
+  blob: Blob
+  cachetime: number // 缓存过期时间
+  expiretime: number // 过期时间
+}
+
+interface ICaches {
+  [propName: string]: ICacheData
+}
+
+interface ICacheobj {
+  key: string
+  copekey: string
+}
+
+let defaultCachetime = 60 * 1000 * 60 * 2 // 默认缓存2小时
+
+const store = localforage.createInstance({
+  name: 'spu-db',
+  storeName: 'oss-cache'
+})
+
+// 生成缓存键 缓存区分租户和人员
+const generateCacheobj = ({
+  type = 'img',
+  source = '',
+  datetime = '',
+  storagetype = 'storage',
+  cope = ''
+}: IDownload): ICacheobj => {
+  const provider = cloudServ.getProvider(storagetype)
+  const copeStr = provider?.isAliyun ? getAliyunCope(cope) : getCope(cope)
+  return {
+    key: `type=${type}&storagetype=${storagetype}&source=${source}&datetime=${datetime}`,
+    copekey: copeStr || 'default'
+  }
+}
+
+const getAllCachesBykey = async (key: string): Promise<ICaches | null> => {
+  const allcaches: ICaches | null = await store.getItem(key)
+  return allcaches || null
+}
+
+const setCache = async (cacheobj: ICacheobj, cache: ICacheData) => {
+  let allcaches = await getAllCachesBykey(cacheobj.key)
+  if (allcaches) {
+    allcaches[cacheobj.copekey] = cache
+  } else {
+    allcaches = {
+      [cacheobj.copekey]: cache
+    }
+  }
+  await store.setItem(cacheobj.key, allcaches)
+}
+
+const setCacheByFile = ({
+  type = 'img',
+  file,
+  source = '',
+  datetime = '',
+  storagetype = 'storage'
+}: IUpload) => {
+  // 暂时只作用于图片
+  if (!!globalOptions?.osscache?.flag && type === 'img') {
+    setCache(
+      generateCacheobj({
+        type,
+        source,
+        datetime,
+        storagetype,
+        cope: false
+      }),
+      {
+        cachetime: defaultCachetime,
+        expiretime: Date.now() + defaultCachetime,
+        blob: new Blob([file], {
+          type: file.type // 保留原 File 的 MIME 类型（如 image/png）
+        })
+      }
+    )
+  }
+}
+
+const isExpireData = (cache: ICacheData) => {
+  if (Date.now() > cache.expiretime) {
+    return true
+  }
+  // return true
+  return false
+}
+
+const getCache = async (cacheobj: ICacheobj, whennomatchcopekeyreturnanyone: boolean = false) => {
+  let allcaches = await getAllCachesBykey(cacheobj.key)
+  let cache = null
+  if (allcaches) {
+    // 找出所有没过期的缓存
+    const noExpireData: ICaches = {}
+    for (const x in allcaches) {
+      const item = allcaches[x]
+      if (!isExpireData(item)) {
+        noExpireData[x] = item
+      }
+    }
+
+    cache = noExpireData[cacheobj.copekey] || null
+    // 当没命中copekey时，返回默认缓存 默认缓存不存在时返回第一个缓存
+    if (!cache && whennomatchcopekeyreturnanyone && Object.keys(noExpireData).length) {
+      cache = noExpireData['default'] || noExpireData[Object.keys(noExpireData)[0]]
+    }
+  }
+  return cache
+}
+
+const removeCache = async (cacheobj: ICacheobj) => {
+  let allcaches = await getAllCachesBykey(cacheobj.key)
+  if (allcaches) {
+    delete allcaches[cacheobj.copekey]
+    if (Object.keys(allcaches).length) {
+      await store.setItem(cacheobj.key, allcaches)
+    } else {
+      await store.removeItem(cacheobj.key)
+    }
+  }
+}
+
+const removeExpireDataBykey = async (key: string) => {
+  let allcaches = await getAllCachesBykey(key)
+  if (allcaches) {
+    for (const x in allcaches) {
+      const cache: ICacheData | null = allcaches[x]
+      if (cache && isExpireData(cache)) {
+        delete allcaches[x]
+      }
+    }
+    if (Object.keys(allcaches).length) {
+      await store.setItem(key, allcaches)
+    } else {
+      await store.removeItem(key)
+    }
+  }
+}
+
+// 清除过期无效数据
+const removeExpireData = async () => {
+  store
+    .keys()
+    .then(async (keys) => {
+      for (let i = 0, len = keys.length; i < len; i++) {
+        const key = keys[i]
+        await removeExpireDataBykey(key)
+      }
+    })
+    .catch((err) => {
+      console.log(err)
+    })
+}
+
+const installOssCache = (options: any) => {
+  defaultCachetime = options?.osscache?.cachetime || defaultCachetime
+  removeExpireData()
+}
+
+export {
+  installOssCache,
+  defaultCachetime,
+  generateCacheobj,
+  setCache,
+  setCacheByFile,
+  getCache,
+  removeCache
+}

package/src/oss/downloadService.ts

@@ -2,18 +2,11 @@ import { AliClient, ObsClient, S3Client } from './OSSClient'
 import dayjs from 'dayjs'
 import cloudServ from './cloudServ'
 import { getServToken } from './servtoken'
-import { axios } from '../axios'
+import { normalAxios } from '../axios'
 import { getUser } from '../login'
-// import { get } from 'lodash-es'
-// import qs from 'qs'
-
-// function getUrlPaths(url: string): string[] {
-//   let path = url.split('?')[0]
-//   if (!path) return []
-//   path = path.replace('http://', '')
-//   path = path.replace('https://', '')
-//   return path.split('/')
-// }
+import { isOnline } from '../utils'
+import { globalOptions } from '../index'
+import { defaultCachetime, generateCacheobj, setCache, getCache } from './cache'
 
 const getContentType = (suffix: string) => {
   const map: IAny = {
@@ -33,32 +26,6 @@ const isIpUrl = (url: string) => {
   return reg.test(url)
 }
 
-// interface UrlInfo {
-//   [propName: string]: {
-//     url: string
-//     outTime: number
-//   }
-// }
-
-// /**
-//  * @Description: 缓存DownloadUrl
-//  * @author: hyl
-//  */
-// const cacheUrlInfo: UrlInfo = {}
-
-// function setCacheUrl(key: string, url: string, expires: number) {
-//   const thisTime = new Date().getTime()
-//   let diff = expires * 1000 - thisTime
-//   if (diff < 0) return
-//   // 最多只缓存20分钟
-//   if (diff > 1000 * 60 * 20) diff = 1000 * 60 * 20
-//   const outTime = thisTime + diff
-//   cacheUrlInfo[key] = {
-//     url,
-//     outTime
-//   }
-// }
-
 type Cope = { width?: number | string; height?: number | string } | string | boolean
 
 const getAliyunCope = (cope?: Cope) => {
@@ -140,10 +107,15 @@ const getUrl = async ({
     filename = source
   }
   const isAbsoluteUrl =
-    !!source.match(/\/att\//) || !!source.match(/\/img\//) || !!source.match(/att\//) || !!source.match(/img\//)
+    !!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}`
+  let objectKey = isAbsoluteUrl
+    ? source
+    : `${source.slice(0, 3)}/${type}/${date}/${tenantCode}/${source}`
   const copeStr = provider?.isAliyun ? getAliyunCope(cope) : getCope(cope)
   const contentType = getContentType(suffix)
 
@@ -319,24 +291,12 @@ const downloadFile = async ({
     filename: realFilename,
     cope
   })
-  // axios.get(url, {
-  //   responseType: 'blob',
-  //   isSendToken: false,
-  //   isShowErrorMessage: false
-  // }).then((response: any) => {
-  //   // console.log(response)
-  //   // debugger
-  //   downloadFileByBlob(response.data, filename)
-  // }).catch((e) => {
-  //   console.log(e)
-  //   throw Error(e)
-  // })
 
   const provider = cloudServ.getProvider(storagetype)
   if (provider?.isAliyun) {
     downloadFileByUrl(url, filename)
   } else {
-    axios
+    await normalAxios
       .get(url, {
         responseType: 'blob',
         isSendToken: false,
@@ -345,7 +305,9 @@ const downloadFile = async ({
       .then((response: any) => {
         // console.log(response)
         // debugger
-        downloadFileByBlob(response.data, filename)
+        if (Object.prototype.toString.call(response.data) === '[object Blob]') {
+          downloadFileByBlob(response.data, filename)
+        }
       })
       .catch((e: any) => {
         console.log(e)
@@ -354,7 +316,107 @@ const downloadFile = async ({
   }
 }
 
+// 根据文件信息生成blob
+const getBlob = async ({
+  type = 'img',
+  source = '',
+  filename = '',
+  datetime = '',
+  storagetype = 'storage',
+  cope = ''
+}: IDownload) => {
+  const cacheobj = generateCacheobj({
+    type,
+    source,
+    datetime,
+    storagetype,
+    cope
+  })
+  const online = await isOnline()
+  const requestBlob = async (issetcache = false): Promise<any> => {
+    let blob: any = null
+    if (online) {
+      try {
+        const url = await getUrl({
+          type,
+          source,
+          datetime,
+          storagetype,
+          filename,
+          cope
+        })
+        const response = await normalAxios.get(url, {
+          responseType: 'blob',
+          isSendToken: false,
+          isShowErrorMessage: false,
+          isShowLoading: false
+        })
+        // console.log(response)
+        if (Object.prototype.toString.call(response.data) === '[object Blob]') {
+          blob = response.data
+          if (issetcache) {
+            setCache(cacheobj, {
+              cachetime: defaultCachetime,
+              expiretime: Date.now() + defaultCachetime,
+              blob
+            })
+          }
+        }
+      } catch (err) {
+        console.error(err)
+      }
+    }
+    return blob
+  }
+
+  // 暂时只作用于图片
+  if (!!globalOptions?.osscache?.flag && type === 'img') {
+    // 缓存策略：
+    // 1. 离线时，使用缓存，缓存不存在时，使用任一同key下的资源，再没有才返回null
+    // 2. 在线时，优先使用缓存，并请求最新数据存入，缓存不存在时，使用网络请求
+    if (online) {
+      const cache = await getCache(cacheobj)
+      if (cache) {
+        requestBlob(true)
+        return cache.blob
+      } else {
+        return await requestBlob(true)
+      }
+    } else {
+      const cache = await getCache(cacheobj, true)
+      return cache?.blob || null
+    }
+  } else {
+    return await requestBlob(false)
+  }
+}
+
+const getObjectURL = async ({
+  type = 'img',
+  source = '',
+  filename = '',
+  datetime = '',
+  storagetype = 'storage',
+  cope = ''
+}: IDownload) => {
+  const blob = await getBlob({
+    type,
+    source,
+    datetime,
+    storagetype,
+    filename,
+    cope
+  })
+  return blob ? URL.createObjectURL(blob) : ''
+}
+
 export default {
   getUrl,
+  getBlob,
+  getObjectURL,
   downloadFile
 }
+
+export { getAliyunCope, getCope }
+
+export type { IDownload }

package/src/oss/servtoken.ts

@@ -1,4 +1,4 @@
-import { axios } from '../axios'
+import { apaasAxios } from '../axios'
 
 export type ServToken = {
   accesskeyid: string
@@ -20,7 +20,9 @@ let xhr: Promise<ServToken> | null = null
 
 const requestServToken = async () => {
   try {
-    const response: ServToken = await axios.get('/api/teapi/auth/servtoken').then((res: any) => res.data)
+    const response: ServToken = await apaasAxios
+      .get('/api/teapi/auth/servtoken')
+      .then((res: any) => res.data)
     // debugger
     return response
   } catch (e) {