@smart100/spu-web-plugin 1.0.8 → 1.0.9

package/package.json

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

package/src/index.ts

@@ -2,14 +2,15 @@ import { version } from '../package.json'
 import { merge } from 'lodash-es'
 import { v4 as getUuid } from 'uuid'
 import { installStorageProxy, lsProxy, ssProxy } from './storageProxy'
-import { getLocation, getDistance } from './location'
+import { getLocation, getDistance } from './map/index'
 import { installAxios, spuAxios, axios } from './axios'
 import { installSpuConfig, spuConfig } from './spuConfig'
 import { globalConfig } from './globalConfig'
 import { downloadService, uploadService } from './oss'
 import { getUniqueid, functionCheck, setTitle, isInApp, isdebugger, isvirtuallocation } from './utils'
 import { installUrlquery } from './urlquery'
-import AMapLoader from './AMapLoader'
+import { mapService } from './map/MapService'
+import AMapLoader from './map/AMapLoader'
 import {
   getToken,
   checkLogin,
@@ -113,6 +114,7 @@ export {
   setTitle,
   isInApp,
   AMapLoader,
+  mapService,
   singleLogin,
   updateToken,
   getToken,

package/src/login.ts

@@ -5,7 +5,6 @@ import { axios } from './axios'
 import cloudServ from './cloudServ'
 import core from './core'
 import { urlquery } from './urlquery'
-import { decrypt } from './crypt'
 import { getData, setData, removeData } from './storageCache'
 import {
   setQueryEnvname,
@@ -15,9 +14,9 @@ import {
   removeEnvdata,
   saveEnvdata,
   setTecode,
-  removeTecode,
-  getTecode
+  removeTecode
 } from './envService'
+import { tenantSetting } from './tenantSetting'
 
 type JwtResult = {
   LoginUser: IAny
@@ -358,41 +357,6 @@ async function getAndSetTenant(tenantcode?: string) {
   }
 }
 
-async function requestAndSetTenantSetting(tenantcode?: string) {
-  try {
-    const res = await axios.post(
-      '/api/auth/tenantsettings',
-      {
-        tenantcode: tenantcode || ''
-      },
-      {
-        isSendToken: false,
-        isSendTecode: true,
-        isShowErrorMessage: false
-      }
-    )
-
-    let tenantSetting = res?.data?.resp_data?.econfig || ''
-    if (tenantSetting) {
-      tenantSetting = decrypt(tenantSetting)
-    }
-    // console.log(tenantSetting)
-    if (tenantSetting) {
-      lsProxy.setItem('tenantsetting', tenantSetting)
-    } else {
-      removeTenantSetting()
-    }
-  } catch (err) {
-    console.error(err)
-    removeTenantSetting()
-  }
-}
-
-function removeTenantSetting() {
-  lsProxy.removeItem('tenantsetting')
-}
-
-
 function updateToken() {
   const loginState = getLoginState()
 
@@ -468,7 +432,7 @@ function startRefreshtoken() {
     if (loginState.type === 2) {
       time = 0
     } else {
-      console.error('未登录，10秒后尝试更新token')
+      // console.error('未登录，10秒后尝试更新token')
       time = 30000
     }
   }
@@ -481,8 +445,6 @@ function startRefreshtoken() {
   }, time)
 }
 
-
-
 // 单点登录
 async function singleLogin(query: IAny) {
   query = cloneDeep(query)
@@ -560,9 +522,9 @@ async function singleLogin(query: IAny) {
           if (envData.tenantcode) {
             setTecode(envData.tenantcode)
             // 租户配置
-            await requestAndSetTenantSetting(envData.tenantcode)
+            await tenantSetting.requestAndSetTenantSetting(envData.tenantcode)
           } else {
-            removeTenantSetting()
+            tenantSetting.removeTenantSetting()
             removeTecode()
           }
         } else {

package/src/map/AMapKey.ts

@@ -0,0 +1,31 @@
+import { mapService } from './MapService'
+
+// 高德地图 web端key 和 安全密钥
+const AMapKey = {
+  // 测试开发环境
+  dev: {
+    key: '38fa4702d240e1e6ee5cc8ca059b254f',
+    securityJsCode: '96f2af5670b7a41a56dcd2e8b63c1e06'
+  },
+  // 生产环境
+  production: {
+    key: '1993ac213d2f4675ac1bffb1b03ef1f0',
+    securityJsCode: '816fe46b7b7bce145940b93c1e4818fa'
+  }
+}
+
+const getAMapKey = () => {
+  if (mapService.isLbssettingEnable && mapService.type === 'amap') {
+    return {
+      key: mapService.key,
+      securityJsCode: mapService.secretkey
+    }
+  } else {
+    return {
+      key: AMapKey.production.key,
+      securityJsCode: AMapKey.production.securityJsCode
+    }
+  }
+}
+
+export { AMapKey, getAMapKey }

package/src/map/AMapLoader.ts

@@ -0,0 +1,43 @@
+import AMapLoader from '@amap/amap-jsapi-loader'
+import { AMapKey } from './AMapKey'
+import { getAMapKey } from './AMapKey'
+
+let isinit = false
+
+const load = (options?: {
+  plugins?: Array<string>
+  AMapUI?: {
+    plugins?: Array<string>
+  }
+}) => {
+  const AMapKey = getAMapKey()
+  if (!isinit) {
+    isinit = true
+    if (AMapKey.securityJsCode) {
+      // 本来想改成取消安全秘钥 但考虑到其他spu有可能用了需要安全秘钥的功能 因此不取消
+      // 如果不设置安全秘钥的话 js-api的逆地址查询不成功 返回 INVALID_USER_SCODE 改成用ipaas服务查询
+      window._AMapSecurityConfig = {
+        securityJsCode: AMapKey.securityJsCode
+      }
+    }
+  }
+
+  // 不开放地址查询 改用ipaas
+  const plugin = ['AMap.Geolocation']
+  // plugin.push('AMap.Geocoder') // 不开放地址查询 改用ipaas
+
+  return AMapLoader.load({
+    key: AMapKey.key,
+    version: '2.0',
+    plugins: options?.plugins || plugin,
+    AMapUI: {
+      version: '1.1',
+      plugins: options?.AMapUI?.plugins || []
+    }
+  })
+}
+
+export default {
+  AMapKey,
+  load
+}

package/src/map/MapService.ts

@@ -0,0 +1,167 @@
+import { importJS, delay } from '../utils'
+import { tenantSetting } from '../tenantSetting'
+import { AMapKey } from './AMapKey'
+import AMapLoader from '@amap/amap-jsapi-loader'
+
+type MapType = 'amap' | 'tencent' | 'baidu'
+
+type MapSupportType = 'android' | 'harmony' | 'ios' | 'web' | 'server'
+
+interface ILbsSetting {
+  type: MapType
+  key: Record<MapSupportType, string>
+  secretkey: Record<MapSupportType, string>
+}
+
+interface ILbsSettingData {
+  enable: string
+  setting: ILbsSetting
+}
+
+class MapService {
+  isInit = false
+
+  get isLbssettingEnable() {
+    return tenantSetting.get('lbssetting')?.enable === '1'
+  }
+
+  private get setting(): ILbsSetting | undefined {
+    return tenantSetting.get('lbssetting')?.setting
+  }
+
+  get key() {
+    if (this.isLbssettingEnable) {
+      return this.setting?.key?.web || ''
+    } else {
+      return AMapKey.production.key
+    }
+  }
+
+  get secretkey() {
+    if (this.isLbssettingEnable) {
+      return this.setting?.secretkey?.web || ''
+    } else {
+      return AMapKey.production.securityJsCode
+    }
+  }
+
+  get type(): MapType {
+    if (this.isLbssettingEnable) {
+      return this.setting?.type || 'amap'
+    } else {
+      return 'amap'
+    }
+  }
+
+  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
+  }
+
+  async init() {
+    if (this.isInit) return
+
+    this.isInit = true
+
+    const type = this.type
+
+    // if (process.env.NODE_ENV === 'development') {
+    //     type = 'baidu'
+    // }
+    if (type === 'tencent') {
+      await this.initTecent()
+    } else if (type === 'amap') {
+      await this.initAmap()
+    } else if (type === 'baidu') {
+      await this.initBaidu()
+    }
+  }
+
+  // reset() {
+  //   this.isInit = false
+  // }
+
+  private async initTecent() {
+    await importJS(
+      `https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=${this.key}`,
+      // `https://map.qq.com/api/gljs?v=1.exp&key=${this.key}`,
+      'TMap'
+    )
+    await delay(300)
+  }
+
+  private async initAmap() {
+    // if (this.secretkey) {
+    //   window._AMapSecurityConfig = {
+    //     securityJsCode: this.secretkey
+    //   }
+    // }
+
+    const plugin = ['AMap.Geolocation']
+    // plugin.push('AMap.Geocoder') // 不开放地址查询 改用ipaas
+
+    const AMap = await AMapLoader.load({
+      key: this.key,
+      version: '2.0',
+      plugins: plugin,
+      AMapUI: {
+        version: '1.1',
+        plugins: []
+      }
+    })
+    window.AMap = AMap
+    // console.log(window)
+    // console.log(window.AMap)
+    // console.log(window.AMapUI)
+    // console.log(window.AMapLoader)
+    // console.log(window.AMap === aaaa)
+  }
+
+  private async initBaidu() {
+    // await importJS(
+    //     `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}`,
+    //     'BMap'
+    // )
+    // await delay(300)
+    // function initialize() {
+    //     const mp = new BMap.Map('map')
+    //     mp.centerAndZoom(new BMap.Point(121.491, 31.233), 11)
+    // }
+    return new Promise((resolve, reject) => {
+      window.__baiduMapInitial = function () {
+        // 启用google标准坐标体系
+        // coordsType 指定输入输出的坐标类型，BMAP_COORD_GCJ02为gcj02坐标，BMAP_COORD_BD09为bd0ll坐标，默认为BMAP_COORD_BD09。
+        window.BMap.coordType = 'BMAP_COORD_GCJ02'
+        resolve(null)
+      }
+      const script = document.createElement('script')
+      // 使用最新 3.0 api https://lbsyun.baidu.com/index.php?title=jspopular3.0
+      script.src = `https://api.map.baidu.com/api?v=3.0&ak=${this.key}&callback=__baiduMapInitial`
+      // script.src = `https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=${this.key}&callback=__baiduMapInitial`
+      script.onerror = (err) => {
+        reject(err)
+      }
+      document.body.appendChild(script)
+    })
+  }
+}
+
+const mapService = new MapService()
+
+export { mapService }