Skip to content

Commit 4601756

Browse files
CarGuoCarGuo
committed
fix error
1 parent 1c87e33 commit 4601756

File tree

9 files changed

+47
-47
lines changed

9 files changed

+47
-47
lines changed

‎lib/common/dao/issue_dao.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class IssueDao {
200200
static lockIssueDao(userName, repository, number, locked) async {
201201
String url = Address.lockIssue(userName, repository, number);
202202
var res = await httpManager.netFetch(
203-
url, null, {"Accept": 'application/vnd.github.VERSION.full+json'}, new Options(method: locked ? "DELETE" : 'PUT', contentType: "text"),
203+
url, null, {"Accept": 'application/vnd.github.VERSION.full+json'}, new Options(method: locked ? "DELETE" : 'PUT'),
204204
noTip: true);
205205
if (res != null && res.result) {
206206
return new DataResult(res.data, true);

‎lib/common/dao/repos_dao.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ class ReposDao {
177177
String urls = Address.resolveStarRepos(userName, reposName);
178178
String urlw = Address.resolveWatcherRepos(userName, reposName);
179179
var resS = await httpManager.netFetch(
180-
urls, null, null, new Options(contentType: "text"),
180+
urls, null, null, null,
181181
noTip: true);
182182
var resW = await httpManager.netFetch(
183-
urlw, null, null, new Options(contentType: "text"),
183+
urlw, null, null, null,
184184
noTip: true);
185185
var data = {"star": resS.result, "watch": resW.result};
186186
return new DataResult(data, true);
@@ -283,7 +283,7 @@ class ReposDao {
283283
null,
284284
null,
285285
new Options(
286-
method: !star ? 'PUT' : 'DELETE', contentType: "text"));
286+
method: !star ? 'PUT' : 'DELETE'));
287287
return Future<DataResult>(() {
288288
return new DataResult(null, res.result);
289289
});
@@ -299,7 +299,7 @@ class ReposDao {
299299
null,
300300
null,
301301
new Options(
302-
method: !watch ? 'PUT' : 'DELETE', contentType: "text"));
302+
method: !watch ? 'PUT' : 'DELETE'));
303303
return new DataResult(null, res.result);
304304
}
305305

@@ -509,7 +509,7 @@ class ReposDao {
509509
static createForkDao(userName, reposName) async {
510510
String url = Address.createFork(userName, reposName);
511511
var res = await httpManager.netFetch(url, null, null,
512-
new Options(method: "POST", contentType: "text"));
512+
new Options(method: "POST"));
513513
return new DataResult(null, res.result);
514514
}
515515

@@ -572,7 +572,7 @@ class ReposDao {
572572
url,
573573
null,
574574
{"Accept": 'application/vnd.github.VERSION.raw'},
575-
new Options(contentType: "text"));
575+
new Options(contentType: "text/plain; charset=utf-8"));
576576
//var res = await httpManager.netFetch(url, null, {"Accept": 'application/vnd.github.html'}, new Options(contentType: ContentType.text));
577577
if (res != null && res.result) {
578578
if (needDb) {

‎lib/common/dao/user_dao.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class UserDao {
277277
*/
278278
static setAllNotificationAsReadDao() async {
279279
String url = Address.setAllNotificationAsRead();
280-
var res = await httpManager.netFetch(url, null, null, new Options(method: "PUT", contentType: "text"));
280+
var res = await httpManager.netFetch(url, null, null, new Options(method: "PUT"));
281281
return new DataResult(res.data, res.result);
282282
}
283283

@@ -286,7 +286,7 @@ class UserDao {
286286
*/
287287
static checkFollowDao(name) async {
288288
String url = Address.doFollow(name);
289-
var res = await httpManager.netFetch(url, null, null, new Options(contentType: "text"), noTip: true);
289+
var res = await httpManager.netFetch(url, null, null, null, noTip: true);
290290
return new DataResult(res.data, res.result);
291291
}
292292

‎lib/common/net/api.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class HttpManager {
3737
///[ params] 请求参数
3838
///[ header] 外加头
3939
///[ option] 配置
40-
netFetch(url, params, Map<String, dynamic> header, Options option, {noTip = false}) async {
40+
Future<ResultData> netFetch(url, params, Map<String, dynamic> header, Options option, {noTip = false}) async {
4141
Map<String, dynamic> headers = new HashMap();
4242
if (header != null) {
4343
headers.addAll(header);

‎lib/common/net/interceptors/header_interceptor.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ class HeaderInterceptors extends InterceptorsWrapper {
99

1010

1111
@override
12-
onRequest(RequestOptions options) {
12+
onRequest(RequestOptions options) async {
1313
///超时
1414
options.connectTimeout = 15000;
1515

16-
return Future.value(options);
16+
return options;
1717
}
1818
}

‎lib/common/net/interceptors/log_interceptor.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@ import 'package:gsy_github_app_flutter/common/config/config.dart';
88
*/
99
class LogsInterceptors extends InterceptorsWrapper {
1010
@override
11-
onRequest(RequestOptions options) {
11+
onRequest(RequestOptions options) async {
1212
if (Config.DEBUG) {
1313
print("请求url：${options.path}");
1414
print('请求头: ' + options.headers.toString());
1515
if (options.data != null) {
1616
print('请求参数: ' + options.data.toString());
1717
}
1818
}
19-
return Future.value(options);
19+
return options;
2020
}
2121

2222
@override
23-
onResponse(Response response) {
23+
onResponse(Response response) async {
2424
if (Config.DEBUG) {
2525
if (response != null) {
2626
print('返回参数: ' + response.toString());
2727
}
2828
}
29-
return Future.value(response); // continue
29+
return response; // continue
3030
}
3131

3232
@override
33-
onError(DioError err) {
33+
onError(DioError err) async {
3434
if (Config.DEBUG) {
3535
print('请求异常: ' + err.toString());
3636
print('请求异常信息: ' + err.response?.toString() ?? "");
3737
}
38-
return Future.value(err); // continue;
38+
return err; // continue;
3939
}
4040
}

‎lib/common/net/interceptors/response_interceptor.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ import 'package:gsy_github_app_flutter/common/net/result_data.dart';
1010
class ResponseInterceptors extends InterceptorsWrapper {
1111

1212
@override
13-
onResponse(Response response) {
13+
onResponse(Response response) async {
1414
RequestOptions option = response.request;
1515
var value;
1616
try {
17-
if (option.contentType != null && option.contentType == "text") {
17+
var header = response.headers[Headers.contentTypeHeader];
18+
if ((header != null && header.toString().contains("text"))) {
1819
value = new ResultData(response.data, true, Code.SUCCESS);
19-
}
20-
if (response.statusCode == 200 || response.statusCode == 201) {
20+
} else if (response.statusCode >= 200 && response.statusCode < 300) {
2121
value = new ResultData(response.data, true, Code.SUCCESS, headers: response.headers);
2222
}
2323
} catch (e) {
2424
print(e.toString() + option.path);
2525
value = new ResultData(response.data, false, response.statusCode, headers: response.headers);
2626
}
27-
return Future.value(value);
27+
return value;
2828
}
2929
}

‎lib/common/net/trending/github_trending.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:gsy_github_app_flutter/common/net/result_data.dart';
1313
*/
1414
class GitHubTrending {
1515
fetchTrending(url) async {
16-
var res = await httpManager.netFetch(url, null, null, new Options(contentType: "text"));
16+
var res = await httpManager.netFetch(url, null, null, new Options(contentType: "text/plain; charset=utf-8"));
1717
if (res != null && res.result && res.data != null) {
1818
return new ResultData(TrendingUtil.htmlToRepo(res.data), true, Code.SUCCESS);
1919
} else {

‎pubspec.lock‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ packages:
1414
name: analyzer
1515
url: "https://pub.flutter-io.cn"
1616
source: hosted
17-
version: "0.37.1+1"
17+
version: "0.38.5"
1818
android_intent:
1919
dependency: "direct main"
2020
description:
@@ -35,7 +35,7 @@ packages:
3535
name: async
3636
url: "https://pub.flutter-io.cn"
3737
source: hosted
38-
version: "2.3.0"
38+
version: "2.4.0"
3939
bezier:
4040
dependency: "direct main"
4141
description:
@@ -49,7 +49,7 @@ packages:
4949
name: build
5050
url: "https://pub.flutter-io.cn"
5151
source: hosted
52-
version: "1.1.5"
52+
version: "1.2.0"
5353
build_config:
5454
dependency: transitive
5555
description:
@@ -70,7 +70,7 @@ packages:
7070
name: build_resolvers
7171
url: "https://pub.flutter-io.cn"
7272
source: hosted
73-
version: "1.0.6"
73+
version: "1.1.1"
7474
build_runner:
7575
dependency: "direct dev"
7676
description:
@@ -84,7 +84,7 @@ packages:
8484
name: build_runner_core
8585
url: "https://pub.flutter-io.cn"
8686
source: hosted
87-
version: "4.0.0"
87+
version: "4.1.0"
8888
built_collection:
8989
dependency: transitive
9090
description:
@@ -98,7 +98,7 @@ packages:
9898
name: built_value
9999
url: "https://pub.flutter-io.cn"
100100
source: hosted
101-
version: "6.7.0"
101+
version: "6.7.1"
102102
charcode:
103103
dependency: transitive
104104
description:
@@ -147,7 +147,7 @@ packages:
147147
name: crypto
148148
url: "https://pub.flutter-io.cn"
149149
source: hosted
150-
version: "2.0.6"
150+
version: "2.1.3"
151151
csslib:
152152
dependency: transitive
153153
description:
@@ -168,7 +168,7 @@ packages:
168168
name: dart_style
169169
url: "https://pub.flutter-io.cn"
170170
source: hosted
171-
version: "1.2.9"
171+
version: "1.3.1"
172172
device_info:
173173
dependency: "direct main"
174174
description:
@@ -203,14 +203,14 @@ packages:
203203
name: flare_dart
204204
url: "https://pub.flutter-io.cn"
205205
source: hosted
206-
version: "2.2.0"
206+
version: "2.2.2"
207207
flare_flutter:
208208
dependency: "direct main"
209209
description:
210210
name: flare_flutter
211211
url: "https://pub.flutter-io.cn"
212212
source: hosted
213-
version: "1.6.1"
213+
version: "1.6.2"
214214
flutter:
215215
dependency: "direct main"
216216
description: flutter
@@ -248,7 +248,7 @@ packages:
248248
name: flutter_slidable
249249
url: "https://pub.flutter-io.cn"
250250
source: hosted
251-
version: "0.5.3"
251+
version: "0.5.4"
252252
flutter_spinkit:
253253
dependency: "direct main"
254254
description:
@@ -283,7 +283,7 @@ packages:
283283
name: front_end
284284
url: "https://pub.flutter-io.cn"
285285
source: hosted
286-
version: "0.1.21+1"
286+
version: "0.1.27"
287287
glob:
288288
dependency: transitive
289289
description:
@@ -304,7 +304,7 @@ packages:
304304
name: html
305305
url: "https://pub.flutter-io.cn"
306306
source: hosted
307-
version: "0.14.0+2"
307+
version: "0.14.0+3"
308308
http:
309309
dependency: transitive
310310
description:
@@ -367,7 +367,7 @@ packages:
367367
name: kernel
368368
url: "https://pub.flutter-io.cn"
369369
source: hosted
370-
version: "0.3.21+1"
370+
version: "0.3.27"
371371
logging:
372372
dependency: transitive
373373
description:
@@ -381,7 +381,7 @@ packages:
381381
name: markdown
382382
url: "https://pub.flutter-io.cn"
383383
source: hosted
384-
version: "2.0.3"
384+
version: "2.1.1"
385385
matcher:
386386
dependency: transitive
387387
description:
@@ -409,7 +409,7 @@ packages:
409409
name: package_config
410410
url: "https://pub.flutter-io.cn"
411411
source: hosted
412-
version: "1.0.5"
412+
version: "1.1.0"
413413
package_info:
414414
dependency: "direct main"
415415
description:
@@ -488,7 +488,7 @@ packages:
488488
name: platform
489489
url: "https://pub.flutter-io.cn"
490490
source: hosted
491-
version: "2.2.0"
491+
version: "2.2.1"
492492
pool:
493493
dependency: transitive
494494
description:
@@ -523,7 +523,7 @@ packages:
523523
name: quiver
524524
url: "https://pub.flutter-io.cn"
525525
source: hosted
526-
version: "2.0.3"
526+
version: "2.0.5"
527527
redux:
528528
dependency: transitive
529529
description:
@@ -584,7 +584,7 @@ packages:
584584
name: source_gen
585585
url: "https://pub.flutter-io.cn"
586586
source: hosted
587-
version: "0.9.4+3"
587+
version: "0.9.4+5"
588588
source_span:
589589
dependency: transitive
590590
description:
@@ -626,7 +626,7 @@ packages:
626626
name: string_scanner
627627
url: "https://pub.flutter-io.cn"
628628
source: hosted
629-
version: "1.0.4"
629+
version: "1.0.5"
630630
synchronized:
631631
dependency: transitive
632632
description:
@@ -689,14 +689,14 @@ packages:
689689
name: web_socket_channel
690690
url: "https://pub.flutter-io.cn"
691691
source: hosted
692-
version: "1.0.14"
692+
version: "1.1.0"
693693
webview_flutter:
694694
dependency: "direct main"
695695
description:
696696
name: webview_flutter
697697
url: "https://pub.flutter-io.cn"
698698
source: hosted
699-
version: "0.3.10+3"
699+
version: "0.3.14+1"
700700
xml:
701701
dependency: transitive
702702
description:
@@ -710,7 +710,7 @@ packages:
710710
name: yaml
711711
url: "https://pub.flutter-io.cn"
712712
source: hosted
713-
version: "2.1.16"
713+
version: "2.2.0"
714714
sdks:
715715
dart: ">=2.5.0 <3.0.0"
716716
flutter: ">=1.9.1 <2.0.0"

0 commit comments

Comments
 (0)