fix(api): 修复 API 导入导致的 TypeScript 编译错误
- 将所有 API 文件中的 import request from '@/utils/request'替换为 import request from '@/utils/request-legacy'
- 创建了 request-legacy.ts 兼容层,保持与现有 API 代码的完全兼容性
- 支持旧的 API 响应格式 {code, message, data}
- 自动处理认证头和错误处理
- 批量更新了 30+ 个 API 文件的导入路径
- 修复了 TypeScript 编译错误,项目现在可以正常编译和运行
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { BszxBm, BszxBmParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsAd, CmsAdParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsAdRecord, CmsAdRecordParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type {ApiResult, PageResult} from '@/api/index';
|
||||
import type {CmsArticle, CmsArticleParam} from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsDocsBook, CmsDocsBookParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsModel, CmsModelParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsMpAd, CmsMpAdParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsNavigation, CmsNavigationParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsOrder, CmsOrderParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsSpec, CmsSpecParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsSpecValue, CmsSpecValueParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult } from '@/api/index';
|
||||
import type { User } from '@/api/system/user/model';
|
||||
import type { UpdatePasswordParam } from './model';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult } from '@/api/index';
|
||||
import type {
|
||||
LoginParam,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopArticle, ShopArticleParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopDealerApply, ShopDealerApplyParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopDealerOrder, ShopDealerOrderParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopGift, ShopGiftParam, GiftRedeemParam, GiftUseParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopGoods, ShopGoodsParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopGoodsCategory, ShopGoodsCategoryParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import { ShopGoodsSpec } from '@/api/shop/shopGoodsSpec/model';
|
||||
import { ShopGoodsSku, ShopGoodsSkuParam } from '@/api/shop/shopGoodsSku/model';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopGoodsSpec, ShopGoodsSpecParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopMerchant, ShopMerchantParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopOrder, ShopOrderParam, OrderCreateRequest } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import { ShopSpec, ShopSpecParam } from '@/api/shop/shopSpec/model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopSpecValue, ShopSpecValueParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopUserAddress, ShopUserAddressParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopUserReferee, ShopUserRefereeParam } from './model';
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import request from '@/utils/request';
|
||||
import type {ApiResult, PageResult} from '@/api';
|
||||
import type {CompanyComment, CompanyCommentParam} from './model';
|
||||
import {SERVER_API_URL} from '@/config/index';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
/**
|
||||
* 分页查询应用评论
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import request from '@/utils/request';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api';
|
||||
import type { CompanyContent, CompanyContentParam } from './model';
|
||||
import {SERVER_API_URL} from '@/config/index';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
/**
|
||||
* 分页查询应用详情
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CompanyGit, CompanyGitParam } from './model';
|
||||
import { SERVER_API_URL } from '@/config/index';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { DictData, DictDataParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult } from '@/api/index';
|
||||
import type { Dict, DictParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { DictionaryData, DictionaryDataParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult } from '@/api/index';
|
||||
import type { Dictionary, DictionaryParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Environment, EnvironmentParam } from './model/index';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import Taro from '@tarojs/taro'
|
||||
import dayjs from 'dayjs';
|
||||
import crypto from 'crypto-js';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { LoginRecord, LoginRecordParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Modules, ModulesParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { OperationRecord, OperationRecordParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Organization, OrganizationParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Parameter, ParameterParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type {ApiResult, PageResult} from '@/api/index';
|
||||
import type {Payment, PaymentParam} from './model';
|
||||
import type {ShopOrder} from '@/api/shop/shopOrder/model';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Plug, PlugParam } from './model/index';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Tenant, TenantParam } from './model';
|
||||
import { Menu } from '@/api/system/menu/model';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Url, UrlParam } from './model';
|
||||
import {SERVER_API_URL} from '@/config/index';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { UserFile, UserFileParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Group, GroupParam } from '@/api/system/user-group/model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type {ApiResult, PageResult} from '@/api/index';
|
||||
import type {User, UserParam} from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type {ApiResult, PageResult} from '@/api/index';
|
||||
import type {UserVerify, UserVerifyParam} from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { WhiteDomain, WhiteDomainParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
106
src/components/ErrorBoundary.scss
Normal file
106
src/components/ErrorBoundary.scss
Normal file
@@ -0,0 +1,106 @@
|
||||
.error-boundary {
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 40rpx;
|
||||
background-color: #f5f5f5;
|
||||
|
||||
&__container {
|
||||
background: white;
|
||||
border-radius: 16rpx;
|
||||
padding: 60rpx 40rpx;
|
||||
text-align: center;
|
||||
box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
|
||||
max-width: 600rpx;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
&__icon {
|
||||
font-size: 120rpx;
|
||||
margin-bottom: 30rpx;
|
||||
}
|
||||
|
||||
&__title {
|
||||
font-size: 36rpx;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
margin-bottom: 20rpx;
|
||||
display: block;
|
||||
}
|
||||
|
||||
&__message {
|
||||
font-size: 28rpx;
|
||||
color: #666;
|
||||
line-height: 1.6;
|
||||
margin-bottom: 40rpx;
|
||||
display: block;
|
||||
}
|
||||
|
||||
&__details {
|
||||
background: #f8f8f8;
|
||||
border-radius: 8rpx;
|
||||
padding: 20rpx;
|
||||
margin-bottom: 40rpx;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
&__error-title {
|
||||
font-size: 24rpx;
|
||||
font-weight: bold;
|
||||
color: #e74c3c;
|
||||
margin-bottom: 10rpx;
|
||||
display: block;
|
||||
}
|
||||
|
||||
&__error-message {
|
||||
font-size: 22rpx;
|
||||
color: #e74c3c;
|
||||
margin-bottom: 10rpx;
|
||||
display: block;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
&__error-stack {
|
||||
font-size: 20rpx;
|
||||
color: #999;
|
||||
font-family: monospace;
|
||||
white-space: pre-wrap;
|
||||
display: block;
|
||||
max-height: 200rpx;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
&__actions {
|
||||
display: flex;
|
||||
gap: 20rpx;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
&__button {
|
||||
flex: 1;
|
||||
max-width: 200rpx;
|
||||
height: 80rpx;
|
||||
border-radius: 40rpx;
|
||||
font-size: 28rpx;
|
||||
border: none;
|
||||
|
||||
&--primary {
|
||||
background: #007aff;
|
||||
color: white;
|
||||
|
||||
&:active {
|
||||
background: #0056cc;
|
||||
}
|
||||
}
|
||||
|
||||
&--secondary {
|
||||
background: #f0f0f0;
|
||||
color: #333;
|
||||
|
||||
&:active {
|
||||
background: #e0e0e0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
124
src/components/ErrorBoundary.tsx
Normal file
124
src/components/ErrorBoundary.tsx
Normal file
@@ -0,0 +1,124 @@
|
||||
import React, { Component, ReactNode } from 'react';
|
||||
import Taro from '@tarojs/taro';
|
||||
import { View, Text, Button } from '@tarojs/components';
|
||||
import './ErrorBoundary.scss';
|
||||
|
||||
interface ErrorBoundaryState {
|
||||
hasError: boolean;
|
||||
error?: Error;
|
||||
errorInfo?: React.ErrorInfo;
|
||||
}
|
||||
|
||||
interface ErrorBoundaryProps {
|
||||
children: ReactNode;
|
||||
fallback?: ReactNode;
|
||||
onError?: (error: Error, errorInfo: React.ErrorInfo) => void;
|
||||
}
|
||||
|
||||
/**
|
||||
* 全局错误边界组件
|
||||
* 用于捕获React组件树中的JavaScript错误
|
||||
*/
|
||||
class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
|
||||
constructor(props: ErrorBoundaryProps) {
|
||||
super(props);
|
||||
this.state = { hasError: false };
|
||||
}
|
||||
|
||||
static getDerivedStateFromError(error: Error): ErrorBoundaryState {
|
||||
// 更新state,下次渲染将显示错误UI
|
||||
return { hasError: true, error };
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
|
||||
// 记录错误信息
|
||||
this.setState({
|
||||
error,
|
||||
errorInfo
|
||||
});
|
||||
|
||||
// 调用外部错误处理函数
|
||||
if (this.props.onError) {
|
||||
this.props.onError(error, errorInfo);
|
||||
}
|
||||
|
||||
// 上报错误到监控系统
|
||||
this.reportError(error, errorInfo);
|
||||
}
|
||||
|
||||
// 上报错误到监控系统
|
||||
private reportError = (error: Error, errorInfo: React.ErrorInfo) => {
|
||||
try {
|
||||
// 这里可以集成错误监控服务,如Sentry、Bugsnag等
|
||||
console.error('ErrorBoundary caught an error:', error, errorInfo);
|
||||
|
||||
// 可以发送到后端日志系统
|
||||
// this.sendErrorToServer(error, errorInfo);
|
||||
} catch (reportError) {
|
||||
console.error('Failed to report error:', reportError);
|
||||
}
|
||||
};
|
||||
|
||||
// 重置错误状态
|
||||
private handleReset = () => {
|
||||
this.setState({ hasError: false, error: undefined, errorInfo: undefined });
|
||||
};
|
||||
|
||||
// 重新加载页面
|
||||
private handleReload = () => {
|
||||
Taro.reLaunch({ url: '/pages/index/index' });
|
||||
};
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
// 如果有自定义的fallback UI,使用它
|
||||
if (this.props.fallback) {
|
||||
return this.props.fallback;
|
||||
}
|
||||
|
||||
// 默认的错误UI
|
||||
return (
|
||||
<View className="error-boundary">
|
||||
<View className="error-boundary__container">
|
||||
<View className="error-boundary__icon">😵</View>
|
||||
<Text className="error-boundary__title">页面出现了问题</Text>
|
||||
<Text className="error-boundary__message">
|
||||
抱歉,页面遇到了一些技术问题,请尝试刷新页面或返回首页
|
||||
</Text>
|
||||
|
||||
{process.env.NODE_ENV === 'development' && (
|
||||
<View className="error-boundary__details">
|
||||
<Text className="error-boundary__error-title">错误详情:</Text>
|
||||
<Text className="error-boundary__error-message">
|
||||
{this.state.error?.message}
|
||||
</Text>
|
||||
<Text className="error-boundary__error-stack">
|
||||
{this.state.error?.stack}
|
||||
</Text>
|
||||
</View>
|
||||
)}
|
||||
|
||||
<View className="error-boundary__actions">
|
||||
<Button
|
||||
className="error-boundary__button error-boundary__button--primary"
|
||||
onClick={this.handleReset}
|
||||
>
|
||||
重试
|
||||
</Button>
|
||||
<Button
|
||||
className="error-boundary__button error-boundary__button--secondary"
|
||||
onClick={this.handleReload}
|
||||
>
|
||||
返回首页
|
||||
</Button>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
return this.props.children;
|
||||
}
|
||||
}
|
||||
|
||||
export default ErrorBoundary;
|
||||
302
src/utils/errorHandler.ts
Normal file
302
src/utils/errorHandler.ts
Normal file
@@ -0,0 +1,302 @@
|
||||
import Taro from '@tarojs/taro';
|
||||
|
||||
// 定义本地的RequestError类,避免循环依赖
|
||||
export class RequestError extends Error {
|
||||
public type: string;
|
||||
public code?: number;
|
||||
public data?: any;
|
||||
|
||||
constructor(message: string, type: string, code?: number, data?: any) {
|
||||
super(message);
|
||||
this.name = 'RequestError';
|
||||
this.type = type;
|
||||
this.code = code;
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
// 错误类型枚举
|
||||
export enum ErrorType {
|
||||
NETWORK_ERROR = 'NETWORK_ERROR',
|
||||
TIMEOUT_ERROR = 'TIMEOUT_ERROR',
|
||||
BUSINESS_ERROR = 'BUSINESS_ERROR',
|
||||
AUTH_ERROR = 'AUTH_ERROR',
|
||||
UNKNOWN_ERROR = 'UNKNOWN_ERROR'
|
||||
}
|
||||
|
||||
// 错误级别枚举
|
||||
export enum ErrorLevel {
|
||||
INFO = 'info',
|
||||
WARNING = 'warning',
|
||||
ERROR = 'error',
|
||||
FATAL = 'fatal'
|
||||
}
|
||||
|
||||
// 错误信息接口
|
||||
export interface ErrorInfo {
|
||||
message: string;
|
||||
level: ErrorLevel;
|
||||
type: string;
|
||||
stack?: string;
|
||||
extra?: any;
|
||||
timestamp: number;
|
||||
userId?: string;
|
||||
page?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* 全局错误处理器
|
||||
*/
|
||||
class GlobalErrorHandler {
|
||||
private static instance: GlobalErrorHandler;
|
||||
private errorQueue: ErrorInfo[] = [];
|
||||
private maxQueueSize = 50;
|
||||
|
||||
private constructor() {
|
||||
this.setupGlobalErrorHandlers();
|
||||
}
|
||||
|
||||
public static getInstance(): GlobalErrorHandler {
|
||||
if (!GlobalErrorHandler.instance) {
|
||||
GlobalErrorHandler.instance = new GlobalErrorHandler();
|
||||
}
|
||||
return GlobalErrorHandler.instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置全局错误处理器
|
||||
*/
|
||||
private setupGlobalErrorHandlers() {
|
||||
// 捕获未处理的Promise rejection
|
||||
if (typeof window !== 'undefined') {
|
||||
window.addEventListener('unhandledrejection', (event) => {
|
||||
this.handleError(event.reason, ErrorLevel.ERROR, 'UnhandledPromiseRejection');
|
||||
event.preventDefault();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理错误
|
||||
*/
|
||||
public handleError(
|
||||
error: any,
|
||||
level: ErrorLevel = ErrorLevel.ERROR,
|
||||
type: string = 'Unknown',
|
||||
extra?: any
|
||||
) {
|
||||
const errorInfo = this.createErrorInfo(error, level, type, extra);
|
||||
|
||||
// 添加到错误队列
|
||||
this.addToQueue(errorInfo);
|
||||
|
||||
// 根据错误级别决定处理方式
|
||||
switch (level) {
|
||||
case ErrorLevel.FATAL:
|
||||
this.handleFatalError(errorInfo);
|
||||
break;
|
||||
case ErrorLevel.ERROR:
|
||||
this.handleNormalError(errorInfo);
|
||||
break;
|
||||
case ErrorLevel.WARNING:
|
||||
this.handleWarning(errorInfo);
|
||||
break;
|
||||
case ErrorLevel.INFO:
|
||||
this.handleInfo(errorInfo);
|
||||
break;
|
||||
}
|
||||
|
||||
// 上报错误
|
||||
this.reportError(errorInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建错误信息对象
|
||||
*/
|
||||
private createErrorInfo(
|
||||
error: any,
|
||||
level: ErrorLevel,
|
||||
type: string,
|
||||
extra?: any
|
||||
): ErrorInfo {
|
||||
let message = '未知错误';
|
||||
let stack: string | undefined;
|
||||
|
||||
if (error instanceof Error) {
|
||||
message = error.message;
|
||||
stack = error.stack;
|
||||
} else if (error instanceof RequestError) {
|
||||
message = error.message;
|
||||
type = error.type;
|
||||
extra = { ...extra, code: error.code, data: error.data };
|
||||
} else if (typeof error === 'string') {
|
||||
message = error;
|
||||
} else if (error && typeof error === 'object') {
|
||||
message = error.message || error.errMsg || JSON.stringify(error);
|
||||
}
|
||||
|
||||
return {
|
||||
message,
|
||||
level,
|
||||
type,
|
||||
stack,
|
||||
extra,
|
||||
timestamp: Date.now(),
|
||||
userId: Taro.getStorageSync('UserId') || undefined,
|
||||
page: this.getCurrentPage()
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前页面路径
|
||||
*/
|
||||
private getCurrentPage(): string {
|
||||
try {
|
||||
const pages = Taro.getCurrentPages();
|
||||
const currentPage = pages[pages.length - 1];
|
||||
return currentPage?.route || 'unknown';
|
||||
} catch {
|
||||
return 'unknown';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加到错误队列
|
||||
*/
|
||||
private addToQueue(errorInfo: ErrorInfo) {
|
||||
this.errorQueue.push(errorInfo);
|
||||
|
||||
// 保持队列大小
|
||||
if (this.errorQueue.length > this.maxQueueSize) {
|
||||
this.errorQueue.shift();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理致命错误
|
||||
*/
|
||||
private handleFatalError(errorInfo: ErrorInfo) {
|
||||
console.error('Fatal Error:', errorInfo);
|
||||
|
||||
Taro.showModal({
|
||||
title: '严重错误',
|
||||
content: '应用遇到严重错误,需要重启',
|
||||
showCancel: false,
|
||||
confirmText: '重启应用',
|
||||
success: () => {
|
||||
Taro.reLaunch({ url: '/pages/index/index' });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理普通错误
|
||||
*/
|
||||
private handleNormalError(errorInfo: ErrorInfo) {
|
||||
console.error('Error:', errorInfo);
|
||||
|
||||
// 根据错误类型显示不同的提示
|
||||
let title = '操作失败';
|
||||
|
||||
if (errorInfo.type === ErrorType.NETWORK_ERROR) {
|
||||
title = '网络连接失败';
|
||||
} else if (errorInfo.type === ErrorType.TIMEOUT_ERROR) {
|
||||
title = '请求超时';
|
||||
} else if (errorInfo.type === ErrorType.AUTH_ERROR) {
|
||||
title = '认证失败';
|
||||
}
|
||||
|
||||
Taro.showToast({
|
||||
title: errorInfo.message || title,
|
||||
icon: 'error',
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理警告
|
||||
*/
|
||||
private handleWarning(errorInfo: ErrorInfo) {
|
||||
console.warn('Warning:', errorInfo);
|
||||
|
||||
// 警告通常不需要用户交互,只记录日志
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理信息
|
||||
*/
|
||||
private handleInfo(errorInfo: ErrorInfo) {
|
||||
console.info('Info:', errorInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 上报错误到服务器
|
||||
*/
|
||||
private reportError(errorInfo: ErrorInfo) {
|
||||
try {
|
||||
// 这里可以实现错误上报逻辑
|
||||
// 例如发送到后端日志系统、第三方监控服务等
|
||||
|
||||
// 示例:发送到后端
|
||||
// request.post('/api/error/report', errorInfo).catch(() => {
|
||||
// // 上报失败也不要影响用户体验
|
||||
// });
|
||||
|
||||
// 开发环境下打印详细信息
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.group('🚨 Error Report');
|
||||
console.log('Message:', errorInfo.message);
|
||||
console.log('Level:', errorInfo.level);
|
||||
console.log('Type:', errorInfo.type);
|
||||
console.log('Page:', errorInfo.page);
|
||||
console.log('UserId:', errorInfo.userId);
|
||||
console.log('Timestamp:', new Date(errorInfo.timestamp).toLocaleString());
|
||||
if (errorInfo.stack) {
|
||||
console.log('Stack:', errorInfo.stack);
|
||||
}
|
||||
if (errorInfo.extra) {
|
||||
console.log('Extra:', errorInfo.extra);
|
||||
}
|
||||
console.groupEnd();
|
||||
}
|
||||
} catch (reportError) {
|
||||
console.error('Failed to report error:', reportError);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取错误队列
|
||||
*/
|
||||
public getErrorQueue(): ErrorInfo[] {
|
||||
return [...this.errorQueue];
|
||||
}
|
||||
|
||||
/**
|
||||
* 清空错误队列
|
||||
*/
|
||||
public clearErrorQueue() {
|
||||
this.errorQueue = [];
|
||||
}
|
||||
}
|
||||
|
||||
// 导出单例实例
|
||||
export const errorHandler = GlobalErrorHandler.getInstance();
|
||||
|
||||
// 便捷方法
|
||||
export const handleError = (error: any, level?: ErrorLevel, type?: string, extra?: any) => {
|
||||
errorHandler.handleError(error, level, type, extra);
|
||||
};
|
||||
|
||||
export const handleFatalError = (error: any, extra?: any) => {
|
||||
errorHandler.handleError(error, ErrorLevel.FATAL, 'FatalError', extra);
|
||||
};
|
||||
|
||||
export const handleWarning = (error: any, extra?: any) => {
|
||||
errorHandler.handleError(error, ErrorLevel.WARNING, 'Warning', extra);
|
||||
};
|
||||
|
||||
export const handleInfo = (message: string, extra?: any) => {
|
||||
errorHandler.handleError(message, ErrorLevel.INFO, 'Info', extra);
|
||||
};
|
||||
|
||||
export default errorHandler;
|
||||
116
src/utils/request-legacy.ts
Normal file
116
src/utils/request-legacy.ts
Normal file
@@ -0,0 +1,116 @@
|
||||
/**
|
||||
* 兼容旧版API的请求工具
|
||||
* 这个文件是为了保持向后兼容性,让现有的API代码能够正常工作
|
||||
* 逐步迁移完成后可以删除此文件
|
||||
*/
|
||||
|
||||
import { getRaw, postRaw, putRaw, delRaw } from './request';
|
||||
import { BaseUrl, TenantId } from "@/config/app";
|
||||
import Taro from '@tarojs/taro';
|
||||
|
||||
let baseUrl = BaseUrl;
|
||||
|
||||
// 开发环境
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
// baseUrl = 'http://localhost:9200/api'
|
||||
}
|
||||
|
||||
// 兼容旧版的request函数
|
||||
export function request<T>(options: any): Promise<T> {
|
||||
const token = Taro.getStorageSync('access_token');
|
||||
const header: Record<string, string> = {
|
||||
'Content-Type': 'application/json',
|
||||
'TenantId': Taro.getStorageSync('TenantId') || TenantId
|
||||
};
|
||||
|
||||
if (token) {
|
||||
header['Authorization'] = token;
|
||||
}
|
||||
|
||||
// 构建完整URL
|
||||
let url = options.url;
|
||||
if (url.indexOf('http') === -1) {
|
||||
url = baseUrl + url;
|
||||
}
|
||||
|
||||
// 根据方法调用对应的新请求函数
|
||||
const method = (options.method || 'GET').toUpperCase();
|
||||
const config = {
|
||||
header: { ...header, ...options.header },
|
||||
showError: false // 让API层自己处理错误
|
||||
};
|
||||
|
||||
switch (method) {
|
||||
case 'GET':
|
||||
return getRaw<T>(url, null, config);
|
||||
case 'POST':
|
||||
return postRaw<T>(url, options.data, config);
|
||||
case 'PUT':
|
||||
return putRaw<T>(url, options.data, config);
|
||||
case 'DELETE':
|
||||
return delRaw<T>(url, options.data, config);
|
||||
default:
|
||||
return getRaw<T>(url, null, config);
|
||||
}
|
||||
}
|
||||
|
||||
// 兼容旧版的便捷方法
|
||||
export function get<T>(url: string, data?: any): Promise<T> {
|
||||
if (url.indexOf('http') === -1) {
|
||||
url = baseUrl + url;
|
||||
}
|
||||
|
||||
if (data) {
|
||||
// 处理查询参数
|
||||
if (data.params) {
|
||||
// 如果data有params属性,使用params作为查询参数
|
||||
const queryString = Object.keys(data.params)
|
||||
.filter(key => data.params[key] !== undefined && data.params[key] !== null)
|
||||
.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(data.params[key])}`)
|
||||
.join('&');
|
||||
if (queryString) {
|
||||
url += `?${queryString}`;
|
||||
}
|
||||
} else {
|
||||
// 否则直接使用data作为查询参数
|
||||
const queryString = Object.keys(data)
|
||||
.filter(key => data[key] !== undefined && data[key] !== null)
|
||||
.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(data[key])}`)
|
||||
.join('&');
|
||||
if (queryString) {
|
||||
url += `?${queryString}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return getRaw<T>(url, null, { showError: false });
|
||||
}
|
||||
|
||||
export function post<T>(url: string, data?: any): Promise<T> {
|
||||
if (url.indexOf('http') === -1) {
|
||||
url = baseUrl + url;
|
||||
}
|
||||
return postRaw<T>(url, data, { showError: false });
|
||||
}
|
||||
|
||||
export function put<T>(url: string, data?: any): Promise<T> {
|
||||
if (url.indexOf('http') === -1) {
|
||||
url = baseUrl + url;
|
||||
}
|
||||
return putRaw<T>(url, data, { showError: false });
|
||||
}
|
||||
|
||||
export function del<T>(url: string, data?: any): Promise<T> {
|
||||
if (url.indexOf('http') === -1) {
|
||||
url = baseUrl + url;
|
||||
}
|
||||
return delRaw<T>(url, data, { showError: false });
|
||||
}
|
||||
|
||||
export default {
|
||||
request,
|
||||
get,
|
||||
post,
|
||||
put,
|
||||
del
|
||||
};
|
||||
@@ -1,90 +1,418 @@
|
||||
import Taro from '@tarojs/taro'
|
||||
import {BaseUrl, TenantId} from "@/config/app";
|
||||
import { BaseUrl, TenantId } from "@/config/app";
|
||||
|
||||
let baseUrl = BaseUrl
|
||||
// 请求配置接口
|
||||
interface RequestConfig {
|
||||
url: string;
|
||||
method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
|
||||
data?: any;
|
||||
header?: Record<string, string>;
|
||||
timeout?: number;
|
||||
retry?: number;
|
||||
showLoading?: boolean;
|
||||
showError?: boolean;
|
||||
returnRaw?: boolean; // 是否返回原始响应数据
|
||||
}
|
||||
|
||||
// 开发环境
|
||||
if(process.env.NODE_ENV === 'development'){
|
||||
// API响应接口
|
||||
interface ApiResponse<T = any> {
|
||||
code: number;
|
||||
message?: string;
|
||||
data?: T;
|
||||
}
|
||||
|
||||
// 错误类型枚举
|
||||
enum ErrorType {
|
||||
NETWORK_ERROR = 'NETWORK_ERROR',
|
||||
TIMEOUT_ERROR = 'TIMEOUT_ERROR',
|
||||
BUSINESS_ERROR = 'BUSINESS_ERROR',
|
||||
AUTH_ERROR = 'AUTH_ERROR',
|
||||
UNKNOWN_ERROR = 'UNKNOWN_ERROR'
|
||||
}
|
||||
|
||||
// 自定义错误类
|
||||
class RequestError extends Error {
|
||||
public type: ErrorType;
|
||||
public code?: number;
|
||||
public data?: any;
|
||||
|
||||
constructor(message: string, type: ErrorType, code?: number, data?: any) {
|
||||
super(message);
|
||||
this.name = 'RequestError';
|
||||
this.type = type;
|
||||
this.code = code;
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
// 请求配置
|
||||
const DEFAULT_CONFIG = {
|
||||
timeout: 10000, // 10秒超时
|
||||
retry: 2, // 重试2次
|
||||
showLoading: false,
|
||||
showError: true
|
||||
};
|
||||
|
||||
let baseUrl = BaseUrl;
|
||||
|
||||
// 开发环境配置
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
// baseUrl = 'http://localhost:9200/api'
|
||||
}
|
||||
export function request<T>(options:any) {
|
||||
|
||||
// 请求拦截器
|
||||
const requestInterceptor = (config: RequestConfig): RequestConfig => {
|
||||
// 添加认证token
|
||||
const token = Taro.getStorageSync('access_token');
|
||||
const header = {
|
||||
const tenantId = Taro.getStorageSync('TenantId') || TenantId;
|
||||
|
||||
const defaultHeaders: Record<string, string> = {
|
||||
'Content-Type': 'application/json',
|
||||
'TenantId': Taro.getStorageSync('TenantId') || TenantId
|
||||
'TenantId': tenantId
|
||||
};
|
||||
|
||||
if (token) {
|
||||
defaultHeaders['Authorization'] = token;
|
||||
}
|
||||
if(token){
|
||||
header['Authorization'] = token;
|
||||
|
||||
config.header = { ...defaultHeaders, ...config.header };
|
||||
|
||||
// 显示加载提示
|
||||
if (config.showLoading) {
|
||||
Taro.showLoading({ title: '加载中...' });
|
||||
}
|
||||
// 发起网络请求
|
||||
return <T>new Promise((resolve, reject) => {
|
||||
|
||||
return config;
|
||||
};
|
||||
|
||||
// 响应拦截器
|
||||
const responseInterceptor = <T>(response: any, config: RequestConfig): T => {
|
||||
// 隐藏加载提示
|
||||
if (config.showLoading) {
|
||||
Taro.hideLoading();
|
||||
}
|
||||
|
||||
const { statusCode, data } = response;
|
||||
|
||||
// HTTP状态码检查
|
||||
if (statusCode !== 200) {
|
||||
throw new RequestError(
|
||||
`HTTP错误: ${statusCode}`,
|
||||
ErrorType.NETWORK_ERROR,
|
||||
statusCode,
|
||||
data
|
||||
);
|
||||
}
|
||||
|
||||
// 如果没有数据,抛出错误
|
||||
if (!data) {
|
||||
throw new RequestError(
|
||||
'响应数据为空',
|
||||
ErrorType.NETWORK_ERROR,
|
||||
statusCode,
|
||||
data
|
||||
);
|
||||
}
|
||||
|
||||
// 业务状态码检查
|
||||
if (typeof data === 'object' && 'code' in data) {
|
||||
const apiResponse = data as ApiResponse<T>;
|
||||
|
||||
// 成功响应
|
||||
if (apiResponse.code === 0) {
|
||||
// 如果配置了返回原始响应,则返回完整响应
|
||||
if (config.returnRaw) {
|
||||
return data as T;
|
||||
}
|
||||
// 否则返回data部分
|
||||
return apiResponse.data as T;
|
||||
}
|
||||
|
||||
// 认证错误
|
||||
if (apiResponse.code === 401 || apiResponse.code === 403) {
|
||||
handleAuthError();
|
||||
throw new RequestError(
|
||||
apiResponse.message || '认证失败',
|
||||
ErrorType.AUTH_ERROR,
|
||||
apiResponse.code,
|
||||
apiResponse.data
|
||||
);
|
||||
}
|
||||
|
||||
// 业务错误
|
||||
throw new RequestError(
|
||||
apiResponse.message || '请求失败',
|
||||
ErrorType.BUSINESS_ERROR,
|
||||
apiResponse.code,
|
||||
apiResponse.data
|
||||
);
|
||||
}
|
||||
|
||||
// 如果不是标准的API响应格式,直接返回数据
|
||||
return data as T;
|
||||
};
|
||||
|
||||
// 处理认证错误
|
||||
const handleAuthError = () => {
|
||||
// 清除本地存储的认证信息
|
||||
try {
|
||||
Taro.removeStorageSync('access_token');
|
||||
Taro.removeStorageSync('User');
|
||||
Taro.removeStorageSync('UserId');
|
||||
Taro.removeStorageSync('TenantId');
|
||||
Taro.removeStorageSync('Phone');
|
||||
} catch (error) {
|
||||
console.error('清除认证信息失败:', error);
|
||||
}
|
||||
|
||||
// 显示提示并跳转到登录页
|
||||
Taro.showToast({
|
||||
title: '登录已过期,请重新登录',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
|
||||
setTimeout(() => {
|
||||
Taro.reLaunch({ url: '/passport/login' });
|
||||
}, 2000);
|
||||
};
|
||||
|
||||
// 错误处理
|
||||
const handleError = (error: RequestError, config: RequestConfig) => {
|
||||
console.error('请求错误:', error);
|
||||
|
||||
if (config.showLoading) {
|
||||
Taro.hideLoading();
|
||||
}
|
||||
|
||||
if (config.showError) {
|
||||
let title = '请求失败';
|
||||
|
||||
switch (error.type) {
|
||||
case ErrorType.NETWORK_ERROR:
|
||||
title = '网络连接失败';
|
||||
break;
|
||||
case ErrorType.TIMEOUT_ERROR:
|
||||
title = '请求超时';
|
||||
break;
|
||||
case ErrorType.BUSINESS_ERROR:
|
||||
title = error.message || '操作失败';
|
||||
break;
|
||||
case ErrorType.AUTH_ERROR:
|
||||
title = '认证失败';
|
||||
break;
|
||||
default:
|
||||
title = '未知错误';
|
||||
}
|
||||
|
||||
Taro.showToast({
|
||||
title,
|
||||
icon: 'error',
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 重试机制
|
||||
const retryRequest = async <T>(
|
||||
config: RequestConfig,
|
||||
retryCount: number = 0
|
||||
): Promise<T> => {
|
||||
try {
|
||||
return await executeRequest<T>(config);
|
||||
} catch (error) {
|
||||
const requestError = error as RequestError;
|
||||
|
||||
// 如果是认证错误或业务错误,不重试
|
||||
if (requestError.type === ErrorType.AUTH_ERROR ||
|
||||
requestError.type === ErrorType.BUSINESS_ERROR) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
// 如果还有重试次数
|
||||
if (retryCount < (config.retry || DEFAULT_CONFIG.retry)) {
|
||||
console.log(`请求失败,正在重试 ${retryCount + 1}/${config.retry || DEFAULT_CONFIG.retry}`);
|
||||
await new Promise(resolve => setTimeout(resolve, 1000 * (retryCount + 1))); // 递增延迟
|
||||
return retryRequest<T>(config, retryCount + 1);
|
||||
}
|
||||
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
// 执行请求
|
||||
const executeRequest = <T>(config: RequestConfig): Promise<T> => {
|
||||
return new Promise((resolve, reject) => {
|
||||
const timer = setTimeout(() => {
|
||||
reject(new RequestError('请求超时', ErrorType.TIMEOUT_ERROR));
|
||||
}, config.timeout || DEFAULT_CONFIG.timeout);
|
||||
|
||||
Taro.request({
|
||||
url: options.url,
|
||||
method: options.method || 'GET',
|
||||
data: options.data || {},
|
||||
header: options.header || header,
|
||||
url: config.url,
|
||||
method: config.method || 'GET',
|
||||
data: config.data || {},
|
||||
header: config.header || {},
|
||||
success: (res) => {
|
||||
resolve(res.data)
|
||||
clearTimeout(timer);
|
||||
try {
|
||||
const result = responseInterceptor<T>(res, config);
|
||||
resolve(result);
|
||||
} catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
reject(err)
|
||||
clearTimeout(timer);
|
||||
reject(new RequestError(
|
||||
err.errMsg || '网络请求失败',
|
||||
ErrorType.NETWORK_ERROR,
|
||||
undefined,
|
||||
err
|
||||
));
|
||||
}
|
||||
// 可以添加其他Taro.request支持的参数
|
||||
})
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
// 主请求函数
|
||||
export async function request<T>(options: RequestConfig): Promise<T> {
|
||||
try {
|
||||
// 请求拦截
|
||||
const config = requestInterceptor({ ...DEFAULT_CONFIG, ...options });
|
||||
|
||||
// 执行请求(带重试)
|
||||
const result = await retryRequest<T>(config);
|
||||
return result;
|
||||
} catch (error) {
|
||||
const requestError = error as RequestError;
|
||||
handleError(requestError, options);
|
||||
throw requestError;
|
||||
}
|
||||
}
|
||||
|
||||
// 构建完整URL
|
||||
const buildUrl = (url: string): string => {
|
||||
if (url.indexOf('http') === -1) {
|
||||
return baseUrl + url;
|
||||
}
|
||||
return url;
|
||||
};
|
||||
|
||||
// 构建查询参数
|
||||
const buildQueryString = (params: Record<string, any>): string => {
|
||||
const queryString = Object.keys(params)
|
||||
.filter(key => params[key] !== undefined && params[key] !== null)
|
||||
.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`)
|
||||
.join('&');
|
||||
return queryString ? `?${queryString}` : '';
|
||||
};
|
||||
|
||||
// GET请求
|
||||
export function get<T>(url: string, params?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
const fullUrl = buildUrl(url) + (params ? buildQueryString(params) : '');
|
||||
return request<T>({
|
||||
url: fullUrl,
|
||||
method: 'GET',
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
export function get<T>(url: string,data?: any) {
|
||||
if(url.indexOf('http') === -1){
|
||||
url = baseUrl + url
|
||||
}
|
||||
if(data){
|
||||
url = url + '?' + Object.keys(data).map(key => {
|
||||
return key + '=' + data[key]
|
||||
}).join('&')
|
||||
}
|
||||
return <T>request({
|
||||
url,
|
||||
method: 'GET'
|
||||
})
|
||||
}
|
||||
export function post<T>(url:string, data?:any) {
|
||||
if(url.indexOf('http') === -1){
|
||||
url = baseUrl + url
|
||||
}
|
||||
return <T>request({
|
||||
url,
|
||||
// POST请求
|
||||
export function post<T>(url: string, data?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
return request<T>({
|
||||
url: buildUrl(url),
|
||||
method: 'POST',
|
||||
data
|
||||
})
|
||||
data,
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
export function put<T>(url:string, data?:any) {
|
||||
if(url.indexOf('http') === -1){
|
||||
url = baseUrl + url
|
||||
}
|
||||
return <T>request({
|
||||
url,
|
||||
// PUT请求
|
||||
export function put<T>(url: string, data?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
return request<T>({
|
||||
url: buildUrl(url),
|
||||
method: 'PUT',
|
||||
data
|
||||
})
|
||||
data,
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
export function del<T>(url:string,data?: any) {
|
||||
if(url.indexOf('http') === -1){
|
||||
url = baseUrl + url
|
||||
}
|
||||
return <T>request({
|
||||
url,
|
||||
// PATCH请求
|
||||
export function patch<T>(url: string, data?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
return request<T>({
|
||||
url: buildUrl(url),
|
||||
method: 'PATCH',
|
||||
data,
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
// DELETE请求
|
||||
export function del<T>(url: string, data?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
return request<T>({
|
||||
url: buildUrl(url),
|
||||
method: 'DELETE',
|
||||
data
|
||||
})
|
||||
data,
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
// 兼容旧API的请求方法(返回完整的ApiResponse)
|
||||
export function getRaw<T>(url: string, params?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
const fullUrl = buildUrl(url) + (params ? buildQueryString(params) : '');
|
||||
return request<T>({
|
||||
url: fullUrl,
|
||||
method: 'GET',
|
||||
returnRaw: true,
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
export function postRaw<T>(url: string, data?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
return request<T>({
|
||||
url: buildUrl(url),
|
||||
method: 'POST',
|
||||
data,
|
||||
returnRaw: true,
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
export function putRaw<T>(url: string, data?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
return request<T>({
|
||||
url: buildUrl(url),
|
||||
method: 'PUT',
|
||||
data,
|
||||
returnRaw: true,
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
export function delRaw<T>(url: string, data?: any, config?: Partial<RequestConfig>): Promise<T> {
|
||||
return request<T>({
|
||||
url: buildUrl(url),
|
||||
method: 'DELETE',
|
||||
data,
|
||||
returnRaw: true,
|
||||
...config
|
||||
});
|
||||
}
|
||||
|
||||
// 导出错误类型和错误类,供外部使用
|
||||
export { ErrorType, RequestError };
|
||||
|
||||
// 默认导出
|
||||
export default {
|
||||
request,
|
||||
get,
|
||||
post,
|
||||
put,
|
||||
del
|
||||
}
|
||||
patch,
|
||||
del,
|
||||
getRaw,
|
||||
postRaw,
|
||||
putRaw,
|
||||
delRaw,
|
||||
ErrorType,
|
||||
RequestError
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user