fastman3-dfyjapp-request 1.0.6 → 1.0.9

package/README.md

@@ -29,3 +29,15 @@
 ### v 1.0.6 - 2021.9.30
 
 1. 支持 OEM APP 网络层适配
+
+### v 1.0.7 - 2021.10.21
+
+1. 新增对微信的环境判断输出
+
+### v 1.0.8 - 2022.04.20
+
+1. 新增restful接口-携带(jwt token)请求方式getRouter,postRouter
+
+### v 1.0.9 - 2022.05.10
+
+1. 完善restful日志的输出完整性

package/es/interceptors/endProductInterceptor.js

@@ -45,7 +45,8 @@ var endProductInterceptor = function endProductInterceptor(chain) {
 
     if (RESTFUL_PATH_BY_FASTMAN3) {
       data = res;
-      code = res.data.code;
+      code = res.data.code || res.statusCode == 200 ? 0 : res.statusCode; // 解决restful 接口mock环境 不正常访问
+
       info = res.data.restfulInfo;
     } // 是否服务端会话过期
 
@@ -61,13 +62,13 @@ var endProductInterceptor = function endProductInterceptor(chain) {
     } else if (code >= 1000 && code <= 1999) {
       return Promise.reject({
         code: 1000,
-        info: "\u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF(" + code + ")"
+        info: "\u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF(".concat(code, ")")
       });
     } else if (isServerSessionExpired) {
       removeStorageSync(TOKEN_KEY);
       return Promise.reject({
         code: 3000,
-        info: "\u672A\u767B\u5F55\u6216\u767B\u5F55\u6001\u5DF2\u5931\u6548(" + code + ")"
+        info: "\u672A\u767B\u5F55\u6216\u767B\u5F55\u6001\u5DF2\u5931\u6548(".concat(code, ")")
       });
     } else {
       return Promise.reject({

package/es/interceptors/httpStatusInterceptor.js

@@ -74,7 +74,7 @@ var httpStatusInterceptor = function httpStatusInterceptor(chain) {
       // 其它未能捕获的http异常
       return Promise.reject({
         code: res.statusCode,
-        info: "Http\u53D1\u751F\u5176\u5B83\u5F02\u5E38(" + res.statusCode + ")"
+        info: "Http\u53D1\u751F\u5176\u5B83\u5F02\u5E38(".concat(res.statusCode, ")")
       });
     }
   });

package/es/interceptors/index.js

@@ -14,6 +14,7 @@ import { timeoutInterceptor } from "./timeoutInterceptor";
  * 遵循洋葱模型规则：先进后出，请开发者注意数组中拦截器的注册顺序
  */
 
-export { endProductInterceptor, transformInterceptor // 先 request 后 response
-, logInterceptor, securityInterceptor // 后 reuqest 先 response
-, httpStatusInterceptor, timeoutInterceptor };
+export { endProductInterceptor, transformInterceptor, // 先 request 后 response
+logInterceptor, securityInterceptor, // 后 reuqest 先 response
+httpStatusInterceptor, timeoutInterceptor // 注：超时拦截器必须放在所有拦截器的最后加入
+};

package/es/interceptors/logInterceptor.js

@@ -12,11 +12,11 @@ export default function logInterceptor(chain) {
       FUNCNO_POWER_BY_FASTMAN3 = requestParams.FUNCNO_POWER_BY_FASTMAN3,
       RESTFUL_PATH_BY_FASTMAN3 = requestParams.RESTFUL_PATH_BY_FASTMAN3; // eslint-disable-next-line no-console
 
-  console.log("http " + (method || "GET") + " --> " + url + " data[" + (FUNCNO_POWER_BY_FASTMAN3 || RESTFUL_PATH_BY_FASTMAN3) + "]: ", data);
+  console.log("http ".concat(method || "GET", " --> ").concat(url, " data[").concat(FUNCNO_POWER_BY_FASTMAN3 || RESTFUL_PATH_BY_FASTMAN3, "]: "), data);
   var p = chain.proceed(requestParams);
   var res = p.then(function (res) {
     // eslint-disable-next-line no-console
-    console.log("http <-- " + url + " result[" + FUNCNO_POWER_BY_FASTMAN3 + "]:", JSON.stringify(res));
+    console.log("http <-- ".concat(url, " result[").concat(FUNCNO_POWER_BY_FASTMAN3 || RESTFUL_PATH_BY_FASTMAN3, "]:"), JSON.stringify(res));
     return res;
   });
   if (typeof p.abort === "function") res.abort = p.abort;

package/es/interceptors/securityInterceptor.js

@@ -1,4 +1,4 @@
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 /*
  * @Author: shenzhiwei

package/es/interceptors/transformInterceptor.js

@@ -35,10 +35,14 @@ var transformInterceptor = function transformInterceptor(chain) {
   var FUNCNO_POWER_BY_FASTMAN3 = requestParams.FUNCNO_POWER_BY_FASTMAN3; // TODO 随着 CHANNEL 对环境的要求高而增多扩展
 
   if (!_system) {
-    if (isFromIos()) {
+    if (isFromWeiXin()) {
+      _system = "Weixin";
+    } else if (isFromIos()) {
       _system = "iOS";
     } else if (isFromAndroid()) {
       _system = "Andriod";
+    } else {
+      _system = "Weixin"; // 添加默认值
     }
   }
 

package/es/request.d.ts

@@ -37,6 +37,24 @@ declare class fetch {
      * 纯净版request
      */
     requestNative(params: any): Taro.RequestTask<any>;
+    /**
+     * 发起中台新版POST restful -请求
+     * HEADER 里面带上jwt token  ,即：Authorization: Bearer ${jwt token}
+     * @param restfulPath restful接口路径，通常由/xxx/xxx...
+     * @param data 数据，对象类型
+     */
+    postRouter(restfulPath: string, data: {
+        [key: string]: any;
+    }): Taro.RequestTask<any>;
+    /**
+     * 发起中台新版 GET restful请求
+     * HEADER 里面带上jwt token  ,即：Authorization: Bearer ${jwt token}
+     * @param restfulPath restful接口路径，通常由/xxx/xxx...
+     * @param data 数据，对象类型
+     */
+    getRouter(restfulPath: string, data?: {
+        [key: string]: any;
+    }): Taro.RequestTask<any>;
 }
 declare const _default: fetch;
 export default _default;

package/es/request.js

@@ -9,6 +9,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 } from "./utils";
+import { AppAuthorize } from "fastman3-dfyjapp-jsbridge";
 addInterceptor(endProductInterceptor);
 addInterceptor(transformInterceptor);
 addInterceptor(logInterceptor);
@@ -43,8 +44,10 @@ function () {
 
     if (process.env.APP_ENV === "mock" && !RESTFUL_PATH_BY_FASTMAN3) {
       url = process.env.GATEWAY_URL + "/" + FUNCNO_POWER_BY_FASTMAN3;
-    } else if (RESTFUL_PATH_BY_FASTMAN3) {
+    } else if (RESTFUL_PATH_BY_FASTMAN3 && process.env.APP_ENV != "mock") {
       url = process.env.GATEWAY_RESTFUL_URL + RESTFUL_PATH_BY_FASTMAN3;
+    } else if (RESTFUL_PATH_BY_FASTMAN3 && process.env.APP_ENV === "mock") {
+      url = process.env.GATEWAY_URL + RESTFUL_PATH_BY_FASTMAN3;
     } else {
       url = process.env.GATEWAY_URL;
     }
@@ -76,19 +79,19 @@ function () {
           });
         } // 网络请求超时
         else if (err.message === "网络链接超时,请稍后再试！") {
-            reject({
-              code: -2,
-              info: err.message
-            });
-          } // 特殊网络容错处理
-          else if (err.status && err.statusText) {
-              reject({
-                code: err.status,
-                info: err.statusText
-              });
-            } else {
-              reject(err);
-            }
+          reject({
+            code: -2,
+            info: err.message
+          });
+        } // 特殊网络容错处理
+        else if (err.status && err.statusText) {
+          reject({
+            code: err.status,
+            info: err.statusText
+          });
+        } else {
+          reject(err);
+        }
       });
     });
   };
@@ -144,6 +147,78 @@ function () {
       isNative: true
     }, params));
   };
+  /**
+   * 发起中台新版POST restful -请求
+   * HEADER 里面带上jwt token  ,即：Authorization: Bearer ${jwt token}
+   * @param restfulPath restful接口路径，通常由/xxx/xxx...
+   * @param data 数据，对象类型
+   */
+
+
+  fetch.prototype.postRouter = function (restfulPath, data) {
+    if (typeof data != "string") {
+      data = JSON.stringify(data);
+    }
+
+    var fullUrlPath;
+
+    if (process.env.APP_ENV === "mock") {
+      fullUrlPath = process.env.ROUTER_URL + "/" + restfulPath.split("func=")[1];
+    } else {
+      fullUrlPath = process.env.ROUTER_URL + restfulPath;
+    }
+
+    var params = {
+      url: fullUrlPath,
+      method: "POST",
+      data: data
+    }; // header添加Authorization -jwt认证-IF018020-accessToken 登录成功时存在,否则为空
+    //@ts-ignore
+
+    if (!!AppAuthorize.accessToken) {
+      params.header = {
+        //@ts-ignore
+        "Authorization": "Bearer ".concat(AppAuthorize.accessToken)
+      };
+    }
+
+    return this.requestNative(params);
+  };
+  /**
+   * 发起中台新版 GET restful请求
+   * HEADER 里面带上jwt token  ,即：Authorization: Bearer ${jwt token}
+   * @param restfulPath restful接口路径，通常由/xxx/xxx...
+   * @param data 数据，对象类型
+   */
+
+
+  fetch.prototype.getRouter = function (restfulPath, data) {
+    if (typeof data != "string") {
+      data = JSON.stringify(data);
+    }
+
+    var fullUrlPath;
+
+    if (process.env.APP_ENV === "mock") {
+      fullUrlPath = process.env.ROUTER_URL + restfulPath.split("func=")[1];
+    } else {
+      fullUrlPath = process.env.ROUTER_URL + createRestfulGetPath(restfulPath, data);
+    }
+
+    var params = {
+      url: fullUrlPath
+    }; // header添加Authorization -jwt认证-IF018020-accessToken 登录成功时存在,否则为空
+    //@ts-ignore
+
+    if (!!AppAuthorize.accessToken) {
+      params.header = {
+        //@ts-ignore
+        "Authorization": "Bearer ".concat(AppAuthorize.accessToken)
+      };
+    }
+
+    return this.requestNative(params);
+  };
 
   return fetch;
 }();

package/es/utils.js

@@ -67,7 +67,7 @@ export var createRestfulGetPath = function createRestfulGetPath(path, param) {
 
   for (var k in param) {
     var value = param[k] !== undefined ? param[k] : '';
-    pathLink += "&" + k + "=" + encodeURIComponent(value);
+    pathLink += "&".concat(k, "=").concat(encodeURIComponent(value));
   }
 
   pathLink = path + "?" + (pathLink === null || pathLink === void 0 ? void 0 : pathLink.substr(1));

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "fastman3-dfyjapp-request",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "description": "a network request for dfyj app",
   "main": "es/request.js",
   "scripts": {
     "build": "father-build"
   },
-  "keywords": [ 
+  "keywords": [
     "http",
     "fetch"
   ],