From 5b78b0ef63c741c5b4fd69ca1138329d56558a0c Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 23 Sep 2025 15:54:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(service):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=B1=82=E4=BB=A3=E7=A0=81=E5=B9=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0API=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除旧的pet、store、user相关API代码
新增listAll和info接口
更新openapi配置指向新API地址
在about页面添加openapi请求示例组件
---
 openapi-ts-request.config.ts                  |   2 +-
 package.json                                  |   2 +-
 src/pages/about/about.vue                     |   2 +
 .../about/components/request-openapi.vue      |  61 +++
 src/service/displayEnumLabel.ts               |  13 -
 src/service/index.ts                          |   6 +-
 src/service/info.ts                           |  18 +
 src/service/listAll.ts                        |  18 +
 src/service/pet.ts                            | 185 ---------
 src/service/store.ts                          |  72 ----
 src/service/types.ts                          | 353 +-----------------
 src/service/user.ts                           | 150 --------
 12 files changed, 119 insertions(+), 763 deletions(-)
 create mode 100644 src/pages/about/components/request-openapi.vue
 delete mode 100644 src/service/displayEnumLabel.ts
 create mode 100644 src/service/info.ts
 create mode 100644 src/service/listAll.ts
 delete mode 100644 src/service/pet.ts
 delete mode 100644 src/service/store.ts
 delete mode 100644 src/service/user.ts

diff --git a/openapi-ts-request.config.ts b/openapi-ts-request.config.ts
index 84c6ddf..18ce1dc 100644
--- a/openapi-ts-request.config.ts
+++ b/openapi-ts-request.config.ts
@@ -2,7 +2,7 @@ import type { GenerateServiceProps } from 'openapi-ts-request'
 
 export default [
   {
-    schemaPath: 'http://petstore.swagger.io/v2/swagger.json',
+    schemaPath: 'https://ukw0y1.laf.run/unibest-opapi-test.json',
     serversPath: './src/service',
     requestLibPath: `import request from '@/http/vue-query';\n import { CustomRequestOptions } from '@/http/types';`,
     requestOptionsType: 'CustomRequestOptions',
diff --git a/package.json b/package.json
index f6b70a1..3d8e591 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
     "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
     "type-check": "vue-tsc --noEmit",
-    "openapi-ts-request": "openapi-ts",
+    "openapi": "openapi-ts",
     "prepare": "git init && husky && node ./scripts/create-base-files.js",
     "docker:prepare": "node ./scripts/create-base-files.js",
     "lint": "eslint",
diff --git a/src/pages/about/about.vue b/src/pages/about/about.vue
index a4e84f3..0535e04 100644
--- a/src/pages/about/about.vue
+++ b/src/pages/about/about.vue
@@ -3,6 +3,7 @@ import { isApp, isAppAndroid, isAppHarmony, isAppIOS, isAppPlus, isH5, isMpWeixi
 import { LOGIN_PAGE } from '@/router/config'
 import { useTokenStore } from '@/store'
 import { tabbarStore } from '@/tabbar/store'
+import RequestCompOpenApi from './components/request-openapi.vue'
 import RequestComp from './components/request.vue'
 import VBindCss from './components/VBindCss.vue'
 
@@ -113,6 +114,7 @@ onShow(() => {
     </button>
     <RequestComp />
     <VBindCss />
+    <RequestCompOpenApi />
     <view class="mb-6 h-1px bg-#eee" />
     <view class="text-center">
       <button type="primary" size="mini" class="w-160px" @click="gotoAlova">
diff --git a/src/pages/about/components/request-openapi.vue b/src/pages/about/components/request-openapi.vue
new file mode 100644
index 0000000..821ad6b
--- /dev/null
+++ b/src/pages/about/components/request-openapi.vue
@@ -0,0 +1,61 @@
+<script lang="ts" setup>
+import type { UserItem } from '@/service'
+import { infoUsingGet } from '@/service/info'
+
+const loading = ref(false)
+const error = ref<Error | null>(null)
+const data = ref<UserItem>()
+
+async function getUserInfo() {
+  try {
+    loading.value = true
+    const res = await (await infoUsingGet({})).promise
+    console.log(res)
+    data.value = res
+    error.value = null
+  }
+  catch (err) {
+    error.value = err as Error
+    data.value = null
+  }
+  finally {
+    loading.value = false
+  }
+}
+const { data: data2, loading: loading2, run } = useRequest(() => infoUsingGet({}), {
+  immediate: false,
+})
+</script>
+
+<template>
+  <view class="p-6 text-center">
+    <view class="my-4 text-center">
+      1)直接使用 openapi 生成的请求
+    </view>
+    <view class="my-4 text-center">
+      <button type="primary" size="mini" class="w-160px" @click="getUserInfo">
+        发送请求
+      </button>
+      <view class="text-xl">
+        请求数据如下
+      </view>
+      <view class="text-green leading-8">
+        {{ JSON.stringify(data) }}
+      </view>
+    </view>
+    <view class="my-4 text-center">
+      2)直接使用 openapi + useRequest 生成的请求
+    </view>
+    <view class="my-4 text-center">
+      <button type="primary" size="mini" class="w-160px" @click="run">
+        发送请求
+      </button>
+      <view class="text-xl">
+        请求数据如下
+      </view>
+      <view class="text-green leading-8">
+        {{ JSON.stringify(data2) }}
+      </view>
+    </view>
+  </view>
+</template>
diff --git a/src/service/displayEnumLabel.ts b/src/service/displayEnumLabel.ts
deleted file mode 100644
index 04b1487..0000000
--- a/src/service/displayEnumLabel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* eslint-disable */
-// @ts-ignore
-import * as API from './types';
-
-export function displayStatusEnum(field: API.StatusEnum) {
-  return { available: 'available', pending: 'pending', sold: 'sold' }[field];
-}
-
-export function displayStatusEnum2(field: API.StatusEnum2) {
-  return { placed: 'placed', approved: 'approved', delivered: 'delivered' }[
-    field
-  ];
-}
diff --git a/src/service/index.ts b/src/service/index.ts
index 2e13a3c..3bfbb5b 100644
--- a/src/service/index.ts
+++ b/src/service/index.ts
@@ -1,8 +1,6 @@
 /* eslint-disable */
 // @ts-ignore
 export * from './types';
-export * from './displayEnumLabel';
 
-export * from './pet';
-export * from './store';
-export * from './user';
+export * from './listAll';
+export * from './info';
diff --git a/src/service/info.ts b/src/service/info.ts
new file mode 100644
index 0000000..b3f8e6b
--- /dev/null
+++ b/src/service/info.ts
@@ -0,0 +1,18 @@
+/* eslint-disable */
+// @ts-ignore
+import request from '@/http/vue-query';
+import { CustomRequestOptions } from '@/http/types';
+
+import * as API from './types';
+
+/** 用户信息 GET /user/info */
+export async function infoUsingGet({
+  options,
+}: {
+  options?: CustomRequestOptions;
+}) {
+  return request<API.UserItem>('/user/info', {
+    method: 'GET',
+    ...(options || {}),
+  });
+}
diff --git a/src/service/listAll.ts b/src/service/listAll.ts
new file mode 100644
index 0000000..bcbd21b
--- /dev/null
+++ b/src/service/listAll.ts
@@ -0,0 +1,18 @@
+/* eslint-disable */
+// @ts-ignore
+import request from '@/http/vue-query';
+import { CustomRequestOptions } from '@/http/types';
+
+import * as API from './types';
+
+/** 用户列表 GET /user/listAll */
+export async function listAllUsingGet({
+  options,
+}: {
+  options?: CustomRequestOptions;
+}) {
+  return request<API.UserItem[]>('/user/listAll', {
+    method: 'GET',
+    ...(options || {}),
+  });
+}
diff --git a/src/service/pet.ts b/src/service/pet.ts
deleted file mode 100644
index b625597..0000000
--- a/src/service/pet.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-/* eslint-disable */
-// @ts-ignore
-import request from '@/http/vue-query';
-import { CustomRequestOptions } from '@/http/types';
-
-import * as API from './types';
-
-/** Update an existing pet PUT /pet */
-export async function petUsingPut({
-  body,
-  options,
-}: {
-  body: API.Pet;
-  options?: CustomRequestOptions;
-}) {
-  return request<unknown>('/pet', {
-    method: 'PUT',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Add a new pet to the store POST /pet */
-export async function petUsingPost({
-  body,
-  options,
-}: {
-  body: API.Pet;
-  options?: CustomRequestOptions;
-}) {
-  return request<unknown>('/pet', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Find pet by ID Returns a single pet GET /pet/${param0} */
-export async function petPetIdUsingGet({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.PetPetIdUsingGetParams;
-  options?: CustomRequestOptions;
-}) {
-  const { petId: param0, ...queryParams } = params;
-
-  return request<API.Pet>(`/pet/${param0}`, {
-    method: 'GET',
-    params: { ...queryParams },
-    ...(options || {}),
-  });
-}
-
-/** Updates a pet in the store with form data POST /pet/${param0} */
-export async function petPetIdUsingPost({
-  params,
-  body,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.PetPetIdUsingPostParams;
-  body: API.PetPetIdUsingPostBody;
-  options?: CustomRequestOptions;
-}) {
-  const { petId: param0, ...queryParams } = params;
-
-  return request<unknown>(`/pet/${param0}`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-    },
-    params: { ...queryParams },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Deletes a pet DELETE /pet/${param0} */
-export async function petPetIdUsingDelete({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.PetPetIdUsingDeleteParams;
-  options?: CustomRequestOptions;
-}) {
-  const { petId: param0, ...queryParams } = params;
-
-  return request<unknown>(`/pet/${param0}`, {
-    method: 'DELETE',
-    params: { ...queryParams },
-    ...(options || {}),
-  });
-}
-
-/** uploads an image POST /pet/${param0}/uploadImage */
-export async function petPetIdUploadImageUsingPost({
-  params,
-  body,
-  file,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.PetPetIdUploadImageUsingPostParams;
-  body: API.PetPetIdUploadImageUsingPostBody;
-  file?: File;
-  options?: CustomRequestOptions;
-}) {
-  const { petId: param0, ...queryParams } = params;
-  const formData = new FormData();
-
-  if (file) {
-    formData.append('file', file);
-  }
-
-  Object.keys(body).forEach((ele) => {
-    const item = (body as { [key: string]: any })[ele];
-
-    if (item !== undefined && item !== null) {
-      if (typeof item === 'object' && !(item instanceof File)) {
-        if (item instanceof Array) {
-          item.forEach((f) => formData.append(ele, f || ''));
-        } else {
-          formData.append(ele, JSON.stringify(item));
-        }
-      } else {
-        formData.append(ele, item);
-      }
-    }
-  });
-
-  return request<API.ApiResponse>(`/pet/${param0}/uploadImage`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'multipart/form-data',
-    },
-    params: { ...queryParams },
-    data: formData,
-    ...(options || {}),
-  });
-}
-
-/** Finds Pets by status Multiple status values can be provided with comma separated strings GET /pet/findByStatus */
-export async function petFindByStatusUsingGet({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.PetFindByStatusUsingGetParams;
-  options?: CustomRequestOptions;
-}) {
-  return request<API.Pet[]>('/pet/findByStatus', {
-    method: 'GET',
-    params: {
-      ...params,
-    },
-    ...(options || {}),
-  });
-}
-
-/** Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. GET /pet/findByTags */
-export async function petFindByTagsUsingGet({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.PetFindByTagsUsingGetParams;
-  options?: CustomRequestOptions;
-}) {
-  return request<API.Pet[]>('/pet/findByTags', {
-    method: 'GET',
-    params: {
-      ...params,
-    },
-    ...(options || {}),
-  });
-}
diff --git a/src/service/store.ts b/src/service/store.ts
deleted file mode 100644
index 8f6c6be..0000000
--- a/src/service/store.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/* eslint-disable */
-// @ts-ignore
-import request from '@/http/vue-query';
-import { CustomRequestOptions } from '@/http/types';
-
-import * as API from './types';
-
-/** Returns pet inventories by status Returns a map of status codes to quantities GET /store/inventory */
-export async function storeInventoryUsingGet({
-  options,
-}: {
-  options?: CustomRequestOptions;
-}) {
-  return request<Record<string, number>>('/store/inventory', {
-    method: 'GET',
-    ...(options || {}),
-  });
-}
-
-/** Place an order for a pet POST /store/order */
-export async function storeOrderUsingPost({
-  body,
-  options,
-}: {
-  body: API.Order;
-  options?: CustomRequestOptions;
-}) {
-  return request<API.Order>('/store/order', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Find purchase order by ID For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions GET /store/order/${param0} */
-export async function storeOrderOrderIdUsingGet({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.StoreOrderOrderIdUsingGetParams;
-  options?: CustomRequestOptions;
-}) {
-  const { orderId: param0, ...queryParams } = params;
-
-  return request<API.Order>(`/store/order/${param0}`, {
-    method: 'GET',
-    params: { ...queryParams },
-    ...(options || {}),
-  });
-}
-
-/** Delete purchase order by ID For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors DELETE /store/order/${param0} */
-export async function storeOrderOrderIdUsingDelete({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.StoreOrderOrderIdUsingDeleteParams;
-  options?: CustomRequestOptions;
-}) {
-  const { orderId: param0, ...queryParams } = params;
-
-  return request<unknown>(`/store/order/${param0}`, {
-    method: 'DELETE',
-    params: { ...queryParams },
-    ...(options || {}),
-  });
-}
diff --git a/src/service/types.ts b/src/service/types.ts
index 8715b7e..4e46b61 100644
--- a/src/service/types.ts
+++ b/src/service/types.ts
@@ -1,350 +1,29 @@
 /* eslint-disable */
 // @ts-ignore
 
-export type ApiResponse = {
-  code?: number;
-  type?: string;
-  message?: string;
+export type InfoUsingGetResponse = {
+  code: number;
+  msg: string;
+  data: UserItem;
 };
 
-export type Category = {
-  id?: number;
-  name?: string;
+export type InfoUsingGetResponses = {
+  200: InfoUsingGetResponse;
 };
 
-export type Order = {
-  id?: number;
-  petId?: number;
-  quantity?: number;
-  shipDate?: string;
-  /** Order Status */
-  status?: 'placed' | 'approved' | 'delivered';
-  complete?: boolean;
+export type ListAllUsingGetResponse = {
+  code: number;
+  msg: string;
+  data: UserItem[];
 };
 
-export type Pet = {
-  id?: number;
-  category?: Category;
-  name: string;
-  photoUrls: string[];
-  tags?: Tag[];
-  /** pet status in the store */
-  status?: 'available' | 'pending' | 'sold';
+export type ListAllUsingGetResponses = {
+  200: ListAllUsingGetResponse;
 };
 
-export type PetFindByStatusUsingGetParams = {
-  /** Status values that need to be considered for filter */
-  status: ('available' | 'pending' | 'sold')[];
-};
-
-export type PetFindByStatusUsingGetResponses = {
-  /**
-   * successful operation
-   */
-  200: Pet[];
-  /**
-   * Invalid status value
-   */
-  400: unknown;
-};
-
-export type PetFindByTagsUsingGetParams = {
-  /** Tags to filter by */
-  tags: string[];
-};
-
-export type PetFindByTagsUsingGetResponses = {
-  /**
-   * successful operation
-   */
-  200: Pet[];
-  /**
-   * Invalid tag value
-   */
-  400: unknown;
-};
-
-export type PetPetIdUploadImageUsingPostBody = {
-  /** Additional data to pass to server */
-  additionalMetadata?: string;
-  /** file to upload */
-  file?: string;
-};
-
-export type PetPetIdUploadImageUsingPostParams = {
-  /** ID of pet to update */
-  petId: number;
-};
-
-export type PetPetIdUploadImageUsingPostResponses = {
-  /**
-   * successful operation
-   */
-  200: ApiResponse;
-};
-
-export type PetPetIdUsingDeleteParams = {
-  /** Pet id to delete */
-  petId: number;
-};
-
-export type PetPetIdUsingDeleteResponses = {
-  /**
-   * Invalid ID supplied
-   */
-  400: unknown;
-  /**
-   * Pet not found
-   */
-  404: unknown;
-};
-
-export type PetPetIdUsingGetParams = {
-  /** ID of pet to return */
-  petId: number;
-};
-
-export type PetPetIdUsingGetResponses = {
-  /**
-   * successful operation
-   */
-  200: Pet;
-  /**
-   * Invalid ID supplied
-   */
-  400: unknown;
-  /**
-   * Pet not found
-   */
-  404: unknown;
-};
-
-export type PetPetIdUsingPostBody = {
-  /** Updated name of the pet */
-  name?: string;
-  /** Updated status of the pet */
-  status?: string;
-};
-
-export type PetPetIdUsingPostParams = {
-  /** ID of pet that needs to be updated */
-  petId: number;
-};
-
-export type PetPetIdUsingPostResponses = {
-  /**
-   * Invalid input
-   */
-  405: unknown;
-};
-
-export type PetUsingPostResponses = {
-  /**
-   * Invalid input
-   */
-  405: unknown;
-};
-
-export type PetUsingPutResponses = {
-  /**
-   * Invalid ID supplied
-   */
-  400: unknown;
-  /**
-   * Pet not found
-   */
-  404: unknown;
-  /**
-   * Validation exception
-   */
-  405: unknown;
-};
-
-export enum StatusEnum {
-  'available' = 'available',
-  'pending' = 'pending',
-  'sold' = 'sold',
-}
-
-export type IStatusEnum = keyof typeof StatusEnum;
-
-export enum StatusEnum2 {
-  'placed' = 'placed',
-  'approved' = 'approved',
-  'delivered' = 'delivered',
-}
-
-export type IStatusEnum2 = keyof typeof StatusEnum2;
-
-export type StoreInventoryUsingGetResponses = {
-  /**
-   * successful operation
-   */
-  200: Record<string, number>;
-};
-
-export type StoreOrderOrderIdUsingDeleteParams = {
-  /** ID of the order that needs to be deleted */
-  orderId: number;
-};
-
-export type StoreOrderOrderIdUsingDeleteResponses = {
-  /**
-   * Invalid ID supplied
-   */
-  400: unknown;
-  /**
-   * Order not found
-   */
-  404: unknown;
-};
-
-export type StoreOrderOrderIdUsingGetParams = {
-  /** ID of pet that needs to be fetched */
-  orderId: number;
-};
-
-export type StoreOrderOrderIdUsingGetResponses = {
-  /**
-   * successful operation
-   */
-  200: Order;
-  /**
-   * Invalid ID supplied
-   */
-  400: unknown;
-  /**
-   * Order not found
-   */
-  404: unknown;
-};
-
-export type StoreOrderUsingPostResponses = {
-  /**
-   * successful operation
-   */
-  200: Order;
-  /**
-   * Invalid Order
-   */
-  400: unknown;
-};
-
-export type Tag = {
-  id?: number;
-  name?: string;
-};
-
-export type User = {
-  id?: number;
-  username?: string;
-  firstName?: string;
-  lastName?: string;
-  email?: string;
-  password?: string;
-  phone?: string;
-  /** User Status */
-  userStatus?: number;
-};
-
-export type UserCreateWithArrayUsingPostBody = User[];
-
-export type UserCreateWithArrayUsingPostResponses = {
-  /**
-   * successful operation
-   */
-  default: unknown;
-};
-
-export type UserCreateWithListUsingPostBody = User[];
-
-export type UserCreateWithListUsingPostResponses = {
-  /**
-   * successful operation
-   */
-  default: unknown;
-};
-
-export type UserLoginUsingGetParams = {
-  /** The user name for login */
+export type UserItem = {
+  userId: number;
   username: string;
-  /** The password for login in clear text */
-  password: string;
-};
-
-export type UserLoginUsingGetResponses = {
-  /**
-   * successful operation
-   */
-  200: string;
-  /**
-   * Invalid username/password supplied
-   */
-  400: unknown;
-};
-
-export type UserLogoutUsingGetResponses = {
-  /**
-   * successful operation
-   */
-  default: unknown;
-};
-
-export type UserUsernameUsingDeleteParams = {
-  /** The name that needs to be deleted */
-  username: string;
-};
-
-export type UserUsernameUsingDeleteResponses = {
-  /**
-   * Invalid username supplied
-   */
-  400: unknown;
-  /**
-   * User not found
-   */
-  404: unknown;
-};
-
-export type UserUsernameUsingGetParams = {
-  /** The name that needs to be fetched. Use user1 for testing.  */
-  username: string;
-};
-
-export type UserUsernameUsingGetResponses = {
-  /**
-   * successful operation
-   */
-  200: User;
-  /**
-   * Invalid username supplied
-   */
-  400: unknown;
-  /**
-   * User not found
-   */
-  404: unknown;
-};
-
-export type UserUsernameUsingPutParams = {
-  /** name that need to be updated */
-  username: string;
-};
-
-export type UserUsernameUsingPutResponses = {
-  /**
-   * Invalid user supplied
-   */
-  400: unknown;
-  /**
-   * User not found
-   */
-  404: unknown;
-};
-
-export type UserUsingPostResponses = {
-  /**
-   * successful operation
-   */
-  default: unknown;
+  nickname: string;
+  avatar: string;
 };
diff --git a/src/service/user.ts b/src/service/user.ts
deleted file mode 100644
index f95e8e6..0000000
--- a/src/service/user.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-/* eslint-disable */
-// @ts-ignore
-import request from '@/http/vue-query';
-import { CustomRequestOptions } from '@/http/types';
-
-import * as API from './types';
-
-/** Create user This can only be done by the logged in user. 返回值: successful operation POST /user */
-export async function userUsingPost({
-  body,
-  options,
-}: {
-  body: API.User;
-  options?: CustomRequestOptions;
-}) {
-  return request<unknown>('/user', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Get user by user name GET /user/${param0} */
-export async function userUsernameUsingGet({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.UserUsernameUsingGetParams;
-  options?: CustomRequestOptions;
-}) {
-  const { username: param0, ...queryParams } = params;
-
-  return request<API.User>(`/user/${param0}`, {
-    method: 'GET',
-    params: { ...queryParams },
-    ...(options || {}),
-  });
-}
-
-/** Updated user This can only be done by the logged in user. PUT /user/${param0} */
-export async function userUsernameUsingPut({
-  params,
-  body,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.UserUsernameUsingPutParams;
-  body: API.User;
-  options?: CustomRequestOptions;
-}) {
-  const { username: param0, ...queryParams } = params;
-
-  return request<unknown>(`/user/${param0}`, {
-    method: 'PUT',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    params: { ...queryParams },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Delete user This can only be done by the logged in user. DELETE /user/${param0} */
-export async function userUsernameUsingDelete({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.UserUsernameUsingDeleteParams;
-  options?: CustomRequestOptions;
-}) {
-  const { username: param0, ...queryParams } = params;
-
-  return request<unknown>(`/user/${param0}`, {
-    method: 'DELETE',
-    params: { ...queryParams },
-    ...(options || {}),
-  });
-}
-
-/** Creates list of users with given input array 返回值: successful operation POST /user/createWithArray */
-export async function userCreateWithArrayUsingPost({
-  body,
-  options,
-}: {
-  body: API.UserCreateWithArrayUsingPostBody;
-  options?: CustomRequestOptions;
-}) {
-  return request<unknown>('/user/createWithArray', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Creates list of users with given input array 返回值: successful operation POST /user/createWithList */
-export async function userCreateWithListUsingPost({
-  body,
-  options,
-}: {
-  body: API.UserCreateWithListUsingPostBody;
-  options?: CustomRequestOptions;
-}) {
-  return request<unknown>('/user/createWithList', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Logs user into the system GET /user/login */
-export async function userLoginUsingGet({
-  params,
-  options,
-}: {
-  // 叠加生成的Param类型 (非body参数openapi默认没有生成对象)
-  params: API.UserLoginUsingGetParams;
-  options?: CustomRequestOptions;
-}) {
-  return request<string>('/user/login', {
-    method: 'GET',
-    params: {
-      ...params,
-    },
-    ...(options || {}),
-  });
-}
-
-/** Logs out current logged in user session 返回值: successful operation GET /user/logout */
-export async function userLogoutUsingGet({
-  options,
-}: {
-  options?: CustomRequestOptions;
-}) {
-  return request<unknown>('/user/logout', {
-    method: 'GET',
-    ...(options || {}),
-  });
-}

From 7887b8600c6c44206c1d6731517b40bc9759e0b3 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 23 Sep 2025 16:04:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(http):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=87=BD=E6=95=B0=E8=BF=94=E5=9B=9E=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=B9=B6=E5=A2=9E=E5=BC=BAuseRequest=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改http和vue-query模块的请求函数返回类型为HttpRequestResult<T>
优化useRequest钩子以支持同步和异步请求函数
在示例组件中更新请求调用方式
---
 src/hooks/useRequest.ts                       | 37 ++++++++++---------
 src/http/http.ts                              |  4 +-
 src/http/vue-query.ts                         |  4 +-
 .../about/components/request-openapi.vue      | 10 ++++-
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/hooks/useRequest.ts b/src/hooks/useRequest.ts
index 7aa7bc6..df8d663 100644
--- a/src/hooks/useRequest.ts
+++ b/src/hooks/useRequest.ts
@@ -19,14 +19,14 @@ interface IUseRequestReturn<T, P = undefined> {
 
 /**
  * useRequest是一个定制化的请求钩子，用于处理异步请求和响应。
- * @param func 一个执行异步请求的函数，返回一个包含响应数据的Promise。
+ * @param func 一个执行异步请求的函数，返回HttpRequestResult<T>或Promise<HttpRequestResult<T>>。
  * @param options 包含请求选项的对象 {immediate, initialData}。
  * @param options.immediate 是否立即执行请求，默认为false。
  * @param options.initialData 初始化数据，默认为undefined。
  * @returns 返回一个对象{loading, error, data, run}，包含请求的加载状态、错误信息、响应数据和手动触发请求的函数。
  */
 export default function useRequest<T, P = undefined>(
-  func: (args?: P) => HttpRequestResult<T>,
+  func: (args?: P) => HttpRequestResult<T> | Promise<HttpRequestResult<T>>,
   options: IUseRequestOptions<T> = { immediate: false },
 ): IUseRequestReturn<T, P> {
   const loading = ref(false)
@@ -36,21 +36,24 @@ export default function useRequest<T, P = undefined>(
 
   const run = async (args?: P) => {
     loading.value = true
-    const { promise, requestTask: task } = func(args)
-    requestTask = task // Store the requestTask
-    return promise
-      .then((res) => {
-        data.value = res
-        error.value = false
-        return data.value
-      })
-      .catch((err) => {
-        error.value = err
-        throw err
-      })
-      .finally(() => {
-        loading.value = false
-      })
+    try {
+      // 支持同步和异步函数
+      const result = await func(args)
+      const { promise, requestTask: task } = result
+      requestTask = task // Store the requestTask
+
+      const res = await promise
+      data.value = res
+      error.value = false
+      return data.value
+    }
+    catch (err) {
+      error.value = err instanceof Error ? err : new Error('Request failed')
+      throw err
+    }
+    finally {
+      loading.value = false
+    }
   }
 
   const cancel = () => {
diff --git a/src/http/http.ts b/src/http/http.ts
index 2e1dd4a..fad25f3 100644
--- a/src/http/http.ts
+++ b/src/http/http.ts
@@ -1,5 +1,5 @@
 import type { IDoubleTokenRes } from '@/api/types/login'
-import type { CustomRequestOptions, IResponse } from '@/http/types'
+import type { CustomRequestOptions, HttpRequestResult, IResponse } from '@/http/types'
 import { nextTick } from 'vue'
 import { LOGIN_PAGE } from '@/router/config'
 import { useTokenStore } from '@/store/token'
@@ -10,7 +10,7 @@ import { ResultEnum } from './tools/enum'
 let refreshing = false // 防止重复刷新 token 标识
 let taskQueue: { resolve: (value: any) => void, reject: (reason?: any) => void, options: CustomRequestOptions }[] = [] as { resolve: (value: any) => void, reject: (reason?: any) => void, options: CustomRequestOptions }[] // 刷新 token 请求队列
 
-export function http<T>(options: CustomRequestOptions) {
+export function http<T>(options: CustomRequestOptions): HttpRequestResult<T> {
   let requestTask: UniApp.RequestTask | undefined
   const promise = new Promise<T>((resolve, reject) => {
     requestTask = uni.request({
diff --git a/src/http/vue-query.ts b/src/http/vue-query.ts
index 31d1eb3..b8c5db4 100644
--- a/src/http/vue-query.ts
+++ b/src/http/vue-query.ts
@@ -1,4 +1,4 @@
-import type { CustomRequestOptions } from '@/http/types'
+import type { CustomRequestOptions, HttpRequestResult } from '@/http/types'
 import { http } from './http'
 
 /*
@@ -10,7 +10,7 @@ export default function request<T = unknown>(
     params?: Record<string, unknown>
     headers?: Record<string, unknown>
   },
-) {
+): HttpRequestResult<T> {
   const requestOptions = {
     url,
     ...options,
diff --git a/src/pages/about/components/request-openapi.vue b/src/pages/about/components/request-openapi.vue
index 821ad6b..fe698fb 100644
--- a/src/pages/about/components/request-openapi.vue
+++ b/src/pages/about/components/request-openapi.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
 import type { UserItem } from '@/service'
+import { ref } from 'vue'
+import useRequest from '@/hooks/useRequest'
 import { infoUsingGet } from '@/service/info'
 
 const loading = ref(false)
@@ -9,7 +11,9 @@ const data = ref<UserItem>()
 async function getUserInfo() {
   try {
     loading.value = true
-    const res = await (await infoUsingGet({})).promise
+    // 直接使用openapi生成的请求，需要解构获取promise
+    const { promise } = await infoUsingGet({})
+    const res = await promise
     console.log(res)
     data.value = res
     error.value = null
@@ -22,7 +26,9 @@ async function getUserInfo() {
     loading.value = false
   }
 }
-const { data: data2, loading: loading2, run } = useRequest(() => infoUsingGet({}), {
+
+// 使用openapi + useRequest生成的请求
+const { data: data2, loading: loading2, run } = useRequest<UserItem>(() => infoUsingGet({}), {
   immediate: false,
 })
 </script>