@gct-paas/api 0.1.6-dev.6 → 0.1.6-dev.7

package/es/service/api-manage.mjs

@@ -1,4 +1,4 @@
-import path from "path-browserify";
+import { joinPath } from "../utils/index.mjs";
 import { ApiService } from "./api-service.mjs";
 export class ApiManage {
   /**
@@ -18,7 +18,7 @@ export class ApiManage {
         }
         if (!(property in manage)) {
           manage[property] = new ApiService(
-            path.join(url, config.entityName),
+            joinPath(url, config.entityName),
             config
           );
         }

package/es/service/api-service.d.ts

@@ -101,4 +101,17 @@ export declare class ApiService {
      * @returns {Promise<T>} 请求结果
      */
     protected _head<T = unknown>(method: string, pathParams?: IParams, query?: IParams, data?: IObject, config?: Partial<AxiosRequestConfig>): Promise<T>;
+    /**
+     * 文件上传方法
+     *
+     * @protected
+     * @template T
+     * @param {string} method 请求方法路径
+     * @param {IObject} [pathParams] 路径参数
+     * @param {IParams} [query] 查询参数
+     * @param {Partial<UploadFileData>} [data] 上传数据
+     * @param {Partial<AxiosRequestConfig>} [config] 请求配置
+     * @return {*}  {Promise<T>} 请求结果
+     */
+    protected _upload<T = unknown>(method: string, pathParams?: IObject, query?: IParams, data?: Partial<UploadFileData>, config?: Partial<AxiosRequestConfig>): Promise<T>;
 }

package/es/service/api-service.interface.d.ts

@@ -1,6 +1,5 @@
 import { type ApiManage as APaasApiManage } from '../apaas';
 import { type ApiManage as PlatformApiManage } from '../platform';
-import { type ApiManage as IPaasApiManage } from '../ipaas';
 /**
  * HTTP 响应接口
  *
@@ -99,6 +98,12 @@ export interface ApiItem {
      * @type {boolean}
      */
     hasData?: boolean;
+    /**
+     * 是否为文件上传
+     *
+     * @type {boolean}
+     */
+    hasUpload?: boolean;
 }
 /**
  * 接口配置项
@@ -159,12 +164,4 @@ export interface ApiMap {
      * @type {PlatformApiManage}
      */
     platform: PlatformApiManage;
-    /**
-     * IPaas 平台 API 管理
-     *
-     * @author wangcheng
-     * @date 2026--03-19 17:08:50
-     * @type {IPaasApiManage}
-     */
-    ipaas: IPaasApiManage;
 }

package/es/service/api-service.mjs

@@ -1,4 +1,4 @@
-import path from "path-browserify";
+import { joinPath } from "../utils/index.mjs";
 import { HttpUtil } from "./http.util.mjs";
 export class ApiService {
   /**
@@ -16,24 +16,24 @@ export class ApiService {
         if (!(property in api)) {
           const cfg = config.apis.find((item) => item.method === property);
           if (cfg) {
-            const modeFn = `_${cfg.mode}`;
+            const modeFn = cfg.hasUpload ? "_upload" : `_${cfg.mode}`;
             if (cfg.hasPathParams && cfg.hasData && cfg.hasQuery) {
-              api[property] = (path2, query, data, config2) => {
-                return api[modeFn](cfg.path, path2, query, data, config2);
+              api[property] = (path, query, data, config2) => {
+                return api[modeFn](cfg.path, path, query, data, config2);
               };
             } else if (cfg.hasPathParams && cfg.hasData) {
-              api[property] = function(path2, data, config2) {
-                return api[modeFn](cfg.path, path2, void 0, data, config2);
+              api[property] = function(path, data, config2) {
+                return api[modeFn](cfg.path, path, void 0, data, config2);
               };
             } else if (cfg.hasPathParams && cfg.hasQuery) {
-              api[property] = function(path2, query, config2) {
-                return api[modeFn](cfg.path, path2, query, void 0, config2);
+              api[property] = function(path, query, config2) {
+                return api[modeFn](cfg.path, path, query, void 0, config2);
               };
             } else if (cfg.hasPathParams) {
-              api[property] = function(path2, config2) {
+              api[property] = function(path, config2) {
                 return api[modeFn](
                   cfg.path,
-                  path2,
+                  path,
                   void 0,
                   void 0,
                   config2
@@ -74,6 +74,10 @@ export class ApiService {
                 );
               };
             }
+          } else {
+            console.warn(
+              `API method ${property} is not defined in the configuration.`
+            );
           }
         }
         return api[property];
@@ -93,7 +97,7 @@ export class ApiService {
    */
   _put(method, pathParams, query, data, config) {
     return HttpUtil.put(
-      path.join(this.url, method),
+      joinPath(this.url, method),
       pathParams,
       data,
       query,
@@ -113,7 +117,7 @@ export class ApiService {
    */
   _get(method, pathParams, query, data, config) {
     return HttpUtil.get(
-      path.join(this.url, method),
+      joinPath(this.url, method),
       pathParams,
       data,
       query,
@@ -133,7 +137,7 @@ export class ApiService {
    */
   _delete(method, pathParams, query, data, config) {
     return HttpUtil.delete(
-      path.join(this.url, method),
+      joinPath(this.url, method),
       pathParams,
       data,
       query,
@@ -153,7 +157,7 @@ export class ApiService {
    */
   _post(method, pathParams, query, data, config) {
     return HttpUtil.post(
-      path.join(this.url, method),
+      joinPath(this.url, method),
       pathParams,
       data,
       query,
@@ -173,7 +177,7 @@ export class ApiService {
    */
   _options(method, pathParams, query, data, config) {
     return HttpUtil.options(
-      path.join(this.url, method),
+      joinPath(this.url, method),
       pathParams,
       data,
       query,
@@ -193,7 +197,7 @@ export class ApiService {
    */
   _patch(method, pathParams, query, data, config) {
     return HttpUtil.patch(
-      path.join(this.url, method),
+      joinPath(this.url, method),
       pathParams,
       data,
       query,
@@ -213,7 +217,28 @@ export class ApiService {
    */
   _head(method, pathParams, query, data, config) {
     return HttpUtil.head(
-      path.join(this.url, method),
+      joinPath(this.url, method),
+      pathParams,
+      data,
+      query,
+      config
+    );
+  }
+  /**
+   * 文件上传方法
+   *
+   * @protected
+   * @template T
+   * @param {string} method 请求方法路径
+   * @param {IObject} [pathParams] 路径参数
+   * @param {IParams} [query] 查询参数
+   * @param {Partial<UploadFileData>} [data] 上传数据
+   * @param {Partial<AxiosRequestConfig>} [config] 请求配置
+   * @return {*}  {Promise<T>} 请求结果
+   */
+  _upload(method, pathParams, query, data, config) {
+    return HttpUtil.upload(
+      joinPath(this.url, method),
       pathParams,
       data,
       query,

package/es/service/http.util.d.ts

@@ -6,6 +6,13 @@ import type { AxiosInstance, AxiosRequestConfig } from 'axios';
  * @class HttpUtil
  */
 export declare class HttpUtil {
+    /**
+     * Axios 实例，供外部使用和挂载中间件
+     *
+     * @static
+     * @type {AxiosInstance}
+     */
+    static _instance: AxiosInstance;
     /**
      * 挂载中间件
      *
@@ -111,7 +118,7 @@ export declare class HttpUtil {
      * @template T
      * @param {string} url 请求地址
      * @param {IObject} [path={}] 路径参数
-     * @param {UploadFileData} [data={}] 额外的请求数据
+     * @param {Partial<UploadFileData>} [data={}] 额外的请求数据
      * @param {IParams} [query={}] 查询参数
      * @param {AxiosRequestConfig} [config={}] 请求配置
      * @returns {Promise<T>} 请求结果

package/es/service/http.util.mjs

@@ -3,6 +3,13 @@ import { ContentTypeEnum } from "./http.enum.mjs";
 import { BackendError } from "./http.error.mjs";
 const instance = axios.create();
 export class HttpUtil {
+  /**
+   * Axios 实例，供外部使用和挂载中间件
+   *
+   * @static
+   * @type {AxiosInstance}
+   */
+  static _instance = instance;
   /**
    * 挂载中间件
    *
@@ -10,7 +17,7 @@ export class HttpUtil {
    * @param {(_axios: AxiosInstance) => void} fn 中间件函数
    */
   static use(fn) {
-    fn(instance);
+    fn(this._instance);
   }
   /**
    * GET 请求方法
@@ -130,7 +137,7 @@ export class HttpUtil {
    * @template T
    * @param {string} url 请求地址
    * @param {IObject} [path={}] 路径参数
-   * @param {UploadFileData} [data={}] 额外的请求数据
+   * @param {Partial<UploadFileData>} [data={}] 额外的请求数据
    * @param {IParams} [query={}] 查询参数
    * @param {AxiosRequestConfig} [config={}] 请求配置
    * @returns {Promise<T>} 请求结果
@@ -164,7 +171,8 @@ export class HttpUtil {
       headers: {
         "Content-Type": ContentTypeEnum.FORM_DATA,
         ...config.headers
-      }
+      },
+      nativeData: true
     });
   }
   /**
@@ -198,6 +206,10 @@ export class HttpUtil {
    * @returns {Promise<T>} 请求结果
    */
   static async request(url, path, data, query, config = {}) {
+    const headers = config.headers || {};
+    if (config.headers) {
+      delete config.headers;
+    }
     const res = await instance.request({
       url: this.transformUrl(url, path || {}),
       data: data instanceof FormData ? data : JSON.stringify(data ? data : {}),
@@ -205,10 +217,16 @@ export class HttpUtil {
       timeout: 2 * 60 * 1e3,
       headers: {
         "Content-Type": ContentTypeEnum.JSON,
-        ...config.headers
+        ...headers
       },
       ...config
     });
+    if (config.nativeResponse) {
+      return res;
+    }
+    if (config.nativeData) {
+      return res.data;
+    }
     if (res.status >= 200 && res.status < 300) {
       const data2 = res.data;
       if (data2.ok === true) {

package/es/service/index.mjs

@@ -1,11 +1,9 @@
 import { apiConfig as aPaasConfig } from "../apaas/index.mjs";
 import { apiConfig as platformConfig } from "../platform/index.mjs";
-import { apiConfig as iPaasConfig } from "../ipaas/index.mjs";
 import { ApiManage } from "./api-manage.mjs";
 export const api = {
   apaas: new ApiManage("/gct-apaas/api", aPaasConfig),
-  platform: new ApiManage("/gct-platform/api", platformConfig),
-  ipaas: new ApiManage("/gct-ipaas/api", iPaasConfig)
+  platform: new ApiManage("/gct-platform/api", platformConfig)
 };
 export {
   ResultEnum,

package/es/types/index.d.ts

@@ -28,6 +28,14 @@ declare global {
    * @interface IObject
    */
   type IObject = Record<string | symbol, any>;
+  interface Window {
+    /**
+     * 安卓混合开发模式标识,由原生层注入，值为 true 时表示在安卓混合开发模式下运行
+     *
+     * @type {boolean}
+     */
+    __GCT_ANDROID__?: boolean;
+  }
 
   /**
    * 查询分页对象
@@ -169,3 +177,22 @@ declare global {
     subMessage?: string;
   }
 }
+
+declare module 'axios' {
+  export interface AxiosRequestConfig {
+    /**
+     * 是否返回原生响应对象
+     *
+     * @default false
+     * @type {boolean}
+     */
+    nativeResponse?: boolean;
+    /**
+     * 是否返回原生数据对象，包含后台返回的所有状态码和消息等信息
+     *
+     * @default false
+     * @type {boolean}
+     */
+    nativeData?: boolean;
+  }
+}

package/es/utils/index.d.ts

@@ -1,3 +1,10 @@
+/**
+ * 拼接 URL 路径片段，处理多余的斜杠
+ *
+ * @param {...string[]} segments 路径片段
+ * @returns {string} 拼接后的路径
+ */
+export declare function joinPath(...segments: string[]): string;
 /**
  * 递归合并两个对象
  *

package/es/utils/index.mjs

@@ -1,4 +1,10 @@
 import { cloneDeep, isEqual, mergeWith, unionWith } from "lodash-es";
+export function joinPath(...segments) {
+  return segments.map((seg, i) => {
+    if (i === 0) return seg.replace(/\/+$/, "");
+    return seg.replace(/^\/+/, "").replace(/\/+$/, "");
+  }).filter(Boolean).join("/");
+}
 export function deepMerge(target, source) {
   return mergeWith(cloneDeep(target), source, (objValue, srcValue) => {
     if (typeof objValue === "object" && typeof srcValue === "object") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/api",
-  "version": "0.1.6-dev.6",
+  "version": "0.1.6-dev.7",
   "description": "paas 平台底包",
   "type": "module",
   "keywords": [