@ibiz-template/core 0.0.1-alpha.4 → 0.0.1-alpha.40

package/out/utils/interceptor/interceptor.js

@@ -1,7 +1,5 @@
-import axios from 'axios';
-import { getToken } from '../util/util';
 /**
- * 默认请求拦截器
+ * 拦截器基类
  *
  * @author chitanda
  * @date 2022-07-20 18:07:11
@@ -9,25 +7,78 @@ import { getToken } from '../util/util';
  * @class Interceptor
  */
 export class Interceptor {
-    constructor() {
-        this.init();
+    /**
+     * 请求之前处理
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:41
+     * @protected
+     * @param {AxiosRequestConfig} config
+     * @returns {*}  {Promise<AxiosRequestConfig>}
+     */
+    async onBeforeRequest(config) {
+        return config;
     }
-    init() {
-        axios.interceptors.request.use(config => {
-            if (!config.headers) {
-                config.headers = {};
-            }
-            config.headers.Authorization = `Bearer ${getToken()}`;
-            const { orgData } = ibiz;
-            if (orgData) {
-                if (orgData.systemid) {
-                    config.headers.srfsystemid = orgData.systemid;
-                }
-                if (orgData.orgid) {
-                    config.headers.srforgid = orgData.orgid;
-                }
-            }
-            return config;
-        });
+    /**
+     * 请求失败之后处理
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:40
+     * @protected
+     * @param {*} error
+     */
+    onRequestError(error) {
+        // 处理请求错误
+        return Promise.reject(error);
+    }
+    /**
+     * 响应成功之后处理
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:38
+     * @protected
+     * @param {AxiosResponse} config
+     * @returns {*}  {Promise<AxiosRequestConfig>}
+     */
+    async onResponseSuccess(config) {
+        return config;
+    }
+    /**
+     * 响应失败之后处理
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:37
+     * @protected
+     * @param {*} _error
+     */
+    onResponseError(error) {
+        // 处理响应错误
+        return Promise.reject(error);
+    }
+    /**
+     * 使用拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:28
+     * @param {AxiosInstance} instance
+     */
+    use(instance) {
+        this.requestTag = instance.interceptors.request.use(this.onBeforeRequest, this.onRequestError);
+        this.responseTag = instance.interceptors.response.use(this.onResponseSuccess, this.onResponseError);
+    }
+    /**
+     * 移出拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:27
+     * @param {AxiosInstance} instance
+     */
+    eject(instance) {
+        if (this.requestTag) {
+            instance.interceptors.request.eject(this.requestTag);
+        }
+        if (this.responseTag) {
+            instance.interceptors.response.eject(this.responseTag);
+        }
     }
 }

package/out/utils/logger/logger.d.ts

@@ -0,0 +1,3 @@
+import * as Logger from 'loglevel';
+export { Logger };
+//# sourceMappingURL=logger.d.ts.map

package/out/utils/logger/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/out/utils/logger/logger.js

@@ -0,0 +1,2 @@
+import * as Logger from 'loglevel';
+export { Logger };

package/out/utils/net/http-response.d.ts

@@ -27,7 +27,7 @@ export interface IHttpResponse<T = IData> extends AxiosResponse {
      * @date 2022-08-18 15:08:44
      * @type {boolean}
      */
-    local?: boolean;
+    local: boolean;
     data: T;
     /**
      * 当前页
@@ -64,14 +64,9 @@ export declare class HttpResponse<T = IData> implements IHttpResponse<T> {
     data: T;
     status: number;
     statusText: string;
-    /**
-     * header 本地仿造时值为空
-     *
-     * @author chitanda
-     * @date 2022-08-18 15:08:46
-     * @type {AxiosResponseHeaders}
-     */
-    headers: AxiosResponseHeaders;
+    headers: AxiosResponseHeaders | Partial<Record<string, string> & {
+        'set-cookie'?: string[] | undefined;
+    }>;
     /**
      * AxiosResponse 本地仿造时值为空
      *

package/out/utils/net/http-response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-response.d.ts","sourceRoot":"","sources":["../../../src/utils/net/http-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAEhF;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa,CAAC,CAAC,GAAG,KAAK,CAAE,SAAQ,aAAa;IAC7D;;;;;;;OAOG;IACH,EAAE,EAAE,OAAO,CAAC;IACZ;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,IAAI,EAAE,CAAC,CAAC;IAER;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;GASG;AACH,qBAAa,YAAY,CAAC,CAAC,GAAG,KAAK,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;IAC9D;;;;;OAKG;IACH,KAAK,UAAQ;IAEb,EAAE,UAAS;IAEX,IAAI,EAAE,CAAC,CAAC;IAER,MAAM,EAAE,MAAM,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,OAAO,EAAE,oBAAoB,CAAM;IAEnC;;;;;;OAMG;IACH,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAM;IAEvC;;;;;;;;OAQG;gBACS,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;CAQjE"}
+{"version":3,"file":"http-response.d.ts","sourceRoot":"","sources":["../../../src/utils/net/http-response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAEhF;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa,CAAC,CAAC,GAAG,KAAK,CAAE,SAAQ,aAAa;IAC7D;;;;;;;OAOG;IACH,EAAE,EAAE,OAAO,CAAC;IACZ;;;;;;;OAOG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf,IAAI,EAAE,CAAC,CAAC;IAER;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;GASG;AACH,qBAAa,YAAY,CAAC,CAAC,GAAG,KAAK,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;IAC9D;;;;;OAKG;IACH,KAAK,UAAQ;IAEb,EAAE,UAAS;IAEX,IAAI,EAAE,CAAC,CAAC;IAER,MAAM,EAAE,MAAM,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EACH,oBAAoB,GACpB,OAAO,CACL,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,CACjE,CAAM;IAEX;;;;;;OAMG;IACH,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAM;IAEvC;;;;;;;;OAQG;gBACS,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;CAQjE"}

package/out/utils/net/http-response.js

@@ -27,13 +27,6 @@ export class HttpResponse {
          */
         this.local = true;
         this.ok = false;
-        /**
-         * header 本地仿造时值为空
-         *
-         * @author chitanda
-         * @date 2022-08-18 15:08:46
-         * @type {AxiosResponseHeaders}
-         */
         this.headers = {};
         /**
          * AxiosResponse 本地仿造时值为空

package/out/utils/net/net.d.ts

@@ -1,4 +1,5 @@
-import { AxiosRequestHeaders } from 'axios';
+import { RawAxiosRequestHeaders, AxiosRequestConfig, AxiosInstance, CreateAxiosDefaults } from 'axios';
+import { Interceptor } from '../interceptor/interceptor';
 import { IHttpResponse } from './http-response';
 /**
  * 全局请求工具类
@@ -10,73 +11,133 @@ import { IHttpResponse } from './http-response';
  */
 export declare class Net {
     /**
-     * 标准请求前缀
+     * axios实例
      *
-     * @author chitanda
-     * @date 2022-07-21 10:07:48
+     * @author lxm
+     * @date 2022-10-27 17:10:18
      * @protected
-     * @type {string}
+     * @type {AxiosInstance}
      */
-    protected _prefix: string;
-    get prefix(): string;
+    protected instance: AxiosInstance;
     /**
      * Creates an instance of Net.
+     * @author lxm
+     * @date 2022-10-27 16:10:05
+     * @param {CreateAxiosDefaults} [config] 创建实例用的默认配置
+     */
+    constructor(config?: CreateAxiosDefaults);
+    /**
+     * 注册的拦截器
      *
-     * @author chitanda
-     * @date 2022-07-21 10:07:27
-     * @param {string} [prefix] 请求前缀
+     * @author lxm
+     * @date 2022-10-27 17:10:18
+     * @type {Map<string, Interceptor>}
+     */
+    interceptors: Map<string, Interceptor>;
+    /**
+     * 添加拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:42
+     * @param {string} name 唯一标识
+     * @param {Interceptor} interceptor 拦截器
+     */
+    addInterceptor(name: string, interceptor: Interceptor): void;
+    /**
+     * 删除拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:27
+     * @param {string} name 唯一标识
+     */
+    removeInterceptor(name: string): void;
+    /**
+     * 预置config,绑定动态的配置
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:48
+     * @readonly
+     * @protected
+     * @type {AxiosRequestConfig}
      */
-    constructor(prefix?: string);
+    protected get presetConfig(): AxiosRequestConfig;
+    /**
+     * 从左到右递归合并配置参数（内置第一个合并的预置参数）
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:09
+     * @protected
+     * @param {...AxiosRequestConfig[]} configs
+     * @returns {*}
+     */
+    protected mergeConfig(...configs: AxiosRequestConfig[]): any;
     /**
      * Post 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:01
+     * @date 2022-10-19 11:10:30
      * @param {string} url
+     * @param {IData} data
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    post(url: string, data: IData, params?: IParams, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
+    post(url: string, data: IData, params?: IParams, headers?: RawAxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * Get 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:08
+     * @date 2022-10-19 11:10:24
      * @param {string} url
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
+     * @param {IParams} [option={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    get(url: string, params?: IParams, headers?: AxiosRequestHeaders, option?: IParams): Promise<IHttpResponse>;
+    get(url: string, params?: IParams, headers?: RawAxiosRequestHeaders, option?: AxiosRequestConfig): Promise<IHttpResponse>;
     /**
      * Delete 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:43
+     * @date 2022-10-19 11:10:17
      * @param {string} url
      * @param {IParams} [params]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    delete(url: string, params?: IParams, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
+    delete(url: string, params?: IParams, headers?: RawAxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * Put 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:49
+     * @date 2022-10-19 11:10:11
      * @param {string} url
      * @param {IData} data
+     * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    put(url: string, data: IData, params?: IParams, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
+    put(url: string, data: IData, params?: IParams, headers?: RawAxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * 获取模型数据
      *
      * @author chitanda
      * @date 2022-07-14 15:07:15
      * @param {string} url
-     * @param {AxiosRequestHeaders} [headers={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    getModel(url: string, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
+    getModel(url: string, headers?: RawAxiosRequestHeaders): Promise<IHttpResponse>;
+    /**
+     * 基础请求方法，会合并预置配置
+     *
+     * @author lxm
+     * @date 2022-10-27 14:10:06
+     * @param {string} url
+     * @param {AxiosRequestConfig} [config={}]
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    request(url: string, config?: AxiosRequestConfig): Promise<IHttpResponse>;
     /**
      * 统一处理请求返回
      *
@@ -109,15 +170,5 @@ export declare class Net {
      * @return {*}  {string}
      */
     private attachUrlParam;
-    /**
-     * 处理 url 参数
-     *
-     * @author chitanda
-     * @date 2022-07-20 20:07:17
-     * @private
-     * @param {string} url
-     * @return {*}  {string}
-     */
-    private attachUrl;
 }
 //# sourceMappingURL=net.d.ts.map

package/out/utils/net/net.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../../src/utils/net/net.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,mBAAmB,EAAiB,MAAM,OAAO,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,GAAG;IACd;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAM;IAE/B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;gBACS,MAAM,CAAC,EAAE,MAAM;IAM3B;;;;;;;;OAQG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAezB;;;;;;;;OAQG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,EACjC,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;OAQG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAMzB;;;;;;;;OAQG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAMzB;;;;;;;;OAQG;IACG,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;;;OASG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;IAiBtB;;;;;;;;OAQG;IACH,OAAO,CAAC,SAAS;CAGlB"}
+{"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../../src/utils/net/net.ts"],"names":[],"mappings":"AAAA,OAAc,EAEZ,sBAAsB,EAEtB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACpB,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,GAAG;IACd;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;IAElC;;;;;OAKG;gBACS,MAAM,CAAC,EAAE,mBAAmB;IAIxC;;;;;;OAMG;IACH,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW;IAKrD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,MAAM;IAQ9B;;;;;;;;OAQG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,CAS/C;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,OAAO,EAAE,kBAAkB,EAAE;IAOtD;;;;;;;;;;OAUG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,CAAC;IAczB;;;;;;;;;;OAUG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,sBAA2B,EACpC,MAAM,GAAE,kBAAuB,GAC9B,OAAO,CAAC,aAAa,CAAC;IAiBzB;;;;;;;;;OASG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;;;OAUG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,CAAC;IAczB;;;;;;;;OAQG;IACG,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,kBAAuB,GAC9B,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;OAQG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;;;OASG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;CAevB"}

package/out/utils/net/net.js

@@ -1,6 +1,8 @@
 import axios from 'axios';
+import { merge } from 'lodash-es';
 import { stringify } from 'qs';
 import { notNilEmpty } from 'qx-util';
+import { HttpError } from '../../error';
 /**
  * 全局请求工具类
  *
@@ -12,54 +14,115 @@ import { notNilEmpty } from 'qx-util';
 export class Net {
     /**
      * Creates an instance of Net.
-     *
-     * @author chitanda
-     * @date 2022-07-21 10:07:27
-     * @param {string} [prefix] 请求前缀
+     * @author lxm
+     * @date 2022-10-27 16:10:05
+     * @param {CreateAxiosDefaults} [config] 创建实例用的默认配置
      */
-    constructor(prefix) {
+    constructor(config) {
         /**
-         * 标准请求前缀
+         * 注册的拦截器
          *
-         * @author chitanda
-         * @date 2022-07-21 10:07:48
-         * @protected
-         * @type {string}
+         * @author lxm
+         * @date 2022-10-27 17:10:18
+         * @type {Map<string, Interceptor>}
          */
-        this._prefix = '';
-        if (prefix) {
-            this._prefix = prefix;
+        this.interceptors = new Map();
+        this.instance = axios.create(config);
+    }
+    /**
+     * 添加拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:42
+     * @param {string} name 唯一标识
+     * @param {Interceptor} interceptor 拦截器
+     */
+    addInterceptor(name, interceptor) {
+        interceptor.use(this.instance);
+        this.interceptors.set(name, interceptor);
+    }
+    /**
+     * 删除拦截器
+     *
+     * @author lxm
+     * @date 2022-10-27 17:10:27
+     * @param {string} name 唯一标识
+     */
+    removeInterceptor(name) {
+        const interceptor = this.interceptors.get(name);
+        if (interceptor) {
+            interceptor.eject(this.instance);
+            this.interceptors.delete(name);
         }
     }
-    get prefix() {
-        return this._prefix || ibiz.env.baseUrl;
+    /**
+     * 预置config,绑定动态的配置
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:48
+     * @readonly
+     * @protected
+     * @type {AxiosRequestConfig}
+     */
+    get presetConfig() {
+        return {
+            // 请求前缀路径
+            baseURL: this.instance.defaults.baseURL || ibiz.env.baseUrl,
+            headers: {
+                'Content-Type': 'application/json;charset=UTF-8',
+                Accept: 'application/json',
+            },
+        };
+    }
+    /**
+     * 从左到右递归合并配置参数（内置第一个合并的预置参数）
+     *
+     * @author lxm
+     * @date 2022-10-27 16:10:09
+     * @protected
+     * @param {...AxiosRequestConfig[]} configs
+     * @returns {*}
+     */
+    mergeConfig(...configs) {
+        if (configs.length === 0) {
+            return this.presetConfig;
+        }
+        return merge(this.presetConfig, ...configs);
     }
     /**
      * Post 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:01
+     * @date 2022-10-19 11:10:30
      * @param {string} url
+     * @param {IData} data
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async post(url, data, params = {}, headers = {}) {
         url = this.handleAppPresetParam(url, params);
-        const response = await axios({
-            method: 'post',
-            url,
-            data,
-            headers: Object.assign({ 'Content-Type': 'application/json;charset=UTF-8', Accept: 'application/json' }, headers),
-        });
-        return this.doResponseResult(response);
+        try {
+            const response = await this.request(url, {
+                method: 'post',
+                data,
+                headers,
+            });
+            return this.doResponseResult(response);
+        }
+        catch (error) {
+            throw new HttpError(error);
+        }
     }
     /**
      * Get 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:08
+     * @date 2022-10-19 11:10:24
      * @param {string} url
      * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
+     * @param {IParams} [option={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async get(url, params = {}, headers = {}, option = {}) {
@@ -68,36 +131,58 @@ export class Net {
         //   delete params.srfparentdata;
         // }
         url = this.attachUrlParam(url, params);
-        const response = await axios.get(url, Object.assign({ headers }, option));
-        return this.doResponseResult(response);
+        try {
+            const response = await this.request(url, merge({ method: 'get', headers }, option));
+            return this.doResponseResult(response);
+        }
+        catch (error) {
+            throw new HttpError(error);
+        }
     }
     /**
      * Delete 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:43
+     * @date 2022-10-19 11:10:17
      * @param {string} url
      * @param {IParams} [params]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async delete(url, params, headers = {}) {
         url = this.handleAppPresetParam(url, params);
-        const response = await axios.delete(url, { headers });
-        return this.doResponseResult(response);
+        try {
+            const response = await this.request(url, { method: 'delete', headers });
+            return this.doResponseResult(response);
+        }
+        catch (error) {
+            throw new HttpError(error);
+        }
     }
     /**
      * Put 请求
      *
      * @author chitanda
-     * @date 2022-07-14 15:07:49
+     * @date 2022-10-19 11:10:11
      * @param {string} url
      * @param {IData} data
+     * @param {IParams} [params={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async put(url, data, params = {}, headers = {}) {
         url = this.handleAppPresetParam(url, params);
-        const response = await axios.put(url, data, { headers });
-        return this.doResponseResult(response);
+        try {
+            const response = await this.request(url, {
+                method: 'put',
+                data,
+                headers,
+            });
+            return this.doResponseResult(response);
+        }
+        catch (error) {
+            throw new HttpError(error);
+        }
     }
     /**
      * 获取模型数据
@@ -105,14 +190,37 @@ export class Net {
      * @author chitanda
      * @date 2022-07-14 15:07:15
      * @param {string} url
-     * @param {AxiosRequestHeaders} [headers={}]
+     * @param {RawAxiosRequestHeaders} [headers={}]
      * @return {*}  {Promise<IHttpResponse>}
      */
     async getModel(url, headers = {}) {
-        const response = await axios.get(url, {
-            headers,
-        });
-        return this.doResponseResult(response);
+        try {
+            const response = await this.instance.get(url, {
+                headers,
+            });
+            return this.doResponseResult(response);
+        }
+        catch (error) {
+            throw new HttpError(error);
+        }
+    }
+    /**
+     * 基础请求方法，会合并预置配置
+     *
+     * @author lxm
+     * @date 2022-10-27 14:10:06
+     * @param {string} url
+     * @param {AxiosRequestConfig} [config={}]
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    async request(url, config = {}) {
+        try {
+            const response = await this.instance.request(this.mergeConfig({ url }, config));
+            return this.doResponseResult(response);
+        }
+        catch (error) {
+            throw new HttpError(error);
+        }
     }
     /**
      * 统一处理请求返回
@@ -164,7 +272,6 @@ export class Net {
      * @return {*}  {string}
      */
     attachUrlParam(url, params) {
-        url = this.attachUrl(url);
         const strParams = stringify(params);
         if (notNilEmpty(strParams)) {
             if (url.endsWith('?')) {
@@ -182,16 +289,4 @@ export class Net {
         }
         return url;
     }
-    /**
-     * 处理 url 参数
-     *
-     * @author chitanda
-     * @date 2022-07-20 20:07:17
-     * @private
-     * @param {string} url
-     * @return {*}  {string}
-     */
-    attachUrl(url) {
-        return `${this.prefix}${url}`;
-    }
 }