fastman3-dfyjapp-request 1.1.0 → 1.1.3

package/README.md

@@ -51,6 +51,23 @@
 
 1. 解决章鱼app为传递vtDeviceId，导致token长时间未用失效的bug
 
+### v 1.0.12 - 2022.05.27
+
+1. 将内部 getVersion 函数调用一律通过 fastman3-common-helper 库内函数来实现，去除了本地自己实现的 getVersion
+
 ### v 1.1.0 - 2022.06.05
 
 1. 支持统一部署方案
+
+### v 1.1.1 - 2022.06.06
+
+1. restful接口支持POST请求
+
+### v 1.1.2 - 2022.06.27
+
+1. restful 接口 token 不需要缓存,解决登录态失效 机构户 登录页面不正常提示问题
+
+### v 1.1.3 - 2022.06.27
+
+1. 1.1.2版本变更 添加注释
+

package/es/interceptors/endProductInterceptor.js

@@ -54,8 +54,13 @@ var endProductInterceptor = function endProductInterceptor(chain) {
     var isServerSessionExpired = code >= 3000 && code <= 3019 || code === 3030 || code === 10026 || code === 5200;
 
     if (code === 0) {
-      // 本地存储或覆盖token
-      storeToken(tempToken);
+      // restful 接口 token 不需要缓存,解决登录态失效 机构户 登录页面不正常提示问题
+      if (RESTFUL_PATH_BY_FASTMAN3) {// 暂不处理
+      } else {
+        // 本地存储或覆盖token
+        storeToken(tempToken);
+      }
+
       return __assign({
         header: header
       }, data);

package/es/interceptors/securityInterceptor.js

@@ -42,6 +42,9 @@ var securityInterceptor = function securityInterceptor(chain) {
   if (RESTFUL_PATH_BY_FASTMAN3) {
     if (method == "GET") {
       requestParams.data = null;
+    } else {
+      // restful 接口post类型,重新组装 入参data
+      requestParams.data = JSON.parse(requestParams.data).payload;
     }
   } else {
     requestParams.data = JSON.stringify(e);

package/es/interceptors/transformInterceptor.js

@@ -22,8 +22,9 @@ var __assign = this && this.__assign || function () {
 
 
 import { AppAuthorize } from "fastman3-dfyjapp-jsbridge";
-import { getVersion, guid } from "../utils";
+import { guid } from "../utils";
 import { isFromApp, isFromWeiXin, isFromIos, isFromAndroid } from "fastman3-common-helper/es/OS.h5";
+import { getVersion } from "fastman3-common-helper/es/version.web";
 import { setStorageSync, getStorageSync } from "fastman3-dfyjapp-syncstorage";
 import { DEVICE_ID_KEY, TOKEN_KEY } from "../constants";
 
@@ -49,7 +50,7 @@ var transformInterceptor = function transformInterceptor(chain) {
   var body = {
     header: {
       appId: process.env.APP_ID,
-      ver: getVersion() || "1.0",
+      ver: getVersion() || "1.0.0",
       // @ts-ignore
       channel: process.env.CHANNEL(_system, process.env.APP_TYPE) || "1",
       funcNo: FUNCNO_POWER_BY_FASTMAN3,

package/es/request.js

@@ -8,7 +8,7 @@ import { addInterceptor, request } from "@tarojs/taro"; // import interceptors f
 
 import { endProductInterceptor, transformInterceptor, logInterceptor, securityInterceptor, httpStatusInterceptor, timeoutInterceptor } from "./interceptors";
 import { isFromApp } from "fastman3-common-helper";
-import { storeToken, storeDeviceId, createRestfulGetPath, exceptionCodeOrInfoHandle } from "./utils";
+import { storeToken, storeDeviceId, createRestfulGetPath, createRestfulGetPathNew, exceptionCodeOrInfoHandle } from "./utils";
 import { AppAuthorize } from "fastman3-dfyjapp-jsbridge";
 
 var fetch =
@@ -139,7 +139,7 @@ function () {
 
   fetch.prototype.getRest = function (restfulPath, data) {
     var params = {
-      RESTFUL_PATH_BY_FASTMAN3: createRestfulGetPath(restfulPath, data)
+      RESTFUL_PATH_BY_FASTMAN3: createRestfulGetPathNew(restfulPath, data)
     };
     return this.baseOptions(params, "GET");
   };

package/es/utils.d.ts

@@ -1,7 +1,3 @@
-/**
- * 获取APP版本号
- */
-export declare const getVersion: () => any;
 /**
  * rc4Key
  */
@@ -23,6 +19,13 @@ export declare const storeDeviceId: (deviceId: string) => void;
  * @returns
  */
 export declare const createRestfulGetPath: (path: string, param: any) => any;
+/**
+ * 拼接path,组合成一个完整的restful-get请求路径 新版本
+ * @param path   路径path /xxx/xx
+ * @param param 参数     {a:1,...}
+ * @returns
+ */
+export declare var createRestfulGetPathNew: (path: any, param: any) => string;
 /**
  * 统一接口异常 code info 处理 (中台新版 restful请求 使用)
  * @param code   1xxx 3xxx

package/es/utils.js

@@ -4,22 +4,8 @@
  * @Company: orientsec.com.cn
  * @Description: 工具包，计划移入 packages 中统一管理，每一个迭代升版一次
  */
-import Taro from "@tarojs/taro";
 import { setStorageSync, getStorageSync } from "fastman3-dfyjapp-syncstorage";
 import { TOKEN_KEY, DEVICE_ID_KEY } from "./constants";
-/**
- * 获取APP版本号
- */
-
-export var getVersion = function getVersion() {
-  var groups = Taro.getEnv() !== Taro.ENV_TYPE.WEB || navigator.userAgent.toLowerCase().match(/DFYJ\/([\d.]+)/i);
-
-  if (!groups) {
-    return undefined;
-  } else {
-    return groups[1];
-  }
-};
 /**
  * rc4Key
  */
@@ -73,6 +59,24 @@ export var createRestfulGetPath = function createRestfulGetPath(path, param) {
   pathLink = path + "?" + (pathLink === null || pathLink === void 0 ? void 0 : pathLink.substr(1));
   return pathLink.replace(" ", "");
 };
+/**
+ * 拼接path,组合成一个完整的restful-get请求路径 新版本
+ * @param path   路径path /xxx/xx
+ * @param param 参数     {a:1,...}
+ * @returns
+ */
+
+export var createRestfulGetPathNew = function createRestfulGetPath(path, param) {
+  var pathLink = "";
+
+  for (var k in param) {
+    pathLink += k + "=" + param[k] + "&";
+  }
+
+  pathLink = pathLink.substring(0, pathLink.length - 1);
+  pathLink = path + "?" + pathLink;
+  return pathLink.replace(" ", "");
+};
 /**
  * 统一接口异常 code info 处理 (中台新版 restful请求 使用)
  * @param code   1xxx 3xxx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastman3-dfyjapp-request",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "a network request for dfyj app",
   "main": "es/request.js",
   "scripts": {