Refactor API requests and update imports

2025-08-18 22:15:55 +08:00
parent ba5f777ed0
commit aac4dec3fd
17 changed files with 113 additions and 193 deletions
--- a/api/pay/index.ts
+++ b/api/pay/index.ts
@ -1,5 +1,6 @@
-import { get, post } from '~/utils/axios'
-import { AppPayWalletPackageRespVO, PayOrderSubmitReqVO, PayOrderRespVO, PageResultAppPayWalletRechargeRespVO } from './types'
+import * as useDollarFetchRequest from '~/composables/useDollarFetchRequest'
+import * as useFetchRequest from '~/composables/useFetchRequest'
+import type { AppPayWalletPackageRespVO, PayOrderSubmitReqVO, PayOrderRespVO, PageResultAppPayWalletRechargeRespVO } from './types'

 /**
 * 获得VIP列表
@ -7,71 +8,55 @@ import { AppPayWalletPackageRespVO, PayOrderSubmitReqVO, PayOrderRespVO, PageRes
 * @returns
 */
 export const listVip = () => {
-  return get<IResponse<AppPayWalletPackageRespVO[]>>({
-    url: '/prod-api/app-api/pay/wallet-recharge-package/list-vip',
-  })
+  return useFetchRequest.get<IResponse<AppPayWalletPackageRespVO[]>>('/prod-api/app-api/pay/wallet-recharge-package/list-vip', {})
 }

 /**
 * 提交支付订单
 */
 export const submitPayOrder = (data: PayOrderSubmitReqVO) => {
-  return post<
+  return useDollarFetchRequest.post<
    IResponse<{
      displayContent: string
      displayMode: string
      orderId: number
      status: number
    }>
-  >({
-    url: '/prod-api/app-api/pay/order/submit',
-    data,
-  })
+  >('/prod-api/app-api/pay/order/submit', data)
 }

 /**
 * 创建示例订单
 */
 export const createOrder = (params: { spuId: number }) => {
-  return post<IResponse<string>>({
-    url: '/prod-api/app-api/pay/demo-order/create',
-    params,
-  })
+  return useDollarFetchRequest.post<IResponse<string>>('/prod-api/app-api/pay/demo-order/create', params)
 }

 /**
 * 获得钱包充值套餐列表
 */
 export const listWalletRechargePackage = () => {
-  return get<IResponse<AppPayWalletPackageRespVO[]>>({
-    url: '/prod-api/app-api/pay/wallet-recharge-package/list',
-  })
+  return useFetchRequest.get<IResponse<AppPayWalletPackageRespVO[]>>('/prod-api/app-api/pay/wallet-recharge-package/list', {})  
 }

 /**
 * 获取支付状态
 */
 export const getPayStatus = (params: { id: number }) => {
-  return get<IResponse<PayOrderRespVO>>({
-    url: '/prod-api/app-api/pay/order/get',
-    params,
-  })
+  return useDollarFetchRequest.get<IResponse<PayOrderRespVO>>('/prod-api/app-api/pay/order/get', params)
 }

 /**
 * 通过code获取token
 */
 export const getTokenByCode = (params: { type: number; code: string; state: string }) => {
-  return post<IResponse<string>>({
-    url: '/prod-api/app-api/member/social-user/bind',
-    data: params,
-  })
+  return useDollarFetchRequest.post<IResponse<string>>('/prod-api/app-api/member/auth/token-by-code', params) 
 }
 /**
 * 社交快捷登录，使用 code 授权码
 */
 export const socialLoginByCode = (params: { type: number; code: string; state: string }) => {
-  return post<
+  return useDollarFetchRequest.post<
    IResponse<{
      accessToken: string
      refreshToken: string
@ -79,18 +64,12 @@ export const socialLoginByCode = (params: { type: number; code: string; state: s
      expiresTime: number
      openid: string
    }>
-  >({
-    url: '/prod-api/app-api/member/auth/social-login',
-    data: params,
-  })
+  >('/prod-api/app-api/member/auth/social-login', params)
 }

 /**
 * 获得钱包充值记录分页
 */
 export const getWalletRechargeRecordPage = (params: { pageNo: number; pageSize: number }) => {
-  return get<IResponse<PageResultAppPayWalletRechargeRespVO>>({
-    url: '/prod-api/app-api/pay/wallet-transaction/page',
-    params,
-  })
+  return useFetchRequest.get<IResponse<PageResultAppPayWalletRechargeRespVO>>('/prod-api/app-api/pay/wallet-transaction/page', params)
 }
--- a/api/personal-center/index.ts
+++ b/api/personal-center/index.ts
@ -1,5 +1,6 @@
-import { get, post, put, Delete } from '~/utils/axios'
-import {
+import * as useDollarFetchRequest from '~/composables/useDollarFetchRequest'
+import * as useFetchRequest from '~/composables/useFetchRequest'
+import type {
  UserExtendSaveReqVO,
  UserExtendRespVO,
  UserAuthInfoRespVO,
@ -16,9 +17,7 @@ import {
 * @returns
 */
 export const getUserInfo = () => {
-  return get<IResponse<UserExtendRespVO>>({
-    url: '/prod-api/app-api/member/user-extend/get',
-  })
+  return useFetchRequest.get<IResponse<UserExtendRespVO>>('/prod-api/app-api/member/user-extend/get', {})
 }

 /**
@ -27,10 +26,7 @@ export const getUserInfo = () => {
 * @returns
 */
 export const userExtend = (params: UserExtendSaveReqVO) => {
-  return post<IResponse<number>>({
-    url: '/prod-api/app-api/member/user-extend/create',
-    data: params,
-  })
+  return useDollarFetchRequest.post<IResponse<number>>('/prod-api/app-api/member/user-extend/create', params)
 }

 /**
@ -39,10 +35,7 @@ export const userExtend = (params: UserExtendSaveReqVO) => {
 * @returns
 */
 export const updateUserExtend = (params: UserExtendSaveReqVO) => {
-  return put<IResponse<number>>({
-    url: '/prod-api/app-api/member/user-extend/update',
-    data: params,
-  })
+  return useDollarFetchRequest.put<IResponse<number>>('/prod-api/app-api/member/user-extend/update', params)
 }
 /**
 * 获取用户信息
@ -50,9 +43,7 @@ export const updateUserExtend = (params: UserExtendSaveReqVO) => {
 * @returns
 */
 export const getUserAuthInfo = () => {
-  return get<IResponse<UserAuthInfoRespVO>>({
-    url: '/prod-api/app-api/member/user-auth-info/get',
-  })
+  return useFetchRequest.get<IResponse<UserAuthInfoRespVO>>('/prod-api/app-api/member/user-auth-info/get', {})
 }
 /**
 * 创建用户信息
@ -60,10 +51,7 @@ export const getUserAuthInfo = () => {
 * @returns
 */
 export const createUserAuthInfo = (params: UserAuthInfoRespVO) => {
-  return post<IResponse<number>>({
-    url: '/prod-api/app-api/member/user-auth-info/create',
-    data: params,
-  })
+  return useDollarFetchRequest.post<IResponse<number>>('/prod-api/app-api/member/user-auth-info/create', params)
 }
 /**
 * 更新用户信息
@ -71,132 +59,92 @@ export const createUserAuthInfo = (params: UserAuthInfoRespVO) => {
 * @returns
 */
 export const updateUserAuthInfo = (params: UserAuthInfoRespVO) => {
-  return put<IResponse<number>>({
-    url: '/prod-api/app-api/member/user-auth-info/update',
-    data: params,
-  })
+  return useDollarFetchRequest.put<IResponse<number>>('/prod-api/app-api/member/user-auth-info/update', params)
 }

 /**
 * 获得内容信息分页
 */
 export const getContentPage = (params: { type: number }) => {
-  return get<IResponse<PageResultProjectHistoryResVO>>({
-    url: '/prod-api/app-api/business/project-history/page',
-    params,
-  })
+  return useFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/project-history/page', params)
 }
 /**
 * 获得用户项目工具箱下载分页
 */
 export const getUserToolBoxPage = (params: { pageNum: number; pageSize: number; type?: number }) => {
-  return get<IResponse<PageResultProjectHistoryResVO>>({
-    url: '/prod-api/app-api/business/project-member-file/page',
-    params,
-  })
+  return useFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/project-member-file/page', params)
 }

 /**
 * 签到
 */
 export const signIn = () => {
-  return post<
+  return useDollarFetchRequest.post<
    IResponse<{
      day: number
      point: number
      experience: number
      createTime: string
    }>
-  >({
-    url: '/prod-api/app-api/member/sign-in/record/create',
-  })
+  >('/prod-api/app-api/member/sign-in/record/create', {})
 }
 /**
 * 获得用户积分记录分页
 */
 export const getUserPointPage = (params: { pageNo: number; pageSize: number }) => {
-  return get<IResponse<PageResultMemberPointRecordRespVO>>({
-    url: '/prod-api/app-api/member/point/record/page',
-    params,
-  })
+  return useFetchRequest.get<IResponse<PageResultMemberPointRecordRespVO>>('/prod-api/app-api/member/point/record/page', params)
 }
 /**
 * 近期收益和近期活跃
 */
 export const getRecentIncomeAndActive = (params: { type: number; limit: number }) => {
-  return get<IResponse<UserStatisticsLineRespVO>>({
-    url: '/prod-api/app-api/member/statistics/line',
-    params,
-  })
+  return useFetchRequest.get<IResponse<UserStatisticsLineRespVO>>('/prod-api/app-api/member/statistics/line', params)
 }
 /**
 * 
 资源下载分布
 */
 export const getResourceDistribution = (params: { type: number; limit: number }) => {
-  return get<IResponse<UserStatisticsBarRespVO>>({
-    url: '/prod-api/app-api/member/statistics/bar',
-    params,
-  })
+  return useFetchRequest.get<IResponse<UserStatisticsBarRespVO>>('/prod-api/app-api/member/statistics/bar', params)
 }
 /**
 * 我的数据统计 包括我的金币 我的关注 我的发布等等
 */
 export const getUserStatistics = () => {
-  return get<IResponse<UserStatisticsCountRespVO>>({
-    url: '/prod-api/app-api/member/statistics/count',
-    params: {},
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded ',
-    },
-  })
+  return useFetchRequest.get<IResponse<UserStatisticsCountRespVO>>('/prod-api/app-api/member/statistics/count', {})
 }

 /**
 * 获得项目订单用户收藏信息分页
 */
 export const getUserFavoritePage = (params: { pageNo: number; pageSize: number; userId: any; type: number }) => {
-  return get<IResponse<PageResultProjectMemberFavoritesRespVO>>({
-    url: '/prod-api/app-api/business/project-member-favorites/page',
-    params,
-  })
+  return useFetchRequest.get<IResponse<PageResultProjectMemberFavoritesRespVO>>('/prod-api/app-api/business/project-member-favorites/page', params)
 }

 /***
 * 自己发布的-内容信息分页
 */
 export const getOwnContentPage = (params: { pageNo: number; pageSize: number; type: number }) => {
-  return get<IResponse<PageResultProjectMemberFavoritesRespVO>>({
-    url: '/prod-api/app-api/business/app/project-draw/my-page',
-    params,
-  })
+  return useFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/app/project-draw/my-page', params)
 }

 /**
 * 下架
 */
 export const offShelf = (params: { id: number }) => {
-  return put<IResponse<boolean>>({
-    url: '/prod-api/app-api/business/app/project-draw/down',
-    data: params,
-  })
+  return useDollarFetchRequest.put<IResponse<boolean>>('/prod-api/app-api/business/app/project-draw/down', params)
 }

 /**
 * 删除资源
 */
 export const deleteResource = (params: { id: number }) => {
-  return Delete<IResponse<boolean>>({
-    url: '/prod-api/app-api/business/app/project-draw/delete',
-    params,
-  })
+  return useDollarFetchRequest.del<IResponse<boolean>>('/prod-api/app-api/business/app/project-draw/delete', params)
 }

 /**
 * 获得信息拓展
 */
 export const getUserExtend = () => {
-  return get<IResponse<UserExtendRespVO>>({
-    url: '/prod-api/app-api/member/user-extend/get',
-  })
+  return useFetchRequest.get<IResponse<UserExtendRespVO>>('/prod-api/app-api/member/user-extend/get', {})
 }
--- a/api/toolbox/index.ts
+++ b/api/toolbox/index.ts
@ -1,5 +1,6 @@
-import { post, get } from '~/utils/axios'
-import { TcreateReq, TpageReq, TpageRes } from './types'
+import * as useDollarFetchRequest from '~/composables/useDollarFetchRequest'
+import * as useFetchRequest from '~/composables/useFetchRequest'
+import type { TcreateReq, TpageReq, TpageRes } from './types'

 /**
 * 新建工具箱
@ -7,18 +8,12 @@ import { TcreateReq, TpageReq, TpageRes } from './types'
 * @returns
 */
 export const create = (params: TcreateReq) => {
-  return post<IResponse<number>>({
-    url: '/prod-api/app-api/business/app/project-resource/create',
-    data: params,
-  })
+  return useDollarFetchRequest.post<IResponse<number>>('/prod-api/app-api/business/app/project-resource/create', params)
 }

 /***
 * 获得内容信息分页
 */
 export const page = (params: TpageReq) => {
-  return get<IResponse<TpageRes>>({
-    url: '/prod-api/app-api/business/app/project-resource/page',
-    params,
-  })
+  return useFetchRequest.get<IResponse<TpageRes>>('/prod-api/app-api/business/app/project-resource/page', params)
 }
--- a/api/upnew/index.ts
+++ b/api/upnew/index.ts
@ -1,5 +1,6 @@
-import { post, get } from '~/utils/axios'
-import { TcreateReq, pageReq, pageRes, recommendTopReq, recommendTopRes, parentRes, ProjectDictNodeVO } from './types'
+import * as useDollarFetchRequest from '~/composables/useDollarFetchRequest'
+import * as useFetchRequest from '~/composables/useFetchRequest'
+import type { TcreateReq, pageReq, pageRes, recommendTopReq, recommendTopRes, parentRes, ProjectDictNodeVO } from './types'

 /**
 * 新建图纸
@ -7,10 +8,7 @@ import { TcreateReq, pageReq, pageRes, recommendTopReq, recommendTopRes, parentR
 * @returns
 */
 export const create = (params: TcreateReq) => {
-  return post<IResponse<boolean>>({
-    url: '/prod-api/app-api/business/app/project/create',
-    data: params,
-  })
+  return useDollarFetchRequest.post<IResponse<boolean>>('/prod-api/app-api/business/app/project/create', params)
 }
 /**
 * 获取具有上下级的字典信息
@ -18,10 +16,7 @@ export const create = (params: TcreateReq) => {
 * @returns
 */
 export const parent = (params: { type: string | number; parentId: number }) => {
-  return get<IResponse<parentRes[]>>({
-    url: '/prod-api/app-api/business/app/dict/parent',
-    params,
-  })
+  return useFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/app/dict/parent', params)
 }
 /**
 * 获取具有上下级的字典信息
@ -29,9 +24,7 @@ export const parent = (params: { type: string | number; parentId: number }) => {
 * @returns
 */
 export const indexTabs = () => {
-  return get<IResponse<parentRes[]>>({
-    url: '/prod-api/app-api/business/project/index/index-tab3',
-  })
+  return useFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/project/index/index-tab3')
 }
 /**
 * 模糊查询获取标签内容
@ -39,10 +32,7 @@ export const indexTabs = () => {
 * @returns
 */
 export const keywords = (params: { type: string | number; keywords: string }) => {
-  return get<IResponse<boolean>>({
-    url: '/prod-api/app-api/business/app/dict/label-keywords',
-    params,
-  })
+  return useFetchRequest.get<IResponse<boolean>>('/prod-api/app-api/business/app/dict/label-keywords', params)
 }
 /**
 * 获取格式类型字典信息
@ -50,10 +40,7 @@ export const keywords = (params: { type: string | number; keywords: string }) =>
 * @returns
 */
 export const labels = (params: { type: string | number }) => {
-  return get<IResponse<boolean>>({
-    url: '/prod-api/app-api/business/app/dict/labels',
-    params,
-  })
+  return useFetchRequest.get<IResponse<boolean>>('/prod-api/app-api/business/app/dict/labels', params)
 }
 /**
 * 获得项目表内容信息分页
@ -61,10 +48,7 @@ export const labels = (params: { type: string | number }) => {
 * @returns
 */
 export const page = (params: pageReq) => {
-  return get<IResponse<pageRes>>({
-    url: '/prod-api/app-api/business/app/project-draw/page',
-    params,
-  })
+  return useFetchRequest.get<IResponse<pageRes>>('/prod-api/app-api/business/app/project-draw/page', params)
 }
 /**
 * 获得项目表内容信息分页
@ -72,17 +56,12 @@ export const page = (params: pageReq) => {
 * @returns
 */
 export const recommendTop = (params: recommendTopReq) => {
-  return get<IResponse<recommendTopRes[]>>({
-    url: '/prod-api/app-api/business/app/project-draw/recommend-top',
-    params,
-  })
+  return useFetchRequest.get<IResponse<recommendTopRes[]>>('/prod-api/app-api/business/app/project-draw/recommend-top', params)
 }

 /**
 * 首页-标签
 */
 export const homeLabel = () => {
-  return get<IResponse<ProjectDictNodeVO[]>>({
-    url: '/prod-api/app-api/business/app/dict/index-tab',
-  })
+  return useFetchRequest.get<IResponse<ProjectDictNodeVO[]>>('/prod-api/app-api/business/app/dict/index-tab')
 }