@smart100/spu-web-plugin 1.0.19 → 1.0.21

package/package.json

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

package/src/axios.ts

@@ -6,6 +6,7 @@ import { getToken, updateToken, getLoginState } from './login'
 import core from './core'
 import { urlquery } from './urlquery'
 import { getTecode } from './envService'
+import { decrypt } from './crypt'
 
 interface Response {
   code: number | string
@@ -14,6 +15,34 @@ interface Response {
   message: string
 }
 
+// _encrydata
+const normalizeEncryData = (response: any) => {
+  if (response.data && response.data._encrydata && typeof response.data._encrydata === 'string') {
+    let res = decrypt(response.data._encrydata)
+    try {
+      let resJson = JSON.parse(res)
+      response.data = {
+        ...resJson
+      }
+    } catch (e) {
+      response.data = res
+    }
+  }
+  if (response.body && response.body._encrydata && typeof response.body._encrydata === 'string') {
+    let res = decrypt(response.body._encrydata)
+    try {
+      let resJson = JSON.parse(res)
+      response.body = {
+        ...resJson
+      }
+    } catch (e) {
+      response.body = res
+    }
+  }
+
+  return response
+}
+
 const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
   const axiosInstance: AxiosInstance = axios.create({
     baseURL: type === 'spu' ? `/api/${options.modulekey}/${options.moduleversion}` : ''
@@ -97,6 +126,7 @@ const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
       // debugger
       const isShowLoading = get(res, 'config.isShowLoading', true)
       isShowLoading && loadding.close()
+      normalizeEncryData(res)
 
       let realRes: Response = {
         code: 404,

package/src/core.js

@@ -40,7 +40,11 @@ class Core {
     const nowEnvname = await getEnvname()
     const nowTenantCode = getUser('tenantcode') || ''
     // console.log(tenantCode)
-    if (this.cache.envName === nowEnvname && this.cache.tenantCode === nowTenantCode && this.loadStatus === 2) {
+    if (
+      this.cache.envName === nowEnvname &&
+      this.cache.tenantCode === nowTenantCode &&
+      this.loadStatus === 2
+    ) {
       return this.cache
     }
 
@@ -332,7 +336,9 @@ class Core {
       if (!indextag) {
         errorMsg = '缺少 indextag，请检查。'
       } else {
-        indextagData = (moduleData.data.protocol.indexs || []).find((item) => item.indextag === indextag)
+        indextagData = (moduleData.data.protocol.indexs || []).find(
+          (item) => item.indextag === indextag
+        )
         if (indextagData) {
           const queryUrl = this.getQueryUrl(indextagData.query || [], queryvalue)
           const context = await this.getContext(modulekey)
@@ -348,9 +354,13 @@ class Core {
           }
 
           if (url.indexOf('?') === -1) {
-            url += `?${queryUrl}indextag=${indextag}&context=${encodeURIComponent(JSON.stringify(context))}`
+            url += `?${queryUrl}indextag=${indextag}&context=${encodeURIComponent(
+              JSON.stringify(context)
+            )}`
           } else {
-            url += `&${queryUrl}indextag=${indextag}&context=${encodeURIComponent(JSON.stringify(context))}`
+            url += `&${queryUrl}indextag=${indextag}&context=${encodeURIComponent(
+              JSON.stringify(context)
+            )}`
           }
         } else {
           errorMsg = `找不到 indextag = ${indextag} 的页面信息。`
@@ -405,6 +415,10 @@ class Core {
       return ''
     }
   }
+
+  checkInAppSpuWebview() {
+    return !!window?.aPaaS?.getPhoto
+  }
 }
 
 const core = new Core()

package/src/index.ts

@@ -23,10 +23,13 @@ import { mapService } from './map/MapService'
 import AMapLoader from './map/AMapLoader'
 import {
   getToken,
-  checkLogin,
-  getUser,
+  setToken,
   getRefreshToken,
+  setRefreshToken,
   getTokenExpires,
+  setTokenExpires,
+  checkLogin,
+  getUser,
   updateToken,
   singleLogin,
   installAuth
@@ -135,6 +138,9 @@ export {
   getToken,
   getTokenExpires,
   getRefreshToken,
+  setToken,
+  setTokenExpires,
+  setRefreshToken,
   getUser,
   checkLogin,
   Module,

package/src/login.ts

@@ -455,7 +455,9 @@ function startRefreshtoken() {
 // 获取 spu 容器 token
 const getSPUContainerToken = (): Promise<any> => {
   return new Promise((resolve, reject) => {
-    if (window.aPaaS?.getToken) {
+    // 在spuwebview中
+    if (core.checkInAppSpuWebview() && window.aPaaS?.getToken) {
+      console.log('in App spuwebview')
       window.aPaaS.getToken((res: any) => {
         console.log('window.aPaaS.getToken success', res)
         const token = res?.token
@@ -473,6 +475,50 @@ const getSPUContainerToken = (): Promise<any> => {
           resolve(null)
         }
       })
+    } else if (window.aPaaS?.getToken && globalOptions.modulekey === 'portalEngine') {
+      console.log('in App interactivewebview')
+      // 兼容门户引擎在 interactivewebview 的情况
+      const u = navigator.userAgent
+      const isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1
+      if (isAndroid) {
+        console.log('in Android, use window.aPaaS.getToken and window.getTokenComplete')
+        window.getTokenComplete = (res: any) => {
+          console.log('window.getTokenComplete 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.getTokenComplete fail')
+            resolve(null)
+          }
+        }
+        window.aPaaS.getToken(window.getTokenComplete)
+      } else {
+        console.log('in IOS, use 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)
@@ -487,44 +533,70 @@ const getSPUContainerToken = (): Promise<any> => {
 // 因此 在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.')
+  if (!window.aPaaS?.getToken) {
+    console.log('SPU is not in App, singleLogin use query token.')
+  } else {
+    if (core.checkInAppSpuWebview()) {
+      console.log('SPU is in App spuwebview, singleLogin use App token.')
+    } else if (globalOptions.modulekey === 'portalEngine') {
+      // 兼容门户引擎在 interactivewebview 的情况
+      console.log('SPU is in App interactivewebview, 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
 }
 
+const checkTokenExpiredAndUpdate = async () => {
+  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)
+      }
+    }
+  }
+}
+
 // 修复 App 切到后台时间过长导致 token 过期
 // 监听 App 切换到前台 判断token是否过期 如果过期就调用获取tokne方法更新token
-const fixAppTokenExpired = () => {
-  if (globalOptions.isfixapptokenexpired && window.Native?.onHostEnterForceground) {
-    console.log('listen App enter forceground')
-    window.Native.onHostEnterForceground(async () => {
+const fixAppTokenExpired = async () => {
+  if (
+    globalOptions.isfixapptokenexpired &&
+    core.checkInAppSpuWebview() &&
+    window.Native?.onHostEnterForceground
+  ) {
+    console.log('SPU is in App spuwebview, listen App enter forceground.')
+    window.Native.onHostEnterForceground(() => {
       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)
-          }
-        }
-      }
+      checkTokenExpiredAndUpdate()
     })
+  } else if (
+    globalOptions.isfixapptokenexpired &&
+    globalOptions.modulekey === 'portalEngine' &&
+    window.aPaaS?.getToken
+  ) {
+    console.log('SPU is in App interactivewebview, listen App enter forceground.')
+    setTimeout(() => {
+      window.Native = window.Native || {}
+      window.Native.onHostEnterForceground = () => {
+        console.log('App enter forceground')
+        checkTokenExpiredAndUpdate()
+      }
+    }, 1000)
   }
 }
 
@@ -700,13 +772,13 @@ function installAuth(options: any) {
 export {
   installAuth,
   getToken,
-  // setToken,
+  setToken,
   // removeToken,
   getTokenExpires,
-  // setTokenExpires,
+  setTokenExpires,
   // removeTokenExpires,
   getRefreshToken,
-  // setRefreshToken,
+  setRefreshToken,
   // removeRefreshToken,
   updateToken,
   // startRefreshtoken,

package/src/types/index.d.ts

@@ -137,6 +137,9 @@ export const updateToken: () => Promise<void>
 export const getToken: () => string
 export const getTokenExpires: () => string
 export const getRefreshToken: () => string
+export const setToken: (value: string) => void
+export const setTokenExpires: (value: string) => void
+export const setRefreshToken: (value: string) => void
 export const getUser: (key?: string) => any
 export const checkLogin: () => boolean
 export const Module: any

package/src/types/shims-lib.d.ts

@@ -35,6 +35,8 @@ interface Window {
   __baiduMapInitial: any
   // 腾讯地图
   TMap: any
+  // InteractiveWebView 中 getToken 回调函数
+  getTokenComplete: any
   // wx: IAny;
   // AMapUI: IAny;
   // lsProxy: any;