update dio

Author: CarGuo

lib/common/net/api.dart

@@ -57,7 +57,7 @@ class HttpManager {
       if (e.response != null) {
         errorResponse = e.response;
       } else {
-        errorResponse = new Response(statusCode: 666, request: RequestOptions(path: url));
+        errorResponse = new Response(statusCode: 666, requestOptions: RequestOptions(path: url));
       }
       if (e.type == DioErrorType.connectTimeout ||
           e.type == DioErrorType.receiveTimeout) {

lib/common/net/interceptors/error_interceptor.dart

@@ -17,15 +17,20 @@ class ErrorInterceptors extends InterceptorsWrapper {
   ErrorInterceptors(this._dio);
 
   @override
-  onRequest(RequestOptions options) async {
+  onRequest(RequestOptions options, handler) async {
     //没有网络
     var connectivityResult = await (new Connectivity().checkConnectivity());
     if (connectivityResult == ConnectivityResult.none) {
-      return _dio.resolve(new ResultData(
-          Code.errorHandleFunction(Code.NETWORK_ERROR, "", false),
-          false,
-          Code.NETWORK_ERROR));
+      return handler.reject(DioError(
+          requestOptions: options,
+          type: DioErrorType.other,
+          response: Response(
+              requestOptions: options,
+              data: new ResultData(
+                  Code.errorHandleFunction(Code.NETWORK_ERROR, "", false),
+                  false,
+                  Code.NETWORK_ERROR))));
     }
-    return options;
+    return super.onRequest(options, handler);
   }
 }

lib/common/net/interceptors/header_interceptor.dart

@@ -7,11 +7,11 @@ import 'package:dio/dio.dart';
  */
 class HeaderInterceptors extends InterceptorsWrapper {
   @override
-  onRequest(RequestOptions options) async {
+  onRequest(RequestOptions options, handler) async {
     ///超时
     options.connectTimeout = 30000;
     options.receiveTimeout = 30000;
 
-    return options;
+    return super.onRequest(options, handler);
   }
 }

lib/common/net/interceptors/log_interceptor.dart

@@ -18,7 +18,7 @@ class LogsInterceptors extends InterceptorsWrapper {
   static List<String?> sHttpErrorUrl = [];
 
   @override
-  onRequest(RequestOptions options) async {
+  onRequest(RequestOptions options, handler) async {
     if (Config.DEBUG!) {
       print("请求url：${options.path} ${options.method}");
       options.headers.forEach((k, v) => options.headers[k] = v ?? "");
@@ -45,19 +45,19 @@ class LogsInterceptors extends InterceptorsWrapper {
     } catch (e) {
       print(e);
     }
-    return options;
+    return super.onRequest(options, handler);
   }
 
   @override
-  onResponse(Response response) async {
+  onResponse(Response response, handler) async {
     if (Config.DEBUG!) {
-        print('返回参数: ' + response.toString());
+      print('返回参数: ' + response.toString());
     }
     if (response.data is Map || response.data is List) {
       try {
         var data = Map<String, dynamic>();
         data["data"] = response.data;
-        addLogic(sResponsesHttpUrl, response.request.uri.toString());
+        addLogic(sResponsesHttpUrl, response.requestOptions.uri.toString());
         addLogic(sHttpResponses, data);
       } catch (e) {
         print(e);
@@ -66,38 +66,38 @@ class LogsInterceptors extends InterceptorsWrapper {
       try {
         var data = Map<String, dynamic>();
         data["data"] = response.data;
-        addLogic(sResponsesHttpUrl, response.request.uri.toString() );
+        addLogic(sResponsesHttpUrl, response.requestOptions.uri.toString());
         addLogic(sHttpResponses, data);
       } catch (e) {
         print(e);
       }
     } else if (response.data != null) {
       try {
         String data = response.data.toJson();
-        addLogic(sResponsesHttpUrl, response.request.uri.toString() );
+        addLogic(sResponsesHttpUrl, response.requestOptions.uri.toString());
         addLogic(sHttpResponses, json.decode(data));
       } catch (e) {
         print(e);
       }
     }
-    return response; // continue
+    return super.onResponse(response, handler);
   }
 
   @override
-  onError(DioError err) async {
+  onError(DioError err, handler) async {
     if (Config.DEBUG!) {
       print('请求异常: ' + err.toString());
       print('请求异常信息: ' + (err.response?.toString() ?? ""));
     }
     try {
-      addLogic(sHttpErrorUrl, err.request!.path);
+      addLogic(sHttpErrorUrl, err.requestOptions.path);
       var errors = Map<String, dynamic>();
       errors["error"] = err.message;
       addLogic(sHttpError, errors);
     } catch (e) {
       print(e);
     }
-    return err; // continue;
+    return super.onError(err, handler);
   }
 
   static addLogic(List list, data) {

lib/common/net/interceptors/response_interceptor.dart

@@ -9,8 +9,8 @@ import 'package:gsy_github_app_flutter/common/net/result_data.dart';
  */
 class ResponseInterceptors extends InterceptorsWrapper {
   @override
-  onResponse(Response response) async {
-    RequestOptions option = response.request;
+  onResponse(Response response, handler) async {
+    RequestOptions option = response.requestOptions;
     var value;
     try {
       var header = response.headers[Headers.contentTypeHeader];
@@ -25,6 +25,7 @@ class ResponseInterceptors extends InterceptorsWrapper {
       value = new ResultData(response.data, false, response.statusCode,
           headers: response.headers);
     }
-    return value;
+    response.data = value;
+    return handler.next(response);
   }
 }

lib/common/net/interceptors/token_interceptor.dart

@@ -12,7 +12,7 @@ class TokenInterceptors extends InterceptorsWrapper {
   String? _token;
 
   @override
-  onRequest(RequestOptions options) async {
+  onRequest(RequestOptions options, handler) async {
     //授权码
     if (_token == null) {
       var authorizationCode = await getAuthorization();
@@ -22,11 +22,11 @@ class TokenInterceptors extends InterceptorsWrapper {
       }
     }
     options.headers["Authorization"] = _token;
-    return options;
+    return super.onRequest(options, handler);
   }
 
   @override
-  onResponse(Response response) async {
+  onResponse(Response response, handler) async {
     try {
       var responseJson = response.data;
       if (response.statusCode == 201 && responseJson["token"] != null) {
@@ -36,7 +36,7 @@ class TokenInterceptors extends InterceptorsWrapper {
     } catch (e) {
       print(e);
     }
-    return response;
+    return super.onResponse(response, handler);
   }
 
   ///清除授权

pubspec.lock

@@ -231,7 +231,7 @@ packages:
       name: dio
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0-beta6"
+    version: "4.0.0"
   ffi:
     dependency: transitive
     description:

pubspec.yaml

@@ -34,7 +34,7 @@ dependencies:
   pub_semver: 2.0.0
   flutter_svg: 0.21.0-nullsafety.0
   flutter_slidable: ^0.6.0-nullsafety.0
-  dio: 4.0.0-beta6
+  dio: 4.0.0
   path_provider: 2.0.0
   flutter_webview_plugin: 0.3.11
   webview_flutter: 2.0.0