@tmsfe/tms-core 0.0.127 → 0.0.129

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.127",
+  "version": "0.0.129",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/runtime/index.js

@@ -96,7 +96,10 @@ const login = async () => {
  */
 async function setPaypointAuth(param = {}) {
   const request = getRequestInstnce();
-  const userInfo = await getLoginInfo();
+  const [userInfo, mycarPubOpenId] = await Promise.all([
+    getLoginInfo(),
+    getMycarPubOpenId(),
+  ]);
 
   const req = {
     traceSource: param.traceSource || 1, // 请求类型
@@ -106,7 +109,7 @@ async function setPaypointAuth(param = {}) {
     subAppId: param.appId || 'wx735359beafd78b9f', // 默认使用我的车的小程序号发布号发布
     appId: param.wechaId || 'wx29d15d946a7f2351', // 默认使用我的车的公众号id
     ...userInfo,
-    openId: userInfo.mycarPubOpenId,
+    openId: mycarPubOpenId,
   };
 
   const res = await request.post('paypoint/setpayauth', req);
@@ -173,7 +176,10 @@ async function getPermissionList(param = {}) {
  */
 async function terminatePaypointPermisson(param = {}) {
   const request = getRequestInstnce();
-  const userInfo = await getLoginInfo();
+  const [userInfo, mycarPubOpenId] = await Promise.all([
+    getLoginInfo(),
+    getMycarPubOpenId(),
+  ]);
 
   const data = {
     traceSource: param.traceSource || 1, // 请求来源
@@ -185,7 +191,7 @@ async function terminatePaypointPermisson(param = {}) {
     reason: param.reason || '其他',
     serviceId: param.serviceId,
     ...userInfo,
-    openId: userInfo.mycarPubOpenId,
+    openId: mycarPubOpenId,
   };
 
   const res = await request.post('paypoint/terminatePaypointPermisson', data);

package/src/runtime/login.ts

@@ -82,7 +82,12 @@ async function login() {
     // @ts-ignore
     const { trafficEntrence: registerSource, scene: sceneId } = getOpenAppTrafficData();
 
-    userData = await getApp().tms.createRequest({ withAuth: false }).post('user/login', { code, registerSource, sceneId });
+    userData = await getApp().tms.createRequest({ withAuth: false }).post('user/login', {
+      code,
+      sceneId,
+      registerSource,
+      apiVer: 1, // 1表示不需要再去请求mycarPubOpenId，能快100ms
+    });
   } catch (e) {
     console.error(e); // eslint-disable-line
   }
@@ -156,12 +161,28 @@ let getMycarPubOpenIdProm;
  * 获取失败时，返回rejected Promise，rejected数据为错误对象
  */
 const getMycarPubOpenId = () => {
-  if (getMycarPubOpenIdProm) { // 避免重复获取
+  if (getMycarPubOpenIdProm) {
+    return getMycarPubOpenIdProm;
+  }
+
+  const { appEnv } = getApp().tms.getEnvInfo();
+  // 优先用缓存的，正式环境跟测试环境的不一样
+  const key = `tms.pubOpenId.${appEnv}`;
+  const pubOpenId = wx.getStorageSync(key);
+  if (pubOpenId) {
+    getMycarPubOpenIdProm = Promise.resolve(pubOpenId);
     return getMycarPubOpenIdProm;
   }
 
+  // 从接口请求
   getMycarPubOpenIdProm = getOaPubOpenId('mycar')
-    .then(openId => openId || Promise.reject(new Error('No mycarPubOpenId found')))
+    .then((pubOpenId) => {
+      if (pubOpenId) {
+        wx.setStorageSync(key, pubOpenId);
+        return pubOpenId;
+      }
+      return Promise.reject(new Error('No mycarPubOpenId found'));
+    })
     .catch((e) => {
       getMycarPubOpenIdProm = null;
       return Promise.reject(e);