From 4f611663cbc3ab2bb5cf929899568c621f92e7f8 Mon Sep 17 00:00:00 2001 From: orz12 Date: Mon, 2 Sep 2024 08:18:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8B=E8=AF=84=E8=AE=BA=E5=8C=BA=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E5=8F=97=E9=99=90=EF=BC=88=E9=9C=80=E7=A7=BB=E9=99=A4cookie?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/orz12/PiliPalaX/pull/214 --- lib/http/reply.dart | 67 +++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/lib/http/reply.dart b/lib/http/reply.dart index 4aa34eab..6ebbadb7 100644 --- a/lib/http/reply.dart +++ b/lib/http/reply.dart @@ -1,5 +1,7 @@ +import 'dart:io'; + import 'package:PiliPalaX/http/loading_state.dart'; -import 'package:PiliPalaX/utils/extension.dart'; +import 'package:PiliPalaX/utils/storage.dart'; import 'package:dio/dio.dart'; import '../models/video/reply/data.dart'; @@ -9,28 +11,30 @@ import 'constants.dart'; import 'init.dart'; class ReplyHttp { - static final _dio = Dio(); static Future replyList({ required int oid, required String nextOffset, required int type, int sort = 1, }) async { - try { - var res = await _dio - .get('${HttpString.apiBaseUrl}${Api.replyList}', queryParameters: { + Options? options = GStorage.userInfo.get('userInfoCache') == null + ? Options( + headers: {HttpHeaders.cookieHeader: "buvid3= ; b_nut= ; sid= "}) + : null; + var res = await Request().get( + '${HttpString.apiBaseUrl}${Api.replyList}', + data: { 'oid': oid, 'type': type, 'pagination_str': '{"offset":"${nextOffset.replaceAll('"', '\\"')}"}', 'mode': sort + 2, //2:按时间排序;3:按热度排序 - }); - if (res.data['code'] == 0) { - return LoadingState.success(ReplyData.fromJson(res.data['data'])); - } else { - return LoadingState.error(res.data['message']); - } - } catch (e) { - return LoadingState.error(e.toString()); + }, + options: options, + ); + if (res.data['code'] == 0) { + return LoadingState.success(ReplyData.fromJson(res.data['data'])); + } else { + return LoadingState.error(res.data['message']); } } @@ -41,23 +45,26 @@ class ReplyHttp { required int type, int sort = 1, }) async { - try { - var res = await _dio.get('${HttpString.apiBaseUrl}${Api.replyReplyList}', - queryParameters: { - 'oid': oid, - 'root': root, - 'pn': pageNum, - 'type': type, - 'sort': 1, - 'csrf': await Request.getCsrf(), - }); - if (res.data['code'] == 0) { - return LoadingState.success(ReplyReplyData.fromJson(res.data['data'])); - } else { - return LoadingState.error(res.data['message']); - } - } catch (e) { - return LoadingState.error(e.toString()); + Options? options = GStorage.userInfo.get('userInfoCache') == null + ? Options( + headers: {HttpHeaders.cookieHeader: "buvid3= ; b_nut= ; sid= "}) + : null; + var res = await Request().get( + '${HttpString.apiBaseUrl}${Api.replyReplyList}', + data: { + 'oid': oid, + 'root': root, + 'pn': pageNum, + 'type': type, + 'sort': 1, + 'csrf': await Request.getCsrf(), + }, + options: options, + ); + if (res.data['code'] == 0) { + return LoadingState.success(ReplyReplyData.fromJson(res.data['data'])); + } else { + return LoadingState.error(res.data['message']); } }