@4399ywkf/cli 1.0.7 → 1.0.9

package/dist/templates/app/config/request/index.ts

@@ -1,174 +1,172 @@
-import jwt from "@config/jwt";
-import axios, {
-  type AxiosInstance,
-  type AxiosRequestConfig,
-  type AxiosResponse,
-} from "axios";
+import axios, { type AxiosInstance } from "axios";
 import qs from "qs";
-
-type Result<T> = {
-  code: number;
-  message: string;
-  data: T;
-  suppressErrorNotification?: boolean;
-};
-
-const baseURL = process.env.API_PREFIX;
-const timeout = process.env.API_TIMEOUT;
-const accessTokenKey = process.env.COOKIE_NAME;
-
-let flag = false; // 设置开关，保证一次只能请求一次刷新token,防止客户端多次操作，多次请求
-let subSequest: any[] = [];
-
-// 把过期请求添加在数组中
-function addRequest(request: () => any) {
-  subSequest.push(request);
-}
-
-// 重新调用过期请求列表
-function retryRequest() {
-  subSequest.forEach((request) => request());
-  subSequest = [];
-}
-
-function getRefreshToken(token: string) {
-  return fetch(`${baseURL}/dns/auth/login/token/refresh`, {
-    headers: {
-      authorization: token,
-    },
-  });
-}
-
-function redirectToLogin() {
-  // 记录当前的url，并且实现跳转
-  if (window.location.pathname === "/login") {
-    return;
-  }
-  jwt.clearAccessToken(accessTokenKey as string);
-  jwt.clearAccessToken("refresh_token");
-  const href = encodeURIComponent(window.location.href);
-  window.location.href = `${window.location.origin}/login?redirect=${href}`;
-}
-
-// 刷新token
-function refreshToken() {
-  if (!flag) {
-    flag = true;
-    // 获取刷新token
-    const r_tk = jwt.getAccessToken("refresh_token");
-    if (r_tk) {
-      // 判断刷新token是否过期
-      getRefreshToken(r_tk)
-        .then((v) => v.json())
-        .then((v) => {
-          flag = false;
-          if (!v?.data?.accessToken) {
-            redirectToLogin();
-            return;
-          }
-          jwt.setAccessToken({
-            token_type: v.data?.tokenType ?? "JWT",
-            access_token: v.data?.accessToken,
-            expires_at: v.data?.expires_at * 1000,
-          });
-          // 重新发送请求
-          retryRequest();
-        })
-        .catch(() => {
-          redirectToLogin();
-        });
-    } else {
-      redirectToLogin();
+import { env } from "@/config/env";
+import type { RequestConfig, ApiResponse, TokenManager } from "./types";
+import { tokenManager as defaultTokenManager } from "./token-manager";
+import {
+  errorHandler as defaultErrorHandler,
+  type ErrorHandler,
+} from "./error-handler";
+import {
+  setupRequestInterceptor,
+  setupResponseInterceptor,
+} from "./interceptors";
+
+/**
+ * 参数序列化器
+ */
+export function paramsSerializer(params: Record<string, any>): string {
+  const result: Record<string, any> = {};
+
+  Object.keys(params).forEach((key) => {
+    const value = params[key];
+    if (value === null || value === undefined) {
+      // 跳过 null 和 undefined
+      return;
     }
-  }
-}
-
-export function paramsSerializer(params) {
-  const result = {};
-  Object.keys(params).forEach((p) => {
-    const value = params[p];
     if (Array.isArray(value)) {
-      result[p] = value;
-    } else if (value === null || value === undefined) {
-      result[p] = value;
+      result[key] = value;
     } else if (typeof value === "object") {
-      result[p] = JSON.stringify(value);
+      result[key] = JSON.stringify(value);
     } else {
-      result[p] = value;
+      result[key] = value;
     }
   });
+
   return qs.stringify(result, { arrayFormat: "repeat", skipNulls: true });
 }
 
-// 导出Request类，可以用来自定义传递配置来创建实例
+/**
+ * Request 配置选项
+ */
+export interface RequestOptions {
+  baseURL?: string;
+  timeout?: number;
+  tokenManager?: TokenManager;
+  errorHandler?: ErrorHandler;
+  onUnauthorized?: () => void;
+}
+
+/**
+ * HTTP 请求类
+ */
 export class Request {
-  // axios 实例
   private instance: AxiosInstance;
-  // 基础配置，url和超时时间
-  private baseConfig: AxiosRequestConfig = {
-    baseURL: baseURL,
-    timeout: Number(timeout),
-    withCredentials: true,
-  };
-
-  constructor(config: AxiosRequestConfig) {
-    // 使用axios.create创建axios实例
-    this.instance = axios.create(Object.assign(this.baseConfig, config));
-
-    this.instance.interceptors.request.use(
-      (config: any) => {
-        // 一般会请求拦截里面加token，用于后端的验证
-        config.headers = config.headers || {};
-        config.headers.Authorization =
-          jwt.getAccessToken(accessTokenKey as string) || "";
-        return config;
-      },
-      (err: any) => {
-        return Promise.reject(err);
-      }
+  public tokenManager: TokenManager;
+  public errorHandler: ErrorHandler;
+
+  constructor(options: RequestOptions = {}) {
+    const {
+      baseURL = env.API_PREFIX,
+      timeout = env.API_TIMEOUT,
+      tokenManager = defaultTokenManager,
+      errorHandler = defaultErrorHandler,
+      onUnauthorized,
+    } = options;
+
+    this.tokenManager = tokenManager;
+    this.errorHandler = errorHandler;
+
+    // 创建 axios 实例
+    this.instance = axios.create({
+      baseURL,
+      timeout,
+      withCredentials: true,
+    });
+
+    // 设置拦截器
+    setupRequestInterceptor(this.instance, tokenManager);
+    setupResponseInterceptor(
+      this.instance,
+      tokenManager,
+      errorHandler,
+      onUnauthorized
     );
   }
 
-  // 定义请求方法
-  public request(config: AxiosRequestConfig): Promise<AxiosResponse> {
+  /**
+   * 通用请求方法
+   */
+  public request<T = any>(config: RequestConfig): Promise<ApiResponse<T>> {
     return this.instance.request(config);
   }
 
+  /**
+   * GET 请求
+   */
   public get<T = any>(
     url: string,
     params?: any,
-    config?: AxiosRequestConfig & { suppressErrorNotification?: boolean }
-  ): Promise<Result<T>> {
+    config?: RequestConfig
+  ): Promise<ApiResponse<T>> {
     return this.instance.get(url, {
       ...config,
-      params: params,
+      params,
       paramsSerializer,
     });
   }
 
+  /**
+   * POST 请求
+   */
   public post<T = any>(
     url: string,
     data?: any,
-    config?: AxiosRequestConfig & { suppressErrorNotification?: boolean }
-  ): Promise<Result<T>> {
+    config?: RequestConfig
+  ): Promise<ApiResponse<T>> {
     return this.instance.post(url, data, config);
   }
 
+  /**
+   * PUT 请求
+   */
   public put<T = any>(
     url: string,
     data?: any,
-    config?: AxiosRequestConfig & { suppressErrorNotification?: boolean }
-  ): Promise<Result<T>> {
+    config?: RequestConfig
+  ): Promise<ApiResponse<T>> {
     return this.instance.put(url, data, config);
   }
 
+  /**
+   * DELETE 请求
+   */
   public delete<T = any>(
     url: string,
-    config?: AxiosRequestConfig & { suppressErrorNotification?: boolean }
-  ): Promise<Result<T>> {
+    config?: RequestConfig
+  ): Promise<ApiResponse<T>> {
     return this.instance.delete(url, config);
   }
+
+  /**
+   * PATCH 请求
+   */
+  public patch<T = any>(
+    url: string,
+    data?: any,
+    config?: RequestConfig
+  ): Promise<ApiResponse<T>> {
+    return this.instance.patch(url, data, config);
+  }
+
+  /**
+   * 获取 axios 实例（用于高级用法）
+   */
+  public getAxiosInstance(): AxiosInstance {
+    return this.instance;
+  }
 }
 
-// 默认导出Request实例
-export default new Request({});
+// 导出默认实例
+export const request = new Request();
+
+// 导出类型
+export type {
+  RequestConfig,
+  ApiResponse,
+  MessageConfig,
+  TokenManager,
+} from "./types";
+
+// 默认导出
+export default request;

package/dist/templates/app/config/request/interceptors.ts

@@ -0,0 +1,118 @@
+import type {
+  AxiosInstance,
+  InternalAxiosRequestConfig,
+  AxiosResponse,
+} from "axios";
+import { message as antdMessage } from "antd";
+import type { TokenManager, RequestConfig, ApiResponse } from "./types";
+import type { ErrorHandler } from "./error-handler";
+
+/**
+ * 设置请求拦截器
+ */
+export function setupRequestInterceptor(
+  instance: AxiosInstance,
+  tokenManager: TokenManager
+): void {
+  instance.interceptors.request.use(
+    (config: InternalAxiosRequestConfig) => {
+      const requestConfig = config as RequestConfig;
+
+      // 添加 Token（如果需要认证，默认为 true）
+      if (requestConfig.requireAuth !== false) {
+        const token = tokenManager.getToken();
+        if (token && config.headers) {
+          config.headers.Authorization = token;
+        }
+      }
+
+      // 添加自定义 Headers
+      if (requestConfig.customHeaders && config.headers) {
+        Object.entries(requestConfig.customHeaders).forEach(([key, value]) => {
+          config.headers[key] = value;
+        });
+      }
+
+      return config;
+    },
+    (error) => {
+      return Promise.reject(error);
+    }
+  );
+}
+
+/**
+ * 设置响应拦截器
+ */
+export function setupResponseInterceptor(
+  instance: AxiosInstance,
+  tokenManager: TokenManager,
+  errorHandler: ErrorHandler,
+  onUnauthorized?: () => void
+): void {
+  instance.interceptors.response.use(
+    (response: AxiosResponse<ApiResponse>) => {
+      const config = response.config as RequestConfig;
+      const messageConfig = config.message;
+
+      const { code, message: msg, data } = response.data;
+
+      // 业务成功（根据实际后端约定调整）
+      if (code === 0 || code === 200) {
+        // 显示成功消息
+        if (messageConfig?.showSuccess) {
+          const successMsg = messageConfig.successMessage || msg || "操作成功";
+          antdMessage.success(successMsg);
+        }
+
+        // 直接返回 data，简化调用
+        return response.data;
+      }
+
+      // 业务失败
+      const errorMsg = messageConfig?.errorMessage || msg || "操作失败";
+
+      if (messageConfig?.showError !== false) {
+        antdMessage.error(errorMsg);
+      }
+
+      return Promise.reject(new Error(errorMsg));
+    },
+    async (error) => {
+      const config = error.config as RequestConfig;
+
+      // 401 未授权
+      if (error.response?.status === 401) {
+        tokenManager.clearToken();
+
+        // 执行自定义的未授权回调
+        if (onUnauthorized) {
+          onUnauthorized();
+        } else {
+          // 默认跳转到登录页
+          redirectToLogin();
+        }
+
+        return Promise.reject(error);
+      }
+
+      // 其他错误统一处理
+      errorHandler.handle(error, config);
+
+      return Promise.reject(error);
+    }
+  );
+}
+
+/**
+ * 重定向到登录页
+ */
+function redirectToLogin(): void {
+  if (typeof window === "undefined") return;
+
+  const currentPath = window.location.pathname;
+  if (currentPath === "/login") return;
+
+  const redirectUrl = encodeURIComponent(window.location.href);
+  window.location.href = `${window.location.origin}/login?redirect=${redirectUrl}`;
+}

package/dist/templates/app/config/request/token-manager.ts

@@ -0,0 +1,23 @@
+import jwt from "@config/jwt";
+import type { TokenManager as TokenManagerType } from "./types";
+/**
+ * Token 刷新管理器
+ * 使用 Promise 避免并发刷新问题
+ */
+export class TokenManager implements TokenManagerType {
+  getToken(token?: string): string | undefined {
+    return jwt.getAccessToken(token);
+  }
+  setToken(token: {
+    token_type: any;
+    access_token: any;
+    expires_at: number;
+  }): void {
+    jwt.setAccessToken(token);
+  }
+  clearToken(token?: string): void {
+    jwt.clearAccessToken(token);
+  }
+}
+
+export const tokenManager = new TokenManager();

package/dist/templates/app/config/request/types.ts

@@ -0,0 +1,63 @@
+import type { AxiosRequestConfig } from "axios";
+
+/**
+ * 后端统一响应格式
+ */
+export interface ApiResponse<T = any> {
+  code: number;
+  message: string;
+  data: T;
+}
+
+/**
+ * 消息提示配置
+ */
+export interface MessageConfig {
+  /** 是否显示成功消息 */
+  showSuccess?: boolean;
+  /** 自定义成功消息 */
+  successMessage?: string;
+  /** 是否显示错误消息 */
+  showError?: boolean;
+  /** 自定义错误消息 */
+  errorMessage?: string;
+}
+
+/**
+ * 扩展的请求配置
+ */
+export interface RequestConfig extends AxiosRequestConfig {
+  /** 消息提示配置 */
+  message?: MessageConfig;
+  /** 自定义请求头 */
+  customHeaders?: Record<string, string>;
+  /** 是否需要认证（默认 true） */
+  requireAuth?: boolean;
+  /** 请求元数据（用于日志、监控等） */
+  metadata?: Record<string, any>;
+}
+
+/**
+ * Token 信息
+ */
+export interface TokenInfo {
+  token_type: string;
+  access_token: string;
+  expires_at: number;
+}
+
+/**
+ * Token 管理器接口
+ */
+export interface TokenManager {
+  getToken(key?: string): string | undefined;
+  setToken(token: TokenInfo): void;
+  clearToken(key?: string): void;
+}
+
+/**
+ * 错误处理器接口
+ */
+export interface ErrorHandler {
+  handle(error: any, config?: RequestConfig): void;
+}