Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
tangrui committed Jul 2, 2023
2 parents e009825 + ee5bec9 commit 764c815
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
6 changes: 5 additions & 1 deletion lib/net/dio_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class DioUtils {
if (result.code == 200) {
onSuccess?.call(result.data);
} else {
if (result.code == 401) {
if (result.code == 401 && Get.currentRoute != NamedRouter.login) {
Get.offAllNamed(NamedRouter.login);
}
_onError(result.code, result.message, onError);
Expand Down Expand Up @@ -307,6 +307,10 @@ class DioUtils {
createHttpClient: () {
var client = HttpClient()..idleTimeout = const Duration(seconds: 3);
client.badCertificateCallback = (cert, host, port) => true;
// client.findProxy = (uri) {
// // Forward all request to proxy "localhost:8888".
// return 'PROXY 192.168.11.217:8888';
// };
return client;
},
validateCertificate: (cert, host, port) {
Expand Down
1 change: 0 additions & 1 deletion lib/screen/login_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ class LoginScreenController extends GetxController with WidgetsBindingObserver {
@override
void onClose() {
WidgetsBinding.instance.removeObserver(this);
_cancelToken.cancel();
super.onClose();
}

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

environment:
sdk: '>=2.19.6 <3.0.0'
Expand Down

0 comments on commit 764c815

Please sign in to comment.