From 3402624002d03d68542bcab5b461ecf470f80071 Mon Sep 17 00:00:00 2001 From: Utopia Date: Mon, 11 Aug 2025 16:33:15 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E5=B0=86=20CustomRequestOptions=20?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=88=B0=20http/types.ts=20=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openapi-ts-request.config.ts | 2 +- src/http/alova.ts | 2 +- src/http/http.ts | 2 +- src/http/interceptor.ts | 7 +------ src/http/{tools => }/types.ts | 9 +++++++++ src/http/vue-query.ts | 2 +- src/service/pet.ts | 2 +- src/service/pet.vuequery.ts | 2 +- src/service/store.ts | 2 +- src/service/store.vuequery.ts | 2 +- src/service/user.ts | 2 +- src/service/user.vuequery.ts | 2 +- 12 files changed, 20 insertions(+), 16 deletions(-) rename src/http/{tools => }/types.ts (53%) diff --git a/openapi-ts-request.config.ts b/openapi-ts-request.config.ts index 7d16105..ce344d0 100644 --- a/openapi-ts-request.config.ts +++ b/openapi-ts-request.config.ts @@ -4,7 +4,7 @@ export default [ { schemaPath: 'http://petstore.swagger.io/v2/swagger.json', serversPath: './src/service', - requestLibPath: `import request from '@/http/vue-query';\n import { CustomRequestOptions } from '@/http/interceptor';`, + requestLibPath: `import request from '@/http/vue-query';\n import { CustomRequestOptions } from '@/http/types';`, requestOptionsType: 'CustomRequestOptions', isGenReactQuery: true, reactQueryMode: 'vue', diff --git a/src/http/alova.ts b/src/http/alova.ts index ba15bbd..c403419 100644 --- a/src/http/alova.ts +++ b/src/http/alova.ts @@ -1,5 +1,5 @@ import type { uniappRequestAdapter } from '@alova/adapter-uniapp' -import type { IResponse } from './tools/types' +import type { IResponse } from './types' import AdapterUniapp from '@alova/adapter-uniapp' import { createAlova } from 'alova' import { createServerTokenAuthentication } from 'alova/client' diff --git a/src/http/http.ts b/src/http/http.ts index 5cea939..98c7324 100644 --- a/src/http/http.ts +++ b/src/http/http.ts @@ -1,4 +1,4 @@ -import type { CustomRequestOptions } from '@/http/interceptor' +import type { CustomRequestOptions } from '@/http/types' export function http(options: CustomRequestOptions) { // 1. 返回 Promise 对象 diff --git a/src/http/interceptor.ts b/src/http/interceptor.ts index fad6ca6..357780b 100644 --- a/src/http/interceptor.ts +++ b/src/http/interceptor.ts @@ -1,14 +1,9 @@ +import type { CustomRequestOptions } from '@/http/types' import { useUserStore } from '@/store' import { getEnvBaseUrl } from '@/utils' import { platform } from '@/utils/platform' import { stringifyQuery } from './tools/queryString' -export type CustomRequestOptions = UniApp.RequestOptions & { - query?: Record - /** 出错时是否隐藏错误提示 */ - hideErrorToast?: boolean -} & IUniUploadFileOptions // 添加uni.uploadFile参数类型 - // 请求基准地址 const baseUrl = getEnvBaseUrl() diff --git a/src/http/tools/types.ts b/src/http/types.ts similarity index 53% rename from src/http/tools/types.ts rename to src/http/types.ts index 2a4154a..25cf472 100644 --- a/src/http/tools/types.ts +++ b/src/http/types.ts @@ -1,3 +1,12 @@ +/** + * 在 uniapp 的 RequestOptions 和 IUniUploadFileOptions 基础上，添加自定义参数 + */ +export type CustomRequestOptions = UniApp.RequestOptions & { + query?: Record + /** 出错时是否隐藏错误提示 */ + hideErrorToast?: boolean +} & IUniUploadFileOptions // 添加uni.uploadFile参数类型 + // 通用响应格式 export interface IResponse { code: number | string diff --git a/src/http/vue-query.ts b/src/http/vue-query.ts index 72bbe2a..31d1eb3 100644 --- a/src/http/vue-query.ts +++ b/src/http/vue-query.ts @@ -1,4 +1,4 @@ -import type { CustomRequestOptions } from '@/http/interceptor' +import type { CustomRequestOptions } from '@/http/types' import { http } from './http' /* diff --git a/src/service/pet.ts b/src/service/pet.ts index 50ecde2..1fc0a92 100644 --- a/src/service/pet.ts +++ b/src/service/pet.ts @@ -1,7 +1,7 @@ /* eslint-disable */ // @ts-ignore import request from '@/http/vue-query'; -import { CustomRequestOptions } from '@/http/interceptor'; +import type { CustomRequestOptions } from '@/http/types'; import * as API from './types'; diff --git a/src/service/pet.vuequery.ts b/src/service/pet.vuequery.ts index 4e28631..a2369ea 100644 --- a/src/service/pet.vuequery.ts +++ b/src/service/pet.vuequery.ts @@ -3,7 +3,7 @@ import { queryOptions, useMutation } from '@tanstack/vue-query'; import type { DefaultError } from '@tanstack/vue-query'; import request from '@/http/vue-query'; -import { CustomRequestOptions } from '@/http/interceptor'; +import type { CustomRequestOptions } from '@/http/types'; import * as apis from './pet'; import * as API from './types'; diff --git a/src/service/store.ts b/src/service/store.ts index ff463fd..cc272f3 100644 --- a/src/service/store.ts +++ b/src/service/store.ts @@ -1,7 +1,7 @@ /* eslint-disable */ // @ts-ignore import request from '@/http/vue-query'; -import { CustomRequestOptions } from '@/http/interceptor'; +import type { CustomRequestOptions } from '@/http/types'; import * as API from './types'; diff --git a/src/service/store.vuequery.ts b/src/service/store.vuequery.ts index c6becfb..2f95787 100644 --- a/src/service/store.vuequery.ts +++ b/src/service/store.vuequery.ts @@ -3,7 +3,7 @@ import { queryOptions, useMutation } from '@tanstack/vue-query'; import type { DefaultError } from '@tanstack/vue-query'; import request from '@/http/vue-query'; -import { CustomRequestOptions } from '@/http/interceptor'; +import type { CustomRequestOptions } from '@/http/types'; import * as apis from './store'; import * as API from './types'; diff --git a/src/service/user.ts b/src/service/user.ts index ee9ed8d..5653783 100644 --- a/src/service/user.ts +++ b/src/service/user.ts @@ -1,7 +1,7 @@ /* eslint-disable */ // @ts-ignore import request from '@/http/vue-query'; -import { CustomRequestOptions } from '@/http/interceptor'; +import type { CustomRequestOptions } from '@/http/types'; import * as API from './types'; diff --git a/src/service/user.vuequery.ts b/src/service/user.vuequery.ts index 23e8f78..658060a 100644 --- a/src/service/user.vuequery.ts +++ b/src/service/user.vuequery.ts @@ -3,7 +3,7 @@ import { queryOptions, useMutation } from '@tanstack/vue-query'; import type { DefaultError } from '@tanstack/vue-query'; import request from '@/http/vue-query'; -import { CustomRequestOptions } from '@/http/interceptor'; +import type { CustomRequestOptions } from '@/http/types'; import * as apis from './user'; import * as API from './types';