abler-api 1.0.33 → 1.0.35

package/dist/cjs/pp-util.js

@@ -376,7 +376,7 @@ class apiUtil$2 {
                 continue;
               } catch (e) {}
             }
-            let x = JSON.hbDateConv(key, value);
+            let x = JSON.convertDate(key, value);
             if (x !== value) {
               obj[key] = x;
             }
@@ -747,14 +747,17 @@ class apiUtil$2 {
     req.accessToken = req.accessToken || apiUtil$2.extractToken(req);
     const tokenKey = apiUtil$2.userTokenStoreKey(req.accessToken);
     const expireTime = apiUtil$2.tokenExpireTime(req);
-    return await apiUtil$2.restoreTokenData(tokenKey, expireTime).then(async function (data) {
-      req.userInfo = apiUtil$2.setUserIdNo(data, data?._idNo || '');
-      if (req.tokenValidater) await req.tokenValidater(req.userInfo, req);
+    try {
+      const userInfo = await apiUtil$2.restoreTokenData(tokenKey, expireTime);
+      req.userInfo = apiUtil$2.setUserIdNo(userInfo, userInfo?._idNo);
+      if (req.tokenValidater) {
+        await req.tokenValidater(req.userInfo, req);
+      }
       return true;
-    }, async function (e) {
+    } catch (e) {
       // 如果给定的token不存在，看看是不是平台内部调用
       return await apiUtil$2.checkInternalToken(req);
-    });
+    }
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "-module": "./dist/es/pp-util.js",
@@ -15,9 +15,9 @@
   "author": "peng_peng",
   "license": "ISC",
   "dependencies": {
-    "abler-db": "^1.0.40",
+    "abler-db": "^1.0.42",
     "abler-i18n": "^1.0.2",
-    "abler-messenger": "^1.0.30",
+    "abler-messenger": "^1.0.32",
     "abler-net": "^1.0.9",
     "abler-util": "^1.0.9",
     "basic-auth": "^2.0.1",
@@ -43,5 +43,5 @@
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-terser": "^7.0.2"
   },
-  "gitHead": "125e1dfeebe2ae8f8fdc4bd0e197c8333b119381"
+  "gitHead": "6d4380c9b98171ed986731b27e5ac628562afe88"
 }