fix request but

src/services/user.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request';
 
-export const currentUser = () => request('/currentUser');
+export const currentUser = () => request('/currentUser', { showType: 0 });
 
 export const changePassword = (data) => request('/change-password', { data, method: 'PUT' });

src/utils/request.js

@@ -1,13 +1,29 @@
-
 import { request } from 'umi';
 import { downloadBlob } from './download';
 
-function requestInterceptor (url, options) {
+/**
+ *
+ * 自定义修改 umi-request 行为
+ *
+ * 默认错误处理行为是通过 message 组件报错
+ * 也可以设置 option.showType 来修改默认行为
+ *
+ * export enum ErrorShowType {
+ *   SILENT = 0, // 不提示错误
+ *   WARN_MESSAGE = 1, // 警告信息提示
+ *   ERROR_MESSAGE = 2, // 错误信息提示
+ *   NOTIFICATION = 4, // 通知提示
+ *   REDIRECT = 9, // 页面跳转，会跳转到 /exception 页面
+ * }
+ *
+ */
+
+function requestInterceptor(url, options) {
   const headers = options.headers || {};
   const token = localStorage.getItem('token')
-    ? { 'X-Authorization-JWT': localStorage.getItem('token') }
-    : // ? { 'Authorization': localStorage.getItem('token') }
-    {};
+    ? { Authorization: localStorage.getItem('token') }
+    : {};
+
   const prefix =
     process.env.NODE_ENV === 'production' ? 'http://sgl-v2.njyunzhi.com/api/admin' : '/api/admin';
 
@@ -23,18 +39,14 @@ function requestInterceptor (url, options) {
   };
 }
 
-async function responseInterceptor (response) {
+async function responseInterceptor(response, ctx) {
+  console.log('-----response--------->', response, ctx);
   const contextType = response.headers.get('content-type');
   if (contextType.indexOf('json') > -1) {
     const result = await response.clone().json();
     if (result?.token || result?.data?.token) {
       localStorage.setItem('token', result?.token || result?.data?.token);
     }
-
-    if (result.code === 1000) {
-      return result;
-    }
-    return Promise.reject(result);
   }
 
   if (contextType.indexOf('application/vnd.ms-excel') > -1) {
@@ -49,13 +61,16 @@ async function responseInterceptor (response) {
 
 // https://umijs.org/plugins/plugin-request
 export const requestConfig = {
+  abc: 1,
   errorConfig: {
-    adaptor: (resData) => {
+    adaptor: (resData, ctx) => {
+      const showError = ctx.req.options?.showType;
+
       return {
         ...resData,
         success: resData.code === 1000,
         errorMessage: resData.message,
-        showType: 0, // 静默处理错误
+        showType: isNaN(showError) ? 1 : showError, // 默认通过 message 组件报错
       };
     },
   },
@@ -65,7 +80,7 @@ export const requestConfig = {
 
 export default (...args) => request(...args).then((r) => r.data);
 
-export function queryTable (apiRequest) {
+export function queryTable(apiRequest) {
   return function (params) {
     return apiRequest({
       ...params,