fastman3-dfyjapp-request 1.1.2 → 1.1.5

package/README.md

@@ -66,3 +66,16 @@
 ### v 1.1.2 - 2022.06.27
 
 1. restful 接口 token 不需要缓存,解决登录态失效 机构户 登录页面不正常提示问题
+
+### v 1.1.3 - 2022.06.27
+
+1. 1.1.2版本变更 添加注释
+
+
+### v 1.1.4 - 2022.07.14
+
+1. 统一 channel 处理逻辑
+
+### v 1.1.5 - 2022.07.22
+
+1. 设置credentials 具体类型，restful 接口get post请求option内不传该字段

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/transformInterceptor.js

@@ -23,7 +23,7 @@ var __assign = this && this.__assign || function () {
 
 import { AppAuthorize } from "fastman3-dfyjapp-jsbridge";
 import { guid } from "../utils";
-import { isFromApp, isFromWeiXin, isFromIos, isFromAndroid } from "fastman3-common-helper/es/OS.h5";
+import { isFromApp, isFromWeiXin, isFromWhichPlatform } 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";
@@ -33,20 +33,20 @@ var _system;
 var transformInterceptor = function transformInterceptor(chain) {
   var requestParams = chain.requestParams;
   if (requestParams === null || requestParams === void 0 ? void 0 : requestParams.isNative) return chain.proceed(requestParams);
-  var FUNCNO_POWER_BY_FASTMAN3 = requestParams.FUNCNO_POWER_BY_FASTMAN3; // TODO 随着 CHANNEL 对环境的要求高而增多扩展
-
-  if (!_system) {
-    if (isFromWeiXin()) {
-      _system = "Weixin";
-    } else if (isFromIos()) {
-      _system = "iOS";
-    } else if (isFromAndroid()) {
-      _system = "Andriod";
-    } else {
-      _system = "Weixin"; // 添加默认值
-    }
-  }
-
+  var FUNCNO_POWER_BY_FASTMAN3 = requestParams.FUNCNO_POWER_BY_FASTMAN3; // // TODO 随着 CHANNEL 对环境的要求高而增多扩展
+  // if(!_system) {
+  //   if (isFromWeiXin()) {
+  //     _system = "Weixin";
+  //   } else if(isFromIos()) {
+  //     _system = "iOS";
+  //   } else if(isFromAndroid()) {
+  //     _system = "Andriod";
+  //   }else {
+  //     _system = "Weixin"; // 添加默认值
+  //   }
+  // }
+
+  _system = isFromWhichPlatform();
   var body = {
     header: {
       appId: process.env.APP_ID,

package/es/request.js

@@ -65,13 +65,28 @@ function () {
       header: {
         "Content-Type": "application/json"
       },
-      // 是否携带 cookie
-      credentials: !isFromApp() ? "omit" : /^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$/.test(location.hostname) || location.hostname === "localhost" ? "omit" : "include",
+      // 是否携带 cookie 注释不用
+      // credentials: !isFromApp()
+      //   ? "omit"
+      //   : /^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$/.test(location.hostname) || location.hostname === "localhost"
+      //   ? "omit"
+      //   : "include",
       FUNCNO_POWER_BY_FASTMAN3: FUNCNO_POWER_BY_FASTMAN3,
       RESTFUL_PATH_BY_FASTMAN3: RESTFUL_PATH_BY_FASTMAN3,
       mode: "cors",
       timeout: process.env.TIME_OUT || 15000
     };
+    /**
+    * 设置credentials 具体类型，restful接口 get post请求不传该字段,否则正常设置
+    */
+
+    if (!RESTFUL_PATH_BY_FASTMAN3) {
+      // 是否携带 cookie
+      //@ts-ignore
+      option.credentials = !isFromApp() ? "omit" : /^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$/.test(location.hostname) || location.hostname === "localhost" ? "omit" : "include";
+    }
+
+    console.log("request --- options =>", option);
     return new Promise(function (resolve, reject) {
       // @ts-ignore
       request(option).then(function (res) {

package/package.json

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