From e7e821faaeedd96057f6b70bde3fa80a7e11d52c Mon Sep 17 00:00:00 2001
From: "954270063@qq.com" <954270063@qq.com>
Date: Sat, 29 May 2021 12:04:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20mergeConfig=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/mergeConfig.ts | 10 +++++++---
 src/defaults.ts         |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/core/mergeConfig.ts b/src/core/mergeConfig.ts
index ad73a92..d2a6614 100644
--- a/src/core/mergeConfig.ts
+++ b/src/core/mergeConfig.ts
@@ -54,12 +54,16 @@ function deepMergeConfig(
   });
 }
 
-const onlyFromConfig2Keys: AxiosRequestConfigKey[] = ['url', 'method', 'data'];
+const onlyFromConfig2Keys: AxiosRequestConfigKey[] = [
+  'url',
+  'method',
+  'data',
+  'upload',
+  'download',
+];
 const priorityFromConfig2Keys: AxiosRequestConfigKey[] = [
   'adapter',
   'baseURL',
-  'method',
-  'validateStatus',
   'paramsSerializer',
   'transformRequest',
   'transformResponse',
diff --git a/src/defaults.ts b/src/defaults.ts
index 88ef436..e2224fc 100644
--- a/src/defaults.ts
+++ b/src/defaults.ts
@@ -3,7 +3,6 @@ import { AxiosRequestConfig } from './core/Axios';
 
 const defaults: AxiosRequestConfig = {
   adapter: getAdapterDefault(),
-  method: 'get',
   headers: {
     common: {
       Accept: 'application/json, test/plain, */*',