merge fix

This commit is contained in:
guozhigq
2023-09-17 23:39:51 +08:00
2 changed files with 5 additions and 14 deletions

View File

@ -89,11 +89,7 @@ class Request {
//响应流上前后两次接受到数据的间隔,单位为毫秒。 //响应流上前后两次接受到数据的间隔,单位为毫秒。
receiveTimeout: const Duration(milliseconds: 12000), receiveTimeout: const Duration(milliseconds: 12000),
//Http请求头. //Http请求头.
headers: { headers: {},
'keep-alive': 'true',
'user-agent': headerUa(),
},
persistentConnection: true,
); );
dio = Dio(options) dio = Dio(options)
@ -128,20 +124,15 @@ class Request {
*/ */
get(url, {data, options, cancelToken, extra}) async { get(url, {data, options, cancelToken, extra}) async {
Response response; Response response;
Options options; Options options = Options();
ResponseType resType = ResponseType.json; ResponseType resType = ResponseType.json;
options = Options();
options.responseType = resType;
if (extra != null) { if (extra != null) {
options.responseType = extra!['resType'] ?? ResponseType.json; resType = extra!['resType'] ?? ResponseType.json;
if (extra['ua'] != null) { if (extra['ua'] != null) {
print(options.headers);
options.headers = {'user-agent': headerUa(type: extra['ua'])}; options.headers = {'user-agent': headerUa(type: extra['ua'])};
// options.headers!['user-agent'] = headerUa(type: extra['ua']);
} }
} }
options.responseType = resType;
try { try {
response = await dio.get( response = await dio.get(

View File

@ -184,7 +184,7 @@ class AboutController extends GetxController {
// 获取远程版本 // 获取远程版本
Future getRemoteApp() async { Future getRemoteApp() async {
var result = await Request().get(Api.latestApp); var result = await Request().get(Api.latestApp, extra: {'ua': 'pc'});
data = LatestDataModel.fromJson(result.data); data = LatestDataModel.fromJson(result.data);
remoteAppInfo = data; remoteAppInfo = data;
remoteVersion.value = data.tagName!; remoteVersion.value = data.tagName!;