@ningboyz/apis 1.5.84 → 1.5.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ningboyz/apis",
-  "version": "1.5.84",
+  "version": "1.5.86",
   "private": false,
   "description": "宁波甬政请求库",
   "author": "nbyt-syq",
@@ -17,7 +17,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@ningboyz/types": "1.5.84",
+    "@ningboyz/types": "1.5.86",
     "axios": "1.8.4",
     "lodash": "^4.17.21"
   },

package/packages/axios.ts

@@ -3,6 +3,7 @@ import axios from "axios";
 import _ from "lodash";
 import { TResp } from "@ningboyz/types";
 import { ISessionUserInfo, TSessionUserInfo } from "@ningboyz/types/src/store";
+import { CONST_ERROR_KEY_TO_会话过期, CONST_ERROR_KEY_TO_路由错误 } from "@ningboyz/types/src/const/const_error_key";
 
 export interface IAxiosConfig {
   baseURL: string;
@@ -10,6 +11,7 @@ export interface IAxiosConfig {
   getUserInfo?: () => ISessionUserInfo;
   interceptorsRequest?: (request: InternalAxiosRequestConfig<any>) => InternalAxiosRequestConfig<any>;
   interceptorsResponse?: (response: AxiosResponse<any>) => AxiosResponse<any>;
+  loseTokenState?: () => void;
 }
 
 class HttpRequest {
@@ -23,7 +25,7 @@ class HttpRequest {
   }
 
   constructor(config: IAxiosConfig) {
-    const { baseURL, timeout = 60000, getUserInfo, interceptorsRequest, interceptorsResponse } = config;
+    const { baseURL, timeout = 60000, getUserInfo, interceptorsRequest, interceptorsResponse, loseTokenState } = config;
     this.instance = axios.create({
       baseURL,
       timeout
@@ -50,9 +52,25 @@ class HttpRequest {
 
     /**用户传了响应中间件 */
     if (!_.isNil(interceptorsResponse)) {
-      this.instance.interceptors.response.use(interceptorsResponse);
+      // this.instance.interceptors.response.use(interceptorsResponse);
+      this.instance.interceptors.response.use((response) => {
+        response = interceptorsResponse(response);
+        if (!_.isNil(response.data) && !_.isNil(loseTokenState)) {
+          const resp = response.data as TResp.IResponse<any>;
+          if (resp.ERRORKEY === CONST_ERROR_KEY_TO_会话过期) {
+            loseTokenState();
+          }
+        }
+        return response;
+      });
     } else {
       this.instance.interceptors.response.use((response) => {
+        if (!_.isNil(response.data) && !_.isNil(loseTokenState)) {
+          const resp = response.data as TResp.IResponse<any>;
+          if (resp.ERRORKEY === CONST_ERROR_KEY_TO_会话过期) {
+            loseTokenState();
+          }
+        }
         return response;
       });
     }
@@ -111,7 +129,7 @@ class HttpRequest {
   postJson<T>(url: string, querys?: object, params?: object, headers?: object): Promise<TResp.IResponse<T>> {
     const lowerQuerys = querys ? this.toLowerCase(querys) : undefined;
     return new Promise((resolve, reject) => {
-      const data = !_.isNil(params) ? params: void 0;
+      const data = !_.isNil(params) ? params : void 0;
       this.instance
         .request<T>({
           method: this.METHOD_POST,
@@ -131,7 +149,6 @@ class HttpRequest {
     });
   }
 
-
   postFile<T>(url: string, querys?: object, params?: object): Promise<TResp.IResponse<T>> {
     const lowerQuerys = querys ? this.toLowerCase(querys) : undefined;
     return new Promise((resolve, reject) => {

package/pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@ningboyz/types':
-        specifier: 1.5.10
-        version: 1.5.10
+        specifier: 1.5.84
+        version: 1.5.84
       axios:
         specifier: 1.8.4
         version: 1.8.4
@@ -27,8 +27,8 @@ packages:
   '@aximario/json-tree@2.2.4':
     resolution: {integrity: sha512-XGMJ+zuVQ0CRizo1d3ZTUKEvrTqKYbm2a00T6DnRFR36mzV6mexLUKRIk6repj3JKgLrj3iwW8aUFrOS4P7CEA==}
 
-  '@ningboyz/types@1.5.10':
-    resolution: {integrity: sha512-DNHU3WgiiWGEvaOJ5T6QRef6RkkfqtiPMpe1FXOElR0IxZYawILCgXs7pU+fMBSfdMLMpVN9ckrc9NevvUUuqw==}
+  '@ningboyz/types@1.5.84':
+    resolution: {integrity: sha512-LBJ0qv/qtLRONLJipm8Y+jyIWSPzSlw3x0wKmWHfmMwtfpgeMsU/VAsOoaGC/BYsvSCc9GTJo8Ssi5ih1R7gMw==}
 
   '@types/lodash@4.17.20':
     resolution: {integrity: sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==}
@@ -133,7 +133,7 @@ snapshots:
 
   '@aximario/json-tree@2.2.4': {}
 
-  '@ningboyz/types@1.5.10':
+  '@ningboyz/types@1.5.84':
     dependencies:
       '@aximario/json-tree': 2.2.4
       lodash: 4.17.21