Merge branch 'fix' into alpha

This commit is contained in:
guozhigq
2023-09-06 21:10:50 +08:00
3 changed files with 7 additions and 28 deletions

View File

@ -9,7 +9,6 @@ import 'package:pilipala/utils/storage.dart';
import 'package:pilipala/utils/utils.dart'; import 'package:pilipala/utils/utils.dart';
import 'package:pilipala/http/constants.dart'; import 'package:pilipala/http/constants.dart';
import 'package:pilipala/http/interceptor.dart'; import 'package:pilipala/http/interceptor.dart';
import 'package:dio_http2_adapter/dio_http2_adapter.dart';
import 'package:dio_cookie_manager/dio_cookie_manager.dart'; import 'package:dio_cookie_manager/dio_cookie_manager.dart';
class Request { class Request {
@ -93,18 +92,15 @@ class Request {
receiveTimeout: const Duration(milliseconds: 12000), receiveTimeout: const Duration(milliseconds: 12000),
//Http请求头. //Http请求头.
headers: { headers: {
// 'cookie': '', 'keep-alive': true,
'user-agent': headerUa('pc'),
'Accept-Encoding': 'gzip'
}, },
contentType: Headers.jsonContentType,
persistentConnection: true,
); );
dio = Dio(options) dio = Dio(options);
..httpClientAdapter = Http2Adapter(
ConnectionManager(
idleTimeout: const Duration(milliseconds: 10000),
// Ignore bad certificate
onClientCreate: (_, config) => config.onBadCertificate = (_) => true,
),
);
//添加拦截器 //添加拦截器
dio.interceptors.add(ApiInterceptor()); dio.interceptors.add(ApiInterceptor());
@ -216,7 +212,7 @@ class Request {
: 'Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.91 Mobile Safari/537.36'; : 'Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.91 Mobile Safari/537.36';
} else { } else {
headerUa = headerUa =
'Mozilla/5.0 (MaciMozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36'; 'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_3_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15';
} }
return headerUa; return headerUa;
} }

View File

@ -321,14 +321,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.0" version: "3.1.0"
dio_http2_adapter:
dependency: "direct main"
description:
name: dio_http2_adapter
sha256: ada89ff1ea108c191188e5112b1ae87f12f5995f8cbf50afe87a736e36f1a5af
url: "https://pub.dev"
source: hosted
version: "2.3.1"
dismissible_page: dismissible_page:
dependency: "direct main" dependency: "direct main"
description: description:
@ -589,14 +581,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0"
http2:
dependency: transitive
description:
name: http2
sha256: "38db0c4aa9f1cd238a5d2e86aa0cc7cc91c77e0c6c94ba64bbe85e4ff732a952"
url: "https://pub.dev"
source: hosted
version: "2.2.0"
http_client_helper: http_client_helper:
dependency: transitive dependency: transitive
description: description:

View File

@ -43,7 +43,6 @@ dependencies:
# 网络 # 网络
dio: ^5.3.0 dio: ^5.3.0
cookie_jar: ^4.0.8 cookie_jar: ^4.0.8
dio_http2_adapter: ^2.3.1
dio_cookie_manager: ^3.1.0 dio_cookie_manager: ^3.1.0
connectivity_plus: ^4.0.1 connectivity_plus: ^4.0.1