diff --git a/lib/http/init.dart b/lib/http/init.dart
index 2022798e..7314ee03 100644
--- a/lib/http/init.dart
+++ b/lib/http/init.dart
@@ -1,8 +1,6 @@
import 'dart:async';
import 'dart:convert';
-import 'dart:developer';
import 'dart:io';
-import 'dart:math' show Random;
import 'package:PiliPlus/build_config.dart';
import 'package:PiliPlus/http/retry_interceptor.dart';
import 'package:PiliPlus/utils/accounts/account.dart';
@@ -13,7 +11,6 @@ import 'package:dio/dio.dart';
import 'package:dio/io.dart';
import 'package:dio_http2_adapter/dio_http2_adapter.dart';
import '../utils/storage.dart';
-import 'api.dart';
import 'constants.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart' as web;
@@ -25,9 +22,8 @@ class Request {
static late AccountManager accountManager;
static late final Dio dio;
factory Request() => _instance;
- static final _rand = Random();
- static final RegExp _spmPrefixExp =
- RegExp(r'');
+ // static final _rand = Random();
+ // static final RegExp _spmPrefixExp = RegExp(r'');
/// 设置cookie
static Future setCookie() async {
@@ -52,36 +48,36 @@ class Request {
return Accounts.main.csrf;
}
- static Future buvidActive(Account account) async {
- // 这样线程不安全, 但仍按预期进行
- if (account.activited) return;
- account.activited = true;
- try {
- final html = await Request().get(Api.dynamicSpmPrefix,
- options: Options(extra: {'account': account}));
- final String spmPrefix = _spmPrefixExp.firstMatch(html.data)!.group(1)!;
- final String randPngEnd = base64.encode(
- List.generate(32, (_) => _rand.nextInt(256)) +
- List.filled(4, 0) +
- [73, 69, 78, 68] +
- List.generate(4, (_) => _rand.nextInt(256)));
+ // static Future buvidActive(Account account) async {
+ // // 这样线程不安全, 但仍按预期进行
+ // if (account.activited) return;
+ // account.activited = true;
+ // try {
+ // final html = await Request().get(Api.dynamicSpmPrefix,
+ // options: Options(extra: {'account': account}));
+ // final String spmPrefix = _spmPrefixExp.firstMatch(html.data)!.group(1)!;
+ // final String randPngEnd = base64.encode(
+ // List.generate(32, (_) => _rand.nextInt(256)) +
+ // List.filled(4, 0) +
+ // [73, 69, 78, 68] +
+ // List.generate(4, (_) => _rand.nextInt(256)));
- String jsonData = json.encode({
- '3064': 1,
- '39c8': '$spmPrefix.fp.risk',
- '3c43': {
- 'adca': 'Linux',
- 'bfe9': randPngEnd.substring(randPngEnd.length - 50),
- },
- });
+ // String jsonData = json.encode({
+ // '3064': 1,
+ // '39c8': '$spmPrefix.fp.risk',
+ // '3c43': {
+ // 'adca': 'Linux',
+ // 'bfe9': randPngEnd.substring(randPngEnd.length - 50),
+ // },
+ // });
- await Request().post(Api.activateBuvidApi,
- data: {'payload': jsonData},
- options: Options(contentType: Headers.jsonContentType));
- } catch (e) {
- log("setCookie, $e");
- }
- }
+ // await Request().post(Api.activateBuvidApi,
+ // data: {'payload': jsonData},
+ // options: Options(contentType: Headers.jsonContentType));
+ // } catch (e) {
+ // log("setCookie, $e");
+ // }
+ // }
/*
* config it and create
diff --git a/lib/http/member.dart b/lib/http/member.dart
index b63fd595..7a7172b8 100644
--- a/lib/http/member.dart
+++ b/lib/http/member.dart
@@ -1,4 +1,5 @@
import 'dart:convert';
+import 'dart:io';
import 'package:PiliPlus/common/constants.dart';
import 'package:PiliPlus/grpc/grpc_repo.dart';
@@ -337,14 +338,14 @@ class MemberHttp {
}
static Future memberArchive({
- int? mid,
- int ps = 40,
+ required int mid,
+ int ps = 25,
int tid = 0,
int? pn,
String? keyword,
String order = 'pubdate',
bool orderAvoided = true,
- dynamic wwebid,
+ String? wwebid,
}) async {
String dmImgStr = Utils.base64EncodeRandomString(16, 64);
String dmCoverImgStr = Utils.base64EncodeRandomString(32, 128);
@@ -356,7 +357,7 @@ class MemberHttp {
'keyword': keyword ?? '',
'order': order,
'platform': 'web',
- 'web_location': 1550101,
+ 'web_location': '333.1387',
'order_avoided': orderAvoided,
'dm_img_list': '[]',
'dm_img_str': dmImgStr,
@@ -367,7 +368,11 @@ class MemberHttp {
var res = await Request().get(
Api.memberArchive,
queryParameters: params,
- extra: {'ua': 'Mozilla/5.0'},
+ options: Options(headers: {
+ HttpHeaders.userAgentHeader: Request.headerUa(type: 'pc'),
+ HttpHeaders.refererHeader: HttpString.spaceBaseUrl,
+ 'origin': HttpString.spaceBaseUrl,
+ }),
);
if (res.data['code'] == 0) {
return {
diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart
index f72f94f8..e86265a4 100644
--- a/lib/pages/login/controller.dart
+++ b/lib/pages/login/controller.dart
@@ -646,9 +646,8 @@ class LoginPageController extends GetxController
tokenInfo['access_token'], tokenInfo['refresh_token']);
await Future.wait([
account.onChange(),
- AnonymousAccount()
- .delete()
- .then((_) => Request.buvidActive(AnonymousAccount()))
+ AnonymousAccount().delete()
+ // .then((_) => Request.buvidActive(AnonymousAccount()))
]);
Accounts.accountMode.updateAll((_, a) => a == account ? account : a);
if (Accounts.main.isLogin) {
diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart
index 3cd1f738..dca59c5f 100644
--- a/lib/pages/member/controller.dart
+++ b/lib/pages/member/controller.dart
@@ -47,7 +47,7 @@ class MemberController extends GetxController {
}
Future