From 7af9a7035d6f8eb578b11914e24aaa718009f287 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Fri, 23 Dec 2022 13:05:15 +0800
Subject: [PATCH 01/24] base

---
 base/lib/src/storage/config/config.dart        |  9 +++------
 .../config/http_adaptor/browser_adaptor.dart   |  4 ----
 .../config/http_adaptor/native_adaptor.dart    |  4 ----
 base/lib/src/storage/error/error.dart          | 11 ++++++-----
 .../methods/put/by_part/put_parts_task.dart    |  7 ++++---
 .../put/by_single/put_by_single_task.dart      |  4 ++--
 base/lib/src/storage/storage.dart              |  8 ++------
 base/lib/src/storage/task/request_task.dart    | 12 +++++++-----
 base/lib/src/storage/task/task.dart            |  3 ++-
 base/pubspec.yaml                              |  4 ++--
 base/test/auth/auth_test.dart                  |  2 +-
 base/test/config.dart                          |  2 +-
 base/test/config_test.dart                     |  3 ++-
 base/test/put/helpers.dart                     | 10 +++++-----
 base/test/put/put_by_parts/put_bytes_test.dart |  7 ++++---
 base/test/put/put_by_parts/put_file_test.dart  |  7 ++++---
 base/test/put/put_by_single/put_bytes.dart     |  2 +-
 base/test/put/put_by_single/put_file.dart      |  2 +-
 base/test/resource_test.dart                   |  2 +-
 base/test/retry_test.dart                      | 18 +++++++++---------
 20 files changed, 57 insertions(+), 64 deletions(-)
 delete mode 100644 base/lib/src/storage/config/http_adaptor/browser_adaptor.dart
 delete mode 100644 base/lib/src/storage/config/http_adaptor/native_adaptor.dart

diff --git a/base/lib/src/storage/config/config.dart b/base/lib/src/storage/config/config.dart
index bad100d6..fac04af8 100644
--- a/base/lib/src/storage/config/config.dart
+++ b/base/lib/src/storage/config/config.dart
@@ -1,9 +1,6 @@
-import 'package:dio/dio.dart';
+import 'package:diox/diox.dart';
 
-import 'package:qiniu_sdk_base/src/storage/error/error.dart';
-
-import 'http_adaptor/native_adaptor.dart'
-    if (dart.library.html) 'http_adaptor/browser_adaptor.dart';
+import '../../storage/error/error.dart';
 
 part 'cache.dart';
 part 'host.dart';
@@ -26,5 +23,5 @@ class Config {
     this.retryLimit = 3,
   })  : hostProvider = hostProvider ?? DefaultHostProvider(),
         cacheProvider = cacheProvider ?? DefaultCacheProvider(),
-        httpClientAdapter = httpClientAdapter ?? createHttpAdaptor();
+        httpClientAdapter = httpClientAdapter ?? HttpClientAdapter();
 }
diff --git a/base/lib/src/storage/config/http_adaptor/browser_adaptor.dart b/base/lib/src/storage/config/http_adaptor/browser_adaptor.dart
deleted file mode 100644
index 19766790..00000000
--- a/base/lib/src/storage/config/http_adaptor/browser_adaptor.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-import 'package:dio/adapter_browser.dart';
-import 'package:dio/dio.dart';
-
-HttpClientAdapter createHttpAdaptor() => BrowserHttpClientAdapter();
diff --git a/base/lib/src/storage/config/http_adaptor/native_adaptor.dart b/base/lib/src/storage/config/http_adaptor/native_adaptor.dart
deleted file mode 100644
index 18056160..00000000
--- a/base/lib/src/storage/config/http_adaptor/native_adaptor.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-import 'package:dio/adapter.dart';
-import 'package:dio/dio.dart';
-
-HttpClientAdapter createHttpAdaptor() => DefaultHttpClientAdapter();
diff --git a/base/lib/src/storage/error/error.dart b/base/lib/src/storage/error/error.dart
index 2b9986d7..02316096 100644
--- a/base/lib/src/storage/error/error.dart
+++ b/base/lib/src/storage/error/error.dart
@@ -1,5 +1,6 @@
-import 'package:dio/dio.dart';
-import 'package:qiniu_sdk_base/src/error/error.dart';
+import 'package:diox/diox.dart';
+
+import '../../error/error.dart';
 
 enum StorageErrorType {
   /// 连接超时
@@ -65,17 +66,17 @@ class StorageError extends QiniuError {
 
 StorageErrorType _mapDioErrorType(DioErrorType type) {
   switch (type) {
-    case DioErrorType.connectTimeout:
+    case DioErrorType.connectionTimeout:
       return StorageErrorType.CONNECT_TIMEOUT;
     case DioErrorType.sendTimeout:
       return StorageErrorType.SEND_TIMEOUT;
     case DioErrorType.receiveTimeout:
       return StorageErrorType.RECEIVE_TIMEOUT;
-    case DioErrorType.response:
+    case DioErrorType.badResponse:
       return StorageErrorType.RESPONSE;
     case DioErrorType.cancel:
       return StorageErrorType.CANCEL;
-    case DioErrorType.other:
+    case DioErrorType.unknown:
     default:
       return StorageErrorType.UNKNOWN;
   }
diff --git a/base/lib/src/storage/methods/put/by_part/put_parts_task.dart b/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
index a3140e2c..3addf5bc 100644
--- a/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
@@ -2,9 +2,10 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:dio/dio.dart';
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
-import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
+import 'package:diox/diox.dart';
+
+import '../../../../../qiniu_sdk_base.dart';
+import '../../../resource/resource.dart';
 
 part 'cache_mixin.dart';
 part 'complete_parts_task.dart';
diff --git a/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart b/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
index eac8f7b7..86c3d1de 100644
--- a/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
+++ b/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
@@ -1,6 +1,6 @@
-import 'package:dio/dio.dart';
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+import 'package:diox/diox.dart';
 
+import '../../../../../qiniu_sdk_base.dart';
 import '../../../resource/resource.dart';
 
 // 直传任务
diff --git a/base/lib/src/storage/storage.dart b/base/lib/src/storage/storage.dart
index 1082fbb4..b4f0ca00 100644
--- a/base/lib/src/storage/storage.dart
+++ b/base/lib/src/storage/storage.dart
@@ -1,18 +1,14 @@
 import 'dart:io';
 import 'dart:typed_data';
-import 'package:path/path.dart' show basename;
 
-import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
+import 'package:path/path.dart' show basename;
 
 import 'config/config.dart';
 import 'methods/put/by_part/put_parts_task.dart';
 import 'methods/put/by_single/put_by_single_task.dart';
 import 'methods/put/put.dart';
+import 'resource/resource.dart';
 import 'task/task.dart';
-
-export 'package:dio/dio.dart' show HttpClientAdapter;
-
-export 'config/config.dart';
 export 'error/error.dart';
 export 'methods/put/put.dart';
 export 'status/status.dart';
diff --git a/base/lib/src/storage/task/request_task.dart b/base/lib/src/storage/task/request_task.dart
index aa2ab086..f117b78f 100644
--- a/base/lib/src/storage/task/request_task.dart
+++ b/base/lib/src/storage/task/request_task.dart
@@ -1,6 +1,8 @@
-import 'package:dio/dio.dart';
+import 'package:diox/diox.dart';
 import 'package:meta/meta.dart';
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+
+import '../../../../qiniu_sdk_base.dart';
+import '../config/config.dart';
 
 part 'request_task_controller.dart';
 part 'request_task_manager.dart';
@@ -152,7 +154,7 @@ abstract class RequestTask<T> extends Task<T> {
     if (!_canConnectToHost(error) || _isHostUnavailable(error)) {
       return true;
     }
-    if (error.type == DioErrorType.response) {
+    if (error.type == DioErrorType.badResponse) {
       if (error.response?.statusCode == 612) {
         return true;
       }
@@ -163,7 +165,7 @@ abstract class RequestTask<T> extends Task<T> {
   // host 是否可以连接上
   bool _canConnectToHost(Object error) {
     if (error is DioError) {
-      if (error.type == DioErrorType.response) {
+      if (error.type == DioErrorType.badResponse) {
         final statusCode = error.response?.statusCode;
         if (statusCode is int && statusCode > 99) {
           return true;
@@ -181,7 +183,7 @@ abstract class RequestTask<T> extends Task<T> {
   // host 是否不可用
   bool _isHostUnavailable(Object error) {
     if (error is DioError) {
-      if (error.type == DioErrorType.response) {
+      if (error.type == DioErrorType.badResponse) {
         final statusCode = error.response?.statusCode;
         if (statusCode == 502) {
           return true;
diff --git a/base/lib/src/storage/task/task.dart b/base/lib/src/storage/task/task.dart
index a8df65ac..752ede91 100644
--- a/base/lib/src/storage/task/task.dart
+++ b/base/lib/src/storage/task/task.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+
+import '../../../../qiniu_sdk_base.dart';
 
 export 'request_task.dart';
 export 'task_manager.dart';
diff --git a/base/pubspec.yaml b/base/pubspec.yaml
index 13ed7703..2391ed64 100644
--- a/base/pubspec.yaml
+++ b/base/pubspec.yaml
@@ -1,4 +1,4 @@
-name: qiniu_sdk_base
+name: qiniu_sdk_base_diox
 version: 0.4.0
 homepage: https://github.com/qiniu/dart-sdk
 description: The sdk basic of Qiniu products
@@ -10,7 +10,7 @@ environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
-  dio: ^4.0.0
+  diox: ^5.0.0-dev.2
   crypto: ^3.0.0
   meta: ^1.3.0
   uuid: ^3.0.5
diff --git a/base/test/auth/auth_test.dart b/base/test/auth/auth_test.dart
index 1f718541..1f8f91cb 100644
--- a/base/test/auth/auth_test.dart
+++ b/base/test/auth/auth_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:qiniu_sdk_base/src/auth/auth.dart';
+import 'package:qiniu_sdk_base_diox/src/auth/auth.dart';
 import 'package:test/test.dart';
 
 class UploadTokenTestData {
diff --git a/base/test/config.dart b/base/test/config.dart
index d64263ca..84c30336 100644
--- a/base/test/config.dart
+++ b/base/test/config.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:dotenv/dotenv.dart' show load, clean, isEveryDefined, env;
-import 'package:qiniu_sdk_base/src/auth/auth.dart';
+import 'package:qiniu_sdk_base_diox/src/auth/auth.dart';
 import 'package:test/test.dart';
 
 late String token;
diff --git a/base/test/config_test.dart b/base/test/config_test.dart
index afe54bc0..cd91f7d4 100644
--- a/base/test/config_test.dart
+++ b/base/test/config_test.dart
@@ -1,6 +1,7 @@
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:dotenv/dotenv.dart';
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:test/test.dart';
 
 import 'config.dart';
diff --git a/base/test/put/helpers.dart b/base/test/put/helpers.dart
index 483a149f..68f53ba4 100644
--- a/base/test/put/helpers.dart
+++ b/base/test/put/helpers.dart
@@ -1,9 +1,9 @@
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:dio/adapter.dart';
-import 'package:dio/dio.dart';
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+import 'package:diox/diox.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:test/test.dart';
 
 final fileForPart = File('test_resource/test_for_put_parts.mp4');
@@ -57,11 +57,11 @@ class PutControllerBuilder {
   }
 }
 
-class HttpAdapterTestWith612 extends HttpClientAdapter {
+class HttpAdapterTestWith612 implements HttpClientAdapter {
   /// 记录 CompletePartsTask 被创建的次数
   /// 第一次我们拦截并返回 612，第二次不拦截
   bool completePartsTaskResponse612 = false;
-  final DefaultHttpClientAdapter _adapter = DefaultHttpClientAdapter();
+  final HttpClientAdapter _adapter = HttpClientAdapter();
   @override
   void close({bool force = false}) {
     _adapter.close(force: force);
diff --git a/base/test/put/put_by_parts/put_bytes_test.dart b/base/test/put/put_by_parts/put_bytes_test.dart
index fdbfa2e9..3dbb377e 100644
--- a/base/test/put/put_by_parts/put_bytes_test.dart
+++ b/base/test/put/put_by_parts/put_bytes_test.dart
@@ -1,8 +1,9 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
-import 'package:qiniu_sdk_base/src/storage/methods/put/by_part/put_parts_task.dart';
-import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/put/put_by_parts/put_file_test.dart b/base/test/put/put_by_parts/put_file_test.dart
index fadfcdfc..1ad4d7dd 100644
--- a/base/test/put/put_by_parts/put_file_test.dart
+++ b/base/test/put/put_by_parts/put_file_test.dart
@@ -1,8 +1,9 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
-import 'package:qiniu_sdk_base/src/storage/methods/put/by_part/put_parts_task.dart';
-import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/put/put_by_single/put_bytes.dart b/base/test/put/put_by_single/put_bytes.dart
index 6c094b2b..6ab21507 100644
--- a/base/test/put/put_by_single/put_bytes.dart
+++ b/base/test/put/put_by_single/put_bytes.dart
@@ -1,6 +1,6 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/put/put_by_single/put_file.dart b/base/test/put/put_by_single/put_file.dart
index 8bbe222f..ad2beff8 100644
--- a/base/test/put/put_by_single/put_file.dart
+++ b/base/test/put/put_by_single/put_file.dart
@@ -1,6 +1,6 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/resource_test.dart b/base/test/resource_test.dart
index 1c4115ce..c97edf7a 100644
--- a/base/test/resource_test.dart
+++ b/base/test/resource_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:path/path.dart';
-import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/base/test/retry_test.dart b/base/test/retry_test.dart
index 70d22707..9893fb09 100644
--- a/base/test/retry_test.dart
+++ b/base/test/retry_test.dart
@@ -3,11 +3,11 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:dio/adapter.dart';
-import 'package:dio/dio.dart';
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
-import 'package:qiniu_sdk_base/src/storage/methods/put/by_part/put_parts_task.dart';
-import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
+import 'package:diox/diox.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
+import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
 
 import 'config.dart';
@@ -187,9 +187,9 @@ void main() {
 }
 
 // 会扔出 DioError，错误类型是 DioErrorType.other，每个请求调用了 3 次
-class HttpAdapterTestWithConnectFailedToHost extends HttpClientAdapter {
+class HttpAdapterTestWithConnectFailedToHost implements HttpClientAdapter {
   int callTimes = 0;
-  final DefaultHttpClientAdapter _adapter = DefaultHttpClientAdapter();
+  final HttpClientAdapter _adapter = HttpClientAdapter();
   // 0 single, 1 parts
   int type = 0;
   HttpAdapterTestWithConnectFailedToHost(this.type);
@@ -214,8 +214,8 @@ class HttpAdapterTestWithConnectFailedToHost extends HttpClientAdapter {
 }
 
 // 502 会触发服务不可用逻辑导致该 host 被冻结，并重试其他 host
-class HttpAdapterTestWith502 extends HttpClientAdapter {
-  final DefaultHttpClientAdapter _adapter = DefaultHttpClientAdapter();
+class HttpAdapterTestWith502 implements HttpClientAdapter {
+  final HttpClientAdapter _adapter = HttpClientAdapter();
   @override
   void close({bool force = false}) {
     _adapter.close(force: force);

From fcb0aca2f2ca7ac83ac94108d99ba8b1211f3cc4 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Sun, 25 Dec 2022 23:20:22 +0800
Subject: [PATCH 02/24] change dio to diox

---
 base/CHANGELOG.md                             |   4 +
 ...sdk_base.dart => qiniu_sdk_base_diox.dart} |   1 +
 .../methods/put/by_part/put_parts_task.dart   |   2 +-
 .../put/by_single/put_by_single_task.dart     |   2 +-
 base/lib/src/storage/task/request_task.dart   |   2 +-
 base/lib/src/storage/task/task.dart           |   2 +-
 base/pubspec.yaml                             |   2 +-
 base/test/config_test.dart                    |   2 +-
 base/test/put/helpers.dart                    |   2 +-
 .../test/put/put_by_parts/put_bytes_test.dart |   2 +-
 base/test/put/put_by_parts/put_file_test.dart |   2 +-
 base/test/put/put_by_single/put_bytes.dart    |   2 +-
 base/test/put/put_by_single/put_file.dart     |   2 +-
 base/test/retry_test.dart                     |   2 +-
 flutter/example/lib/main.dart                 |   7 +-
 flutter/example/lib/widgets/select_file.dart  |   5 +-
 flutter/example/pubspec.lock                  | 123 +++++++++---------
 flutter/example/pubspec.yaml                  |   2 +-
 ...r_sdk.dart => qiniu_flutter_sdk_diox.dart} |   0
 flutter/lib/src/storage/controller.dart       |   2 +-
 flutter/lib/src/storage/storage.dart          |   4 +-
 flutter/pubspec.yaml                          |   6 +-
 22 files changed, 85 insertions(+), 93 deletions(-)
 rename base/lib/{qiniu_sdk_base.dart => qiniu_sdk_base_diox.dart} (74%)
 rename flutter/lib/{qiniu_flutter_sdk.dart => qiniu_flutter_sdk_diox.dart} (100%)

diff --git a/base/CHANGELOG.md b/base/CHANGELOG.md
index 6536f611..caaa8815 100644
--- a/base/CHANGELOG.md
+++ b/base/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.1
+
+- fix package file name
+
 ## 0.4.0
 
 - 新增 putBytes 接口用于上传 Uint8List 类型的资源
diff --git a/base/lib/qiniu_sdk_base.dart b/base/lib/qiniu_sdk_base_diox.dart
similarity index 74%
rename from base/lib/qiniu_sdk_base.dart
rename to base/lib/qiniu_sdk_base_diox.dart
index b0abc803..90fccc77 100644
--- a/base/lib/qiniu_sdk_base.dart
+++ b/base/lib/qiniu_sdk_base_diox.dart
@@ -2,4 +2,5 @@ library qiniu_sdk_base;
 
 export 'src/auth/auth.dart';
 export 'src/error/error.dart';
+export 'src/storage/config/config.dart';
 export 'src/storage/storage.dart';
diff --git a/base/lib/src/storage/methods/put/by_part/put_parts_task.dart b/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
index 3addf5bc..9c4e9dfc 100644
--- a/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
@@ -4,7 +4,7 @@ import 'dart:math';
 
 import 'package:diox/diox.dart';
 
-import '../../../../../qiniu_sdk_base.dart';
+import '../../../../../qiniu_sdk_base_diox.dart';
 import '../../../resource/resource.dart';
 
 part 'cache_mixin.dart';
diff --git a/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart b/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
index 86c3d1de..fd9878d6 100644
--- a/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
+++ b/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
@@ -1,6 +1,6 @@
 import 'package:diox/diox.dart';
 
-import '../../../../../qiniu_sdk_base.dart';
+import '../../../../../qiniu_sdk_base_diox.dart';
 import '../../../resource/resource.dart';
 
 // 直传任务
diff --git a/base/lib/src/storage/task/request_task.dart b/base/lib/src/storage/task/request_task.dart
index f117b78f..8545e570 100644
--- a/base/lib/src/storage/task/request_task.dart
+++ b/base/lib/src/storage/task/request_task.dart
@@ -1,7 +1,7 @@
 import 'package:diox/diox.dart';
 import 'package:meta/meta.dart';
 
-import '../../../../qiniu_sdk_base.dart';
+import '../../../qiniu_sdk_base_diox.dart';
 import '../config/config.dart';
 
 part 'request_task_controller.dart';
diff --git a/base/lib/src/storage/task/task.dart b/base/lib/src/storage/task/task.dart
index 752ede91..2e88f254 100644
--- a/base/lib/src/storage/task/task.dart
+++ b/base/lib/src/storage/task/task.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:meta/meta.dart';
 
-import '../../../../qiniu_sdk_base.dart';
+import '../../../qiniu_sdk_base_diox.dart';
 
 export 'request_task.dart';
 export 'task_manager.dart';
diff --git a/base/pubspec.yaml b/base/pubspec.yaml
index 2391ed64..510032d5 100644
--- a/base/pubspec.yaml
+++ b/base/pubspec.yaml
@@ -1,5 +1,5 @@
 name: qiniu_sdk_base_diox
-version: 0.4.0
+version: 0.4.1
 homepage: https://github.com/qiniu/dart-sdk
 description: The sdk basic of Qiniu products
 
diff --git a/base/test/config_test.dart b/base/test/config_test.dart
index cd91f7d4..23536656 100644
--- a/base/test/config_test.dart
+++ b/base/test/config_test.dart
@@ -1,6 +1,6 @@
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:dotenv/dotenv.dart';
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:test/test.dart';
 
diff --git a/base/test/put/helpers.dart b/base/test/put/helpers.dart
index 68f53ba4..207c9094 100644
--- a/base/test/put/helpers.dart
+++ b/base/test/put/helpers.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:diox/diox.dart';
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:test/test.dart';
 
diff --git a/base/test/put/put_by_parts/put_bytes_test.dart b/base/test/put/put_by_parts/put_bytes_test.dart
index 3dbb377e..6d7ab976 100644
--- a/base/test/put/put_by_parts/put_bytes_test.dart
+++ b/base/test/put/put_by_parts/put_bytes_test.dart
@@ -1,6 +1,6 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
diff --git a/base/test/put/put_by_parts/put_file_test.dart b/base/test/put/put_by_parts/put_file_test.dart
index 1ad4d7dd..b954651e 100644
--- a/base/test/put/put_by_parts/put_file_test.dart
+++ b/base/test/put/put_by_parts/put_file_test.dart
@@ -1,6 +1,6 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
diff --git a/base/test/put/put_by_single/put_bytes.dart b/base/test/put/put_by_single/put_bytes.dart
index 6ab21507..6eff28e1 100644
--- a/base/test/put/put_by_single/put_bytes.dart
+++ b/base/test/put/put_by_single/put_bytes.dart
@@ -1,6 +1,6 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/put/put_by_single/put_file.dart b/base/test/put/put_by_single/put_file.dart
index ad2beff8..ad88edb8 100644
--- a/base/test/put/put_by_single/put_file.dart
+++ b/base/test/put/put_by_single/put_file.dart
@@ -1,6 +1,6 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/retry_test.dart b/base/test/retry_test.dart
index 9893fb09..ab5897fb 100644
--- a/base/test/retry_test.dart
+++ b/base/test/retry_test.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:diox/diox.dart';
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
diff --git a/flutter/example/lib/main.dart b/flutter/example/lib/main.dart
index 66c177f2..1f4f5570 100644
--- a/flutter/example/lib/main.dart
+++ b/flutter/example/lib/main.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:qiniu_flutter_sdk/qiniu_flutter_sdk.dart';
+import 'package:qiniu_flutter_sdk_diox/qiniu_flutter_sdk_diox.dart';
 
 import 'token.dart';
 import 'utils/uint.dart';
@@ -241,12 +241,9 @@ class BaseState extends DisposableState<Base> {
     if (statusValue == StorageStatus.Request) {
       return Padding(
         padding: EdgeInsets.all(10),
-        child: RaisedButton(
+        child: ElevatedButton(
           child: Text('取消上传'),
           onPressed: () => putController?.cancel(),
-          padding: EdgeInsets.symmetric(vertical: 10, horizontal: 40),
-          textColor: Colors.white,
-          color: Colors.red,
         ),
       );
     }
diff --git a/flutter/example/lib/widgets/select_file.dart b/flutter/example/lib/widgets/select_file.dart
index 75bf8178..74972e68 100644
--- a/flutter/example/lib/widgets/select_file.dart
+++ b/flutter/example/lib/widgets/select_file.dart
@@ -25,13 +25,10 @@ class SelectFileState extends State<SelectFile> {
   Widget get selectButton {
     return Container(
       width: double.maxFinite,
-      child: RaisedButton.icon(
+      child: ElevatedButton.icon(
         label: Text('点击选择文件'),
         icon: Icon(Icons.folder),
         onPressed: openSelectFileWindow,
-        padding: EdgeInsets.symmetric(vertical: 10, horizontal: 40),
-        textColor: Colors.white,
-        color: Colors.blue,
       ),
     );
   }
diff --git a/flutter/example/pubspec.lock b/flutter/example/pubspec.lock
index 9ff3f878..5b3c411f 100644
--- a/flutter/example/pubspec.lock
+++ b/flutter/example/pubspec.lock
@@ -5,77 +5,70 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
-  dio:
+    version: "1.0.5"
+  diox:
     dependency: transitive
     description:
-      name: dio
-      url: "https://pub.dartlang.org"
+      name: diox
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.4"
+    version: "5.0.0-dev.2"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   file_picker:
     dependency: "direct main"
     description:
       name: file_picker
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.4"
   flutter:
@@ -87,9 +80,9 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -104,65 +97,65 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.2"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.2"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
-  qiniu_flutter_sdk:
+    version: "2.1.3"
+  qiniu_flutter_sdk_diox:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.3.0"
-  qiniu_sdk_base:
+    version: "0.4.0"
+  qiniu_sdk_base_diox:
     dependency: transitive
     description:
       path: "../../base"
       relative: true
     source: path
-    version: "0.4.0"
+    version: "0.4.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -172,65 +165,65 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.1"
+    version: "1.9.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.8"
+    version: "0.4.12"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   uuid:
     dependency: transitive
     description:
       name: uuid
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
-  flutter: ">=2.0.0"
+  dart: ">=2.17.0-0 <3.0.0"
+  flutter: ">=2.8.0"
diff --git a/flutter/example/pubspec.yaml b/flutter/example/pubspec.yaml
index 7e62d3e0..53e583e7 100644
--- a/flutter/example/pubspec.yaml
+++ b/flutter/example/pubspec.yaml
@@ -24,7 +24,7 @@ dependencies:
   flutter:
     sdk: flutter
   file_picker: ^3.0.1
-  qiniu_flutter_sdk:
+  qiniu_flutter_sdk_diox:
     path: ../
 
   # The following adds the Cupertino Icons font to your application.
diff --git a/flutter/lib/qiniu_flutter_sdk.dart b/flutter/lib/qiniu_flutter_sdk_diox.dart
similarity index 100%
rename from flutter/lib/qiniu_flutter_sdk.dart
rename to flutter/lib/qiniu_flutter_sdk_diox.dart
diff --git a/flutter/lib/src/storage/controller.dart b/flutter/lib/src/storage/controller.dart
index 999c77b0..e5460bf3 100644
--- a/flutter/lib/src/storage/controller.dart
+++ b/flutter/lib/src/storage/controller.dart
@@ -1,3 +1,3 @@
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart' as base;
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart' as base;
 
 class PutController extends base.PutController {}
diff --git a/flutter/lib/src/storage/storage.dart b/flutter/lib/src/storage/storage.dart
index 75da5d55..6e30da98 100644
--- a/flutter/lib/src/storage/storage.dart
+++ b/flutter/lib/src/storage/storage.dart
@@ -1,9 +1,9 @@
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:qiniu_sdk_base/qiniu_sdk_base.dart' as base;
+import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart' as base;
 
-export 'package:qiniu_sdk_base/qiniu_sdk_base.dart'
+export 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart'
     show
         Config,
         PutOptions,
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index f757f1df..f8bbadf8 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -1,4 +1,4 @@
-name: qiniu_flutter_sdk
+name: qiniu_flutter_sdk_diox
 description: Qiniu Flutter sdk
 version: 0.4.0
 homepage: https://github.com/qiniu/dart-sdk/tree/master/flutter
@@ -10,8 +10,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  dio: ^4.0.0
-  qiniu_sdk_base: ^0.4.0
+  diox: ^5.0.0-dev.2
+  qiniu_sdk_base_diox: ^0.4.1
 
 dev_dependencies:
   pedantic: ^1.9.0

From bd32e4ad9e312dd2aa39234ae7fb8ea6ee90560f Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Mon, 26 Dec 2022 10:04:17 +0800
Subject: [PATCH 03/24] pub

---
 flutter/example/pubspec.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flutter/example/pubspec.lock b/flutter/example/pubspec.lock
index 5b3c411f..658bc684 100644
--- a/flutter/example/pubspec.lock
+++ b/flutter/example/pubspec.lock
@@ -152,9 +152,9 @@ packages:
   qiniu_sdk_base_diox:
     dependency: transitive
     description:
-      path: "../../base"
-      relative: true
-    source: path
+      name: qiniu_sdk_base_diox
+      url: "https://pub.flutter-io.cn"
+    source: hosted
     version: "0.4.1"
   sky_engine:
     dependency: transitive

From a81f5d9e410b3a84a9e7a8df97cad57928699172 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Tue, 27 Dec 2022 12:28:46 +0800
Subject: [PATCH 04/24] readme

---
 README.md         | 6 ++++--
 base/README.md    | 2 +-
 flutter/README.md | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 21833b49..ce009561 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,10 @@
 
 [![codecov](https://codecov.io/gh/qiniu/dart-sdk/branch/master/graph/badge.svg?token=5VOX6NJTKF)](https://codecov.io/gh/qiniu/dart-sdk)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![qiniu_sdk_base](https://img.shields.io/pub/v/qiniu_sdk_base.svg?label=qiniu_sdk_base)](https://pub.dev/packages/qiniu_sdk_base)
-[![qiniu_flutter_sdk](https://img.shields.io/pub/v/qiniu_flutter_sdk.svg?label=qiniu_flutter_sdk)](https://pub.dev/packages/qiniu_flutter_sdk)
+[![qiniu_sdk_base_diox](https://img.shields.io/pub/v/qiniu_sdk_base.svg?label=qiniu_sdk_base_diox)](https://pub.dev/packages/qiniu_sdk_base_diox)
+[![qiniu_flutter_sdk_diox](https://img.shields.io/pub/v/qiniu_flutter_sdk.svg?label=qiniu_flutter_sdk_diox)](https://pub.dev/packages/qiniu_flutter_sdk_diox)
+
+将 qiniu_sdk_base 和 qiniu_flutter_sdk 的 dio 依赖修改为 diox
 
 ## 目录说明
 
diff --git a/base/README.md b/base/README.md
index 317aa4cc..a62964e0 100644
--- a/base/README.md
+++ b/base/README.md
@@ -1,4 +1,4 @@
-# Qiniu Sdk Base [![qiniu_sdk_base](https://img.shields.io/pub/v/qiniu_sdk_base.svg?label=qiniu_sdk_base)](https://pub.dev/packages/qiniu_sdk_base) [![codecov](https://codecov.io/gh/qiniu/dart-sdk/branch/master/graph/badge.svg?token=5VOX6NJTKF)](https://codecov.io/gh/qiniu/dart-sdk)
+# Qiniu Sdk Base [![qiniu_sdk_base](https://img.shields.io/pub/v/qiniu_sdk_base.svg?label=qiniu_sdk_base_diox)](https://pub.dev/packages/qiniu_sdk_base_diox) [![codecov](https://codecov.io/gh/qiniu/dart-sdk/branch/master/graph/badge.svg?token=5VOX6NJTKF)](https://codecov.io/gh/qiniu/dart-sdk)
 
 七牛 dart 平台 sdk 的 base 包，为上层 sdk 提供基础设施和共享代码。
 
diff --git a/flutter/README.md b/flutter/README.md
index a77287f3..746cd2a6 100644
--- a/flutter/README.md
+++ b/flutter/README.md
@@ -1,4 +1,4 @@
-# 七牛云存储 Flutter SDK [![qiniu_flutter_sdk](https://img.shields.io/pub/v/qiniu_flutter_sdk.svg?label=qiniu_flutter_sdk)](https://pub.dev/packages/qiniu_flutter_sdk)
+# 七牛云存储 Flutter SDK [![qiniu_flutter_sdk_diox](https://img.shields.io/pub/v/qiniu_flutter_sdk.svg?label=qiniu_flutter_sdk_diox)](https://pub.dev/packages/qiniu_flutter_sdk_diox)
 
 七牛云存储的 Flutter SDK。
 基于七牛云 API 实现，封装了七牛云存储系统的的客户端操作。
@@ -24,18 +24,18 @@ Qiniu-Flutter-SDK 为客户端 SDK，没有包含 `token` 生成实现，为了
 
 ## 快速开始
 
-编辑你的 `pubspec.yaml` 文件，在 `dependencies` 添加  `qiniu-flutter-sdk`，如下：
+编辑你的 `pubspec.yaml` 文件，在 `dependencies` 添加  `qiniu-flutter-sdk_diox`，如下：
 
 ```yaml
 dependencies:
   ...
-  qiniu_flutter_sdk: // 这里输入你需要的版本
+  qiniu_flutter_sdk_diox: // 这里输入你需要的版本
 ```
 
 在你需要使用的地方 `import`，如下：
 
 ```dart
-import 'package:qiniu_flutter_sdk/qiniu_flutter_sdk.dart';
+import 'package:qiniu_flutter_sdk_diox/qiniu_flutter_sdk_diox.dart';
 ```
 
 ### 快速使用

From 74071dbf5039f0c6df124ab5729df6bf4356f54d Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Fri, 10 Feb 2023 16:23:36 +0800
Subject: [PATCH 05/24] upadte diox to 5.0.0

---
 base/CHANGELOG.md                             |  4 +
 base/lib/src/storage/task/request_task.dart   |  1 -
 base/pubspec.yaml                             |  4 +-
 base/test/config_test.dart                    |  1 -
 base/test/put/helpers.dart                    |  1 -
 .../test/put/put_by_parts/put_bytes_test.dart |  1 -
 base/test/put/put_by_parts/put_file_test.dart |  1 -
 base/test/retry_test.dart                     |  1 -
 flutter/CHANGELOG.md                          | 18 +++--
 flutter/analysis_options.yaml                 |  1 -
 flutter/example/lib/main.dart                 | 31 +++-----
 flutter/example/lib/token.dart                |  2 +-
 flutter/example/lib/utils/uint.dart           |  4 +-
 flutter/example/lib/widgets/app.dart          |  2 +-
 flutter/example/lib/widgets/console.dart      |  4 +-
 flutter/example/lib/widgets/progress.dart     | 15 ++--
 flutter/example/lib/widgets/select_file.dart  |  9 ++-
 flutter/example/lib/widgets/string_input.dart | 21 +++---
 flutter/example/pubspec.lock                  | 74 +++++++++++++++----
 flutter/example/pubspec.yaml                  |  1 +
 flutter/lib/src/storage/storage.dart          |  5 +-
 flutter/pubspec.yaml                          |  4 +-
 22 files changed, 121 insertions(+), 84 deletions(-)

diff --git a/base/CHANGELOG.md b/base/CHANGELOG.md
index caaa8815..d6bf56b4 100644
--- a/base/CHANGELOG.md
+++ b/base/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.2
+
+* upgrade diox to 5.0.0
+
 ## 0.4.1
 
 - fix package file name
diff --git a/base/lib/src/storage/task/request_task.dart b/base/lib/src/storage/task/request_task.dart
index 8545e570..435cb553 100644
--- a/base/lib/src/storage/task/request_task.dart
+++ b/base/lib/src/storage/task/request_task.dart
@@ -2,7 +2,6 @@ import 'package:diox/diox.dart';
 import 'package:meta/meta.dart';
 
 import '../../../qiniu_sdk_base_diox.dart';
-import '../config/config.dart';
 
 part 'request_task_controller.dart';
 part 'request_task_manager.dart';
diff --git a/base/pubspec.yaml b/base/pubspec.yaml
index 510032d5..c01e4bac 100644
--- a/base/pubspec.yaml
+++ b/base/pubspec.yaml
@@ -1,5 +1,5 @@
 name: qiniu_sdk_base_diox
-version: 0.4.1
+version: 0.4.2
 homepage: https://github.com/qiniu/dart-sdk
 description: The sdk basic of Qiniu products
 
@@ -10,7 +10,7 @@ environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
-  diox: ^5.0.0-dev.2
+  diox: ^5.0.0
   crypto: ^3.0.0
   meta: ^1.3.0
   uuid: ^3.0.5
diff --git a/base/test/config_test.dart b/base/test/config_test.dart
index 23536656..e00e6aba 100644
--- a/base/test/config_test.dart
+++ b/base/test/config_test.dart
@@ -1,7 +1,6 @@
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:dotenv/dotenv.dart';
 import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:test/test.dart';
 
 import 'config.dart';
diff --git a/base/test/put/helpers.dart b/base/test/put/helpers.dart
index 207c9094..eb6a76c5 100644
--- a/base/test/put/helpers.dart
+++ b/base/test/put/helpers.dart
@@ -3,7 +3,6 @@ import 'dart:typed_data';
 
 import 'package:diox/diox.dart';
 import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:test/test.dart';
 
 final fileForPart = File('test_resource/test_for_put_parts.mp4');
diff --git a/base/test/put/put_by_parts/put_bytes_test.dart b/base/test/put/put_by_parts/put_bytes_test.dart
index 6d7ab976..5ff60694 100644
--- a/base/test/put/put_by_parts/put_bytes_test.dart
+++ b/base/test/put/put_by_parts/put_bytes_test.dart
@@ -1,7 +1,6 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
 import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
diff --git a/base/test/put/put_by_parts/put_file_test.dart b/base/test/put/put_by_parts/put_file_test.dart
index b954651e..9eb82ad2 100644
--- a/base/test/put/put_by_parts/put_file_test.dart
+++ b/base/test/put/put_by_parts/put_file_test.dart
@@ -1,7 +1,6 @@
 @Timeout(Duration(seconds: 60))
 import 'package:dotenv/dotenv.dart' show env;
 import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
diff --git a/base/test/retry_test.dart b/base/test/retry_test.dart
index ab5897fb..c4295e89 100644
--- a/base/test/retry_test.dart
+++ b/base/test/retry_test.dart
@@ -5,7 +5,6 @@ import 'dart:typed_data';
 
 import 'package:diox/diox.dart';
 import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/config/config.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
 import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
diff --git a/flutter/CHANGELOG.md b/flutter/CHANGELOG.md
index 1dcad2a9..2021811b 100644
--- a/flutter/CHANGELOG.md
+++ b/flutter/CHANGELOG.md
@@ -1,16 +1,20 @@
-## [0.1.0]
+## 0.4.1
 
-* Initial Release.
+* upgrade diox to 5.0.0
 
-## [0.2.0]
+## 0.4.0
 
-* 优化了 `StorageError` 输出的调用栈
-* `CacheProvider` 的方法都改成异步的
+* 增加 putBytes 支持 WEB 平台(#50)
 
 ## 0.3.0
 
 * 增加 null-safety(#44)
 
-## 0.4.0
+## [0.2.0]
 
-* 增加 putBytes 支持 WEB 平台(#50)
+* 优化了 `StorageError` 输出的调用栈
+* `CacheProvider` 的方法都改成异步的
+
+## [0.1.0]
+
+* Initial Release.
diff --git a/flutter/analysis_options.yaml b/flutter/analysis_options.yaml
index 96c1e8bf..633c1d0f 100644
--- a/flutter/analysis_options.yaml
+++ b/flutter/analysis_options.yaml
@@ -40,7 +40,6 @@ linter:
   - empty_statements
   - file_names
   - hash_and_equals
-  - invariant_booleans
   - iterable_contains_unrelated_type
   - library_names
   - library_prefixes
diff --git a/flutter/example/lib/main.dart b/flutter/example/lib/main.dart
index 1f4f5570..f3051d39 100644
--- a/flutter/example/lib/main.dart
+++ b/flutter/example/lib/main.dart
@@ -16,11 +16,13 @@ import 'widgets/select_file.dart';
 import 'widgets/string_input.dart';
 
 void main() {
-  runApp(App(child: Base()));
+  runApp(const App(child: Base()));
 }
 
 // 基础的上传示例
 class Base extends StatefulWidget implements Example {
+  const Base({Key? key}) : super(key: key);
+
   @override
   String get title => '基础上传示例';
 
@@ -57,16 +59,6 @@ class BaseState extends DisposableState<Base> {
   // 控制器，可以用于取消任务、获取上述的状态，进度等信息
   PutController? putController;
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
   void onStatus(StorageStatus status) {
     printToConsole('状态变化: 当前任务状态：${status.toString()}');
     setState(() => statusValue = status);
@@ -107,7 +99,7 @@ class BaseState extends DisposableState<Base> {
     var usedToken = token;
 
     if (token == null || token == '') {
-      if (builtinToken != null && builtinToken != '') {
+      if (builtinToken.isNotEmpty) {
         printToConsole('使用内建 Token 进行上传');
         usedToken = builtinToken;
       }
@@ -150,7 +142,7 @@ class BaseState extends DisposableState<Base> {
         printToConsole('上传已完成: 原始响应数据: ${jsonEncode(response.rawData)}');
         printToConsole('------------------------');
       })
-      ..catchError((dynamic error) {
+      ..catchError((dynamic error) async {
         if (error is StorageError) {
           switch (error.type) {
             case StorageErrorType.CONNECT_TIMEOUT:
@@ -183,6 +175,7 @@ class BaseState extends DisposableState<Base> {
         }
 
         printToConsole('------------------------');
+        return PutResponse.fromJson({'error': error});
       });
   }
 
@@ -240,21 +233,21 @@ class BaseState extends DisposableState<Base> {
   Widget get cancelButton {
     if (statusValue == StorageStatus.Request) {
       return Padding(
-        padding: EdgeInsets.all(10),
+        padding: const EdgeInsets.all(10),
         child: ElevatedButton(
-          child: Text('取消上传'),
+          child: const Text('取消上传'),
           onPressed: () => putController?.cancel(),
         ),
       );
     }
-    return SizedBox.shrink();
+    return const SizedBox.shrink();
   }
 
   @override
   Widget build(BuildContext context) {
     return ListView(children: [
       Padding(
-        padding: EdgeInsets.all(20),
+        padding: const EdgeInsets.all(20),
         child: Progress(progressValue),
       ),
       Padding(
@@ -284,10 +277,10 @@ class BaseState extends DisposableState<Base> {
       ),
       // 取消按钮
       cancelButton,
-      Padding(
+      const Padding(
         key: Key('console'),
-        child: const Console(),
         padding: EdgeInsets.all(8.0),
+        child: Console(),
       ),
     ]);
   }
diff --git a/flutter/example/lib/token.dart b/flutter/example/lib/token.dart
index b3e5c80f..dc18e060 100644
--- a/flutter/example/lib/token.dart
+++ b/flutter/example/lib/token.dart
@@ -1,2 +1,2 @@
-final String? builtinToken =
+const builtinToken =
     'lVgtk5xr03Oz_uvkzDtQ8LtpiEUWx5tGEDUZVg1y:KBGQR5DaE7J03MYSrlF9kxtE8EY=:eyJyZXR1cm5Cb2R5Ijoie1wia2V5XCI6ICQoa2V5KX0iLCJzY29wZSI6InFpbml1LWRhcnQtc2RrIiwiZGVhZGxpbmUiOjE2MTg4NjIxMDZ9';
diff --git a/flutter/example/lib/utils/uint.dart b/flutter/example/lib/utils/uint.dart
index 8dbe00ab..e5883777 100644
--- a/flutter/example/lib/utils/uint.dart
+++ b/flutter/example/lib/utils/uint.dart
@@ -31,12 +31,12 @@ String humanizeBigNumber(
     displayValue = value.toStringAsFixed(decimal);
   }
 
-  return displayValue + ' ' + units[index];
+  return '$displayValue ${units[index]}';
 }
 
 String humanizeFileSize(
   double value, {
   int decimal = 2,
 }) {
-  return humanizeBigNumber(value, decimal: decimal, radix: 1024) + 'B';
+  return '${humanizeBigNumber(value, decimal: decimal, radix: 1024)}B';
 }
diff --git a/flutter/example/lib/widgets/app.dart b/flutter/example/lib/widgets/app.dart
index 67e76013..1295249b 100644
--- a/flutter/example/lib/widgets/app.dart
+++ b/flutter/example/lib/widgets/app.dart
@@ -25,7 +25,7 @@ class App extends StatelessWidget {
           appBar: AppBar(
             title: Text(
               child.title,
-              style: TextStyle(
+              style: const TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.bold,
               ),
diff --git a/flutter/example/lib/widgets/console.dart b/flutter/example/lib/widgets/console.dart
index a32d8b42..83cfe367 100644
--- a/flutter/example/lib/widgets/console.dart
+++ b/flutter/example/lib/widgets/console.dart
@@ -93,8 +93,8 @@ class ConsoleState extends DisposableState<Console> {
         color: Colors.green[800],
       ),
       child: Container(
-        padding: EdgeInsets.all(10),
-        decoration: BoxDecoration(
+        padding: const EdgeInsets.all(10),
+        decoration: const BoxDecoration(
           color: Colors.black87,
           borderRadius: BorderRadius.all(Radius.circular(4)),
         ),
diff --git a/flutter/example/lib/widgets/progress.dart b/flutter/example/lib/widgets/progress.dart
index 5393cd32..4d30b707 100644
--- a/flutter/example/lib/widgets/progress.dart
+++ b/flutter/example/lib/widgets/progress.dart
@@ -1,14 +1,15 @@
 import 'package:flutter/material.dart';
 
 class Progress extends StatelessWidget {
+  const Progress(this.value, {Key? key}) : super(key: key);
+
   final double value;
-  Progress(this.value);
 
   Widget get progress {
     return Container(
       width: 200,
       height: 200,
-      padding: EdgeInsets.all(20),
+      padding: const EdgeInsets.all(20),
       child: CircularProgressIndicator(
         value: value,
         strokeWidth: 14,
@@ -20,10 +21,10 @@ class Progress extends StatelessWidget {
   Widget get progressText {
     final integer = (value * 100).toInt();
     final decimal = (((value * 100) - integer) * 100).toInt();
-    final unit = '%';
+    const unit = '%';
 
     return DefaultTextStyle(
-        style: TextStyle(
+        style: const TextStyle(
           color: Colors.black87,
           fontWeight: FontWeight.bold,
         ),
@@ -32,12 +33,12 @@ class Progress extends StatelessWidget {
           children: [
             Text(
               integer.toString(),
-              style: TextStyle(fontSize: 50),
+              style: const TextStyle(fontSize: 50),
             ),
             Column(
               children: [
-                Text(unit.toString(), style: TextStyle(fontSize: 14)),
-                Text('.$decimal', style: TextStyle(fontSize: 18)),
+                Text(unit.toString(), style: const TextStyle(fontSize: 14)),
+                Text('.$decimal', style: const TextStyle(fontSize: 18)),
               ],
             )
           ],
diff --git a/flutter/example/lib/widgets/select_file.dart b/flutter/example/lib/widgets/select_file.dart
index 74972e68..bed0457f 100644
--- a/flutter/example/lib/widgets/select_file.dart
+++ b/flutter/example/lib/widgets/select_file.dart
@@ -4,8 +4,9 @@ import 'package:flutter/material.dart';
 typedef OnSelected = void Function(PlatformFile file);
 
 class SelectFile extends StatefulWidget {
+  const SelectFile(this.onSelected, {Key? key}) : super(key: key);
+
   final OnSelected onSelected;
-  const SelectFile(this.onSelected);
 
   @override
   State<StatefulWidget> createState() {
@@ -23,11 +24,11 @@ class SelectFileState extends State<SelectFile> {
   }
 
   Widget get selectButton {
-    return Container(
+    return SizedBox(
       width: double.maxFinite,
       child: ElevatedButton.icon(
-        label: Text('点击选择文件'),
-        icon: Icon(Icons.folder),
+        label: const Text('点击选择文件'),
+        icon: const Icon(Icons.folder),
         onPressed: openSelectFileWindow,
       ),
     );
diff --git a/flutter/example/lib/widgets/string_input.dart b/flutter/example/lib/widgets/string_input.dart
index ca63ea4a..056501d7 100644
--- a/flutter/example/lib/widgets/string_input.dart
+++ b/flutter/example/lib/widgets/string_input.dart
@@ -3,20 +3,19 @@ import 'package:flutter/material.dart';
 class StringInput extends StatelessWidget {
   final String label;
   final void Function(String token) onChange;
-  const StringInput(this.onChange, {Key? key, required this.label}) : super(key: key);
+  const StringInput(this.onChange, {Key? key, required this.label})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      child: TextField(
-        onSubmitted: onChange,
-        decoration: InputDecoration(
-          labelText: label,
-          contentPadding: EdgeInsets.all(20.0),
-          border: OutlineInputBorder(
-            borderSide: BorderSide(width: 2), // 设置无效，好像有 BUG
-            borderRadius: BorderRadius.circular(0.0),
-          ),
+    return TextField(
+      onSubmitted: onChange,
+      decoration: InputDecoration(
+        labelText: label,
+        contentPadding: const EdgeInsets.all(20.0),
+        border: OutlineInputBorder(
+          borderSide: const BorderSide(width: 2), // 设置无效，好像有 BUG
+          borderRadius: BorderRadius.circular(0.0),
         ),
       ),
     );
diff --git a/flutter/example/pubspec.lock b/flutter/example/pubspec.lock
index 658bc684..bb95a9e2 100644
--- a/flutter/example/pubspec.lock
+++ b/flutter/example/pubspec.lock
@@ -5,20 +5,23 @@ packages:
     dependency: transitive
     description:
       name: async
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.9.0"
+    version: "2.10.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.1"
@@ -26,6 +29,7 @@ packages:
     dependency: transitive
     description:
       name: clock
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.1"
@@ -33,13 +37,15 @@ packages:
     dependency: transitive
     description:
       name: collection
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
+      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.2"
@@ -47,6 +53,7 @@ packages:
     dependency: "direct main"
     description:
       name: cupertino_icons
+      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.5"
@@ -54,13 +61,15 @@ packages:
     dependency: transitive
     description:
       name: diox
+      sha256: "6b971f9936f1de9a6d7b2070a1f626e4a3c490d0c044d432b72e96537db2ed22"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.0.0-dev.2"
+    version: "5.0.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
@@ -68,6 +77,7 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
+      sha256: f9245fc33aeba9e0b938d7f3785f10b7a7230e05b8fc40f5a6a8342d7899e391
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.4"
@@ -76,10 +86,19 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
+      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.7"
@@ -97,6 +116,7 @@ packages:
     dependency: transitive
     description:
       name: http_parser
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.2"
@@ -104,27 +124,39 @@ packages:
     dependency: transitive
     description:
       name: js
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.6.5"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.4"
+    version: "2.0.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.5"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0"
@@ -132,6 +164,7 @@ packages:
     dependency: transitive
     description:
       name: path
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.2"
@@ -139,6 +172,7 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
+      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.3"
@@ -148,11 +182,12 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.4.0"
+    version: "0.4.1"
   qiniu_sdk_base_diox:
     dependency: transitive
     description:
       name: qiniu_sdk_base_diox
+      sha256: f9d51a0b3c10df937fccbe490901f722184b7b3ce015f41c5d69aff33ed31a87
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.4.1"
@@ -165,34 +200,39 @@ packages:
     dependency: transitive
     description:
       name: source_span
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.1"
@@ -200,13 +240,15 @@ packages:
     dependency: transitive
     description:
       name: test_api
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.12"
+    version: "0.4.16"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
+      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
@@ -214,6 +256,7 @@ packages:
     dependency: transitive
     description:
       name: uuid
+      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.7"
@@ -221,9 +264,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
+  dart: ">=2.18.0 <3.0.0"
   flutter: ">=2.8.0"
diff --git a/flutter/example/pubspec.yaml b/flutter/example/pubspec.yaml
index 53e583e7..f0bf0d39 100644
--- a/flutter/example/pubspec.yaml
+++ b/flutter/example/pubspec.yaml
@@ -34,6 +34,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_lints: ^2.0.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/flutter/lib/src/storage/storage.dart b/flutter/lib/src/storage/storage.dart
index 6e30da98..b7faa2b5 100644
--- a/flutter/lib/src/storage/storage.dart
+++ b/flutter/lib/src/storage/storage.dart
@@ -10,13 +10,10 @@ export 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart'
         PutResponse,
         HostProvider,
         CacheProvider,
-        HttpClientAdapter,
         QiniuError,
         StorageError,
         StorageErrorType,
-        PutByPartOptions,
-        StorageStatus,
-        PutBySingleOptions;
+        StorageStatus;
 
 export './controller.dart';
 
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index f8bbadf8..d0a7293b 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: qiniu_flutter_sdk_diox
 description: Qiniu Flutter sdk
-version: 0.4.0
+version: 0.4.1
 homepage: https://github.com/qiniu/dart-sdk/tree/master/flutter
 
 environment:
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  diox: ^5.0.0-dev.2
+  diox: ^5.0.0
   qiniu_sdk_base_diox: ^0.4.1
 
 dev_dependencies:

From 606e21f65a6c8cb84d6e2c565d68fbde7d02a8b1 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Fri, 10 Feb 2023 16:28:36 +0800
Subject: [PATCH 06/24] fix version

---
 base/pubspec.yaml    | 2 +-
 flutter/pubspec.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/pubspec.yaml b/base/pubspec.yaml
index c01e4bac..33e17914 100644
--- a/base/pubspec.yaml
+++ b/base/pubspec.yaml
@@ -7,7 +7,7 @@ false_secrets:
   - /test/auth/auth_test.dart
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.12.0 <4.0.0'
 
 dependencies:
   diox: ^5.0.0
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index d0a7293b..fc829210 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -4,14 +4,14 @@ version: 0.4.1
 homepage: https://github.com/qiniu/dart-sdk/tree/master/flutter
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.17.0"
+  sdk: ">=2.12.0 <4.0.0"
+  flutter: ">=2.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
   diox: ^5.0.0
-  qiniu_sdk_base_diox: ^0.4.1
+  qiniu_sdk_base_diox: ^0.4.2
 
 dev_dependencies:
   pedantic: ^1.9.0

From b373dc3b5e8e8b4ff8398c6924e9ae73b3eb43d5 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Fri, 10 Feb 2023 16:52:35 +0800
Subject: [PATCH 07/24] fix test

---
 base/.pubignore              |  1 +
 base/pubspec.yaml            |  8 ++++----
 base/test/config.dart        | 19 +++++++++----------
 flutter/example/pubspec.lock |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 base/.pubignore

diff --git a/base/.pubignore b/base/.pubignore
new file mode 100644
index 00000000..34c62e31
--- /dev/null
+++ b/base/.pubignore
@@ -0,0 +1 @@
+pubspec.lock
\ No newline at end of file
diff --git a/base/pubspec.yaml b/base/pubspec.yaml
index 33e17914..c5fe01ee 100644
--- a/base/pubspec.yaml
+++ b/base/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   path: ^1.8.0
 
 dev_dependencies:
-  pedantic: ^1.11.0
-  test: ^1.16.8
-  dotenv: 3.0.0-nullsafety.0
-  coverage: "^1.0.2"
+  test:
+  lints:
+  dotenv: ^4.1.0
+  coverage: "^1.6.3"
diff --git a/base/test/config.dart b/base/test/config.dart
index 84c30336..a9054526 100644
--- a/base/test/config.dart
+++ b/base/test/config.dart
@@ -1,20 +1,19 @@
 import 'dart:io';
 
 // ignore: import_of_legacy_library_into_null_safe
-import 'package:dotenv/dotenv.dart' show load, clean, isEveryDefined, env;
+import 'package:dotenv/dotenv.dart' show DotEnv;
 import 'package:qiniu_sdk_base_diox/src/auth/auth.dart';
 import 'package:test/test.dart';
 
 late String token;
 
-bool get isSensitiveDataDefined {
-  load();
-  return isEveryDefined([
-    'QINIU_DART_SDK_ACCESS_KEY',
-    'QINIU_DART_SDK_SECRET_KEY',
-    'QINIU_DART_SDK_TOKEN_SCOPE'
-  ]);
-}
+final env = DotEnv(includePlatformEnvironment: true)..load();
+
+final isSensitiveDataDefined = env.isEveryDefined([
+  'QINIU_DART_SDK_ACCESS_KEY',
+  'QINIU_DART_SDK_SECRET_KEY',
+  'QINIU_DART_SDK_TOKEN_SCOPE'
+]);
 
 void configEnv() {
   setUpAll(() {
@@ -35,5 +34,5 @@ void configEnv() {
     }
   });
 
-  tearDownAll(clean);
+  tearDownAll(env.clear);
 }
diff --git a/flutter/example/pubspec.lock b/flutter/example/pubspec.lock
index bb95a9e2..97805896 100644
--- a/flutter/example/pubspec.lock
+++ b/flutter/example/pubspec.lock
@@ -187,10 +187,10 @@ packages:
     dependency: transitive
     description:
       name: qiniu_sdk_base_diox
-      sha256: f9d51a0b3c10df937fccbe490901f722184b7b3ce015f41c5d69aff33ed31a87
+      sha256: f1efca003b5278091074c17574598840f48b5c9e1f0b2cff6b630da0739978d3
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.2"
   sky_engine:
     dependency: transitive
     description: flutter

From fa75b73b69b40634fa5aa34ebbfd54d11434770c Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Fri, 10 Feb 2023 17:02:05 +0800
Subject: [PATCH 08/24] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/test_resource/test_for_put.txt |   0
 flutter/.pubignore                  |   2 +
 flutter/example/.gitignore          |   2 +
 flutter/example/pubspec.lock        | 273 ----------------------------
 4 files changed, 4 insertions(+), 273 deletions(-)
 mode change 100755 => 100644 base/test_resource/test_for_put.txt
 create mode 100644 flutter/.pubignore
 delete mode 100644 flutter/example/pubspec.lock

diff --git a/base/test_resource/test_for_put.txt b/base/test_resource/test_for_put.txt
old mode 100755
new mode 100644
diff --git a/flutter/.pubignore b/flutter/.pubignore
new file mode 100644
index 00000000..cc7e8921
--- /dev/null
+++ b/flutter/.pubignore
@@ -0,0 +1,2 @@
+pubspec.lock
+example/pubspec.lock
\ No newline at end of file
diff --git a/flutter/example/.gitignore b/flutter/example/.gitignore
index 0fa6b675..2ee9b90c 100644
--- a/flutter/example/.gitignore
+++ b/flutter/example/.gitignore
@@ -44,3 +44,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+pubspec.lock
\ No newline at end of file
diff --git a/flutter/example/pubspec.lock b/flutter/example/pubspec.lock
deleted file mode 100644
index 97805896..00000000
--- a/flutter/example/pubspec.lock
+++ /dev/null
@@ -1,273 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.10.0"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.1"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.1"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.17.0"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.0.2"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.5"
-  diox:
-    dependency: transitive
-    description:
-      name: diox
-      sha256: "6b971f9936f1de9a6d7b2070a1f626e4a3c490d0c044d432b72e96537db2ed22"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "5.0.0"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.3.1"
-  file_picker:
-    dependency: "direct main"
-    description:
-      name: file_picker
-      sha256: f9245fc33aeba9e0b938d7f3785f10b7a7230e05b8fc40f5a6a8342d7899e391
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.0.4"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.1"
-  flutter_plugin_android_lifecycle:
-    dependency: transitive
-    description:
-      name: flutter_plugin_android_lifecycle
-      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.7"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "4.0.2"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.6.5"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.1"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.12.13"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.2.0"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.8.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.8.2"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.3"
-  qiniu_flutter_sdk_diox:
-    dependency: "direct main"
-    description:
-      path: ".."
-      relative: true
-    source: path
-    version: "0.4.1"
-  qiniu_sdk_base_diox:
-    dependency: transitive
-    description:
-      name: qiniu_sdk_base_diox
-      sha256: f1efca003b5278091074c17574598840f48b5c9e1f0b2cff6b630da0739978d3
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.4.2"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.9.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.11.0"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.1"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.1"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.4.16"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.3.1"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.0.7"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=2.18.0 <3.0.0"
-  flutter: ">=2.8.0"

From b69731c46a3614160127d6690a0ba3c6890ff196 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Tue, 14 Feb 2023 10:04:23 +0800
Subject: [PATCH 09/24] migrate to dio5.0

---
 base/CHANGELOG.md                             |  4 +-
 base/analysis_options.yaml                    | 82 ++----------------
 ...sdk_base_diox.dart => qiniu_sdk_base.dart} |  0
 base/lib/src/storage/config/config.dart       |  2 +-
 base/lib/src/storage/error/error.dart         |  2 +-
 .../methods/put/by_part/put_parts_task.dart   |  4 +-
 .../put/by_single/put_by_single_task.dart     |  4 +-
 base/lib/src/storage/task/request_task.dart   |  4 +-
 base/lib/src/storage/task/task.dart           |  2 +-
 base/pubspec.yaml                             |  6 +-
 base/test/auth/auth_test.dart                 |  2 +-
 base/test/config.dart                         |  2 +-
 base/test/config_test.dart                    |  2 +-
 base/test/put/helpers.dart                    |  4 +-
 .../test/put/put_by_parts/put_bytes_test.dart |  7 +-
 base/test/put/put_by_parts/put_file_test.dart |  7 +-
 base/test/put/put_by_single/put_bytes.dart    |  3 +-
 base/test/put/put_by_single/put_file.dart     |  3 +-
 base/test/resource_test.dart                  |  2 +-
 base/test/retry_test.dart                     |  8 +-
 flutter/CHANGELOG.md                          |  2 +-
 flutter/analysis_options.yaml                 | 83 ++-----------------
 flutter/example/lib/main.dart                 |  2 +-
 flutter/example/pubspec.yaml                  |  2 +-
 ...r_sdk_diox.dart => qiniu_flutter_sdk.dart} |  0
 flutter/lib/src/storage/controller.dart       |  2 +-
 flutter/lib/src/storage/storage.dart          |  4 +-
 flutter/pubspec.yaml                          | 11 +--
 28 files changed, 57 insertions(+), 199 deletions(-)
 rename base/lib/{qiniu_sdk_base_diox.dart => qiniu_sdk_base.dart} (100%)
 rename flutter/lib/{qiniu_flutter_sdk_diox.dart => qiniu_flutter_sdk.dart} (100%)

diff --git a/base/CHANGELOG.md b/base/CHANGELOG.md
index d6bf56b4..04a866d1 100644
--- a/base/CHANGELOG.md
+++ b/base/CHANGELOG.md
@@ -1,6 +1,6 @@
-## 0.4.2
+## 0.5.0
 
-* upgrade diox to 5.0.0
+* upgrade dio to 5.0.0
 
 ## 0.4.1
 
diff --git a/base/analysis_options.yaml b/base/analysis_options.yaml
index 633c1d0f..34b0a7d3 100644
--- a/base/analysis_options.yaml
+++ b/base/analysis_options.yaml
@@ -1,6 +1,6 @@
 # copy from https://github.com/dart-lang/http/blob/master/analysis_options.yaml
 
-include: package:pedantic/analysis_options.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   # enable-experiment:
@@ -12,78 +12,8 @@ analyzer:
 
 linter:
   rules:
-  - annotate_overrides
-  - avoid_bool_literals_in_conditional_expressions
-  - avoid_classes_with_only_static_members
-  - avoid_empty_else
-  - avoid_function_literals_in_foreach_calls
-  - avoid_init_to_null
-  - avoid_null_checks_in_equality_operators
-  - avoid_relative_lib_imports
-  - avoid_renaming_method_parameters
-  - avoid_return_types_on_setters
-  - avoid_returning_null_for_void
-  - avoid_returning_this
-  - avoid_shadowing_type_parameters
-  - avoid_single_cascade_in_expression_statements
-  - avoid_types_as_parameter_names
-  - avoid_unused_constructor_parameters
-  - await_only_futures
-  - camel_case_types
-  - cascade_invocations
-  # comment_references
-  - control_flow_in_finally
-  - curly_braces_in_flow_control_structures
-  - directives_ordering
-  - empty_catches
-  - empty_constructor_bodies
-  - empty_statements
-  - file_names
-  - hash_and_equals
-  - iterable_contains_unrelated_type
-  - library_names
-  - library_prefixes
-  - list_remove_unrelated_type
-  - no_adjacent_strings_in_list
-  - no_duplicate_case_values
-  - non_constant_identifier_names
-  - null_closures
-  - omit_local_variable_types
-  - only_throw_errors
-  - overridden_fields
-  - package_names
-  - package_prefixed_library_names
-  - prefer_adjacent_string_concatenation
-  - prefer_conditional_assignment
-  - prefer_contains
-  - prefer_equal_for_default_values
-  - prefer_final_fields
-  - prefer_collection_literals
-  - prefer_generic_function_type_aliases
-  - prefer_initializing_formals
-  - prefer_is_empty
-  - prefer_is_not_empty
-  - prefer_null_aware_operators
-  - prefer_single_quotes
-  - prefer_typing_uninitialized_variables
-  - recursive_getters
-  - slash_for_doc_comments
-  - test_types_in_equals
-  - throw_in_finally
-  - type_init_formals
-  - unawaited_futures
-  - unnecessary_brace_in_string_interps
-  - unnecessary_const
-  - unnecessary_getters_setters
-  - unnecessary_lambdas
-  - unnecessary_new
-  - unnecessary_null_aware_assignments
-  - unnecessary_null_in_if_null_operators
-  - unnecessary_overrides
-  - unnecessary_parenthesis
-  - unnecessary_statements
-  - unnecessary_this
-  - unrelated_type_equality_checks
-  - use_rethrow_when_possible
-  - valid_regexps
-  - void_checks
+    constant_identifier_names: false
+    prefer_final_locals: true
+    prefer_single_quotes: true
+    always_declare_return_types: true
+    require_trailing_commas: true
diff --git a/base/lib/qiniu_sdk_base_diox.dart b/base/lib/qiniu_sdk_base.dart
similarity index 100%
rename from base/lib/qiniu_sdk_base_diox.dart
rename to base/lib/qiniu_sdk_base.dart
diff --git a/base/lib/src/storage/config/config.dart b/base/lib/src/storage/config/config.dart
index fac04af8..2716bfdb 100644
--- a/base/lib/src/storage/config/config.dart
+++ b/base/lib/src/storage/config/config.dart
@@ -1,4 +1,4 @@
-import 'package:diox/diox.dart';
+import 'package:dio/dio.dart';
 
 import '../../storage/error/error.dart';
 
diff --git a/base/lib/src/storage/error/error.dart b/base/lib/src/storage/error/error.dart
index 02316096..d5d13172 100644
--- a/base/lib/src/storage/error/error.dart
+++ b/base/lib/src/storage/error/error.dart
@@ -1,4 +1,4 @@
-import 'package:diox/diox.dart';
+import 'package:dio/dio.dart';
 
 import '../../error/error.dart';
 
diff --git a/base/lib/src/storage/methods/put/by_part/put_parts_task.dart b/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
index 9c4e9dfc..24f6d069 100644
--- a/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:diox/diox.dart';
+import 'package:dio/dio.dart';
 
-import '../../../../../qiniu_sdk_base_diox.dart';
+import '../../../../../qiniu_sdk_base.dart';
 import '../../../resource/resource.dart';
 
 part 'cache_mixin.dart';
diff --git a/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart b/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
index fd9878d6..56911820 100644
--- a/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
+++ b/base/lib/src/storage/methods/put/by_single/put_by_single_task.dart
@@ -1,6 +1,6 @@
-import 'package:diox/diox.dart';
+import 'package:dio/dio.dart';
 
-import '../../../../../qiniu_sdk_base_diox.dart';
+import '../../../../../qiniu_sdk_base.dart';
 import '../../../resource/resource.dart';
 
 // 直传任务
diff --git a/base/lib/src/storage/task/request_task.dart b/base/lib/src/storage/task/request_task.dart
index 435cb553..26352b86 100644
--- a/base/lib/src/storage/task/request_task.dart
+++ b/base/lib/src/storage/task/request_task.dart
@@ -1,7 +1,7 @@
-import 'package:diox/diox.dart';
+import 'package:dio/dio.dart';
 import 'package:meta/meta.dart';
 
-import '../../../qiniu_sdk_base_diox.dart';
+import '../../../qiniu_sdk_base.dart';
 
 part 'request_task_controller.dart';
 part 'request_task_manager.dart';
diff --git a/base/lib/src/storage/task/task.dart b/base/lib/src/storage/task/task.dart
index 2e88f254..c7d0f218 100644
--- a/base/lib/src/storage/task/task.dart
+++ b/base/lib/src/storage/task/task.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:meta/meta.dart';
 
-import '../../../qiniu_sdk_base_diox.dart';
+import '../../../qiniu_sdk_base.dart';
 
 export 'request_task.dart';
 export 'task_manager.dart';
diff --git a/base/pubspec.yaml b/base/pubspec.yaml
index c5fe01ee..f36941f8 100644
--- a/base/pubspec.yaml
+++ b/base/pubspec.yaml
@@ -1,5 +1,5 @@
-name: qiniu_sdk_base_diox
-version: 0.4.2
+name: qiniu_sdk_base
+version: 0.5.0
 homepage: https://github.com/qiniu/dart-sdk
 description: The sdk basic of Qiniu products
 
@@ -10,7 +10,7 @@ environment:
   sdk: '>=2.12.0 <4.0.0'
 
 dependencies:
-  diox: ^5.0.0
+  dio: ^5.0.0
   crypto: ^3.0.0
   meta: ^1.3.0
   uuid: ^3.0.5
diff --git a/base/test/auth/auth_test.dart b/base/test/auth/auth_test.dart
index 1f8f91cb..1f718541 100644
--- a/base/test/auth/auth_test.dart
+++ b/base/test/auth/auth_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:qiniu_sdk_base_diox/src/auth/auth.dart';
+import 'package:qiniu_sdk_base/src/auth/auth.dart';
 import 'package:test/test.dart';
 
 class UploadTokenTestData {
diff --git a/base/test/config.dart b/base/test/config.dart
index a9054526..cd3e4f9a 100644
--- a/base/test/config.dart
+++ b/base/test/config.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:dotenv/dotenv.dart' show DotEnv;
-import 'package:qiniu_sdk_base_diox/src/auth/auth.dart';
+import 'package:qiniu_sdk_base/src/auth/auth.dart';
 import 'package:test/test.dart';
 
 late String token;
diff --git a/base/test/config_test.dart b/base/test/config_test.dart
index e00e6aba..afe54bc0 100644
--- a/base/test/config_test.dart
+++ b/base/test/config_test.dart
@@ -1,6 +1,6 @@
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:dotenv/dotenv.dart';
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
 import 'package:test/test.dart';
 
 import 'config.dart';
diff --git a/base/test/put/helpers.dart b/base/test/put/helpers.dart
index eb6a76c5..79a43a8d 100644
--- a/base/test/put/helpers.dart
+++ b/base/test/put/helpers.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:diox/diox.dart';
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
+import 'package:dio/dio.dart';
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
 import 'package:test/test.dart';
 
 final fileForPart = File('test_resource/test_for_put_parts.mp4');
diff --git a/base/test/put/put_by_parts/put_bytes_test.dart b/base/test/put/put_by_parts/put_bytes_test.dart
index 5ff60694..4095cbcd 100644
--- a/base/test/put/put_by_parts/put_bytes_test.dart
+++ b/base/test/put/put_by_parts/put_bytes_test.dart
@@ -1,8 +1,7 @@
 @Timeout(Duration(seconds: 60))
-import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base/src/storage/methods/put/by_part/put_parts_task.dart';
+import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/put/put_by_parts/put_file_test.dart b/base/test/put/put_by_parts/put_file_test.dart
index 9eb82ad2..6aca09de 100644
--- a/base/test/put/put_by_parts/put_file_test.dart
+++ b/base/test/put/put_by_parts/put_file_test.dart
@@ -1,8 +1,7 @@
 @Timeout(Duration(seconds: 60))
-import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base/src/storage/methods/put/by_part/put_parts_task.dart';
+import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/put/put_by_single/put_bytes.dart b/base/test/put/put_by_single/put_bytes.dart
index 6eff28e1..610ff25b 100644
--- a/base/test/put/put_by_single/put_bytes.dart
+++ b/base/test/put/put_by_single/put_bytes.dart
@@ -1,6 +1,5 @@
 @Timeout(Duration(seconds: 60))
-import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/put/put_by_single/put_file.dart b/base/test/put/put_by_single/put_file.dart
index ad88edb8..ffa8c8b3 100644
--- a/base/test/put/put_by_single/put_file.dart
+++ b/base/test/put/put_by_single/put_file.dart
@@ -1,6 +1,5 @@
 @Timeout(Duration(seconds: 60))
-import 'package:dotenv/dotenv.dart' show env;
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
 import 'package:test/test.dart';
 
 import '../../config.dart';
diff --git a/base/test/resource_test.dart b/base/test/resource_test.dart
index c97edf7a..1c4115ce 100644
--- a/base/test/resource_test.dart
+++ b/base/test/resource_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:path/path.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
+import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/base/test/retry_test.dart b/base/test/retry_test.dart
index c4295e89..f794e680 100644
--- a/base/test/retry_test.dart
+++ b/base/test/retry_test.dart
@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:diox/diox.dart';
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/methods/put/by_part/put_parts_task.dart';
-import 'package:qiniu_sdk_base_diox/src/storage/resource/resource.dart';
+import 'package:dio/dio.dart';
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
+import 'package:qiniu_sdk_base/src/storage/methods/put/by_part/put_parts_task.dart';
+import 'package:qiniu_sdk_base/src/storage/resource/resource.dart';
 import 'package:test/test.dart';
 
 import 'config.dart';
diff --git a/flutter/CHANGELOG.md b/flutter/CHANGELOG.md
index 2021811b..d000084c 100644
--- a/flutter/CHANGELOG.md
+++ b/flutter/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 0.4.1
 
-* upgrade diox to 5.0.0
+* upgrade dio to 5.0.0
 
 ## 0.4.0
 
diff --git a/flutter/analysis_options.yaml b/flutter/analysis_options.yaml
index 633c1d0f..91e0eee3 100644
--- a/flutter/analysis_options.yaml
+++ b/flutter/analysis_options.yaml
@@ -1,6 +1,6 @@
 # copy from https://github.com/dart-lang/http/blob/master/analysis_options.yaml
 
-include: package:pedantic/analysis_options.yaml
+include: package:flutter_lints/flutter.yaml
 
 analyzer:
   # enable-experiment:
@@ -12,78 +12,9 @@ analyzer:
 
 linter:
   rules:
-  - annotate_overrides
-  - avoid_bool_literals_in_conditional_expressions
-  - avoid_classes_with_only_static_members
-  - avoid_empty_else
-  - avoid_function_literals_in_foreach_calls
-  - avoid_init_to_null
-  - avoid_null_checks_in_equality_operators
-  - avoid_relative_lib_imports
-  - avoid_renaming_method_parameters
-  - avoid_return_types_on_setters
-  - avoid_returning_null_for_void
-  - avoid_returning_this
-  - avoid_shadowing_type_parameters
-  - avoid_single_cascade_in_expression_statements
-  - avoid_types_as_parameter_names
-  - avoid_unused_constructor_parameters
-  - await_only_futures
-  - camel_case_types
-  - cascade_invocations
-  # comment_references
-  - control_flow_in_finally
-  - curly_braces_in_flow_control_structures
-  - directives_ordering
-  - empty_catches
-  - empty_constructor_bodies
-  - empty_statements
-  - file_names
-  - hash_and_equals
-  - iterable_contains_unrelated_type
-  - library_names
-  - library_prefixes
-  - list_remove_unrelated_type
-  - no_adjacent_strings_in_list
-  - no_duplicate_case_values
-  - non_constant_identifier_names
-  - null_closures
-  - omit_local_variable_types
-  - only_throw_errors
-  - overridden_fields
-  - package_names
-  - package_prefixed_library_names
-  - prefer_adjacent_string_concatenation
-  - prefer_conditional_assignment
-  - prefer_contains
-  - prefer_equal_for_default_values
-  - prefer_final_fields
-  - prefer_collection_literals
-  - prefer_generic_function_type_aliases
-  - prefer_initializing_formals
-  - prefer_is_empty
-  - prefer_is_not_empty
-  - prefer_null_aware_operators
-  - prefer_single_quotes
-  - prefer_typing_uninitialized_variables
-  - recursive_getters
-  - slash_for_doc_comments
-  - test_types_in_equals
-  - throw_in_finally
-  - type_init_formals
-  - unawaited_futures
-  - unnecessary_brace_in_string_interps
-  - unnecessary_const
-  - unnecessary_getters_setters
-  - unnecessary_lambdas
-  - unnecessary_new
-  - unnecessary_null_aware_assignments
-  - unnecessary_null_in_if_null_operators
-  - unnecessary_overrides
-  - unnecessary_parenthesis
-  - unnecessary_statements
-  - unnecessary_this
-  - unrelated_type_equality_checks
-  - use_rethrow_when_possible
-  - valid_regexps
-  - void_checks
+    constant_identifier_names: false
+    prefer_final_locals: true
+    prefer_single_quotes: true
+    always_declare_return_types: true
+    require_trailing_commas: true
+    public_member_api_docs: true
diff --git a/flutter/example/lib/main.dart b/flutter/example/lib/main.dart
index f3051d39..fddb3ac8 100644
--- a/flutter/example/lib/main.dart
+++ b/flutter/example/lib/main.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:qiniu_flutter_sdk_diox/qiniu_flutter_sdk_diox.dart';
+import 'package:qiniu_flutter_sdk/qiniu_flutter_sdk.dart';
 
 import 'token.dart';
 import 'utils/uint.dart';
diff --git a/flutter/example/pubspec.yaml b/flutter/example/pubspec.yaml
index f0bf0d39..d0b8ff00 100644
--- a/flutter/example/pubspec.yaml
+++ b/flutter/example/pubspec.yaml
@@ -24,7 +24,7 @@ dependencies:
   flutter:
     sdk: flutter
   file_picker: ^3.0.1
-  qiniu_flutter_sdk_diox:
+  qiniu_flutter_sdk:
     path: ../
 
   # The following adds the Cupertino Icons font to your application.
diff --git a/flutter/lib/qiniu_flutter_sdk_diox.dart b/flutter/lib/qiniu_flutter_sdk.dart
similarity index 100%
rename from flutter/lib/qiniu_flutter_sdk_diox.dart
rename to flutter/lib/qiniu_flutter_sdk.dart
diff --git a/flutter/lib/src/storage/controller.dart b/flutter/lib/src/storage/controller.dart
index e5460bf3..999c77b0 100644
--- a/flutter/lib/src/storage/controller.dart
+++ b/flutter/lib/src/storage/controller.dart
@@ -1,3 +1,3 @@
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart' as base;
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart' as base;
 
 class PutController extends base.PutController {}
diff --git a/flutter/lib/src/storage/storage.dart b/flutter/lib/src/storage/storage.dart
index b7faa2b5..7a1243e6 100644
--- a/flutter/lib/src/storage/storage.dart
+++ b/flutter/lib/src/storage/storage.dart
@@ -1,9 +1,9 @@
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart' as base;
+import 'package:qiniu_sdk_base/qiniu_sdk_base.dart' as base;
 
-export 'package:qiniu_sdk_base_diox/qiniu_sdk_base_diox.dart'
+export 'package:qiniu_sdk_base/qiniu_sdk_base.dart'
     show
         Config,
         PutOptions,
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index fc829210..39553eb4 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -1,6 +1,6 @@
-name: qiniu_flutter_sdk_diox
+name: qiniu_flutter_sdk
 description: Qiniu Flutter sdk
-version: 0.4.1
+version: 0.5.0
 homepage: https://github.com/qiniu/dart-sdk/tree/master/flutter
 
 environment:
@@ -10,11 +10,12 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  diox: ^5.0.0
-  qiniu_sdk_base_diox: ^0.4.2
+  dio: ^5.0.0
+  qiniu_sdk_base: #^0.5.0
+    path: ../base/
 
 dev_dependencies:
-  pedantic: ^1.9.0
+  flutter_lints: ^2.0.1
   flutter_test:
     sdk: flutter
 

From be80078bfa8b27fe1a1f0be80072a7fc0ec7320a Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Tue, 14 Feb 2023 10:13:22 +0800
Subject: [PATCH 10/24] fix lints

---
 base/lib/src/auth/auth.dart                   |  32 +-
 base/lib/src/storage/config/host.dart         |  16 +-
 base/lib/src/storage/error/error.dart         |   7 +-
 .../methods/put/by_part/init_parts_task.dart  |   3 +-
 .../methods/put/by_part/put_parts_task.dart   |  20 +-
 .../put/by_part/upload_parts_task.dart        |  36 +-
 .../src/storage/methods/put/put_options.dart  |   6 +-
 base/lib/src/storage/task/request_task.dart   |  22 +-
 .../storage/task/request_task_controller.dart |   3 +-
 base/test/auth/auth_test.dart                 |  29 +-
 base/test/config.dart                         |   9 +-
 base/test/config_test.dart                    |  67 +-
 base/test/put/helpers.dart                    |   7 +-
 .../test/put/put_by_parts/put_bytes_test.dart | 647 ++++++++++--------
 base/test/put/put_by_parts/put_file_test.dart | 647 ++++++++++--------
 base/test/put/put_by_single/put_bytes.dart    | 252 +++----
 base/test/put/put_by_single/put_file.dart     | 252 +++----
 base/test/retry_test.dart                     | 333 ++++-----
 flutter/lib/src/storage/controller.dart       |   1 +
 flutter/lib/src/storage/storage.dart          |   7 +-
 flutter/pubspec.yaml                          |   3 +-
 21 files changed, 1288 insertions(+), 1111 deletions(-)

diff --git a/base/lib/src/auth/auth.dart b/base/lib/src/auth/auth.dart
index d86b2494..4ad5c964 100644
--- a/base/lib/src/auth/auth.dart
+++ b/base/lib/src/auth/auth.dart
@@ -42,9 +42,9 @@ class Auth {
   String generateUploadToken({
     required PutPolicy putPolicy,
   }) {
-    var data = jsonEncode(putPolicy);
-    var encodedPutPolicy = base64Url.encode(utf8.encode(data));
-    var baseToken = generateAccessToken(bytes: utf8.encode(encodedPutPolicy));
+    final data = jsonEncode(putPolicy);
+    final encodedPutPolicy = base64Url.encode(utf8.encode(data));
+    final baseToken = generateAccessToken(bytes: utf8.encode(encodedPutPolicy));
     return '$baseToken:$encodedPutPolicy';
   }
 
@@ -58,7 +58,7 @@ class Auth {
     required int deadline,
     required String bucketDomain,
   }) {
-    var downloadURL = '$bucketDomain/$key?e=$deadline';
+    final downloadURL = '$bucketDomain/$key?e=$deadline';
     return generateAccessToken(bytes: utf8.encode(downloadURL));
   }
 
@@ -66,10 +66,10 @@ class Auth {
   ///
   /// 访问七牛的接口需要对请求进行签名, 该方法提供 Token 签发服务
   String generateAccessToken({required List<int> bytes}) {
-    var hmacEncoder = Hmac(sha1, utf8.encode(secretKey));
+    final hmacEncoder = Hmac(sha1, utf8.encode(secretKey));
 
-    var sign = hmacEncoder.convert(bytes);
-    var encodedSign = base64Url.encode(sign.bytes);
+    final sign = hmacEncoder.convert(bytes);
+    final encodedSign = base64Url.encode(sign.bytes);
     return '$accessKey:$encodedSign';
   }
 
@@ -79,13 +79,13 @@ class Auth {
   static TokenInfo parseToken(String token) {
     assert(token != '');
 
-    var segments = token.split(':');
+    final segments = token.split(':');
     if (segments.length < 2) {
       throw ArgumentError('invalid token');
     }
 
     PutPolicy? putPolicy;
-    var accessKey = segments.first;
+    final accessKey = segments.first;
 
     /// 具体的 token 信息可以参考这里。
     /// [内部文档](https://github.com/qbox/product/blob/master/kodo/auths/UpToken.md#admin-uptoken-authorization)
@@ -94,13 +94,15 @@ class Auth {
         throw ArgumentError('invalid token');
       }
 
-      putPolicy = PutPolicy.fromJson(jsonDecode(
-        String.fromCharCodes(
-          base64Url.decode(
-            segments.last,
+      putPolicy = PutPolicy.fromJson(
+        jsonDecode(
+          String.fromCharCodes(
+            base64Url.decode(
+              segments.last,
+            ),
           ),
-        ),
-      ) as Map<String, dynamic>);
+        ) as Map<String, dynamic>,
+      );
     }
 
     return TokenInfo(accessKey, putPolicy);
diff --git a/base/lib/src/storage/config/host.dart b/base/lib/src/storage/config/host.dart
index bb04da80..1cdbb01a 100644
--- a/base/lib/src/storage/config/host.dart
+++ b/base/lib/src/storage/config/host.dart
@@ -30,9 +30,9 @@ class DefaultHostProvider extends HostProvider {
     // 解冻需要被解冻的 host
     _frozenUpDomains.removeWhere((domain) => !domain.isFrozen());
 
-    var _upDomains = <_Domain>[];
+    final upDomains = <_Domain>[];
     if ('$accessKey:$bucket' == _cacheKey && _stashedUpDomains.isNotEmpty) {
-      _upDomains.addAll(_stashedUpDomains);
+      upDomains.addAll(_stashedUpDomains);
     } else {
       final url =
           '$protocol://api.qiniu.com/v4/query?ak=$accessKey&bucket=$bucket';
@@ -47,21 +47,21 @@ class DefaultHostProvider extends HostProvider {
       for (var host in hosts) {
         final domainList = host.up['domains'].cast<String>() as List<String>;
         final domains = domainList.map((domain) => _Domain(domain));
-        _upDomains.addAll(domains);
+        upDomains.addAll(domains);
       }
 
       _cacheKey = '$accessKey:$bucket';
-      _stashedUpDomains.addAll(_upDomains);
+      _stashedUpDomains.addAll(upDomains);
     }
 
     // 每次都从头遍历一遍，最合适的 host 总是会排在最前面
-    for (var index = 0; index < _upDomains.length; index++) {
-      final availableDomain = _upDomains.elementAt(index);
+    for (var index = 0; index < upDomains.length; index++) {
+      final availableDomain = upDomains.elementAt(index);
       // 检查看起来可用的 host 是否之前被冻结过
-      final frozen = isFrozen(protocol + '://' + availableDomain.value);
+      final frozen = isFrozen('$protocol://${availableDomain.value}');
 
       if (!frozen) {
-        return protocol + '://' + availableDomain.value;
+        return '$protocol://${availableDomain.value}';
       }
     }
     // 全部被冻结，几乎不存在的情况
diff --git a/base/lib/src/storage/error/error.dart b/base/lib/src/storage/error/error.dart
index d5d13172..4f288d97 100644
--- a/base/lib/src/storage/error/error.dart
+++ b/base/lib/src/storage/error/error.dart
@@ -42,9 +42,10 @@ class StorageError extends QiniuError {
 
   factory StorageError.fromError(Error error) {
     return StorageError(
-        type: StorageErrorType.UNKNOWN,
-        rawError: error,
-        message: error.toString());
+      type: StorageErrorType.UNKNOWN,
+      rawError: error,
+      message: error.toString(),
+    );
   }
 
   factory StorageError.fromDioError(DioError error) {
diff --git a/base/lib/src/storage/methods/put/by_part/init_parts_task.dart b/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
index acd69731..48af2169 100644
--- a/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
@@ -64,7 +64,8 @@ class InitPartsTask extends RequestTask<InitParts> with CacheMixin<InitParts> {
     final initPartsCache = await getCache();
     if (initPartsCache != null) {
       return InitParts.fromJson(
-          json.decode(initPartsCache) as Map<String, dynamic>);
+        json.decode(initPartsCache) as Map<String, dynamic>,
+      );
     }
 
     final bucket = _tokenInfo.putPolicy.getBucket();
diff --git a/base/lib/src/storage/methods/put/by_part/put_parts_task.dart b/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
index 24f6d069..8d4d0d85 100644
--- a/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/put_parts_task.dart
@@ -125,22 +125,22 @@ class PutByPartTask extends RequestTask<PutResponse> {
 
   /// 初始化上传信息，分片上传的第一步
   InitPartsTask _createInitParts() {
-    final _controller = PutController();
+    final controller = PutController();
 
     final task = InitPartsTask(
       resource: resource,
       token: token,
       key: options.key,
-      controller: _controller,
+      controller: controller,
     );
 
     manager.addTask(task);
-    _currentWorkingTaskController = _controller;
+    _currentWorkingTaskController = controller;
     return task;
   }
 
   UploadPartsTask _createUploadParts(String uploadId) {
-    final _controller = PutController();
+    final controller = PutController();
 
     final task = UploadPartsTask(
       token: token,
@@ -148,13 +148,13 @@ class PutByPartTask extends RequestTask<PutResponse> {
       uploadId: uploadId,
       maxPartsRequestNumber: options.maxPartsRequestNumber,
       resource: resource,
-      controller: _controller,
+      controller: controller,
     );
 
-    _controller.addSendProgressListener(onSendProgress);
+    controller.addSendProgressListener(onSendProgress);
 
     manager.addTask(task);
-    _currentWorkingTaskController = _controller;
+    _currentWorkingTaskController = controller;
     return task;
   }
 
@@ -163,18 +163,18 @@ class PutByPartTask extends RequestTask<PutResponse> {
     String uploadId,
     List<Part> parts,
   ) {
-    final _controller = PutController();
+    final controller = PutController();
     final task = CompletePartsTask(
       token: token,
       uploadId: uploadId,
       parts: parts,
       key: resource.name,
       customVars: options.customVars,
-      controller: _controller,
+      controller: controller,
     );
 
     manager.addTask(task);
-    _currentWorkingTaskController = _controller;
+    _currentWorkingTaskController = controller;
     return task;
   }
 }
diff --git a/base/lib/src/storage/methods/put/by_part/upload_parts_task.dart b/base/lib/src/storage/methods/put/by_part/upload_parts_task.dart
index b81cfc6f..1a2def13 100644
--- a/base/lib/src/storage/methods/put/by_part/upload_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/upload_parts_task.dart
@@ -96,8 +96,8 @@ class UploadPartsTask extends RequestTask<List<Part>> with CacheMixin {
       var cachedList = <Part>[];
 
       try {
-        final _cachedList = json.decode(cachedData) as List<dynamic>;
-        cachedList = _cachedList
+        final cachedList0 = json.decode(cachedData) as List<dynamic>;
+        cachedList = cachedList0
             .map((dynamic item) => Part.fromJson(item as Map<String, dynamic>))
             .toList();
       } catch (error) {
@@ -131,7 +131,7 @@ class UploadPartsTask extends RequestTask<List<Part>> with CacheMixin {
 
   // 从指定的分片位置往后上传切片
   Future<void> _uploadParts() async {
-    final taskFutures = <Future<Null>>[];
+    final taskFutures = <Future<void>>[];
     final tasksLength =
         min(_idleRequestNumber, _totalPartCount - _uploadingPartIndex);
 
@@ -141,8 +141,8 @@ class UploadPartsTask extends RequestTask<List<Part>> with CacheMixin {
       final partNumber = ++_uploadingPartIndex;
 
       // 跳过上传过的分片
-      final _uploadedPart = _uploadedPartMap[partNumber];
-      if (_uploadedPart != null) {
+      final uploadedPart = _uploadedPartMap[partNumber];
+      if (uploadedPart != null) {
         _sentPartCount++;
         _sentPartToServerCount++;
         notifySendProgress();
@@ -159,14 +159,16 @@ class UploadPartsTask extends RequestTask<List<Part>> with CacheMixin {
       }
     }
 
-    await Future.wait<Null>(taskFutures);
+    await Future.wait<void>(taskFutures);
   }
 
-  Future<Null> _createUploadPartTaskFutureByPartNumber(
-      List<int> bytes, int partNumber) async {
+  Future<void> _createUploadPartTaskFutureByPartNumber(
+    List<int> bytes,
+    int partNumber,
+  ) async {
     _idleRequestNumber--;
-    final _controller = PutController();
-    _workingUploadPartTaskControllers.add(_controller);
+    final controller = PutController();
+    _workingUploadPartTaskControllers.add(controller);
 
     final task = UploadPartTask(
       token: token,
@@ -176,10 +178,10 @@ class UploadPartsTask extends RequestTask<List<Part>> with CacheMixin {
       partNumber: partNumber,
       partSize: partSize,
       key: resource.name,
-      controller: _controller,
+      controller: controller,
     );
 
-    _controller
+    controller
       // UploadPartTask 一次上传一个 chunk，通知一次进度
       ..addSendProgressListener((percent) {
         _sentPartCount++;
@@ -198,7 +200,7 @@ class UploadPartsTask extends RequestTask<List<Part>> with CacheMixin {
     _idleRequestNumber++;
     _uploadedPartMap[partNumber] =
         Part(partNumber: partNumber, etag: data.etag);
-    _workingUploadPartTaskControllers.remove(_controller);
+    _workingUploadPartTaskControllers.remove(controller);
 
     await storeUploadedPart();
 
@@ -214,8 +216,10 @@ class UploadPartsTask extends RequestTask<List<Part>> with CacheMixin {
   }
 
   void notifyProgress() {
-    controller?.notifyProgressListeners(_sentPartToServerCount /
-        _totalPartCount *
-        RequestTask.onSendProgressTakePercentOfTotal);
+    controller?.notifyProgressListeners(
+      _sentPartToServerCount /
+          _totalPartCount *
+          RequestTask.onSendProgressTakePercentOfTotal,
+    );
   }
 }
diff --git a/base/lib/src/storage/methods/put/put_options.dart b/base/lib/src/storage/methods/put/put_options.dart
index fd21b27c..3e616586 100644
--- a/base/lib/src/storage/methods/put/put_options.dart
+++ b/base/lib/src/storage/methods/put/put_options.dart
@@ -30,6 +30,8 @@ class PutOptions {
     this.maxPartsRequestNumber = 5,
     this.customVars,
     this.controller,
-  }) : assert(partSize >= 1 && partSize <= 1024,
-            'partSize must be greater than or equal to 1 and less than or equal to 1024');
+  }) : assert(
+          partSize >= 1 && partSize <= 1024,
+          'partSize must be greater than or equal to 1 and less than or equal to 1024',
+        );
 }
diff --git a/base/lib/src/storage/task/request_task.dart b/base/lib/src/storage/task/request_task.dart
index 26352b86..865b7765 100644
--- a/base/lib/src/storage/task/request_task.dart
+++ b/base/lib/src/storage/task/request_task.dart
@@ -53,15 +53,19 @@ abstract class RequestTask<T> extends Task<T> {
     controller?.notifyProgressListeners(preStartTakePercentOfTotal);
     retryLimit = config.retryLimit;
     client.httpClientAdapter = config.httpClientAdapter;
-    client.interceptors.add(InterceptorsWrapper(onRequest: (options, handler) {
-      controller?.notifyStatusListeners(StorageStatus.Request);
-      options
-        ..cancelToken = controller?.cancelToken
-        ..onSendProgress = (sent, total) => onSendProgress(sent / total);
-      options.headers['User-Agent'] = _getUserAgent();
-
-      handler.next(options);
-    }));
+    client.interceptors.add(
+      InterceptorsWrapper(
+        onRequest: (options, handler) {
+          controller?.notifyStatusListeners(StorageStatus.Request);
+          options
+            ..cancelToken = controller?.cancelToken
+            ..onSendProgress = (sent, total) => onSendProgress(sent / total);
+          options.headers['User-Agent'] = _getUserAgent();
+
+          handler.next(options);
+        },
+      ),
+    );
 
     super.preStart();
   }
diff --git a/base/lib/src/storage/task/request_task_controller.dart b/base/lib/src/storage/task/request_task_controller.dart
index d908a463..035ae5f0 100644
--- a/base/lib/src/storage/task/request_task_controller.dart
+++ b/base/lib/src/storage/task/request_task_controller.dart
@@ -29,7 +29,8 @@ mixin RequestTaskSendProgressListenersMixin {
   final List<RequestTaskSendProgressListener> _sendProgressListeners = [];
 
   void Function() addSendProgressListener(
-      RequestTaskSendProgressListener listener) {
+    RequestTaskSendProgressListener listener,
+  ) {
     _sendProgressListeners.add(listener);
     return () => removeSendProgressListener(listener);
   }
diff --git a/base/test/auth/auth_test.dart b/base/test/auth/auth_test.dart
index 1f718541..4baa3d1f 100644
--- a/base/test/auth/auth_test.dart
+++ b/base/test/auth/auth_test.dart
@@ -39,13 +39,13 @@ class AccessTokenTestData {
 
 void main() {
   group('Auth', () {
-    var auth = Auth(
+    final auth = Auth(
       accessKey: 'iN7NgwM31j4-BZacMjPrOQBs34UG1maYCAQmhdCV',
       secretKey: '6QTOr2Jg1gcZEWDQXKOGZh5PziC2MCV5KsntT70j',
     );
 
     test('GenerateUploadToken and parseToken should all well', () {
-      var testDataTable = <UploadTokenTestData>[
+      final testDataTable = <UploadTokenTestData>[
         UploadTokenTestData(
           PutPolicy(
             scope: 'testBucket',
@@ -70,10 +70,11 @@ void main() {
         ),
         UploadTokenTestData(
           PutPolicy(
-              scope: 'testBucket',
-              deadline: 1600000000,
-              returnBody: '{"key": \$(key)}',
-              callbackUrl: 'http://test.qiniu.com'),
+            scope: 'testBucket',
+            deadline: 1600000000,
+            returnBody: '{"key": \$(key)}',
+            callbackUrl: 'http://test.qiniu.com',
+          ),
           'iN7NgwM31j4-BZacMjPrOQBs34UG1maYCAQmhdCV:noK7jkMNZbw-padaaHy71buHpy8=:eyJzY29wZSI6InRlc3RCdWNrZXQiLCJkZWFkbGluZSI6MTYwMDAwMDAwMCwicmV0dXJuQm9keSI6IntcImtleVwiOiAkKGtleSl9IiwiY2FsbGJhY2tVcmwiOiJodHRwOi8vdGVzdC5xaW5pdS5jb20ifQ==',
         ),
         UploadTokenTestData(
@@ -86,10 +87,10 @@ void main() {
       ];
 
       for (final testData in testDataTable) {
-        var token = auth.generateUploadToken(putPolicy: testData.putPolicy);
+        final token = auth.generateUploadToken(putPolicy: testData.putPolicy);
         expect(token, equals(testData.expectedToken));
 
-        var tokenInfo = Auth.parseToken(token);
+        final tokenInfo = Auth.parseToken(token);
         expect(tokenInfo.accessKey, equals(auth.accessKey));
 
         expect(
@@ -100,7 +101,7 @@ void main() {
     });
 
     test('GenerateDownloadToken and parseToken should all well', () {
-      var testDataTable = <DownloadTokenTestData>[
+      final testDataTable = <DownloadTokenTestData>[
         DownloadTokenTestData(
           'testFileName',
           1600000000,
@@ -128,21 +129,21 @@ void main() {
       ];
 
       for (final testData in testDataTable) {
-        var token = auth.generateDownloadToken(
+        final token = auth.generateDownloadToken(
           key: testData.key,
           deadline: testData.deadline,
           bucketDomain: testData.bucketDomain,
         );
 
         expect(token, equals(testData.expectedToken));
-        var tokenInfo = Auth.parseToken(token);
+        final tokenInfo = Auth.parseToken(token);
         expect(tokenInfo.accessKey, equals(auth.accessKey));
         expect(tokenInfo.putPolicy, equals(null));
       }
     });
 
     test('GenerateAccessToken and parseToken should all well', () {
-      var testDataTable = <AccessTokenTestData>[
+      final testDataTable = <AccessTokenTestData>[
         AccessTokenTestData(
           utf8.encode('POST /move/test\nHost: rs.qiniu.com\n\n'),
           'iN7NgwM31j4-BZacMjPrOQBs34UG1maYCAQmhdCV:-m6mplPX8YzlVQ-NE08BqHvFC-Y=',
@@ -154,9 +155,9 @@ void main() {
       ];
 
       for (final testData in testDataTable) {
-        var token = auth.generateAccessToken(bytes: testData.bytes);
+        final token = auth.generateAccessToken(bytes: testData.bytes);
         expect(token, equals(testData.expectedToken));
-        var tokenInfo = Auth.parseToken(token);
+        final tokenInfo = Auth.parseToken(token);
         expect(tokenInfo.accessKey, equals(auth.accessKey));
         expect(tokenInfo.putPolicy, equals(null));
       }
diff --git a/base/test/config.dart b/base/test/config.dart
index cd3e4f9a..d5aec3ac 100644
--- a/base/test/config.dart
+++ b/base/test/config.dart
@@ -18,16 +18,17 @@ final isSensitiveDataDefined = env.isEveryDefined([
 void configEnv() {
   setUpAll(() {
     if (isSensitiveDataDefined) {
-      var auth = Auth(
+      final auth = Auth(
         accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
         secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
       );
 
       token = auth.generateUploadToken(
         putPolicy: PutPolicy(
-            insertOnly: 0,
-            scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
-            deadline: DateTime.now().millisecondsSinceEpoch + 3600),
+          insertOnly: 0,
+          scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
+          deadline: DateTime.now().millisecondsSinceEpoch + 3600,
+        ),
       );
     } else {
       stderr.writeln('没有在 .env 文件里配置测试用的必要信息，一些测试用例会被跳过');
diff --git a/base/test/config_test.dart b/base/test/config_test.dart
index afe54bc0..eaa0c663 100644
--- a/base/test/config_test.dart
+++ b/base/test/config_test.dart
@@ -1,5 +1,3 @@
-// ignore: import_of_legacy_library_into_null_safe
-import 'package:dotenv/dotenv.dart';
 import 'package:qiniu_sdk_base/qiniu_sdk_base.dart';
 import 'package:test/test.dart';
 
@@ -7,19 +5,23 @@ import 'config.dart';
 
 void main() {
   configEnv();
-  test('RegionProvider should works well.', () async {
-    final hostProvider = DefaultHostProvider();
-    final tokenInfo = Auth.parseUpToken(token);
-    final putPolicy = tokenInfo.putPolicy;
-
-    final hostInToken = await hostProvider.getUpHost(
-      accessKey: tokenInfo.accessKey,
-      bucket: putPolicy.getBucket(),
-    );
-
-    // 根据传入的 token 的 bucket 对应的区域，需要对应的修改这里
-    expect(hostInToken, 'https://upload-na0.qiniup.com');
-  }, skip: !isSensitiveDataDefined);
+  test(
+    'RegionProvider should works well.',
+    () async {
+      final hostProvider = DefaultHostProvider();
+      final tokenInfo = Auth.parseUpToken(token);
+      final putPolicy = tokenInfo.putPolicy;
+
+      final hostInToken = await hostProvider.getUpHost(
+        accessKey: tokenInfo.accessKey,
+        bucket: putPolicy.getBucket(),
+      );
+
+      // 根据传入的 token 的 bucket 对应的区域，需要对应的修改这里
+      expect(hostInToken, 'https://upload-na0.qiniup.com');
+    },
+    skip: !isSensitiveDataDefined,
+  );
 
   test('DefaultCacheProvider should works well.', () async {
     final cacheProvider = DefaultCacheProvider();
@@ -35,20 +37,23 @@ void main() {
     expect(cacheProvider.value.length, 0);
   });
 
-  test('freeze mechanism should works well with DefaultHostProvider.',
-      () async {
-    final config = Config();
-    final hostA = await config.hostProvider.getUpHost(
-      accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
-      bucket: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
-    );
-    config.hostProvider.freezeHost(hostA);
-    final hostB = await config.hostProvider.getUpHost(
-      accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
-      bucket: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
-    );
-
-    // getUpHost 会返回至少2个host，不用担心会少于两个
-    expect(hostA == hostB, false);
-  }, skip: !isSensitiveDataDefined);
+  test(
+    'freeze mechanism should works well with DefaultHostProvider.',
+    () async {
+      final config = Config();
+      final hostA = await config.hostProvider.getUpHost(
+        accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
+        bucket: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
+      );
+      config.hostProvider.freezeHost(hostA);
+      final hostB = await config.hostProvider.getUpHost(
+        accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
+        bucket: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
+      );
+
+      // getUpHost 会返回至少2个host，不用担心会少于两个
+      expect(hostA == hostB, false);
+    },
+    skip: !isSensitiveDataDefined,
+  );
 }
diff --git a/base/test/put/helpers.dart b/base/test/put/helpers.dart
index 79a43a8d..76a533fa 100644
--- a/base/test/put/helpers.dart
+++ b/base/test/put/helpers.dart
@@ -67,8 +67,11 @@ class HttpAdapterTestWith612 implements HttpClientAdapter {
   }
 
   @override
-  Future<ResponseBody> fetch(RequestOptions options,
-      Stream<Uint8List>? requestStream, Future? cancelFuture) async {
+  Future<ResponseBody> fetch(
+    RequestOptions options,
+    Stream<Uint8List>? requestStream,
+    Future? cancelFuture,
+  ) async {
     /// 如果是 CompletePartsTask 发出去的请求，则返回 612
     if (options.path.contains('uploads/') &&
         options.method == 'POST' &&
diff --git a/base/test/put/put_by_parts/put_bytes_test.dart b/base/test/put/put_by_parts/put_bytes_test.dart
index 4095cbcd..fb696ba1 100644
--- a/base/test/put/put_by_parts/put_bytes_test.dart
+++ b/base/test/put/put_by_parts/put_bytes_test.dart
@@ -12,119 +12,122 @@ void main() {
 
   final bytes = fileForPart.readAsBytesSync();
 
-  test('customVars&returnBody customVars should works well.', () async {
-    final storage = Storage();
-
-    final auth = Auth(
-      accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
-      secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
-    );
-
-    final token = auth.generateUploadToken(
-      putPolicy: PutPolicy(
-        insertOnly: 0,
-        scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
-        returnBody: '{"key":"\$(key)","type":"\$(x:type)","ext":"\$(x:ext)"}',
-        deadline: DateTime.now().millisecondsSinceEpoch + 3600,
-      ),
-    );
-
-    var customVars = <String, String>{
-      'x:type': 'testXType',
-      'x:ext': 'testXExt',
-    };
-
-    var putController = PutController();
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        key: fileKeyForPart,
-        partSize: 1,
-        customVars: customVars,
-        controller: putController,
-      ),
-    );
-
-    expect(response.key, fileKeyForPart);
-    expect(response.rawData['type'], 'testXType');
-    expect(response.rawData['ext'], 'testXExt');
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes should works well.', () async {
-    final storage = Storage();
-    final pcb = PutControllerBuilder();
-    var callnumber = 0;
-    pcb.putController.addSendProgressListener((percent) {
-      callnumber++;
-    });
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        key: fileKeyForPart,
-        partSize: 1,
-        controller: pcb.putController,
-      ),
-    );
-    expect(response, isA<PutResponse>());
-    // 2 片分片所以 2 次
-    expect(callnumber, 2);
-
-    pcb.testAll();
-
-    // 不设置参数的情况
-    final responseNoOps = await storage.putBytes(
-      bytes,
-      token,
-    );
-
-    expect(responseNoOps, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes should throw error with incorrect partSize.', () async {
-    final storage = Storage();
-    try {
-      await storage.putBytes(
+  test(
+    'customVars&returnBody customVars should works well.',
+    () async {
+      final storage = Storage();
+
+      final auth = Auth(
+        accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
+        secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
+      );
+
+      final token = auth.generateUploadToken(
+        putPolicy: PutPolicy(
+          insertOnly: 0,
+          scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
+          returnBody: '{"key":"\$(key)","type":"\$(x:type)","ext":"\$(x:ext)"}',
+          deadline: DateTime.now().millisecondsSinceEpoch + 3600,
+        ),
+      );
+
+      final customVars = <String, String>{
+        'x:type': 'testXType',
+        'x:ext': 'testXExt',
+      };
+
+      final putController = PutController();
+      final response = await storage.putBytes(
         bytes,
         token,
-        options: PutOptions(partSize: 0),
+        options: PutOptions(
+          key: fileKeyForPart,
+          partSize: 1,
+          customVars: customVars,
+          controller: putController,
+        ),
       );
-    } catch (e) {
-      expect(e, isA<AssertionError>());
-    }
 
-    try {
-      await storage.putBytes(
+      expect(response.key, fileKeyForPart);
+      expect(response.rawData['type'], 'testXType');
+      expect(response.rawData['ext'], 'testXExt');
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes should works well.',
+    () async {
+      final storage = Storage();
+      final pcb = PutControllerBuilder();
+      var callnumber = 0;
+      pcb.putController.addSendProgressListener((percent) {
+        callnumber++;
+      });
+      final response = await storage.putBytes(
         bytes,
         token,
-        options: PutOptions(partSize: 1025),
+        options: PutOptions(
+          key: fileKeyForPart,
+          partSize: 1,
+          controller: pcb.putController,
+        ),
       );
-    } catch (e) {
-      expect(e, isA<AssertionError>());
-    }
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes should throw error if there is a same task is working.',
-      () async {
-    final storage = Storage();
-    final key = fileKeyForPart;
-
-    var errorOccurred = false;
-
-    // 故意不 await，让后面发送一个相同的任务
-    // ignore: unawaited_futures
-    storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        key: key,
-        partSize: 1,
-      ),
-    );
+      expect(response, isA<PutResponse>());
+      // 2 片分片所以 2 次
+      expect(callnumber, 2);
+
+      pcb.testAll();
+
+      // 不设置参数的情况
+      final responseNoOps = await storage.putBytes(
+        bytes,
+        token,
+      );
+
+      expect(responseNoOps, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes should throw error with incorrect partSize.',
+    () async {
+      final storage = Storage();
+      try {
+        await storage.putBytes(
+          bytes,
+          token,
+          options: PutOptions(partSize: 0),
+        );
+      } catch (e) {
+        expect(e, isA<AssertionError>());
+      }
 
-    try {
-      await storage.putBytes(
+      try {
+        await storage.putBytes(
+          bytes,
+          token,
+          options: PutOptions(partSize: 1025),
+        );
+      } catch (e) {
+        expect(e, isA<AssertionError>());
+      }
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes should throw error if there is a same task is working.',
+    () async {
+      final storage = Storage();
+      final key = fileKeyForPart;
+
+      var errorOccurred = false;
+
+      // 故意不 await，让后面发送一个相同的任务
+      // ignore: unawaited_futures
+      storage.putBytes(
         bytes,
         token,
         options: PutOptions(
@@ -132,64 +135,58 @@ void main() {
           partSize: 1,
         ),
       );
-    } catch (e) {
-      errorOccurred = true;
-      expect(e, isA<StorageError>());
-      expect((e as StorageError).type, StorageErrorType.IN_PROGRESS);
-    }
-    expect(errorOccurred, true);
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes should works well while response 612.', () async {
-    final httpAdapterTest = HttpAdapterTestWith612();
-    final storage = Storage(config: Config(httpClientAdapter: httpAdapterTest));
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(key: fileKeyForPart, partSize: 1),
-    );
-
-    /// httpAdapterTest 应该会触发一次 612 response
-    expect(httpAdapterTest.completePartsTaskResponse612, true);
-    expect(response, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes can be cancelled.', () async {
-    final pcb = PutControllerBuilder();
-    final storage = Storage(config: Config(hostProvider: HostProviderTest()));
-    final key = fileKeyForPart;
-    pcb.putController.addSendProgressListener((percent) {
-      // 开始上传并且 InitPartsTask 设置完缓存后取消
-      if (percent > 0.1) {
-        pcb.putController.cancel();
+
+      try {
+        await storage.putBytes(
+          bytes,
+          token,
+          options: PutOptions(
+            key: key,
+            partSize: 1,
+          ),
+        );
+      } catch (e) {
+        errorOccurred = true;
+        expect(e, isA<StorageError>());
+        expect((e as StorageError).type, StorageErrorType.IN_PROGRESS);
       }
-    });
-    var future = storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        key: key,
-        partSize: 1,
-        controller: pcb.putController,
-      ),
-    );
-    try {
-      await future;
-    } catch (error) {
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-    expect(future, throwsA(TypeMatcher<StorageError>()));
-    pcb.testStatus(targetStatusList: [
-      StorageStatus.Init,
-      StorageStatus.Request,
-      StorageStatus.Cancel
-    ], targetProgressList: [
-      0.001,
-      0.002,
-    ]);
-
-    try {
-      await storage.putBytes(
+      expect(errorOccurred, true);
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes should works well while response 612.',
+    () async {
+      final httpAdapterTest = HttpAdapterTestWith612();
+      final storage =
+          Storage(config: Config(httpClientAdapter: httpAdapterTest));
+      final response = await storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(key: fileKeyForPart, partSize: 1),
+      );
+
+      /// httpAdapterTest 应该会触发一次 612 response
+      expect(httpAdapterTest.completePartsTaskResponse612, true);
+      expect(response, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes can be cancelled.',
+    () async {
+      final pcb = PutControllerBuilder();
+      final storage = Storage(config: Config(hostProvider: HostProviderTest()));
+      final key = fileKeyForPart;
+      pcb.putController.addSendProgressListener((percent) {
+        // 开始上传并且 InitPartsTask 设置完缓存后取消
+        if (percent > 0.1) {
+          pcb.putController.cancel();
+        }
+      });
+      final future = storage.putBytes(
         bytes,
         token,
         options: PutOptions(
@@ -198,148 +195,190 @@ void main() {
           controller: pcb.putController,
         ),
       );
-    } catch (error) {
-      // 复用了相同的 controller，所以也会触发取消的错误
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-
-    expect(future, throwsA(isA<StorageError>()));
-
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(key: key, partSize: 1),
-    );
-    expect(response, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes can be resumed.', () async {
-    final storage = Storage(config: Config(hostProvider: HostProviderTest()));
-    final putController = PutController();
-    putController.addSendProgressListener((percent) {
-      // 开始上传了取消
-      if (percent > 0.1) {
-        putController.cancel();
+      try {
+        await future;
+      } catch (error) {
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
       }
-    });
-
-    final future = storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        key: fileKeyForPart,
-        partSize: 1,
-        controller: putController,
-      ),
-    );
-
-    try {
-      await future;
-    } catch (error) {
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-
-    expect(future, throwsA(TypeMatcher<StorageError>()));
-
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(key: fileKeyForPart, partSize: 1),
-    );
-
-    expect(response, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes should works well with cacheProvider.', () async {
-    final cacheProvider = CacheProviderForTest();
-    final config = Config(cacheProvider: cacheProvider);
-    final storage = Storage(config: config);
-    final key = fileKeyForPart;
-    final resource = BytesResource(bytes: bytes, length: bytes.length);
-
-    /// 手动初始化一个初始化文件的任务，确定分片上传的第一步会被缓存
-    final task = InitPartsTask(
-      token: token,
-      resource: resource,
-      key: key,
-    );
-
-    storage.taskManager.addTask(task);
-
-    await task.future;
-
-    final putController = PutController();
-
-    putController.addSendProgressListener((percent) {
-      // 因为一共 2 个分片，取 0.5 一个完成后就取消
-      if (percent > 0.5) {
-        putController.cancel();
+      expect(future, throwsA(TypeMatcher<StorageError>()));
+      pcb.testStatus(
+        targetStatusList: [
+          StorageStatus.Init,
+          StorageStatus.Request,
+          StorageStatus.Cancel
+        ],
+        targetProgressList: [
+          0.001,
+          0.002,
+        ],
+      );
+
+      try {
+        await storage.putBytes(
+          bytes,
+          token,
+          options: PutOptions(
+            key: key,
+            partSize: 1,
+            controller: pcb.putController,
+          ),
+        );
+      } catch (error) {
+        // 复用了相同的 controller，所以也会触发取消的错误
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
       }
-    });
-
-    final future = storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(key: key, partSize: 1, controller: putController),
-    );
-
-    /// 这个时候应该只缓存了初始化的缓存信息
-    expect(cacheProvider.value.length, 1);
-
-    /// 初始化的缓存 key 生成逻辑
-    final cacheKey = InitPartsTask.getCacheKey(
-      resource.id,
-      key,
-    );
-
-    expect(await cacheProvider.getItem(cacheKey), isA<String>());
-    await cacheProvider.clear();
-
-    try {
-      await future;
-    } catch (error) {
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-      // 每个分片完成后会保存一次
-      // init 一次，仅有的一个分片完成后一次共 2 次
-      expect(cacheProvider.callNumber, 2);
-    }
-
-    await cacheProvider.clear();
-    cacheProvider.callNumber = 0;
-
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(key: key, partSize: 1),
-    );
-
-    expect(response, isA<PutResponse>());
-
-    /// 上传完成后缓存应该被清理
-    expect(cacheProvider.value.length, 0);
-    // init + 2 个分片 2 次 = 3 次
-    expect(cacheProvider.callNumber, 3);
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes\'s status and progress should works well.', () async {
-    final storage = Storage();
-    final pcb = PutControllerBuilder();
-
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        key: fileKeyForPart,
-        partSize: 1,
-        controller: pcb.putController,
-      ),
-    );
-    expect(response, isA<PutResponse>());
-    pcb
-      ..testProcess()
-      ..testStatus(targetProgressList: [0.001, 0.002, 0.99, 1]);
-  }, skip: !isSensitiveDataDefined);
+
+      expect(future, throwsA(isA<StorageError>()));
+
+      final response = await storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(key: key, partSize: 1),
+      );
+      expect(response, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes can be resumed.',
+    () async {
+      final storage = Storage(config: Config(hostProvider: HostProviderTest()));
+      final putController = PutController();
+      putController.addSendProgressListener((percent) {
+        // 开始上传了取消
+        if (percent > 0.1) {
+          putController.cancel();
+        }
+      });
+
+      final future = storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(
+          key: fileKeyForPart,
+          partSize: 1,
+          controller: putController,
+        ),
+      );
+
+      try {
+        await future;
+      } catch (error) {
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
+      }
+
+      expect(future, throwsA(TypeMatcher<StorageError>()));
+
+      final response = await storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(key: fileKeyForPart, partSize: 1),
+      );
+
+      expect(response, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes should works well with cacheProvider.',
+    () async {
+      final cacheProvider = CacheProviderForTest();
+      final config = Config(cacheProvider: cacheProvider);
+      final storage = Storage(config: config);
+      final key = fileKeyForPart;
+      final resource = BytesResource(bytes: bytes, length: bytes.length);
+
+      /// 手动初始化一个初始化文件的任务，确定分片上传的第一步会被缓存
+      final task = InitPartsTask(
+        token: token,
+        resource: resource,
+        key: key,
+      );
+
+      storage.taskManager.addTask(task);
+
+      await task.future;
+
+      final putController = PutController();
+
+      putController.addSendProgressListener((percent) {
+        // 因为一共 2 个分片，取 0.5 一个完成后就取消
+        if (percent > 0.5) {
+          putController.cancel();
+        }
+      });
+
+      final future = storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(key: key, partSize: 1, controller: putController),
+      );
+
+      /// 这个时候应该只缓存了初始化的缓存信息
+      expect(cacheProvider.value.length, 1);
+
+      /// 初始化的缓存 key 生成逻辑
+      final cacheKey = InitPartsTask.getCacheKey(
+        resource.id,
+        key,
+      );
+
+      expect(await cacheProvider.getItem(cacheKey), isA<String>());
+      await cacheProvider.clear();
+
+      try {
+        await future;
+      } catch (error) {
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
+        // 每个分片完成后会保存一次
+        // init 一次，仅有的一个分片完成后一次共 2 次
+        expect(cacheProvider.callNumber, 2);
+      }
+
+      await cacheProvider.clear();
+      cacheProvider.callNumber = 0;
+
+      final response = await storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(key: key, partSize: 1),
+      );
+
+      expect(response, isA<PutResponse>());
+
+      /// 上传完成后缓存应该被清理
+      expect(cacheProvider.value.length, 0);
+      // init + 2 个分片 2 次 = 3 次
+      expect(cacheProvider.callNumber, 3);
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes\'s status and progress should works well.',
+    () async {
+      final storage = Storage();
+      final pcb = PutControllerBuilder();
+
+      final response = await storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(
+          key: fileKeyForPart,
+          partSize: 1,
+          controller: pcb.putController,
+        ),
+      );
+      expect(response, isA<PutResponse>());
+      pcb
+        ..testProcess()
+        ..testStatus(targetProgressList: [0.001, 0.002, 0.99, 1]);
+    },
+    skip: !isSensitiveDataDefined,
+  );
 }
diff --git a/base/test/put/put_by_parts/put_file_test.dart b/base/test/put/put_by_parts/put_file_test.dart
index 6aca09de..60cbf2f6 100644
--- a/base/test/put/put_by_parts/put_file_test.dart
+++ b/base/test/put/put_by_parts/put_file_test.dart
@@ -10,149 +10,143 @@ import '../helpers.dart';
 void main() {
   configEnv();
 
-  test('customVars&returnBody should works well.', () async {
-    final storage = Storage();
-
-    final auth = Auth(
-      accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
-      secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
-    );
-
-    final token = auth.generateUploadToken(
-      putPolicy: PutPolicy(
-        insertOnly: 0,
-        scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
-        returnBody: '{"key":"\$(key)","type":"\$(x:type)","ext":"\$(x:ext)"}',
-        deadline: DateTime.now().millisecondsSinceEpoch + 3600,
-      ),
-    );
-
-    var customVars = <String, String>{
-      'x:type': 'testXType',
-      'x:ext': 'testXExt',
-    };
-
-    var putController = PutController();
-    final response = await storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(
-        key: fileKeyForPart,
-        partSize: 1,
-        customVars: customVars,
-        controller: putController,
-      ),
-    );
-
-    expect(response.key, fileKeyForPart);
-    expect(response.rawData['type'], 'testXType');
-    expect(response.rawData['ext'], 'testXExt');
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile should works well.', () async {
-    final storage = Storage();
-    final pcb = PutControllerBuilder();
-    var callnumber = 0;
-    pcb.putController.addSendProgressListener((percent) {
-      callnumber++;
-    });
-    final response = await storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(
-        key: fileKeyForPart,
-        partSize: 1,
-        controller: pcb.putController,
-      ),
-    );
-    expect(response, isA<PutResponse>());
-    // 2 片分片所以 2 次
-    expect(callnumber, 2);
-
-    pcb.testAll();
-
-    // 不设置参数的情况
-    final responseNoOps = await storage.putFile(
-      fileForPart,
-      token,
-    );
-
-    expect(responseNoOps, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile should throw error with incorrect partSize.', () async {
-    final storage = Storage();
-    try {
-      await storage.putFile(
+  test(
+    'customVars&returnBody should works well.',
+    () async {
+      final storage = Storage();
+
+      final auth = Auth(
+        accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
+        secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
+      );
+
+      final token = auth.generateUploadToken(
+        putPolicy: PutPolicy(
+          insertOnly: 0,
+          scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
+          returnBody: '{"key":"\$(key)","type":"\$(x:type)","ext":"\$(x:ext)"}',
+          deadline: DateTime.now().millisecondsSinceEpoch + 3600,
+        ),
+      );
+
+      final customVars = <String, String>{
+        'x:type': 'testXType',
+        'x:ext': 'testXExt',
+      };
+
+      final putController = PutController();
+      final response = await storage.putFile(
+        fileForPart,
+        token,
+        options: PutOptions(
+          key: fileKeyForPart,
+          partSize: 1,
+          customVars: customVars,
+          controller: putController,
+        ),
+      );
+
+      expect(response.key, fileKeyForPart);
+      expect(response.rawData['type'], 'testXType');
+      expect(response.rawData['ext'], 'testXExt');
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile should works well.',
+    () async {
+      final storage = Storage();
+      final pcb = PutControllerBuilder();
+      var callnumber = 0;
+      pcb.putController.addSendProgressListener((percent) {
+        callnumber++;
+      });
+      final response = await storage.putFile(
         fileForPart,
         token,
-        options: PutOptions(partSize: 0),
+        options: PutOptions(
+          key: fileKeyForPart,
+          partSize: 1,
+          controller: pcb.putController,
+        ),
       );
-    } catch (e) {
-      expect(e, isA<AssertionError>());
-    }
+      expect(response, isA<PutResponse>());
+      // 2 片分片所以 2 次
+      expect(callnumber, 2);
+
+      pcb.testAll();
 
-    try {
-      await storage.putFile(
+      // 不设置参数的情况
+      final responseNoOps = await storage.putFile(
         fileForPart,
         token,
-        options: PutOptions(partSize: 1025),
       );
-    } catch (e) {
-      expect(e, isA<AssertionError>());
-    }
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile should works well while response 612.', () async {
-    final httpAdapterTest = HttpAdapterTestWith612();
-    final storage = Storage(config: Config(httpClientAdapter: httpAdapterTest));
-    final response = await storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(key: fileKeyForPart, partSize: 1),
-    );
-
-    /// httpAdapterTest 应该会触发一次 612 response
-    expect(httpAdapterTest.completePartsTaskResponse612, true);
-    expect(response, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile can be cancelled.', () async {
-    final pcb = PutControllerBuilder();
-    final storage = Storage(config: Config(hostProvider: HostProviderTest()));
-    final key = fileKeyForPart;
-    pcb.putController.addSendProgressListener((percent) {
-      // 开始上传并且 InitPartsTask 设置完缓存后取消
-      if (percent > 0.1) {
-        pcb.putController.cancel();
+
+      expect(responseNoOps, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile should throw error with incorrect partSize.',
+    () async {
+      final storage = Storage();
+      try {
+        await storage.putFile(
+          fileForPart,
+          token,
+          options: PutOptions(partSize: 0),
+        );
+      } catch (e) {
+        expect(e, isA<AssertionError>());
       }
-    });
-    var future = storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(
-        key: key,
-        partSize: 1,
-        controller: pcb.putController,
-      ),
-    );
-    try {
-      await future;
-    } catch (error) {
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-    expect(future, throwsA(TypeMatcher<StorageError>()));
-    pcb.testStatus(targetStatusList: [
-      StorageStatus.Init,
-      StorageStatus.Request,
-      StorageStatus.Cancel
-    ], targetProgressList: [
-      0.001,
-      0.002,
-    ]);
-
-    try {
-      await storage.putFile(
+
+      try {
+        await storage.putFile(
+          fileForPart,
+          token,
+          options: PutOptions(partSize: 1025),
+        );
+      } catch (e) {
+        expect(e, isA<AssertionError>());
+      }
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile should works well while response 612.',
+    () async {
+      final httpAdapterTest = HttpAdapterTestWith612();
+      final storage =
+          Storage(config: Config(httpClientAdapter: httpAdapterTest));
+      final response = await storage.putFile(
+        fileForPart,
+        token,
+        options: PutOptions(key: fileKeyForPart, partSize: 1),
+      );
+
+      /// httpAdapterTest 应该会触发一次 612 response
+      expect(httpAdapterTest.completePartsTaskResponse612, true);
+      expect(response, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile can be cancelled.',
+    () async {
+      final pcb = PutControllerBuilder();
+      final storage = Storage(config: Config(hostProvider: HostProviderTest()));
+      final key = fileKeyForPart;
+      pcb.putController.addSendProgressListener((percent) {
+        // 开始上传并且 InitPartsTask 设置完缓存后取消
+        if (percent > 0.1) {
+          pcb.putController.cancel();
+        }
+      });
+      final future = storage.putFile(
         fileForPart,
         token,
         options: PutOptions(
@@ -161,153 +155,182 @@ void main() {
           controller: pcb.putController,
         ),
       );
-    } catch (error) {
-      // 复用了相同的 controller，所以也会触发取消的错误
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-
-    expect(future, throwsA(isA<StorageError>()));
-
-    final response = await storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(key: key, partSize: 1),
-    );
-    expect(response, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile can be resumed.', () async {
-    final storage = Storage(config: Config(hostProvider: HostProviderTest()));
-    final putController = PutController();
-    putController.addSendProgressListener((percent) {
-      // 开始上传了取消
-      if (percent > 0.1) {
-        putController.cancel();
+      try {
+        await future;
+      } catch (error) {
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
       }
-    });
-
-    final future = storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(
-        key: fileKeyForPart,
-        partSize: 1,
-        controller: putController,
-      ),
-    );
-
-    try {
-      await future;
-    } catch (error) {
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-
-    expect(future, throwsA(TypeMatcher<StorageError>()));
-
-    final response = await storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(key: fileKeyForPart, partSize: 1),
-    );
-
-    expect(response, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile should works well with cacheProvider.', () async {
-    final cacheProvider = CacheProviderForTest();
-    final config = Config(cacheProvider: cacheProvider);
-    final storage = Storage(config: config);
-    final key = fileKeyForPart;
-    final resource =
-        FileResource(file: fileForPart, length: fileForPart.lengthSync());
-
-    /// 手动初始化一个初始化文件的任务，确定分片上传的第一步会被缓存
-    final task = InitPartsTask(
-      token: token,
-      resource: resource,
-      key: key,
-    );
-
-    storage.taskManager.addTask(task);
-
-    await task.future;
-
-    final putController = PutController();
-
-    putController.addSendProgressListener((percent) {
-      // 因为一共 2 个分片，取 0.5 一个完成后就取消
-      if (percent > 0.5) {
-        putController.cancel();
+      expect(future, throwsA(TypeMatcher<StorageError>()));
+      pcb.testStatus(
+        targetStatusList: [
+          StorageStatus.Init,
+          StorageStatus.Request,
+          StorageStatus.Cancel
+        ],
+        targetProgressList: [
+          0.001,
+          0.002,
+        ],
+      );
+
+      try {
+        await storage.putFile(
+          fileForPart,
+          token,
+          options: PutOptions(
+            key: key,
+            partSize: 1,
+            controller: pcb.putController,
+          ),
+        );
+      } catch (error) {
+        // 复用了相同的 controller，所以也会触发取消的错误
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
       }
-    });
-
-    final future = storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(key: key, partSize: 1, controller: putController),
-    );
-
-    /// 这个时候应该只缓存了初始化的缓存信息
-    expect(cacheProvider.value.length, 1);
-
-    /// 初始化的缓存 key 生成逻辑
-    final cacheKey = InitPartsTask.getCacheKey(
-      resource.id,
-      key,
-    );
-
-    expect(await cacheProvider.getItem(cacheKey), isA<String>());
-    await cacheProvider.clear();
-
-    try {
-      await future;
-    } catch (error) {
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-      // 每个分片完成后会保存一次
-      // init 一次，仅有的一个分片完成后一次共 2 次
-      expect(cacheProvider.callNumber, 2);
-    }
-
-    await cacheProvider.clear();
-    cacheProvider.callNumber = 0;
-
-    final response = await storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(key: key, partSize: 1),
-    );
-
-    expect(response, isA<PutResponse>());
-
-    /// 上传完成后缓存应该被清理
-    expect(cacheProvider.value.length, 0);
-    // init + 2 个分片 2 次 = 3 次
-    expect(cacheProvider.callNumber, 3);
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile should throw error if there is a same task is working.',
-      () async {
-    final storage = Storage();
-    final key = fileKeyForPart;
-
-    var errorOccurred = false;
-
-    // 故意不 await，让后面发送一个相同的任务
-    // ignore: unawaited_futures
-    storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(
+
+      expect(future, throwsA(isA<StorageError>()));
+
+      final response = await storage.putFile(
+        fileForPart,
+        token,
+        options: PutOptions(key: key, partSize: 1),
+      );
+      expect(response, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile can be resumed.',
+    () async {
+      final storage = Storage(config: Config(hostProvider: HostProviderTest()));
+      final putController = PutController();
+      putController.addSendProgressListener((percent) {
+        // 开始上传了取消
+        if (percent > 0.1) {
+          putController.cancel();
+        }
+      });
+
+      final future = storage.putFile(
+        fileForPart,
+        token,
+        options: PutOptions(
+          key: fileKeyForPart,
+          partSize: 1,
+          controller: putController,
+        ),
+      );
+
+      try {
+        await future;
+      } catch (error) {
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
+      }
+
+      expect(future, throwsA(TypeMatcher<StorageError>()));
+
+      final response = await storage.putFile(
+        fileForPart,
+        token,
+        options: PutOptions(key: fileKeyForPart, partSize: 1),
+      );
+
+      expect(response, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile should works well with cacheProvider.',
+    () async {
+      final cacheProvider = CacheProviderForTest();
+      final config = Config(cacheProvider: cacheProvider);
+      final storage = Storage(config: config);
+      final key = fileKeyForPart;
+      final resource =
+          FileResource(file: fileForPart, length: fileForPart.lengthSync());
+
+      /// 手动初始化一个初始化文件的任务，确定分片上传的第一步会被缓存
+      final task = InitPartsTask(
+        token: token,
+        resource: resource,
         key: key,
-        partSize: 1,
-      ),
-    );
+      );
+
+      storage.taskManager.addTask(task);
+
+      await task.future;
 
-    try {
-      await storage.putFile(
+      final putController = PutController();
+
+      putController.addSendProgressListener((percent) {
+        // 因为一共 2 个分片，取 0.5 一个完成后就取消
+        if (percent > 0.5) {
+          putController.cancel();
+        }
+      });
+
+      final future = storage.putFile(
+        fileForPart,
+        token,
+        options: PutOptions(key: key, partSize: 1, controller: putController),
+      );
+
+      /// 这个时候应该只缓存了初始化的缓存信息
+      expect(cacheProvider.value.length, 1);
+
+      /// 初始化的缓存 key 生成逻辑
+      final cacheKey = InitPartsTask.getCacheKey(
+        resource.id,
+        key,
+      );
+
+      expect(await cacheProvider.getItem(cacheKey), isA<String>());
+      await cacheProvider.clear();
+
+      try {
+        await future;
+      } catch (error) {
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
+        // 每个分片完成后会保存一次
+        // init 一次，仅有的一个分片完成后一次共 2 次
+        expect(cacheProvider.callNumber, 2);
+      }
+
+      await cacheProvider.clear();
+      cacheProvider.callNumber = 0;
+
+      final response = await storage.putFile(
+        fileForPart,
+        token,
+        options: PutOptions(key: key, partSize: 1),
+      );
+
+      expect(response, isA<PutResponse>());
+
+      /// 上传完成后缓存应该被清理
+      expect(cacheProvider.value.length, 0);
+      // init + 2 个分片 2 次 = 3 次
+      expect(cacheProvider.callNumber, 3);
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile should throw error if there is a same task is working.',
+    () async {
+      final storage = Storage();
+      final key = fileKeyForPart;
+
+      var errorOccurred = false;
+
+      // 故意不 await，让后面发送一个相同的任务
+      // ignore: unawaited_futures
+      storage.putFile(
         fileForPart,
         token,
         options: PutOptions(
@@ -315,30 +338,46 @@ void main() {
           partSize: 1,
         ),
       );
-    } catch (e) {
-      errorOccurred = true;
-      expect(e, isA<StorageError>());
-      expect((e as StorageError).type, StorageErrorType.IN_PROGRESS);
-    }
-    expect(errorOccurred, true);
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile\'s status and progress should works well.', () async {
-    final storage = Storage();
-    final pcb = PutControllerBuilder();
-
-    final response = await storage.putFile(
-      fileForPart,
-      token,
-      options: PutOptions(
-        key: fileKeyForPart,
-        partSize: 1,
-        controller: pcb.putController,
-      ),
-    );
-    expect(response, isA<PutResponse>());
-    pcb
-      ..testProcess()
-      ..testStatus(targetProgressList: [0.001, 0.002, 0.99, 1]);
-  }, skip: !isSensitiveDataDefined);
+
+      try {
+        await storage.putFile(
+          fileForPart,
+          token,
+          options: PutOptions(
+            key: key,
+            partSize: 1,
+          ),
+        );
+      } catch (e) {
+        errorOccurred = true;
+        expect(e, isA<StorageError>());
+        expect((e as StorageError).type, StorageErrorType.IN_PROGRESS);
+      }
+      expect(errorOccurred, true);
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile\'s status and progress should works well.',
+    () async {
+      final storage = Storage();
+      final pcb = PutControllerBuilder();
+
+      final response = await storage.putFile(
+        fileForPart,
+        token,
+        options: PutOptions(
+          key: fileKeyForPart,
+          partSize: 1,
+          controller: pcb.putController,
+        ),
+      );
+      expect(response, isA<PutResponse>());
+      pcb
+        ..testProcess()
+        ..testStatus(targetProgressList: [0.001, 0.002, 0.99, 1]);
+    },
+    skip: !isSensitiveDataDefined,
+  );
 }
diff --git a/base/test/put/put_by_single/put_bytes.dart b/base/test/put/put_by_single/put_bytes.dart
index 610ff25b..b589f17d 100644
--- a/base/test/put/put_by_single/put_bytes.dart
+++ b/base/test/put/put_by_single/put_bytes.dart
@@ -11,124 +11,146 @@ void main() {
   final storage = Storage();
   final bytes = fileForSingle.readAsBytesSync();
 
-  test('customVars&returnBody should works well.', () async {
-    final auth = Auth(
-      accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
-      secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
-    );
-
-    final token = auth.generateUploadToken(
-      putPolicy: PutPolicy(
-        insertOnly: 0,
-        scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
-        returnBody: '{"key":"\$(key)","type":"\$(x:type)","ext":"\$(x:ext)"}',
-        deadline: DateTime.now().millisecondsSinceEpoch + 3600,
-      ),
-    );
-
-    var customVars = <String, String>{
-      'x:type': 'testXType',
-      'x:ext': 'testXExt',
-    };
-
-    var putController = PutController();
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        forceBySingle: true,
-        key: fileKeyForSingle,
-        customVars: customVars,
-        controller: putController,
-      ),
-    );
-
-    expect(response.key, fileKeyForSingle);
-    expect(response.rawData['type'], 'testXType');
-    expect(response.rawData['ext'], 'testXExt');
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes should works well.', () async {
-    var pcb = PutControllerBuilder();
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        forceBySingle: true,
-        key: fileKeyForSingle,
-        controller: pcb.putController,
-      ),
-    );
-
-    pcb.testAll();
-    expect(response.key, fileKeyForSingle);
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes can be cancelled.', () async {
-    final putController = PutController();
-    final key = fileKeyForSingle;
-
-    final statusList = <StorageStatus>[];
-    putController.addStatusListener((status) {
-      statusList.add(status);
-      if (status == StorageStatus.Request) {
-        putController.cancel();
+  test(
+    'customVars&returnBody should works well.',
+    () async {
+      final auth = Auth(
+        accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
+        secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
+      );
+
+      final token = auth.generateUploadToken(
+        putPolicy: PutPolicy(
+          insertOnly: 0,
+          scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
+          returnBody: '{"key":"\$(key)","type":"\$(x:type)","ext":"\$(x:ext)"}',
+          deadline: DateTime.now().millisecondsSinceEpoch + 3600,
+        ),
+      );
+
+      final customVars = <String, String>{
+        'x:type': 'testXType',
+        'x:ext': 'testXExt',
+      };
+
+      final putController = PutController();
+      final response = await storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(
+          forceBySingle: true,
+          key: fileKeyForSingle,
+          customVars: customVars,
+          controller: putController,
+        ),
+      );
+
+      expect(response.key, fileKeyForSingle);
+      expect(response.rawData['type'], 'testXType');
+      expect(response.rawData['ext'], 'testXExt');
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes should works well.',
+    () async {
+      final pcb = PutControllerBuilder();
+      final response = await storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(
+          forceBySingle: true,
+          key: fileKeyForSingle,
+          controller: pcb.putController,
+        ),
+      );
+
+      pcb.testAll();
+      expect(response.key, fileKeyForSingle);
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes can be cancelled.',
+    () async {
+      final putController = PutController();
+      final key = fileKeyForSingle;
+
+      final statusList = <StorageStatus>[];
+      putController.addStatusListener((status) {
+        statusList.add(status);
+        if (status == StorageStatus.Request) {
+          putController.cancel();
+        }
+      });
+      final future = storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(
+          forceBySingle: true,
+          key: key,
+          controller: putController,
+        ),
+      );
+      try {
+        await future;
+      } catch (error) {
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
+      }
+      expect(future, throwsA(TypeMatcher<StorageError>()));
+      expect(statusList[0], StorageStatus.Init);
+      expect(statusList[1], StorageStatus.Request);
+      expect(statusList[2], StorageStatus.Cancel);
+
+      try {
+        await storage.putBytes(
+          bytes,
+          token,
+          options: PutOptions(
+            forceBySingle: true,
+            key: key,
+            controller: putController,
+          ),
+        );
+      } catch (error) {
+        // 复用了相同的 controller，所以也会触发取消的错误
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
       }
-    });
-    var future = storage.putBytes(
-      bytes,
-      token,
-      options:
-          PutOptions(forceBySingle: true, key: key, controller: putController),
-    );
-    try {
-      await future;
-    } catch (error) {
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-    expect(future, throwsA(TypeMatcher<StorageError>()));
-    expect(statusList[0], StorageStatus.Init);
-    expect(statusList[1], StorageStatus.Request);
-    expect(statusList[2], StorageStatus.Cancel);
-
-    try {
-      await storage.putBytes(
+
+      expect(future, throwsA(TypeMatcher<StorageError>()));
+
+      final response = await storage.putBytes(
+        bytes,
+        token,
+        options: PutOptions(forceBySingle: true, key: key),
+      );
+
+      expect(response, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putBytes\'s status and progress should works well.',
+    () async {
+      final pcb = PutControllerBuilder();
+
+      final response = await storage.putBytes(
         bytes,
         token,
         options: PutOptions(
-            forceBySingle: true, key: key, controller: putController),
+          forceBySingle: true,
+          key: fileKeyForSingle,
+          controller: pcb.putController,
+        ),
       );
-    } catch (error) {
-      // 复用了相同的 controller，所以也会触发取消的错误
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-
-    expect(future, throwsA(TypeMatcher<StorageError>()));
-
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(forceBySingle: true, key: key),
-    );
-
-    expect(response, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putBytes\'s status and progress should works well.', () async {
-    final pcb = PutControllerBuilder();
-
-    final response = await storage.putBytes(
-      bytes,
-      token,
-      options: PutOptions(
-        forceBySingle: true,
-        key: fileKeyForSingle,
-        controller: pcb.putController,
-      ),
-    );
-    expect(response.key, fileKeyForSingle);
-    pcb.testAll();
-  }, skip: !isSensitiveDataDefined);
+      expect(response.key, fileKeyForSingle);
+      pcb.testAll();
+    },
+    skip: !isSensitiveDataDefined,
+  );
 }
diff --git a/base/test/put/put_by_single/put_file.dart b/base/test/put/put_by_single/put_file.dart
index ffa8c8b3..e7046172 100644
--- a/base/test/put/put_by_single/put_file.dart
+++ b/base/test/put/put_by_single/put_file.dart
@@ -10,124 +10,146 @@ void main() {
 
   final storage = Storage();
 
-  test('putFile customVars should works well.', () async {
-    final auth = Auth(
-      accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
-      secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
-    );
-
-    final token = auth.generateUploadToken(
-      putPolicy: PutPolicy(
-        insertOnly: 0,
-        scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
-        returnBody: '{"key":"\$(key)","type":"\$(x:type)","ext":"\$(x:ext)"}',
-        deadline: DateTime.now().millisecondsSinceEpoch + 3600,
-      ),
-    );
-
-    var customVars = <String, String>{
-      'x:type': 'testXType',
-      'x:ext': 'testXExt',
-    };
-
-    var putController = PutController();
-    final response = await storage.putFile(
-      fileForSingle,
-      token,
-      options: PutOptions(
-        forceBySingle: true,
-        key: fileKeyForSingle,
-        customVars: customVars,
-        controller: putController,
-      ),
-    );
-
-    expect(response.key, fileKeyForSingle);
-    expect(response.rawData['type'], 'testXType');
-    expect(response.rawData['ext'], 'testXExt');
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile should works well.', () async {
-    var pcb = PutControllerBuilder();
-    final response = await storage.putFile(
-      fileForSingle,
-      token,
-      options: PutOptions(
-        forceBySingle: true,
-        key: fileKeyForSingle,
-        controller: pcb.putController,
-      ),
-    );
-
-    pcb.testAll();
-    expect(response.key, fileKeyForSingle);
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile can be cancelled.', () async {
-    final putController = PutController();
-    final key = fileKeyForSingle;
-
-    final statusList = <StorageStatus>[];
-    putController.addStatusListener((status) {
-      statusList.add(status);
-      if (status == StorageStatus.Request) {
-        putController.cancel();
+  test(
+    'putFile customVars should works well.',
+    () async {
+      final auth = Auth(
+        accessKey: env['QINIU_DART_SDK_ACCESS_KEY']!,
+        secretKey: env['QINIU_DART_SDK_SECRET_KEY']!,
+      );
+
+      final token = auth.generateUploadToken(
+        putPolicy: PutPolicy(
+          insertOnly: 0,
+          scope: env['QINIU_DART_SDK_TOKEN_SCOPE']!,
+          returnBody: '{"key":"\$(key)","type":"\$(x:type)","ext":"\$(x:ext)"}',
+          deadline: DateTime.now().millisecondsSinceEpoch + 3600,
+        ),
+      );
+
+      final customVars = <String, String>{
+        'x:type': 'testXType',
+        'x:ext': 'testXExt',
+      };
+
+      final putController = PutController();
+      final response = await storage.putFile(
+        fileForSingle,
+        token,
+        options: PutOptions(
+          forceBySingle: true,
+          key: fileKeyForSingle,
+          customVars: customVars,
+          controller: putController,
+        ),
+      );
+
+      expect(response.key, fileKeyForSingle);
+      expect(response.rawData['type'], 'testXType');
+      expect(response.rawData['ext'], 'testXExt');
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile should works well.',
+    () async {
+      final pcb = PutControllerBuilder();
+      final response = await storage.putFile(
+        fileForSingle,
+        token,
+        options: PutOptions(
+          forceBySingle: true,
+          key: fileKeyForSingle,
+          controller: pcb.putController,
+        ),
+      );
+
+      pcb.testAll();
+      expect(response.key, fileKeyForSingle);
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile can be cancelled.',
+    () async {
+      final putController = PutController();
+      final key = fileKeyForSingle;
+
+      final statusList = <StorageStatus>[];
+      putController.addStatusListener((status) {
+        statusList.add(status);
+        if (status == StorageStatus.Request) {
+          putController.cancel();
+        }
+      });
+      final future = storage.putFile(
+        fileForSingle,
+        token,
+        options: PutOptions(
+          forceBySingle: true,
+          key: key,
+          controller: putController,
+        ),
+      );
+      try {
+        await future;
+      } catch (error) {
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
+      }
+      expect(future, throwsA(TypeMatcher<StorageError>()));
+      expect(statusList[0], StorageStatus.Init);
+      expect(statusList[1], StorageStatus.Request);
+      expect(statusList[2], StorageStatus.Cancel);
+
+      try {
+        await storage.putFile(
+          fileForSingle,
+          token,
+          options: PutOptions(
+            forceBySingle: true,
+            key: key,
+            controller: putController,
+          ),
+        );
+      } catch (error) {
+        // 复用了相同的 controller，所以也会触发取消的错误
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.CANCEL);
       }
-    });
-    var future = storage.putFile(
-      fileForSingle,
-      token,
-      options:
-          PutOptions(forceBySingle: true, key: key, controller: putController),
-    );
-    try {
-      await future;
-    } catch (error) {
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-    expect(future, throwsA(TypeMatcher<StorageError>()));
-    expect(statusList[0], StorageStatus.Init);
-    expect(statusList[1], StorageStatus.Request);
-    expect(statusList[2], StorageStatus.Cancel);
-
-    try {
-      await storage.putFile(
+
+      expect(future, throwsA(TypeMatcher<StorageError>()));
+
+      final response = await storage.putFile(
+        fileForSingle,
+        token,
+        options: PutOptions(forceBySingle: true, key: key),
+      );
+
+      expect(response, isA<PutResponse>());
+    },
+    skip: !isSensitiveDataDefined,
+  );
+
+  test(
+    'putFile\'s status and progress should works well.',
+    () async {
+      final pcb = PutControllerBuilder();
+
+      final response = await storage.putFile(
         fileForSingle,
         token,
         options: PutOptions(
-            forceBySingle: true, key: key, controller: putController),
+          forceBySingle: true,
+          key: fileKeyForSingle,
+          controller: pcb.putController,
+        ),
       );
-    } catch (error) {
-      // 复用了相同的 controller，所以也会触发取消的错误
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.CANCEL);
-    }
-
-    expect(future, throwsA(TypeMatcher<StorageError>()));
-
-    final response = await storage.putFile(
-      fileForSingle,
-      token,
-      options: PutOptions(forceBySingle: true, key: key),
-    );
-
-    expect(response, isA<PutResponse>());
-  }, skip: !isSensitiveDataDefined);
-
-  test('putFile\'s status and progress should works well.', () async {
-    final pcb = PutControllerBuilder();
-
-    final response = await storage.putFile(
-      fileForSingle,
-      token,
-      options: PutOptions(
-        forceBySingle: true,
-        key: fileKeyForSingle,
-        controller: pcb.putController,
-      ),
-    );
-    expect(response.key, fileKeyForSingle);
-    pcb.testAll();
-  }, skip: !isSensitiveDataDefined);
+      expect(response.key, fileKeyForSingle);
+      pcb.testAll();
+    },
+    skip: !isSensitiveDataDefined,
+  );
 }
diff --git a/base/test/retry_test.dart b/base/test/retry_test.dart
index f794e680..75628006 100644
--- a/base/test/retry_test.dart
+++ b/base/test/retry_test.dart
@@ -15,161 +15,175 @@ void main() {
   configEnv();
 
   test(
-      'putBySingle\'s retry mechanism should throw error directly while cannot connect to host.',
-      () async {
-    final httpAdapter = HttpAdapterTestWithConnectFailedToHost(0);
-    final config = Config(
-      hostProvider: HostProviderTest(),
-      httpClientAdapter: httpAdapter,
-      retryLimit: 3,
-    );
-    final storage = Storage(config: config);
-    final statusList = <StorageStatus>[];
-    final future = storage.putFile(
-      File('test_resource/test_for_put.txt'),
-      token,
-      options: PutOptions(
-        controller: PutController()..addStatusListener(statusList.add),
-      ),
-    );
-    try {
-      await future;
-    } catch (error) {
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.UNKNOWN);
-    }
-    expect(future, throwsA(isA<StorageError>()));
-    // 初始 1 次 + 重试 3 次
-    expect(httpAdapter.callTimes, 4);
-    expect(statusList, [
-      StorageStatus.Init,
-      StorageStatus.Request,
-      StorageStatus.Retry,
-      StorageStatus.Request,
-      StorageStatus.Retry,
-      StorageStatus.Request,
-      StorageStatus.Retry,
-      StorageStatus.Request,
-      StorageStatus.Error
-    ]);
-  }, skip: !isSensitiveDataDefined);
+    'putBySingle\'s retry mechanism should throw error directly while cannot connect to host.',
+    () async {
+      final httpAdapter = HttpAdapterTestWithConnectFailedToHost(0);
+      final config = Config(
+        hostProvider: HostProviderTest(),
+        httpClientAdapter: httpAdapter,
+        retryLimit: 3,
+      );
+      final storage = Storage(config: config);
+      final statusList = <StorageStatus>[];
+      final future = storage.putFile(
+        File('test_resource/test_for_put.txt'),
+        token,
+        options: PutOptions(
+          controller: PutController()..addStatusListener(statusList.add),
+        ),
+      );
+      try {
+        await future;
+      } catch (error) {
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.UNKNOWN);
+      }
+      expect(future, throwsA(isA<StorageError>()));
+      // 初始 1 次 + 重试 3 次
+      expect(httpAdapter.callTimes, 4);
+      expect(statusList, [
+        StorageStatus.Init,
+        StorageStatus.Request,
+        StorageStatus.Retry,
+        StorageStatus.Request,
+        StorageStatus.Retry,
+        StorageStatus.Request,
+        StorageStatus.Retry,
+        StorageStatus.Request,
+        StorageStatus.Error
+      ]);
+    },
+    skip: !isSensitiveDataDefined,
+  );
 
   test(
-      'putFileByPart\'s retry mechanism should throw error directly while cannot connect to host.',
-      () async {
-    final httpAdapter = HttpAdapterTestWithConnectFailedToHost(1);
-    final cacheProvider = DefaultCacheProvider();
-    final config = Config(
-      cacheProvider: cacheProvider,
-      hostProvider: HostProviderTest(),
-      httpClientAdapter: httpAdapter,
-    );
-    final storage = Storage(config: config);
-    final file = File('test_resource/test_for_put_parts.mp4');
-    final resource = FileResource(file: file, length: file.lengthSync());
-    final statusList = <StorageStatus>[];
-    // 设置一个假的初始化缓存，让分片上传跳过初始化文件，便于测试后面的上传文件流程
-    await cacheProvider.setItem(InitPartsTask.getCacheKey(resource.id, null),
-        json.encode({'expireAt': 0, 'uploadId': '0'}));
-    final future = storage.putFile(file, token,
+    'putFileByPart\'s retry mechanism should throw error directly while cannot connect to host.',
+    () async {
+      final httpAdapter = HttpAdapterTestWithConnectFailedToHost(1);
+      final cacheProvider = DefaultCacheProvider();
+      final config = Config(
+        cacheProvider: cacheProvider,
+        hostProvider: HostProviderTest(),
+        httpClientAdapter: httpAdapter,
+      );
+      final storage = Storage(config: config);
+      final file = File('test_resource/test_for_put_parts.mp4');
+      final resource = FileResource(file: file, length: file.lengthSync());
+      final statusList = <StorageStatus>[];
+      // 设置一个假的初始化缓存，让分片上传跳过初始化文件，便于测试后面的上传文件流程
+      await cacheProvider.setItem(
+        InitPartsTask.getCacheKey(resource.id, null),
+        json.encode({'expireAt': 0, 'uploadId': '0'}),
+      );
+      final future = storage.putFile(
+        file,
+        token,
         options: PutOptions(
           partSize: 1,
           controller: PutController()..addStatusListener(statusList.add),
-        ));
-    try {
-      await future;
-    } catch (error) {
-      expect(error, isA<StorageError>());
-      expect((error as StorageError).type, StorageErrorType.UNKNOWN);
-    }
-    expect(future, throwsA(isA<StorageError>()));
-    // UploadPartTask 4 次 * 2 个分片
-    expect(httpAdapter.callTimes, 8);
-    expect(statusList,
-        [StorageStatus.Init, StorageStatus.Request, StorageStatus.Error]);
-  }, skip: !isSensitiveDataDefined);
+        ),
+      );
+      try {
+        await future;
+      } catch (error) {
+        expect(error, isA<StorageError>());
+        expect((error as StorageError).type, StorageErrorType.UNKNOWN);
+      }
+      expect(future, throwsA(isA<StorageError>()));
+      // UploadPartTask 4 次 * 2 个分片
+      expect(httpAdapter.callTimes, 8);
+      expect(
+        statusList,
+        [StorageStatus.Init, StorageStatus.Request, StorageStatus.Error],
+      );
+    },
+    skip: !isSensitiveDataDefined,
+  );
 
   test(
-      'retry mechanism should works well with putBySingle while host is unavailable.',
-      () async {
-    final config = Config(
-      hostProvider: HostProviderTest(),
-      httpClientAdapter: HttpAdapterTestWith502(),
-    );
-    final storage = Storage(config: config);
-    final putController = PutController();
-    final statusList = <StorageStatus>[];
-    putController.addStatusListener(statusList.add);
-    final response = await storage.putFile(
-      File('test_resource/test_for_put.txt'),
-      token,
-      options: PutOptions(
-        forceBySingle: true,
-        key: 'test_for_put.txt',
-        controller: putController,
-      ),
-    );
-    expect(statusList, [
-      StorageStatus.Init,
-      StorageStatus.Request,
-      // 重试了 1 次
-      StorageStatus.Retry,
-      // 重试后会重新发请求
-      StorageStatus.Request,
-      StorageStatus.Success
-    ]);
-    expect(response.key, 'test_for_put.txt');
-  }, skip: !isSensitiveDataDefined);
+    'retry mechanism should works well with putBySingle while host is unavailable.',
+    () async {
+      final config = Config(
+        hostProvider: HostProviderTest(),
+        httpClientAdapter: HttpAdapterTestWith502(),
+      );
+      final storage = Storage(config: config);
+      final putController = PutController();
+      final statusList = <StorageStatus>[];
+      putController.addStatusListener(statusList.add);
+      final response = await storage.putFile(
+        File('test_resource/test_for_put.txt'),
+        token,
+        options: PutOptions(
+          forceBySingle: true,
+          key: 'test_for_put.txt',
+          controller: putController,
+        ),
+      );
+      expect(statusList, [
+        StorageStatus.Init,
+        StorageStatus.Request,
+        // 重试了 1 次
+        StorageStatus.Retry,
+        // 重试后会重新发请求
+        StorageStatus.Request,
+        StorageStatus.Success
+      ]);
+      expect(response.key, 'test_for_put.txt');
+    },
+    skip: !isSensitiveDataDefined,
+  );
 
   test(
-      'retry mechanism should works well with putByPart while host is unavailable.',
-      () async {
-    final config = Config(
-      hostProvider: HostProviderTest(),
-      httpClientAdapter: HttpAdapterTestWith502(),
-    );
-    final storage = Storage(config: config);
-    final file = File('test_resource/test_for_put_parts.mp4');
-    final resource = FileResource(file: file, length: file.lengthSync());
-    final key = 'test_for_put_parts.mp4';
-    final initPartsTaskStatusList = <StorageStatus>[];
-
-    // 重试阶段会发生在 InitPartsTask 调用 getUpHost 的时候
-    // 手动初始化一个用于测试
-    final task = InitPartsTask(
+    'retry mechanism should works well with putByPart while host is unavailable.',
+    () async {
+      final config = Config(
+        hostProvider: HostProviderTest(),
+        httpClientAdapter: HttpAdapterTestWith502(),
+      );
+      final storage = Storage(config: config);
+      final file = File('test_resource/test_for_put_parts.mp4');
+      final resource = FileResource(file: file, length: file.lengthSync());
+      final key = 'test_for_put_parts.mp4';
+      final initPartsTaskStatusList = <StorageStatus>[];
+
+      // 重试阶段会发生在 InitPartsTask 调用 getUpHost 的时候
+      // 手动初始化一个用于测试
+      final task = InitPartsTask(
         token: token,
         resource: resource,
         key: key,
         controller: PutController()
-          ..addStatusListener(initPartsTaskStatusList.add));
-    storage.taskManager.addTask(task);
-
-    // 接下来是正常流程
-    final putController = PutController();
-    final statusList = <StorageStatus>[];
-    late double _sendPercent, _totalPercent;
-    putController
-      ..addStatusListener(statusList.add)
-      ..addProgressListener((percent) {
-        _totalPercent = percent;
-      })
-      ..addSendProgressListener((percent) {
-        _sendPercent = percent;
-      });
-    final response = await storage.putFile(
-      file,
-      token,
-      options: PutOptions(
-        key: key,
-        partSize: 1,
-        controller: putController,
-      ),
-    );
-    expect(response, isA<PutResponse>());
-
-    expect(_sendPercent, 1);
-    expect(_totalPercent, 1);
-    expect(
+          ..addStatusListener(initPartsTaskStatusList.add),
+      );
+      storage.taskManager.addTask(task);
+
+      // 接下来是正常流程
+      final putController = PutController();
+      final statusList = <StorageStatus>[];
+      late double sendPercent, totalPercent;
+      putController
+        ..addStatusListener(statusList.add)
+        ..addProgressListener((percent) {
+          totalPercent = percent;
+        })
+        ..addSendProgressListener((percent) {
+          sendPercent = percent;
+        });
+      final response = await storage.putFile(
+        file,
+        token,
+        options: PutOptions(
+          key: key,
+          partSize: 1,
+          controller: putController,
+        ),
+      );
+      expect(response, isA<PutResponse>());
+
+      expect(sendPercent, 1);
+      expect(totalPercent, 1);
+      expect(
         initPartsTaskStatusList,
         equals([
           StorageStatus.Init,
@@ -177,12 +191,15 @@ void main() {
           StorageStatus.Retry,
           StorageStatus.Request,
           StorageStatus.Success
-        ]));
-    expect(statusList[0], StorageStatus.Init);
-    expect(statusList[1], StorageStatus.Request);
-    // 分片上传 PutPartsTask 本身不会重试，子任务会去重试，所以没有 Retry 状态
-    expect(statusList[2], StorageStatus.Success);
-  }, skip: !isSensitiveDataDefined);
+        ]),
+      );
+      expect(statusList[0], StorageStatus.Init);
+      expect(statusList[1], StorageStatus.Request);
+      // 分片上传 PutPartsTask 本身不会重试，子任务会去重试，所以没有 Retry 状态
+      expect(statusList[2], StorageStatus.Success);
+    },
+    skip: !isSensitiveDataDefined,
+  );
 }
 
 // 会扔出 DioError，错误类型是 DioErrorType.other，每个请求调用了 3 次
@@ -198,8 +215,11 @@ class HttpAdapterTestWithConnectFailedToHost implements HttpClientAdapter {
   }
 
   @override
-  Future<ResponseBody> fetch(RequestOptions options,
-      Stream<Uint8List>? requestStream, Future? cancelFuture) async {
+  Future<ResponseBody> fetch(
+    RequestOptions options,
+    Stream<Uint8List>? requestStream,
+    Future? cancelFuture,
+  ) async {
     if (options.path.contains('test.com')) {
       if ((type == 0 && options.method == 'POST') ||
           (type == 1 && options.method == 'PUT')) {
@@ -221,8 +241,11 @@ class HttpAdapterTestWith502 implements HttpClientAdapter {
   }
 
   @override
-  Future<ResponseBody> fetch(RequestOptions options,
-      Stream<Uint8List>? requestStream, Future? cancelFuture) async {
+  Future<ResponseBody> fetch(
+    RequestOptions options,
+    Stream<Uint8List>? requestStream,
+    Future? cancelFuture,
+  ) async {
     if (options.path.contains('test.com') && options.method == 'POST') {
       return ResponseBody.fromString('', 502);
     }
@@ -238,8 +261,10 @@ class HostProviderTest extends HostProvider {
   }
 
   @override
-  Future<String> getUpHost(
-      {required String accessKey, required String bucket}) async {
+  Future<String> getUpHost({
+    required String accessKey,
+    required String bucket,
+  }) async {
     if (isFrozen('https://test.com')) {
       return _hostProvider.getUpHost(accessKey: accessKey, bucket: bucket);
     }
diff --git a/flutter/lib/src/storage/controller.dart b/flutter/lib/src/storage/controller.dart
index 999c77b0..46cd8df3 100644
--- a/flutter/lib/src/storage/controller.dart
+++ b/flutter/lib/src/storage/controller.dart
@@ -1,3 +1,4 @@
 import 'package:qiniu_sdk_base/qiniu_sdk_base.dart' as base;
 
+/// PutController
 class PutController extends base.PutController {}
diff --git a/flutter/lib/src/storage/storage.dart b/flutter/lib/src/storage/storage.dart
index 7a1243e6..291109af 100644
--- a/flutter/lib/src/storage/storage.dart
+++ b/flutter/lib/src/storage/storage.dart
@@ -17,10 +17,14 @@ export 'package:qiniu_sdk_base/qiniu_sdk_base.dart'
 
 export './controller.dart';
 
+/// Storage
 class Storage {
-  final base.Storage _baseStorage;
+  /// Storage
   Storage({base.Config? config}) : _baseStorage = base.Storage(config: config);
 
+  final base.Storage _baseStorage;
+
+  /// putFile
   Future<base.PutResponse> putFile(
     File file,
     String token, {
@@ -29,6 +33,7 @@ class Storage {
     return _baseStorage.putFile(file, token, options: options);
   }
 
+  /// putBytes
   Future<base.PutResponse> putBytes(
     Uint8List bytes,
     String token, {
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index 39553eb4..f247735b 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -11,8 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   dio: ^5.0.0
-  qiniu_sdk_base: #^0.5.0
-    path: ../base/
+  qiniu_sdk_base: ^0.5.0
 
 dev_dependencies:
   flutter_lints: ^2.0.1

From 69fd979d8fb0d7deeb642567be6b2abb6b083801 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Tue, 14 Feb 2023 15:04:13 +0800
Subject: [PATCH 11/24] fix readme

---
 README.md         | 6 ++----
 base/README.md    | 2 +-
 flutter/README.md | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ce009561..21833b49 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,8 @@
 
 [![codecov](https://codecov.io/gh/qiniu/dart-sdk/branch/master/graph/badge.svg?token=5VOX6NJTKF)](https://codecov.io/gh/qiniu/dart-sdk)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![qiniu_sdk_base_diox](https://img.shields.io/pub/v/qiniu_sdk_base.svg?label=qiniu_sdk_base_diox)](https://pub.dev/packages/qiniu_sdk_base_diox)
-[![qiniu_flutter_sdk_diox](https://img.shields.io/pub/v/qiniu_flutter_sdk.svg?label=qiniu_flutter_sdk_diox)](https://pub.dev/packages/qiniu_flutter_sdk_diox)
-
-将 qiniu_sdk_base 和 qiniu_flutter_sdk 的 dio 依赖修改为 diox
+[![qiniu_sdk_base](https://img.shields.io/pub/v/qiniu_sdk_base.svg?label=qiniu_sdk_base)](https://pub.dev/packages/qiniu_sdk_base)
+[![qiniu_flutter_sdk](https://img.shields.io/pub/v/qiniu_flutter_sdk.svg?label=qiniu_flutter_sdk)](https://pub.dev/packages/qiniu_flutter_sdk)
 
 ## 目录说明
 
diff --git a/base/README.md b/base/README.md
index a62964e0..317aa4cc 100644
--- a/base/README.md
+++ b/base/README.md
@@ -1,4 +1,4 @@
-# Qiniu Sdk Base [![qiniu_sdk_base](https://img.shields.io/pub/v/qiniu_sdk_base.svg?label=qiniu_sdk_base_diox)](https://pub.dev/packages/qiniu_sdk_base_diox) [![codecov](https://codecov.io/gh/qiniu/dart-sdk/branch/master/graph/badge.svg?token=5VOX6NJTKF)](https://codecov.io/gh/qiniu/dart-sdk)
+# Qiniu Sdk Base [![qiniu_sdk_base](https://img.shields.io/pub/v/qiniu_sdk_base.svg?label=qiniu_sdk_base)](https://pub.dev/packages/qiniu_sdk_base) [![codecov](https://codecov.io/gh/qiniu/dart-sdk/branch/master/graph/badge.svg?token=5VOX6NJTKF)](https://codecov.io/gh/qiniu/dart-sdk)
 
 七牛 dart 平台 sdk 的 base 包，为上层 sdk 提供基础设施和共享代码。
 
diff --git a/flutter/README.md b/flutter/README.md
index 746cd2a6..a77287f3 100644
--- a/flutter/README.md
+++ b/flutter/README.md
@@ -1,4 +1,4 @@
-# 七牛云存储 Flutter SDK [![qiniu_flutter_sdk_diox](https://img.shields.io/pub/v/qiniu_flutter_sdk.svg?label=qiniu_flutter_sdk_diox)](https://pub.dev/packages/qiniu_flutter_sdk_diox)
+# 七牛云存储 Flutter SDK [![qiniu_flutter_sdk](https://img.shields.io/pub/v/qiniu_flutter_sdk.svg?label=qiniu_flutter_sdk)](https://pub.dev/packages/qiniu_flutter_sdk)
 
 七牛云存储的 Flutter SDK。
 基于七牛云 API 实现，封装了七牛云存储系统的的客户端操作。
@@ -24,18 +24,18 @@ Qiniu-Flutter-SDK 为客户端 SDK，没有包含 `token` 生成实现，为了
 
 ## 快速开始
 
-编辑你的 `pubspec.yaml` 文件，在 `dependencies` 添加  `qiniu-flutter-sdk_diox`，如下：
+编辑你的 `pubspec.yaml` 文件，在 `dependencies` 添加  `qiniu-flutter-sdk`，如下：
 
 ```yaml
 dependencies:
   ...
-  qiniu_flutter_sdk_diox: // 这里输入你需要的版本
+  qiniu_flutter_sdk: // 这里输入你需要的版本
 ```
 
 在你需要使用的地方 `import`，如下：
 
 ```dart
-import 'package:qiniu_flutter_sdk_diox/qiniu_flutter_sdk_diox.dart';
+import 'package:qiniu_flutter_sdk/qiniu_flutter_sdk.dart';
 ```
 
 ### 快速使用

From 4a3d47ba8121c61a580f3b75ad35d68c68b7bc21 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Sun, 26 Feb 2023 11:01:22 +0800
Subject: [PATCH 12/24] update example

---
 flutter/example/.metadata                     | 32 +++++++++++++++++--
 flutter/example/android/app/build.gradle      |  5 ++-
 .../android/app/src/debug/AndroidManifest.xml |  5 +--
 .../android/app/src/main/AndroidManifest.xml  |  2 +-
 .../kotlin/com/qiniu/example/MainActivity.kt  |  2 +-
 .../app/src/main/res/values-night/styles.xml  |  2 +-
 .../app/src/main/res/values/styles.xml        |  2 +-
 .../app/src/profile/AndroidManifest.xml       |  5 +--
 flutter/example/android/build.gradle          |  4 +--
 .../gradle/wrapper/gradle-wrapper.properties  |  3 +-
 flutter/example/lib/widgets/string_input.dart |  5 ++-
 11 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/flutter/example/.metadata b/flutter/example/.metadata
index e09c69f5..a0dcf313 100644
--- a/flutter/example/.metadata
+++ b/flutter/example/.metadata
@@ -1,10 +1,36 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: 37ebe3d82a9d5faeda7d3c1a6ad193030210a2cc
-  channel: dev
+  revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+  channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+      base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+    - platform: android
+      create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+      base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+    - platform: ios
+      create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+      base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+    - platform: macos
+      create_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+      base_revision: c07f7888888435fd9df505aa2efc38d3cf65681b
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/flutter/example/android/app/build.gradle b/flutter/example/android/app/build.gradle
index 0bdfa3a0..c498abee 100644
--- a/flutter/example/android/app/build.gradle
+++ b/flutter/example/android/app/build.gradle
@@ -27,6 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -43,7 +44,9 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.qiniu.flutter_sdk_example"
+        applicationId "com.qiniu.example"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
diff --git a/flutter/example/android/app/src/debug/AndroidManifest.xml b/flutter/example/android/app/src/debug/AndroidManifest.xml
index 4ef3824b..07fcd91c 100644
--- a/flutter/example/android/app/src/debug/AndroidManifest.xml
+++ b/flutter/example/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qiniu.flutter_sdk_example">
-    <!-- Flutter needs it to communicate with the running application
+    package="com.qiniu.example">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/flutter/example/android/app/src/main/AndroidManifest.xml b/flutter/example/android/app/src/main/AndroidManifest.xml
index 272ce9b7..2795db8e 100644
--- a/flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/flutter/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qiniu.flutter_sdk_example">
+    package="com.qiniu.example">
    <application
         android:label="example"
         android:name="${applicationName}"
diff --git a/flutter/example/android/app/src/main/kotlin/com/qiniu/example/MainActivity.kt b/flutter/example/android/app/src/main/kotlin/com/qiniu/example/MainActivity.kt
index 80690b1b..9183ffb9 100644
--- a/flutter/example/android/app/src/main/kotlin/com/qiniu/example/MainActivity.kt
+++ b/flutter/example/android/app/src/main/kotlin/com/qiniu/example/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.qiniu.flutter_sdk_example
+package com.qiniu.example
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/flutter/example/android/app/src/main/res/values-night/styles.xml b/flutter/example/android/app/src/main/res/values-night/styles.xml
index 3db14bb5..06952be7 100644
--- a/flutter/example/android/app/src/main/res/values-night/styles.xml
+++ b/flutter/example/android/app/src/main/res/values-night/styles.xml
@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/flutter/example/android/app/src/main/res/values/styles.xml b/flutter/example/android/app/src/main/res/values/styles.xml
index d460d1e9..cb1ef880 100644
--- a/flutter/example/android/app/src/main/res/values/styles.xml
+++ b/flutter/example/android/app/src/main/res/values/styles.xml
@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/flutter/example/android/app/src/profile/AndroidManifest.xml b/flutter/example/android/app/src/profile/AndroidManifest.xml
index 4ef3824b..07fcd91c 100644
--- a/flutter/example/android/app/src/profile/AndroidManifest.xml
+++ b/flutter/example/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qiniu.flutter_sdk_example">
-    <!-- Flutter needs it to communicate with the running application
+    package="com.qiniu.example">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/flutter/example/android/build.gradle b/flutter/example/android/build.gradle
index 4256f917..58a8c74b 100644
--- a/flutter/example/android/build.gradle
+++ b/flutter/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter/example/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58af..3c472b99 100644
--- a/flutter/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/flutter/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/flutter/example/lib/widgets/string_input.dart b/flutter/example/lib/widgets/string_input.dart
index 056501d7..6be566ec 100644
--- a/flutter/example/lib/widgets/string_input.dart
+++ b/flutter/example/lib/widgets/string_input.dart
@@ -2,14 +2,17 @@ import 'package:flutter/material.dart';
 
 class StringInput extends StatelessWidget {
   final String label;
+  final String value;
   final void Function(String token) onChange;
-  const StringInput(this.onChange, {Key? key, required this.label})
+  const StringInput(this.onChange,
+      {Key? key, required this.label, this.value = ''})
       : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return TextField(
       onSubmitted: onChange,
+      controller: TextEditingController(text: value),
       decoration: InputDecoration(
         labelText: label,
         contentPadding: const EdgeInsets.all(20.0),

From a34cd938fd4f9e1cb4bbbff4b0c696052937f04e Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Sun, 26 Feb 2023 11:05:24 +0800
Subject: [PATCH 13/24] upgrade dio version to fix multipart upload error

---
 base/pubspec.yaml    | 2 +-
 flutter/pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/pubspec.yaml b/base/pubspec.yaml
index f36941f8..888ec51b 100644
--- a/base/pubspec.yaml
+++ b/base/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
   sdk: '>=2.12.0 <4.0.0'
 
 dependencies:
-  dio: ^5.0.0
+  dio: ^5.0.1
   crypto: ^3.0.0
   meta: ^1.3.0
   uuid: ^3.0.5
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index f247735b..e2bd04bc 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  dio: ^5.0.0
+  dio: ^5.0.1
   qiniu_sdk_base: ^0.5.0
 
 dev_dependencies:

From 42bfc451115cddb9a05ec65caeca78db4af72c2b Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Wed, 15 Mar 2023 11:55:01 +0800
Subject: [PATCH 14/24] =?UTF-8?q?=E4=B8=BAuploadpart=E6=8C=87=E5=AE=9Acont?=
 =?UTF-8?q?entType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/storage/methods/put/by_part/upload_part_task.dart    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/base/lib/src/storage/methods/put/by_part/upload_part_task.dart b/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
index 0194e8b3..bf1ebbee 100644
--- a/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
@@ -62,7 +62,10 @@ class UploadPartTask extends RequestTask<UploadPart> {
       data: Stream.fromIterable([bytes.cast<int>()]),
       // 在 data 是 stream 的场景下， interceptor 传入 cancelToken 这里不传会有 bug
       cancelToken: controller?.cancelToken,
-      options: Options(headers: headers),
+      options: Options(
+        headers: headers,
+        contentType: 'application/octet-stream',
+      ),
     );
 
     return UploadPart.fromJson(response.data!);

From 2c99eff906f709718adffc3e76987c6c171605c6 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Wed, 15 Mar 2023 15:49:33 +0800
Subject: [PATCH 15/24] fix contentType

---
 .../src/storage/methods/put/by_part/complete_parts_task.dart | 5 ++++-
 .../lib/src/storage/methods/put/by_part/init_parts_task.dart | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/base/lib/src/storage/methods/put/by_part/complete_parts_task.dart b/base/lib/src/storage/methods/put/by_part/complete_parts_task.dart
index 465e4ce3..8e28c2f1 100644
--- a/base/lib/src/storage/methods/put/by_part/complete_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/complete_parts_task.dart
@@ -53,7 +53,10 @@ class CompletePartsTask extends RequestTask<PutResponse> {
     final response = await client.post<Map<String, dynamic>>(
       paramUrl,
       data: data,
-      options: Options(headers: headers),
+      options: Options(
+        headers: headers,
+        contentType: 'application/json',
+      ),
     );
 
     return PutResponse.fromJson(response.data!);
diff --git a/base/lib/src/storage/methods/put/by_part/init_parts_task.dart b/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
index 48af2169..d43a43a8 100644
--- a/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
@@ -83,7 +83,10 @@ class InitPartsTask extends RequestTask<InitParts> with CacheMixin<InitParts> {
 
       /// 这里 data 不传，dio 不会触发 cancel 事件
       data: <String, dynamic>{},
-      options: Options(headers: headers),
+      options: Options(
+        headers: headers,
+        contentType: 'application/json',
+      ),
     );
 
     return InitParts.fromJson(response.data!);

From 36757181c624c4dce50ef5f913f0c0d1a6946458 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Wed, 15 Mar 2023 15:50:03 +0800
Subject: [PATCH 16/24] rename test file

---
 .../put/put_by_single/{put_bytes.dart => put_bytes_test.dart} | 0
 .../put/put_by_single/{put_file.dart => put_file_test.dart}   | 0
 base/test/test_coverage.dart                                  | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename base/test/put/put_by_single/{put_bytes.dart => put_bytes_test.dart} (100%)
 rename base/test/put/put_by_single/{put_file.dart => put_file_test.dart} (100%)

diff --git a/base/test/put/put_by_single/put_bytes.dart b/base/test/put/put_by_single/put_bytes_test.dart
similarity index 100%
rename from base/test/put/put_by_single/put_bytes.dart
rename to base/test/put/put_by_single/put_bytes_test.dart
diff --git a/base/test/put/put_by_single/put_file.dart b/base/test/put/put_by_single/put_file_test.dart
similarity index 100%
rename from base/test/put/put_by_single/put_file.dart
rename to base/test/put/put_by_single/put_file_test.dart
diff --git a/base/test/test_coverage.dart b/base/test/test_coverage.dart
index cb2e2250..53ebd5e4 100644
--- a/base/test/test_coverage.dart
+++ b/base/test/test_coverage.dart
@@ -2,8 +2,8 @@ import 'auth/auth_test.dart' as auth_test;
 import 'config_test.dart' as config_test;
 import 'put/put_by_parts/put_bytes_test.dart' as put_by_part_bytes_test;
 import 'put/put_by_parts/put_file_test.dart' as put_by_part_file_test;
-import 'put/put_by_single/put_bytes.dart' as put_by_single_bytes_test;
-import 'put/put_by_single/put_file.dart' as put_by_single_file_test;
+import 'put/put_by_single/put_bytes_test.dart' as put_by_single_bytes_test;
+import 'put/put_by_single/put_file_test.dart' as put_by_single_file_test;
 import 'resource_test.dart' as resource_test;
 import 'retry_test.dart' as retry_test;
 

From 42d1c2582ecc6c194c6b8bf787817d3650d54e9c Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Thu, 23 Mar 2023 18:53:00 +0800
Subject: [PATCH 17/24] some fix

---
 base/analysis_options.yaml                                     | 2 --
 base/lib/qiniu_sdk_base.dart                                   | 1 -
 base/lib/src/storage/methods/put/by_part/upload_part_task.dart | 2 +-
 base/lib/src/storage/storage.dart                              | 2 ++
 flutter/example/lib/main.dart                                  | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/base/analysis_options.yaml b/base/analysis_options.yaml
index 34b0a7d3..ad8e012f 100644
--- a/base/analysis_options.yaml
+++ b/base/analysis_options.yaml
@@ -1,5 +1,3 @@
-# copy from https://github.com/dart-lang/http/blob/master/analysis_options.yaml
-
 include: package:lints/recommended.yaml
 
 analyzer:
diff --git a/base/lib/qiniu_sdk_base.dart b/base/lib/qiniu_sdk_base.dart
index 90fccc77..b0abc803 100644
--- a/base/lib/qiniu_sdk_base.dart
+++ b/base/lib/qiniu_sdk_base.dart
@@ -2,5 +2,4 @@ library qiniu_sdk_base;
 
 export 'src/auth/auth.dart';
 export 'src/error/error.dart';
-export 'src/storage/config/config.dart';
 export 'src/storage/storage.dart';
diff --git a/base/lib/src/storage/methods/put/by_part/upload_part_task.dart b/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
index bf1ebbee..aa8be0a9 100644
--- a/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
@@ -8,7 +8,7 @@ class UploadPartTask extends RequestTask<UploadPart> {
   final int partSize;
 
   // 如果 data 是 Stream 的话，Dio 需要判断 content-length 才会调用 onSendProgress
-  // https://github.com/flutterchina/dio/blob/21136168ab39a7536835c7a59ce0465bb05feed4/dio/lib/src/dio.dart#L1000
+  // https://github.com/cfug/dio/blob/v5.0.0/dio/lib/src/dio_mixin.dart#L633
   final int byteLength;
 
   final int partNumber;
diff --git a/base/lib/src/storage/storage.dart b/base/lib/src/storage/storage.dart
index b4f0ca00..1ee8720a 100644
--- a/base/lib/src/storage/storage.dart
+++ b/base/lib/src/storage/storage.dart
@@ -9,11 +9,13 @@ import 'methods/put/by_single/put_by_single_task.dart';
 import 'methods/put/put.dart';
 import 'resource/resource.dart';
 import 'task/task.dart';
+
 export 'error/error.dart';
 export 'methods/put/put.dart';
 export 'status/status.dart';
 export 'task/request_task.dart';
 export 'task/task.dart';
+export 'config/config.dart';
 
 /// 客户端
 class Storage {
diff --git a/flutter/example/lib/main.dart b/flutter/example/lib/main.dart
index fddb3ac8..4ed915ab 100644
--- a/flutter/example/lib/main.dart
+++ b/flutter/example/lib/main.dart
@@ -142,7 +142,7 @@ class BaseState extends DisposableState<Base> {
         printToConsole('上传已完成: 原始响应数据: ${jsonEncode(response.rawData)}');
         printToConsole('------------------------');
       })
-      ..catchError((dynamic error) async {
+      ..catchError((dynamic error) {
         if (error is StorageError) {
           switch (error.type) {
             case StorageErrorType.CONNECT_TIMEOUT:

From b0f0cee9321554d10c940225b06ae7051a6093aa Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Fri, 24 Mar 2023 12:42:12 +0800
Subject: [PATCH 18/24] export HttpClientAdapter

---
 base/lib/src/storage/storage.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/base/lib/src/storage/storage.dart b/base/lib/src/storage/storage.dart
index 1ee8720a..370d2f62 100644
--- a/base/lib/src/storage/storage.dart
+++ b/base/lib/src/storage/storage.dart
@@ -10,6 +10,7 @@ import 'methods/put/put.dart';
 import 'resource/resource.dart';
 import 'task/task.dart';
 
+export 'package:dio/dio.dart' show HttpClientAdapter;
 export 'error/error.dart';
 export 'methods/put/put.dart';
 export 'status/status.dart';

From bfb733c7f40ef5e32a2afd2e4001173438043bdf Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Fri, 24 Mar 2023 12:43:08 +0800
Subject: [PATCH 19/24] set contentType in interceptor

---
 .../storage/methods/put/by_part/complete_parts_task.dart  | 1 -
 .../src/storage/methods/put/by_part/init_parts_task.dart  | 1 -
 .../src/storage/methods/put/by_part/upload_part_task.dart | 1 -
 base/lib/src/storage/task/request_task.dart               | 8 ++++++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/base/lib/src/storage/methods/put/by_part/complete_parts_task.dart b/base/lib/src/storage/methods/put/by_part/complete_parts_task.dart
index 8e28c2f1..e72682bd 100644
--- a/base/lib/src/storage/methods/put/by_part/complete_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/complete_parts_task.dart
@@ -55,7 +55,6 @@ class CompletePartsTask extends RequestTask<PutResponse> {
       data: data,
       options: Options(
         headers: headers,
-        contentType: 'application/json',
       ),
     );
 
diff --git a/base/lib/src/storage/methods/put/by_part/init_parts_task.dart b/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
index d43a43a8..3ab42e1c 100644
--- a/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/init_parts_task.dart
@@ -85,7 +85,6 @@ class InitPartsTask extends RequestTask<InitParts> with CacheMixin<InitParts> {
       data: <String, dynamic>{},
       options: Options(
         headers: headers,
-        contentType: 'application/json',
       ),
     );
 
diff --git a/base/lib/src/storage/methods/put/by_part/upload_part_task.dart b/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
index aa8be0a9..1eccb318 100644
--- a/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
+++ b/base/lib/src/storage/methods/put/by_part/upload_part_task.dart
@@ -64,7 +64,6 @@ class UploadPartTask extends RequestTask<UploadPart> {
       cancelToken: controller?.cancelToken,
       options: Options(
         headers: headers,
-        contentType: 'application/octet-stream',
       ),
     );
 
diff --git a/base/lib/src/storage/task/request_task.dart b/base/lib/src/storage/task/request_task.dart
index 865b7765..9b017d0f 100644
--- a/base/lib/src/storage/task/request_task.dart
+++ b/base/lib/src/storage/task/request_task.dart
@@ -62,6 +62,14 @@ abstract class RequestTask<T> extends Task<T> {
             ..onSendProgress = (sent, total) => onSendProgress(sent / total);
           options.headers['User-Agent'] = _getUserAgent();
 
+          if (options.contentType == null) {
+            if (options.data is Stream) {
+              options.contentType = 'application/octet-stream';
+            } else {
+              options.contentType = 'application/json';
+            }
+          }
+
           handler.next(options);
         },
       ),

From 15cf4b1721d216c87bb0372976d5bd3937371bdc Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Fri, 24 Mar 2023 16:51:12 +0800
Subject: [PATCH 20/24] export HttpClientAdapter

---
 flutter/lib/src/storage/storage.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flutter/lib/src/storage/storage.dart b/flutter/lib/src/storage/storage.dart
index 291109af..2012b77b 100644
--- a/flutter/lib/src/storage/storage.dart
+++ b/flutter/lib/src/storage/storage.dart
@@ -10,6 +10,7 @@ export 'package:qiniu_sdk_base/qiniu_sdk_base.dart'
         PutResponse,
         HostProvider,
         CacheProvider,
+        HttpClientAdapter,
         QiniuError,
         StorageError,
         StorageErrorType,

From a8b81878e970b2d48d4c4e6a690e7007c0776fb8 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Wed, 29 Mar 2023 16:20:06 +0800
Subject: [PATCH 21/24] sdk version

---
 base/pubspec.yaml    | 4 ++--
 flutter/CHANGELOG.md | 7 +++++--
 flutter/pubspec.yaml | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/base/pubspec.yaml b/base/pubspec.yaml
index 888ec51b..edb43d83 100644
--- a/base/pubspec.yaml
+++ b/base/pubspec.yaml
@@ -7,10 +7,10 @@ false_secrets:
   - /test/auth/auth_test.dart
 
 environment:
-  sdk: '>=2.12.0 <4.0.0'
+  sdk: '>=2.15.0 <4.0.0'
 
 dependencies:
-  dio: ^5.0.1
+  dio: ^5.0.0
   crypto: ^3.0.0
   meta: ^1.3.0
   uuid: ^3.0.5
diff --git a/flutter/CHANGELOG.md b/flutter/CHANGELOG.md
index d000084c..c0715864 100644
--- a/flutter/CHANGELOG.md
+++ b/flutter/CHANGELOG.md
@@ -1,6 +1,9 @@
-## 0.4.1
+## 0.5.0
 
-* upgrade dio to 5.0.0
+* Upgrade dio to 5.0.0
+
+Breaking Changes 
+* Dart >= 2.15 & Flutter >= 2.8.0
 
 ## 0.4.0
 
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index e2bd04bc..18cf1a70 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -4,13 +4,13 @@ version: 0.5.0
 homepage: https://github.com/qiniu/dart-sdk/tree/master/flutter
 
 environment:
-  sdk: ">=2.12.0 <4.0.0"
-  flutter: ">=2.0.0"
+  sdk: ">=2.15.0 <4.0.0"
+  flutter: ">=2.8.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  dio: ^5.0.1
+  dio: ^5.0.0
   qiniu_sdk_base: ^0.5.0
 
 dev_dependencies:

From e2b5052cd642f12a1eb4981e99a5e10f45a43543 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Wed, 29 Mar 2023 16:31:35 +0800
Subject: [PATCH 22/24] readme

---
 flutter/README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/flutter/README.md b/flutter/README.md
index a77287f3..3c3a1ff1 100644
--- a/flutter/README.md
+++ b/flutter/README.md
@@ -152,6 +152,11 @@ import 'package:qiniu_flutter_sdk/qiniu_flutter_sdk.dart';
 ### 其他说明
 
 1. 如果您想了解更多七牛的上传策略，建议您仔细阅读 [七牛官方文档-上传](https://developer.qiniu.com/kodo/manual/upload-types)。另外，七牛的上传策略是在后端服务指定的.
+2. 如果Flutter SDK版本低于 3.0.0，需要override flutter_lints版本
+```yaml
+dependency_overrides: 
+  flutter_lints: ^1.0.0
+```
 
 ## 功能列表
 

From 1972de9e7548ea29391abb1597623956eec10ca8 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Thu, 30 Mar 2023 09:09:56 +0800
Subject: [PATCH 23/24] Delete deprecated PutByPartOptions & PutBySingleOptions

---
 .../put/by_part/put_by_part_options.dart      | 30 -------------------
 .../put/by_single/put_by_single_options.dart  | 17 -----------
 base/lib/src/storage/methods/put/put.dart     |  2 --
 flutter/CHANGELOG.md                          |  2 ++
 4 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 base/lib/src/storage/methods/put/by_part/put_by_part_options.dart
 delete mode 100644 base/lib/src/storage/methods/put/by_single/put_by_single_options.dart

diff --git a/base/lib/src/storage/methods/put/by_part/put_by_part_options.dart b/base/lib/src/storage/methods/put/by_part/put_by_part_options.dart
deleted file mode 100644
index 2c105e8d..00000000
--- a/base/lib/src/storage/methods/put/by_part/put_by_part_options.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import '../put_controller.dart';
-
-@Deprecated('use PutOptions')
-class PutByPartOptions {
-  /// 资源名
-  /// 如果不传则后端自动生成
-  final String? key;
-
-  /// 切片大小，单位 MB
-  ///
-  /// 超出 [partSize] 的文件大小会把每片按照 [partSize] 的大小切片并上传
-  /// 默认 4MB，最小不得小于 1MB，最大不得大于 1024 MB
-  final int partSize;
-
-  final int maxPartsRequestNumber;
-
-  /// 自定义变量，key 必须以 x: 开始
-  final Map<String, String>? customVars;
-
-  /// 控制器
-  final PutController? controller;
-
-  const PutByPartOptions({
-    this.key,
-    this.partSize = 4,
-    this.maxPartsRequestNumber = 5,
-    this.customVars,
-    this.controller,
-  });
-}
diff --git a/base/lib/src/storage/methods/put/by_single/put_by_single_options.dart b/base/lib/src/storage/methods/put/by_single/put_by_single_options.dart
deleted file mode 100644
index f7fc4f73..00000000
--- a/base/lib/src/storage/methods/put/by_single/put_by_single_options.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import '../put_controller.dart';
-
-@Deprecated('use PutOptions')
-class PutBySingleOptions {
-  /// 资源名
-  ///
-  /// 如果不传则后端自动生成
-  final String? key;
-
-  /// 自定义变量，key 必须以 x: 开始
-  final Map<String, String>? customVars;
-
-  /// 控制器
-  final PutController? controller;
-
-  const PutBySingleOptions({this.key, this.customVars, this.controller});
-}
diff --git a/base/lib/src/storage/methods/put/put.dart b/base/lib/src/storage/methods/put/put.dart
index af6273fb..ba579f92 100644
--- a/base/lib/src/storage/methods/put/put.dart
+++ b/base/lib/src/storage/methods/put/put.dart
@@ -1,5 +1,3 @@
-export 'by_part/put_by_part_options.dart';
-export 'by_single/put_by_single_options.dart';
 export 'put_controller.dart';
 export 'put_options.dart';
 export 'put_response.dart';
diff --git a/flutter/CHANGELOG.md b/flutter/CHANGELOG.md
index c0715864..1daac798 100644
--- a/flutter/CHANGELOG.md
+++ b/flutter/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 Breaking Changes 
 * Dart >= 2.15 & Flutter >= 2.8.0
+* Deprecated `PutByPartOptions`
+* Deprecated `PutBySingleOptions`
 
 ## 0.4.0
 

From 9ba1d16e8e747aece12078bd6e5c8f7be2a58008 Mon Sep 17 00:00:00 2001
From: shirne <shirne@126.com>
Date: Tue, 18 Apr 2023 16:09:17 +0800
Subject: [PATCH 24/24] resolve pub conflict

---
 flutter/example/pubspec.yaml | 6 +++++-
 flutter/pubspec.yaml         | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/flutter/example/pubspec.yaml b/flutter/example/pubspec.yaml
index d0b8ff00..f113725f 100644
--- a/flutter/example/pubspec.yaml
+++ b/flutter/example/pubspec.yaml
@@ -20,6 +20,10 @@ version: 1.0.0+1
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
+dependency_overrides: 
+  qiniu_sdk_base:
+    path: ../../base/
+
 dependencies:
   flutter:
     sdk: flutter
@@ -32,9 +36,9 @@ dependencies:
   cupertino_icons: ^1.0.2
 
 dev_dependencies:
+  flutter_lints:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index 18cf1a70..860d4496 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   qiniu_sdk_base: ^0.5.0
 
 dev_dependencies:
-  flutter_lints: ^2.0.1
+  flutter_lints:
   flutter_test:
     sdk: flutter