@smart100/spu-web-plugin 1.0.18 → 1.0.20

package/dist/index.d.ts

@@ -80,6 +80,7 @@ interface IUploadService {
 //   modulename: string
 //   moduleversion: string
 //   storageproxyprefix?: string
+//   isfixapptokenexpired?: boolean
 //   router?: any
 // }
 
@@ -104,7 +105,11 @@ export const getLocation: (isuseiplocation?: boolean) => Promise<{
   [propName: string]: any
 } | null>
 export const getDistance: (p1: [number, number], p2: [number, number]) => Promise<any>
-export const getAddress: (location: { longitude: string; latitude: string; [propName: string]: any }) => Promise<string>
+export const getAddress: (location: {
+  longitude: string
+  latitude: string
+  [propName: string]: any
+}) => Promise<string>
 export const spuAxios: any
 export const apaasAxios: any
 export const axios: any
@@ -132,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/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.18";
+var version = "1.0.20";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -8368,6 +8368,12 @@ var Core = /*#__PURE__*/function () {
       }
       return getSpuContainerType;
     }()
+  }, {
+    key: "checkInAppSpuWebview",
+    value: function checkInAppSpuWebview() {
+      var _window3;
+      return !!((_window3 = window) !== null && _window3 !== void 0 && (_window3 = _window3.aPaaS) !== null && _window3 !== void 0 && _window3.getPhoto);
+    }
   }]);
   return Core;
 }();
@@ -16390,13 +16396,13 @@ function getAndSetUserInfo() {
   return _getAndSetUserInfo.apply(this, arguments);
 }
 function _getAndSetUserInfo() {
-  _getAndSetUserInfo = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee5() {
+  _getAndSetUserInfo = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee6() {
     var accountinfo;
-    return _regeneratorRuntime$1().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regeneratorRuntime$1().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          _context5.prev = 0;
-          _context5.next = 3;
+          _context6.prev = 0;
+          _context6.next = 3;
           return normalAxios$1.post('/api/teapi/rolepermission/account/getaccountinfo', {
             positionid: getUser('positioncode') || '',
             deviceinfo: '',
@@ -16410,22 +16416,22 @@ function _getAndSetUserInfo() {
             }
           });
         case 3:
-          accountinfo = _context5.sent;
+          accountinfo = _context6.sent;
           if (accountinfo) {
             setUser(accountinfo);
           }
-          _context5.next = 11;
+          _context6.next = 11;
           break;
         case 7:
-          _context5.prev = 7;
-          _context5.t0 = _context5["catch"](0);
-          console.error(_context5.t0);
+          _context6.prev = 7;
+          _context6.t0 = _context6["catch"](0);
+          console.error(_context6.t0);
           console.warn('获取用户信息失败，当前您登录的帐号可能为非标准租户帐号。');
         case 11:
         case "end":
-          return _context5.stop();
+          return _context6.stop();
       }
-    }, _callee5, null, [[0, 7]]);
+    }, _callee6, null, [[0, 7]]);
   }));
   return _getAndSetUserInfo.apply(this, arguments);
 }
@@ -16458,19 +16464,19 @@ function getAndSetTenant(_x) {
   return _getAndSetTenant.apply(this, arguments);
 }
 function _getAndSetTenant() {
-  _getAndSetTenant = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee6(tenantcode) {
+  _getAndSetTenant = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee7(tenantcode) {
     var tenantsRes, tenant, normalizedTenant;
-    return _regeneratorRuntime$1().wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+    return _regeneratorRuntime$1().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          _context6.prev = 0;
-          _context6.next = 3;
+          _context7.prev = 0;
+          _context7.next = 3;
           return normalAxios$1.get('/api/auth/tenantlist', {}).then(function (res) {
             var _res$data;
             return res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.tenants;
           });
         case 3:
-          tenantsRes = _context6.sent;
+          tenantsRes = _context7.sent;
           tenant = null;
           if (tenantsRes !== null && tenantsRes !== void 0 && tenantsRes.length) {
             if (!tenantcode) {
@@ -16491,18 +16497,18 @@ function _getAndSetTenant() {
               cloudServ.set(normalizedTenant);
             }
           }
-          _context6.next = 13;
+          _context7.next = 13;
           break;
         case 9:
-          _context6.prev = 9;
-          _context6.t0 = _context6["catch"](0);
-          console.error(_context6.t0);
+          _context7.prev = 9;
+          _context7.t0 = _context7["catch"](0);
+          console.error(_context7.t0);
           console.warn('获取租户信息失败，当前您登录的帐号可能为非标准租户帐号。');
         case 13:
         case "end":
-          return _context6.stop();
+          return _context7.stop();
       }
-    }, _callee6, null, [[0, 9]]);
+    }, _callee7, null, [[0, 9]]);
   }));
   return _getAndSetTenant.apply(this, arguments);
 }
@@ -16599,16 +16605,15 @@ function startRefreshtoken() {
 // 获取 spu 容器 token
 var getSPUContainerToken = function getSPUContainerToken() {
   return new Promise(function (resolve, reject) {
-    var _window$aPaaS;
-    if ((_window$aPaaS = window.aPaaS) !== null && _window$aPaaS !== void 0 && _window$aPaaS.getToken) {
+    var _window$aPaaS, _window$aPaaS2;
+    // 在spuwebview中
+    if (core$1.checkInAppSpuWebview() && (_window$aPaaS = window.aPaaS) !== null && _window$aPaaS !== void 0 && _window$aPaaS.getToken) {
+      console.log('in App spuwebview');
       window.aPaaS.getToken(function (res) {
         console.log('window.aPaaS.getToken success', res);
-        // 安卓返回 token tokenExpires refreshToken
-        // ios返回 token tokenexpires refreshtoken
-        // 改好按安卓
         var token = res === null || res === void 0 ? void 0 : res.token;
-        var tokenexpires = (res === null || res === void 0 ? void 0 : res.tokenExpires) || (res === null || res === void 0 ? void 0 : res.tokenexpires);
-        var refreshtoken = (res === null || res === void 0 ? void 0 : res.refreshToken) || (res === null || res === void 0 ? void 0 : res.refreshtoken);
+        var tokenexpires = res === null || res === void 0 ? void 0 : res.tokenExpires;
+        var refreshtoken = res === null || res === void 0 ? void 0 : res.refreshToken;
         if (token && tokenexpires && refreshtoken) {
           resolve({
             token: token,
@@ -16620,6 +16625,49 @@ var getSPUContainerToken = function getSPUContainerToken() {
           resolve(null);
         }
       });
+    } else if ((_window$aPaaS2 = window.aPaaS) !== null && _window$aPaaS2 !== void 0 && _window$aPaaS2.getToken && globalOptions.modulekey === 'portalEngine') {
+      console.log('in App interactivewebview');
+      // 兼容门户引擎在 interactivewebview 的情况
+      var u = navigator.userAgent;
+      var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
+      if (isAndroid) {
+        console.log('in Android, use window.aPaaS.getToken and window.getTokenComplete');
+        window.getTokenComplete = function (res) {
+          console.log('window.getTokenComplete success', res);
+          var token = res === null || res === void 0 ? void 0 : res.token;
+          var tokenexpires = res === null || res === void 0 ? void 0 : res.tokenExpires;
+          var refreshtoken = res === null || res === void 0 ? void 0 : res.refreshToken;
+          if (token && tokenexpires && refreshtoken) {
+            resolve({
+              token: token,
+              tokenexpires: tokenexpires,
+              refreshtoken: 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(function (res) {
+          console.log('window.aPaaS.getToken success', res);
+          var token = res === null || res === void 0 ? void 0 : res.token;
+          var tokenexpires = res === null || res === void 0 ? void 0 : res.tokenExpires;
+          var refreshtoken = res === null || res === void 0 ? void 0 : res.refreshToken;
+          if (token && tokenexpires && refreshtoken) {
+            resolve({
+              token: token,
+              tokenexpires: tokenexpires,
+              refreshtoken: refreshtoken
+            });
+          } else {
+            console.error('window.aPaaS.getToken fail');
+            resolve(null);
+          }
+        });
+      }
     } else {
       console.warn('window.aPaaS.getToken fail: not in SPU container');
       resolve(null);
@@ -16633,21 +16681,26 @@ var getSPUContainerToken = function getSPUContainerToken() {
 // 因此 在APP端 单点登录不使用url上的token 而是直接拿App端的 App端能保证拿到的token一直不过期
 var fixLoginQuery = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee2(query) {
-    var _window$aPaaS2;
-    var newQuery, type, tokenData;
+    var _window$aPaaS3;
+    var newQuery, tokenData;
     return _regeneratorRuntime$1().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           newQuery = cloneDeep$1(query);
-          _context2.next = 3;
-          return Module.getSpuContainerType();
-        case 3:
-          type = _context2.sent;
-          if (!(type === 'app' && (_window$aPaaS2 = window.aPaaS) !== null && _window$aPaaS2 !== void 0 && _window$aPaaS2.getToken)) {
-            _context2.next = 12;
+          if ((_window$aPaaS3 = window.aPaaS) !== null && _window$aPaaS3 !== void 0 && _window$aPaaS3.getToken) {
+            _context2.next = 5;
             break;
           }
-          console.log('SPU is in App, singleLogin use App token.');
+          console.log('SPU is not in App, singleLogin use query token.');
+          _context2.next = 10;
+          break;
+        case 5:
+          if (core$1.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.');
+          }
           _context2.next = 8;
           return getSPUContainerToken();
         case 8:
@@ -16657,13 +16710,9 @@ var fixLoginQuery = /*#__PURE__*/function () {
             newQuery.tokenexpires = tokenData.tokenexpires;
             newQuery.refreshtoken = tokenData.refreshtoken;
           }
-          _context2.next = 13;
-          break;
-        case 12:
-          console.log('SPU is not in App, singleLogin use query token.');
-        case 13:
+        case 10:
           return _context2.abrupt("return", newQuery);
-        case 14:
+        case 11:
         case "end":
           return _context2.stop();
       }
@@ -16673,64 +16722,94 @@ var fixLoginQuery = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
-// 修复 App 切到后台时间过长导致 token 过期
-// 监听 App 切换到前台 判断token是否过期 如果过期就调用获取tokne方法更新token
-var fixAppTokenExpired = function fixAppTokenExpired() {
-  var _window$Native;
-  if ((_window$Native = window.Native) !== null && _window$Native !== void 0 && _window$Native.onHostEnterForceground) {
-    console.log('listen App enter forceground');
-    window.Native.onHostEnterForceground( /*#__PURE__*/_asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee3() {
-      var loginState, tokenData;
-      return _regeneratorRuntime$1().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            console.log('App enter forceground');
-            loginState = getLoginState();
-            if (!(!loginState.islogin && loginState.type === 2 && loginState.role !== 'center')) {
-              _context3.next = 20;
-              break;
-            }
-            _context3.next = 5;
-            return getSPUContainerToken();
-          case 5:
-            tokenData = _context3.sent;
-            if (!tokenData) {
-              _context3.next = 12;
-              break;
-            }
-            setToken(tokenData.token);
-            setRefreshToken(tokenData.refreshtoken);
-            setTokenExpires(tokenData.tokenexpires);
-            _context3.next = 20;
+var checkTokenExpiredAndUpdate = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee3() {
+    var loginState, tokenData;
+    return _regeneratorRuntime$1().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          loginState = getLoginState();
+          if (!(!loginState.islogin && loginState.type === 2 && loginState.role !== 'center')) {
+            _context3.next = 19;
             break;
-          case 12:
-            _context3.prev = 12;
-            _context3.next = 15;
-            return updateToken();
-          case 15:
-            _context3.next = 20;
+          }
+          _context3.next = 4;
+          return getSPUContainerToken();
+        case 4:
+          tokenData = _context3.sent;
+          if (!tokenData) {
+            _context3.next = 11;
             break;
-          case 17:
-            _context3.prev = 17;
-            _context3.t0 = _context3["catch"](12);
-            console.error(_context3.t0);
-          case 20:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, null, [[12, 17]]);
-    })));
-  }
-};
+          }
+          setToken(tokenData.token);
+          setRefreshToken(tokenData.refreshtoken);
+          setTokenExpires(tokenData.tokenexpires);
+          _context3.next = 19;
+          break;
+        case 11:
+          _context3.prev = 11;
+          _context3.next = 14;
+          return updateToken();
+        case 14:
+          _context3.next = 19;
+          break;
+        case 16:
+          _context3.prev = 16;
+          _context3.t0 = _context3["catch"](11);
+          console.error(_context3.t0);
+        case 19:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[11, 16]]);
+  }));
+  return function checkTokenExpiredAndUpdate() {
+    return _ref3.apply(this, arguments);
+  };
+}();
+// 修复 App 切到后台时间过长导致 token 过期
+// 监听 App 切换到前台 判断token是否过期 如果过期就调用获取tokne方法更新token
+var fixAppTokenExpired = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4() {
+    var _window$Native, _window$aPaaS4;
+    return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          if (globalOptions.isfixapptokenexpired && core$1.checkInAppSpuWebview() && (_window$Native = window.Native) !== null && _window$Native !== void 0 && _window$Native.onHostEnterForceground) {
+            console.log('SPU is in App spuwebview, listen App enter forceground.');
+            window.Native.onHostEnterForceground(function () {
+              console.log('App enter forceground');
+              checkTokenExpiredAndUpdate();
+            });
+          } else if (globalOptions.isfixapptokenexpired && globalOptions.modulekey === 'portalEngine' && (_window$aPaaS4 = window.aPaaS) !== null && _window$aPaaS4 !== void 0 && _window$aPaaS4.getToken) {
+            console.log('SPU is in App interactivewebview, listen App enter forceground.');
+            setTimeout(function () {
+              window.Native = window.Native || {};
+              window.Native.onHostEnterForceground = function () {
+                console.log('App enter forceground');
+                checkTokenExpiredAndUpdate();
+              };
+            }, 1000);
+          }
+        case 1:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return function fixAppTokenExpired() {
+    return _ref4.apply(this, arguments);
+  };
+}();
 // 单点登录
 function singleLogin(_x3) {
   return _singleLogin.apply(this, arguments);
 }
 function _singleLogin() {
-  _singleLogin = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee7(query) {
+  _singleLogin = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee8(query) {
     var flag, token, refreshtoken, tokenexpires, envname, context, setBaseInfo, isneedlogin, loginRole, refreshTokenUser, tokenUser, nowEnvname, envData;
-    return _regeneratorRuntime$1().wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+    return _regeneratorRuntime$1().wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
         case 0:
           setBaseInfo = function _setBaseInfo() {
             setToken(token);
@@ -16742,10 +16821,16 @@ function _singleLogin() {
             // web 端有传 app没传 需要做兼容
             context && lsProxy.setItem('context', decodeURIComponent(context));
           };
-          _context7.next = 3;
+          query = cloneDeep$1(query);
+          if (!globalOptions.isfixapptokenexpired) {
+            _context8.next = 6;
+            break;
+          }
+          _context8.next = 5;
           return fixLoginQuery(query);
-        case 3:
-          query = _context7.sent;
+        case 5:
+          query = _context8.sent;
+        case 6:
           flag = false; // 是否登录成功
           token = query.token;
           refreshtoken = query.refreshtoken;
@@ -16753,7 +16838,7 @@ function _singleLogin() {
           envname = query.envname;
           context = query.context;
           if (!checkLoginByToken(token)) {
-            _context7.next = 62;
+            _context8.next = 64;
             break;
           }
           isneedlogin = true; // 是否需要走单点登录流程
@@ -16775,104 +16860,104 @@ function _singleLogin() {
           // isneedlogin = true
           // debugger
           if (!isneedlogin) {
-            _context7.next = 60;
+            _context8.next = 62;
             break;
           }
           setBaseInfo();
           // 单点登录写入 token 之后
           // 1、如果 refreshtoken 不完整 则换取完整的 refreshtoken
-          _context7.prev = 16;
+          _context8.prev = 18;
           if (!checkLogin()) {
-            _context7.next = 23;
+            _context8.next = 25;
             break;
           }
           refreshTokenUser = getUserByToken(getRefreshToken());
           tokenUser = getUserByToken(getToken());
           if (!(!(refreshTokenUser !== null && refreshTokenUser !== void 0 && refreshTokenUser.tokenId) && tokenUser !== null && tokenUser !== void 0 && tokenUser.tokenId)) {
-            _context7.next = 23;
+            _context8.next = 25;
             break;
           }
-          _context7.next = 23;
+          _context8.next = 25;
           return updateToken();
-        case 23:
-          _context7.next = 28;
-          break;
         case 25:
-          _context7.prev = 25;
-          _context7.t0 = _context7["catch"](16);
-          console.error(_context7.t0);
-        case 28:
+          _context8.next = 30;
+          break;
+        case 27:
+          _context8.prev = 27;
+          _context8.t0 = _context8["catch"](18);
+          console.error(_context8.t0);
+        case 30:
           // 2、重新计算刷新 token 时间 因为刚开始进入就 startRefreshtoken 检测到没有 token 会过10秒才执行刷新 token 操作
           startRefreshtoken();
           // 获取环境信息和租户配置信息
-          _context7.next = 31;
+          _context8.next = 33;
           return getEnvname();
-        case 31:
-          nowEnvname = _context7.sent;
+        case 33:
+          nowEnvname = _context8.sent;
           if (!nowEnvname) {
-            _context7.next = 52;
+            _context8.next = 54;
             break;
           }
-          _context7.next = 35;
+          _context8.next = 37;
           return requestEnvdata(nowEnvname);
-        case 35:
-          envData = _context7.sent;
+        case 37:
+          envData = _context8.sent;
           if (!envData) {
-            _context7.next = 48;
+            _context8.next = 50;
             break;
           }
           saveEnvdata(envData);
           if (!envData.tenantcode) {
-            _context7.next = 44;
+            _context8.next = 46;
             break;
           }
           setTecode(envData.tenantcode);
           // 租户配置
-          _context7.next = 42;
+          _context8.next = 44;
           return tenantSetting.requestAndSetTenantSetting(envData.tenantcode);
-        case 42:
-          _context7.next = 46;
-          break;
         case 44:
+          _context8.next = 48;
+          break;
+        case 46:
           tenantSetting.removeTenantSetting();
           removeTecode();
-        case 46:
-          _context7.next = 50;
-          break;
         case 48:
+          _context8.next = 52;
+          break;
+        case 50:
           removeEnvdata();
           removeTecode();
-        case 50:
-          _context7.next = 54;
-          break;
         case 52:
+          _context8.next = 56;
+          break;
+        case 54:
           removeEnvdata();
           removeTecode();
-        case 54:
-          _context7.next = 56;
-          return getAndSetTenant();
         case 56:
-          _context7.next = 58;
-          return getAndSetUserInfo();
+          _context8.next = 58;
+          return getAndSetTenant();
         case 58:
+          _context8.next = 60;
+          return getAndSetUserInfo();
+        case 60:
           // 单点登录后 获取 web 开发者模式 如果是则设置 isdebugger
           urlquery.dealWebDebugger();
           flag = true;
-        case 60:
-          _context7.next = 65;
-          break;
         case 62:
+          _context8.next = 67;
+          break;
+        case 64:
           flag = false;
           setBaseInfo(); // 传递的token过期依然写入 如果不写入的话 有可能之前的token本来没过期 页面依然可用
           console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires 是否非法或过期。');
-        case 65:
+        case 67:
           if (!flag) {
-            _context7.next = 68;
+            _context8.next = 70;
             break;
           }
-          _context7.next = 68;
+          _context8.next = 70;
           return core$1.initGetData();
-        case 68:
+        case 70:
           if (flag) {
             // 单点登录成功 需要删除 query 中相关参数
             token && delete query.token;
@@ -16881,15 +16966,15 @@ function _singleLogin() {
             envname && delete query.envname;
             context && delete query.context;
           }
-          return _context7.abrupt("return", {
+          return _context8.abrupt("return", {
             flag: flag,
             query: query
           });
-        case 70:
+        case 72:
         case "end":
-          return _context7.stop();
+          return _context8.stop();
       }
-    }, _callee7, null, [[16, 25]]);
+    }, _callee8, null, [[18, 27]]);
   }));
   return _singleLogin.apply(this, arguments);
 }
@@ -16898,19 +16983,19 @@ function installAuth(options) {
   fixAppTokenExpired();
   if (options.router) {
     options.router.beforeEach( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee4(to, from, next) {
+      var _ref5 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee5(to, from, next) {
         var singleLoginRes;
-        return _regeneratorRuntime$1().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime$1().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               if (!to.query.token) {
-                _context4.next = 8;
+                _context5.next = 8;
                 break;
               }
-              _context4.next = 3;
+              _context5.next = 3;
               return singleLogin(to.query);
             case 3:
-              singleLoginRes = _context4.sent;
+              singleLoginRes = _context5.sent;
               if (singleLoginRes.flag) {
                 // next()
                 next({
@@ -16922,18 +17007,18 @@ function installAuth(options) {
                 next();
               }
               options.singleLoginCallback && options.singleLoginCallback(singleLoginRes);
-              _context4.next = 9;
+              _context5.next = 9;
               break;
             case 8:
               next();
             case 9:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       }));
       return function (_x4, _x5, _x6) {
-        return _ref4.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }());
   } else {
@@ -70312,6 +70397,7 @@ var getDefaultGlobalOptions = function getDefaultGlobalOptions() {
     modulekey: arr[1] || '',
     moduleversion: arr[2] || '',
     storageproxyprefix: '',
+    isfixapptokenexpired: false,
     singleLoginCallback: null,
     router: null
   };
@@ -70356,4 +70442,4 @@ var SPUWebPlugin = {
   version: version
 };
 
-export { AMapLoader, Module, normalAxios$1 as apaasAxios, normalAxios$1 as axios, checkLogin, index as components, SPUWebPlugin as default, downloadService, expandexp, functionCheck, getAddress, getCloudServ, getDistance, getLocation, getRefreshToken, getServToken, getServerTime, getToken, getTokenExpires, getUniqueid, getUser, v4 as getUuid, globalConfig, globalOptions, isInApp, isdebugger, isvirtuallocation, lsProxy, mapService, setTitle, singleLogin, spuAxios, spuConfig, ssProxy, updateToken, uploadService, wxworkSuite };
+export { AMapLoader, Module, normalAxios$1 as apaasAxios, normalAxios$1 as axios, checkLogin, index as components, SPUWebPlugin as default, downloadService, expandexp, functionCheck, getAddress, getCloudServ, getDistance, getLocation, getRefreshToken, getServToken, getServerTime, getToken, getTokenExpires, getUniqueid, getUser, v4 as getUuid, globalConfig, globalOptions, isInApp, isdebugger, isvirtuallocation, lsProxy, mapService, setRefreshToken, setTitle, setToken, setTokenExpires, singleLogin, spuAxios, spuConfig, ssProxy, updateToken, uploadService, wxworkSuite };

package/package.json

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

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
@@ -53,6 +56,7 @@ const getDefaultGlobalOptions = () => {
     modulekey: arr[1] || '',
     moduleversion: arr[2] || '',
     storageproxyprefix: '',
+    isfixapptokenexpired: false, // 是否修复apptoken过期问题 目前版本暂时不默认修复 等门户引擎验证通过之后 再改成默认修复
     singleLoginCallback: null,
     router: null
   }
@@ -134,6 +138,9 @@ export {
   getToken,
   getTokenExpires,
   getRefreshToken,
+  setToken,
+  setTokenExpires,
+  setRefreshToken,
   getUser,
   checkLogin,
   Module,

package/src/login.ts

@@ -17,6 +17,7 @@ import {
   removeTecode
 } from './envService'
 import { tenantSetting } from './tenantSetting'
+import { globalOptions } from './index'
 
 type JwtResult = {
   LoginUser: IAny
@@ -454,16 +455,14 @@ 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)
-        // 安卓返回 token tokenExpires refreshToken
-        // ios返回 token tokenexpires refreshtoken
-        // 改好按安卓
-
         const token = res?.token
-        const tokenexpires = res?.tokenExpires || res?.tokenexpires
-        const refreshtoken = res?.refreshToken || res?.refreshtoken
+        const tokenexpires = res?.tokenExpires
+        const refreshtoken = res?.refreshToken
 
         if (token && tokenexpires && refreshtoken) {
           resolve({
@@ -476,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)
@@ -490,50 +533,79 @@ 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 (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)
   }
 }
 
 // 单点登录
 async function singleLogin(query: IAny) {
-  query = await fixLoginQuery(query)
+  query = cloneDeep(query)
+  if (globalOptions.isfixapptokenexpired) {
+    query = await fixLoginQuery(query)
+  }
 
   let flag = false // 是否登录成功
   const token = query.token
@@ -658,7 +730,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)
@@ -698,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

@@ -80,6 +80,7 @@ interface IUploadService {
 //   modulename: string
 //   moduleversion: string
 //   storageproxyprefix?: string
+//   isfixapptokenexpired?: boolean
 //   router?: any
 // }
 
@@ -104,7 +105,11 @@ export const getLocation: (isuseiplocation?: boolean) => Promise<{
   [propName: string]: any
 } | null>
 export const getDistance: (p1: [number, number], p2: [number, number]) => Promise<any>
-export const getAddress: (location: { longitude: string; latitude: string; [propName: string]: any }) => Promise<string>
+export const getAddress: (location: {
+  longitude: string
+  latitude: string
+  [propName: string]: any
+}) => Promise<string>
 export const spuAxios: any
 export const apaasAxios: any
 export const axios: any
@@ -132,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;