@smart100/spu-web-plugin 1.0.17 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/envService.ts

@@ -22,7 +22,7 @@ async function getEnvname(): Promise<string> {
     envname = queryEnvname
   } else if (window?.aPaaS?.getWebInitParams && window?.Native?.setNavigationBarReturnButton) {
     // 手机端 查 envname
-    // 只有手机端有 setNavigationBarReturnButton 方法
+    // 只有手机端有 setNavigationBarReturnButton 和 getWebInitParams 方法
     envname = await new Promise((resolve, reject) => {
       window.aPaaS.getWebInitParams((params: any) => {
         resolve(params?.envname || '')

package/src/index.ts

@@ -9,7 +9,15 @@ import { globalConfig } from './globalConfig'
 import { downloadService, uploadService } from './oss'
 import { getServToken } from './oss/servtoken'
 import { getCloudServ } from './oss/cloudServ'
-import { getUniqueid, functionCheck, setTitle, isInApp, isdebugger, isvirtuallocation } from './utils'
+import {
+  getUniqueid,
+  functionCheck,
+  setTitle,
+  isInApp,
+  isdebugger,
+  isvirtuallocation,
+  getServerTime
+} from './utils'
 import { installUrlquery } from './urlquery'
 import { mapService } from './map/MapService'
 import AMapLoader from './map/AMapLoader'
@@ -45,6 +53,7 @@ const getDefaultGlobalOptions = () => {
     modulekey: arr[1] || '',
     moduleversion: arr[2] || '',
     storageproxyprefix: '',
+    isfixapptokenexpired: false, // 是否修复apptoken过期问题 目前版本暂时不默认修复 等门户引擎验证通过之后 再改成默认修复
     singleLoginCallback: null,
     router: null
   }
@@ -73,7 +82,7 @@ const install = (app: any, options: any) => {
   console.log(globalOptions)
 
   // setTimeout(() => {
-  //   console.error('5416546544')
+  //   console.error('9999')
   // }, 1000)
 
   // if (install.installed) return
@@ -116,6 +125,7 @@ export {
   getUniqueid,
   getUuid,
   functionCheck,
+  getServerTime,
   setTitle,
   isInApp,
   AMapLoader,

package/src/login.ts

@@ -3,7 +3,7 @@ import jwtDecode from 'jwt-decode'
 import { lsProxy } from './storageProxy'
 import { axios } from './axios'
 import cloudServ from './oss/cloudServ'
-import core from './core'
+import core, { Module } from './core'
 import { urlquery } from './urlquery'
 import { getData, setData, removeData } from './storageCache'
 import {
@@ -17,6 +17,7 @@ import {
   removeTecode
 } from './envService'
 import { tenantSetting } from './tenantSetting'
+import { globalOptions } from './index'
 
 type JwtResult = {
   LoginUser: IAny
@@ -24,11 +25,14 @@ type JwtResult = {
 } | null
 
 function getToken() {
-  return getData('token')
-  // return lsProxy.getItem('token') as string
+  const token = getData('token')
+  // const token = lsProxy.getItem('token') as string
+  return token
 }
 
 function setToken(value: string) {
+  // console.log('setToken', value)
+  // debugger
   setData('token', value)
 }
 
@@ -110,6 +114,7 @@ function removeUser() {
 }
 
 function parseToken(token?: string) {
+  // debugger
   if (!token) {
     console.error('token为空 jwt解析token出错')
     return null
@@ -328,9 +333,11 @@ function formatTenant(tenant: ITenantInfo) {
 
 async function getAndSetTenant(tenantcode?: string) {
   try {
-    const tenantsRes: null | ITenantInfo[] = await axios.get('/api/auth/tenantlist', {}).then((res: any) => {
-      return res?.data?.tenants
-    })
+    const tenantsRes: null | ITenantInfo[] = await axios
+      .get('/api/auth/tenantlist', {})
+      .then((res: any) => {
+        return res?.data?.tenants
+      })
 
     let tenant: ITenantInfo | null = null
     if (tenantsRes?.length) {
@@ -445,9 +452,88 @@ function startRefreshtoken() {
   }, time)
 }
 
+// 获取 spu 容器 token
+const getSPUContainerToken = (): Promise<any> => {
+  return new Promise((resolve, reject) => {
+    if (window.aPaaS?.getToken) {
+      window.aPaaS.getToken((res: any) => {
+        console.log('window.aPaaS.getToken success', res)
+        const token = res?.token
+        const tokenexpires = res?.tokenExpires
+        const refreshtoken = res?.refreshToken
+
+        if (token && tokenexpires && refreshtoken) {
+          resolve({
+            token,
+            tokenexpires,
+            refreshtoken
+          })
+        } else {
+          console.error('window.aPaaS.getToken fail')
+          resolve(null)
+        }
+      })
+    } else {
+      console.warn('window.aPaaS.getToken fail: not in SPU container')
+      resolve(null)
+    }
+  })
+}
+
+// 如果APP端在SPU页面切到后台 然后又切回前台 有可能发生
+// 1、切后台时间过长导致 token 过期
+// 2、切后台后打开太多别的应用 导致切回前台时内存不足 从而导致 SPU 的 webview reload
+// 如果 1 2 同时发生 那么当前SPU页面重走单点登录流程 而url上的token已经过期 会导致单点登录失败
+// 因此 在APP端 单点登录不使用url上的token 而是直接拿App端的 App端能保证拿到的token一直不过期
+const fixLoginQuery = async (query: IAny) => {
+  const newQuery = cloneDeep(query)
+  const type = await Module.getSpuContainerType()
+  if (type === 'app' && window.aPaaS?.getToken) {
+    console.log('SPU is in App, singleLogin use App token.')
+    const tokenData = await getSPUContainerToken()
+    if (tokenData) {
+      newQuery.token = tokenData.token
+      newQuery.tokenexpires = tokenData.tokenexpires
+      newQuery.refreshtoken = tokenData.refreshtoken
+    }
+  } else {
+    console.log('SPU is not in App, singleLogin use query token.')
+  }
+  return newQuery
+}
+
+// 修复 App 切到后台时间过长导致 token 过期
+// 监听 App 切换到前台 判断token是否过期 如果过期就调用获取tokne方法更新token
+const fixAppTokenExpired = () => {
+  if (globalOptions.isfixapptokenexpired && window.Native?.onHostEnterForceground) {
+    console.log('listen App enter forceground')
+    window.Native.onHostEnterForceground(async () => {
+      console.log('App enter forceground')
+      const loginState = getLoginState()
+      if (!loginState.islogin && loginState.type === 2 && loginState.role !== 'center') {
+        const tokenData = await getSPUContainerToken()
+        if (tokenData) {
+          setToken(tokenData.token)
+          setRefreshToken(tokenData.refreshtoken)
+          setTokenExpires(tokenData.tokenexpires)
+        } else {
+          try {
+            await updateToken()
+          } catch (err) {
+            console.error(err)
+          }
+        }
+      }
+    })
+  }
+}
+
 // 单点登录
 async function singleLogin(query: IAny) {
   query = cloneDeep(query)
+  if (globalOptions.isfixapptokenexpired) {
+    query = await fixLoginQuery(query)
+  }
 
   let flag = false // 是否登录成功
   const token = query.token
@@ -572,6 +658,9 @@ async function singleLogin(query: IAny) {
 
 function installAuth(options: any) {
   startRefreshtoken()
+
+  fixAppTokenExpired()
+
   if (options.router) {
     options.router.beforeEach(async (to: any, from: any, next: any) => {
       // console.log(from)
@@ -583,6 +672,7 @@ function installAuth(options: any) {
       if (to.query.token) {
         const singleLoginRes = await singleLogin(to.query)
         if (singleLoginRes.flag) {
+          // next()
           next({
             path: to.path,
             params: to.params,
@@ -598,7 +688,7 @@ function installAuth(options: any) {
     })
   } else {
     console.warn(
-      '@smart100/spu-web-plugin 需要传入一个 vue-router 实例以便执行单点登录逻辑，如果您没传 vue-router 实例则需要自行在合适的位置执行单点登录代码。'
+      '@smart100/spu-web-plugin 需要传入一个 vue-router 实例以便执行单点登录逻辑，如果您没传 vue-router 实例则需要自行在合适的位置执行单点登录代码，如果您已自行实现，请忽略该提示。'
     )
   }
 

package/src/map/MapService.ts

@@ -22,12 +22,51 @@ class MapService {
   private isInit = false
   private initPromise: any = null
 
+  get lbssetting(): ILbsSettingData | undefined {
+    return tenantSetting.get('lbssetting')
+    // const lbssetting: any = {
+    //   enable: '1',
+    //   setting: {
+    //     type: '',
+    //     key: {
+    //       web: '',
+    //       android: '',
+    //       ios: '',
+    //       harmony: ''
+    //     },
+    //     secretkey: {
+    //       web: '',
+    //       android: '',
+    //       ios: '',
+    //       harmony: ''
+    //     }
+    //   }
+    // }
+    // // // 高德地图公司key
+    // // lbssetting.setting.type = 'amap'
+    // // lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
+    // // lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
+    // // 高德地图个人key
+    // lbssetting.setting.type = 'amap'
+    // lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
+    // lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
+    // // // 腾讯地图
+    // // lbssetting.setting.type = 'tencent'
+    // // lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
+    // // lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0'
+    // // // 百度地图
+    // // lbssetting.setting.type = 'baidu'
+    // // lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
+    // // lbssetting.setting.secretkey.web = ''
+    // return lbssetting
+  }
+
   get isLbssettingEnable() {
-    return tenantSetting.get('lbssetting')?.enable === '1'
+    return this.lbssetting?.enable === '1'
   }
 
   private get setting(): ILbsSetting | undefined {
-    return tenantSetting.get('lbssetting')?.setting
+    return this.lbssetting?.setting
   }
 
   get key() {
@@ -57,35 +96,6 @@ class MapService {
   AMap: any = null
   TMap: any = null
   BMap: any = null
-  MapCore: any = null
-
-  // get AMap() {
-  //   if (!this.isInit || this.type !== 'amap') {
-  //     return null
-  //   }
-  //   return window.AMap
-  // }
-
-  // get TMap() {
-  //   if (!this.isInit || this.type !== 'tencent') {
-  //     return null
-  //   }
-  //   return window.TMap
-  // }
-
-  // get BMap() {
-  //   if (!this.isInit || this.type !== 'baidu') {
-  //     return null
-  //   }
-  //   return window.BMap
-  // }
-
-  // get MapCore() {
-  //   if (!this.isInit) {
-  //     return null
-  //   }
-  //   return window.BMap
-  // }
 
   async init() {
     if (this.isInit) return
@@ -134,10 +144,11 @@ class MapService {
     this.isInit = true
   }
 
-  // reset() {
-  //   this.isInit = false
-  // }
-
+  // 腾讯地图 key 配置错误
+  // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
+  // 2 如果是调用 api 会返回 catch 和详细的错误信息
+  // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
+  // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
   private async initTecent() {
     await importJS(
       `https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=${this.key}`,
@@ -145,10 +156,12 @@ class MapService {
       'TMap'
     )
     this.TMap = window.TMap
-    this.MapCore = window.TMap
     await delay(300)
   }
 
+  // 高德地图 key 配置错误
+  // 1 如果是 key 格式不对 那么没返回 promise 连 window.AMap 都拿不到 地图和都不能用
+  // 1 如果是 key 格式对 但 key 不对 有返回 window.AMap 但 api 定位调用失败 地图可以渲染空白地图
   private async initAmap() {
     return new Promise(async (resolve, reject) => {
       // 高德地图api初始化失败 没有返回reject 因此用超时机制检测
@@ -180,7 +193,6 @@ class MapService {
 
       window.AMap = AMap
       this.AMap = window.AMap
-      this.MapCore = window.AMap
       // console.log(window)
       // console.log(window.AMap)
       // console.log(window.AMapUI)
@@ -190,13 +202,14 @@ class MapService {
     })
   }
 
+  // 百度地图 key 配置错误
+  // alert以下信息: 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
   private async initBaidu() {
     return new Promise((resolve, reject) => {
       window.BMAP_INITIAL_CALLBACK = (e: any) => {
         // console.log(e)
         // debugger
         this.BMap = window.BMap
-        this.MapCore = window.BMap
         // debugger
         // 启用google标准坐标体系
         // coordsType 指定输入输出的坐标类型，BMAP_COORD_GCJ02为gcj02坐标，BMAP_COORD_BD09为bd0ll坐标，默认为BMAP_COORD_BD09。

package/src/map/index.ts

@@ -479,7 +479,7 @@ const getAddressByBmap = async (position: Location): Promise<string> => {
   })
 }
 
-const getLocationPromise = async (isuseiplocarion = false): Promise<Location> => {
+const getLocationPromise = async (isuseiplocation = false): Promise<Location> => {
   let location: Location = null
 
   // 在 SPU 容器里使用 Native-API 的定位
@@ -490,18 +490,18 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
   if (!location) {
     if (mapService.type === 'amap') {
       location = await getLocationByAMap()
-      if (!location && isuseiplocarion) {
+      if (!location && isuseiplocation) {
         location = await getCityLocationByAMap()
       }
       // 改成不使用ipaas了
-      // if (!location && isuseiplocarion) {
+      // if (!location && isuseiplocation) {
       //   location = await getIPLocationByIpaas()
       // }
-    } else if (mapService.type === 'tencent' && isuseiplocarion) {
+    } else if (mapService.type === 'tencent' && isuseiplocation) {
       location = await getIPLocationByTMap()
     } else if (mapService.type === 'baidu') {
       location = await getLocationByBMap()
-      if (!location && isuseiplocarion) {
+      if (!location && isuseiplocation) {
         location = await getCityLocationByBMap()
       }
     }
@@ -544,7 +544,7 @@ const getLocationPromise = async (isuseiplocarion = false): Promise<Location> =>
 // WGS84 GCJ-02 BD-09 坐标系
 // https://www.jianshu.com/p/559029832a67
 // 不能精确定位的情况下是否启用ip城市定位，ip定位用于不需要精确定位的场景
-async function getLocation(isuseiplocarion = false) {
+async function getLocation(isuseiplocation = false) {
   await mapService.init()
   // debugger
   // 缓存30秒
@@ -557,7 +557,7 @@ async function getLocation(isuseiplocarion = false) {
   }
   // console.log('runing')
   runing = true
-  locationPromise = getLocationPromise(isuseiplocarion)
+  locationPromise = getLocationPromise(isuseiplocation)
   const locationRes = await locationPromise
   runing = false
   if (locationRes) {

package/src/tenantSetting.ts

@@ -39,64 +39,6 @@ class TenantSetting {
   }
 
   get(key: string) {
-    // const tenantsetting = {
-    //   lbssetting: {
-    //     enable: '1',
-    //     setting: {
-    //       type: '',
-    //       key: {
-    //         web: '',
-    //         android: '',
-    //         ios: '',
-    //         harmony: ''
-    //       },
-    //       secretkey: {
-    //         web: '',
-    //         android: '',
-    //         ios: '',
-    //         harmony: ''
-    //       }
-    //     }
-    //   }
-    // }
-
-    // 高德地图key配置错误
-    // 1 如果是key格式不对 那么没返回promise 连window.AMap都拿不到 地图和都不能用
-    // 1 如果是key对式对 但key不对 有返回 window.AMap 但api定位调用失败 地图可以渲染空白地图
-
-    // // 高德地图公司key
-    // tenantsetting.lbssetting.setting.type = 'amap'
-    // tenantsetting.lbssetting.setting.key.web = '1993ac213d2f4675ac1bffb1b03ef1f0'
-    // tenantsetting.lbssetting.setting.secretkey.web = '816fe46b7b7bce145940b93c1e4818fa'
-
-    // // 高德地图个人key
-    // tenantsetting.lbssetting.setting.type = 'amap'
-    // tenantsetting.lbssetting.setting.key.web = 'e4d25fe4661a34198c4e6f79abe9afac'
-    // tenantsetting.lbssetting.setting.secretkey.web = 'a6b674affd9a3278c68602cf7ba02fcb'
-
-    // tencent地图key配置错误
-    // 1 如果是地图 会在地图上明确文字提示 鉴权失败，请传入正确的key
-    // 2 如果是调用定位等api 会返回 catch 和详细的错误信息
-    // getIPLocationByTMap fail: {"status":311,"message":"key格式错误","request_id":"ccedb04fd95e4f3f9cd45cfbad729d10","id":"cbm919vjdj0"}
-    // getIPLocationByTMap fail: {"status":190,"message":"无效的key","request_id":"b6ca9d0749eb4c91a47db9412b1253ca","id":"cbm919wxo40"}
-    // tenantsetting.lbssetting.setting.type = 'tencent'
-    // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT'
-    // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0'
-
-    // 百度地图key配置错误alert以下信息
-    // 您提供的密钥不是有效的百度LBS开放平台密钥，或此密钥未对本应用的百度地图JavaScriptAPI授权。您可以访问如下网址了解如何获取有效的密钥：http://lbsyun.baidu.com/apiconsole/key#。
-    // tenantsetting.lbssetting.setting.type = 'baidu'
-    // tenantsetting.lbssetting.setting.key.web = '7r3bsPeQqJ74vsxf3EOXg7C1AM4lOWA1'
-
-
-
-    // tenantsetting.lbssetting.setting.type = 'tencent'
-    // tenantsetting.lbssetting.setting.key.web = 'NHBBZ-K5LCQ-LF35M-2CTDP-E4OO7-AIBFT是的是的'
-    // tenantsetting.lbssetting.setting.secretkey.web = 'zowvV5I2pSxqgGb2Sgr1x62HGXbqdxT0对对对'
-
-    // lsProxy.setItem('tenantsetting', JSON.stringify(tenantsetting))
-
-
     let tenantsettingStr = lsProxy.getItem('tenantsetting')
     if (tenantsettingStr) {
       const tenantsetting = JSON.parse(tenantsettingStr)

package/src/types/index.d.ts

@@ -31,12 +31,11 @@ interface IAMapLoader {
 }
 
 interface IMapService {
-  init: () => Promise<any>
+  init: () => Promise<void>
   type: 'amap' | 'tencent' | 'baidu'
   AMap: any
   BMap: any
   TMap: any
-  MapCore: any
 }
 
 type StorageType = 'storage' | 'storage-1d' | 'storage-3m' | 'storage-1y'
@@ -81,6 +80,7 @@ interface IUploadService {
 //   modulename: string
 //   moduleversion: string
 //   storageproxyprefix?: string
+//   isfixapptokenexpired?: boolean
 //   router?: any
 // }
 
@@ -98,7 +98,7 @@ export default SPUWebPlugin
 export const globalOptions: any
 export const lsProxy: any
 export const ssProxy: any
-export const getLocation: () => Promise<{
+export const getLocation: (isuseiplocation?: boolean) => Promise<{
   longitude: string
   latitude: string
   address: string
@@ -127,6 +127,7 @@ export const getCloudServ: (type?: StorageType) => any
 export const getUniqueid: () => string
 export const getUuid: () => string
 export const functionCheck: (functioncode?: string) => boolean
+export const getServerTime: () => Promise<string>
 export const setTitle: (pagetitle?: string) => void
 export const isInApp: () => boolean
 export const AMapLoader: IAMapLoader

package/src/utils.ts

@@ -1,6 +1,7 @@
 import { getUser } from './login'
 import { urlquery } from './urlquery'
 import { get } from 'lodash-es'
+import { axios } from './axios'
 
 function isIOS() {
   const ua = navigator.userAgent
@@ -128,6 +129,40 @@ const delay = (timeout = 1000) => {
   })
 }
 
+const getServerTime = () => {
+  return new Promise((resolve, reject) => {
+    if (window?.Native?.getServerTime) {
+      window.Native.getServerTime((res: any) => {
+        if (res) {
+          resolve(res.toString())
+        } else {
+          resolve(Date.now().toString())
+        }
+      })
+    } else {
+      axios
+        .get(
+          '/api/teapi/offline/servertime',
+          {},
+          {
+            isShowLoading: false
+          }
+        )
+        .then((res: any) => {
+          if (res.data) {
+            resolve(res.data.toString())
+          } else {
+            resolve(Date.now().toString())
+          }
+        })
+        .catch((err: any) => {
+          resolve(Date.now().toString())
+        })
+    }
+  })
+}
+
+
 export {
   isIOS,
   isMobile,
@@ -139,5 +174,6 @@ export {
   isvirtuallocation,
   toggleHttpOrHttps,
   importJS,
-  delay
+  delay,
+  getServerTime
 }