From 85f77ed93349e6f7f15cb45395a87d6cb45dd8e5 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Sat, 12 Oct 2024 22:05:04 +0800
Subject: [PATCH] =?UTF-8?q?mod:=20up=E4=B8=BB=E9=A1=B5wWebid=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/http/member.dart                     | 31 +++++++++++++++---------
 lib/pages/member_article/controller.dart | 16 ------------
 lib/utils/global_data_cache.dart         |  1 +
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/lib/http/member.dart b/lib/http/member.dart
index c7b22359..fc99c987 100644
--- a/lib/http/member.dart
+++ b/lib/http/member.dart
@@ -4,6 +4,7 @@ import 'package:hive/hive.dart';
 import 'package:html/parser.dart';
 import 'package:pilipala/models/member/article.dart';
 import 'package:pilipala/models/member/like.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import '../common/constants.dart';
 import '../models/dynamics/result.dart';
 import '../models/follow/result.dart';
@@ -19,14 +20,20 @@ import 'index.dart';
 
 class MemberHttp {
   static Future memberInfo({
-    int? mid,
+    required int mid,
     String token = '',
   }) async {
+    String? wWebid;
+    if ((await getWWebid(mid: mid))['status']) {
+      wWebid = GlobalDataCache().wWebid;
+    }
+
     Map params = await WbiSign().makSign({
       'mid': mid,
       'token': token,
       'platform': 'web',
       'web_location': 1550101,
+      ...wWebid != null ? {'w_webid': wWebid} : {},
     });
     var res = await Request().get(
       Api.memberInfo,
@@ -566,6 +573,10 @@ class MemberHttp {
   }
 
   static Future getWWebid({required int mid}) async {
+    String? wWebid = GlobalDataCache().wWebid;
+    if (wWebid != null) {
+      return {'status': true, 'data': wWebid};
+    }
     var res = await Request().get('https://space.bilibili.com/$mid/article');
     String? headContent = parse(res.data).head?.outerHtml;
     final regex = RegExp(
@@ -576,6 +587,7 @@ class MemberHttp {
         final content = match.group(1);
         String decodedString = Uri.decodeComponent(content!);
         Map<String, dynamic> map = jsonDecode(decodedString);
+        GlobalDataCache().wWebid = map['access_id'];
         return {'status': true, 'data': map['access_id']};
       } else {
         return {'status': false, 'data': '请检查登录状态'};
@@ -588,25 +600,20 @@ class MemberHttp {
   static Future getMemberArticle({
     required int mid,
     required int pn,
-    required String wWebid,
     String? offset,
   }) async {
+    String? wWebid;
+    if ((await getWWebid(mid: mid))['status']) {
+      wWebid = GlobalDataCache().wWebid;
+    }
     Map params = await WbiSign().makSign({
       'host_mid': mid,
       'page': pn,
       'offset': offset,
       'web_location': 333.999,
-      'w_webid': wWebid,
-    });
-    var res = await Request().get(Api.opusList, data: {
-      'host_mid': mid,
-      'page': pn,
-      'offset': offset,
-      'web_location': 333.999,
-      'w_webid': wWebid,
-      'w_rid': params['w_rid'],
-      'wts': params['wts'],
+      ...wWebid != null ? {'w_webid': wWebid} : {},
     });
+    var res = await Request().get(Api.opusList, data: params);
     if (res.data['code'] == 0) {
       return {
         'status': true,
diff --git a/lib/pages/member_article/controller.dart b/lib/pages/member_article/controller.dart
index cffce2fe..d79fb4a6 100644
--- a/lib/pages/member_article/controller.dart
+++ b/lib/pages/member_article/controller.dart
@@ -10,7 +10,6 @@ class MemberArticleController extends GetxController {
   int pn = 1;
   String? offset;
   bool hasMore = true;
-  String? wWebid;
   RxBool isLoading = false.obs;
   RxList<MemberArticleItemModel> articleList = <MemberArticleItemModel>[].obs;
 
@@ -20,25 +19,11 @@ class MemberArticleController extends GetxController {
     mid = int.parse(Get.parameters['mid']!);
   }
 
-  // 获取wWebid
-  Future getWWebid() async {
-    var res = await MemberHttp.getWWebid(mid: mid);
-    if (res['status']) {
-      wWebid = res['data'];
-    } else {
-      wWebid = '-1';
-      SmartDialog.showToast(res['msg']);
-    }
-  }
-
   Future getMemberArticle(type) async {
     if (isLoading.value) {
       return;
     }
     isLoading.value = true;
-    if (wWebid == null) {
-      await getWWebid();
-    }
     if (type == 'init') {
       pn = 1;
       articleList.clear();
@@ -47,7 +32,6 @@ class MemberArticleController extends GetxController {
       mid: mid,
       pn: pn,
       offset: offset,
-      wWebid: wWebid!,
     );
     if (res['status']) {
       offset = res['data'].offset;
diff --git a/lib/utils/global_data_cache.dart b/lib/utils/global_data_cache.dart
index 9d925a0f..a2b454a9 100644
--- a/lib/utils/global_data_cache.dart
+++ b/lib/utils/global_data_cache.dart
@@ -15,6 +15,7 @@ class GlobalDataCache {
   late FullScreenGestureMode fullScreenGestureMode;
   late bool enablePlayerControlAnimation;
   late List<String> actionTypeSort;
+  String? wWebid;
 
   /// 播放器相关
   // 弹幕开关