Skip to content

Commit 764c815

Browse files
author
tangrui
committed
Merge branch 'develop' into main
2 parents e009825 + ee5bec9 commit 764c815

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

lib/net/dio_utils.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class DioUtils {
177177
if (result.code == 200) {
178178
onSuccess?.call(result.data);
179179
} else {
180-
if (result.code == 401) {
180+
if (result.code == 401 && Get.currentRoute != NamedRouter.login) {
181181
Get.offAllNamed(NamedRouter.login);
182182
}
183183
_onError(result.code, result.message, onError);
@@ -307,6 +307,10 @@ class DioUtils {
307307
createHttpClient: () {
308308
var client = HttpClient()..idleTimeout = const Duration(seconds: 3);
309309
client.badCertificateCallback = (cert, host, port) => true;
310+
// client.findProxy = (uri) {
311+
// // Forward all request to proxy "localhost:8888".
312+
// return 'PROXY 192.168.11.217:8888';
313+
// };
310314
return client;
311315
},
312316
validateCertificate: (cert, host, port) {

lib/screen/login_screen.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ class LoginScreenController extends GetxController with WidgetsBindingObserver {
268268
@override
269269
void onClose() {
270270
WidgetsBinding.instance.removeObserver(this);
271-
_cancelToken.cancel();
272271
super.onClose();
273272
}
274273

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1616
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
1717
# In Windows, build-name is used as the major, minor, and patch parts
1818
# of the product and file versions while build-number is used as the build suffix.
19-
version: 1.0.2+3
19+
version: 1.0.3+4
2020

2121
environment:
2222
sdk: '>=2.19.6 <3.0.0'

0 commit comments

Comments
 (0)