diff --git a/lib/const/api.dart b/lib/const/api.dart index 97d970f..d8ee73a 100644 --- a/lib/const/api.dart +++ b/lib/const/api.dart @@ -21,6 +21,9 @@ class _Auth { ///登录/退出:管家app用户短信登录 String get login => '/login/loginSMSUser'; + + ///登录/退出:管家用户退出账户 + String get logout => '/user/signOut'; } class _User { diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index acefa69..122220c 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -2,6 +2,7 @@ import 'dart:io'; // Flutter imports: +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Project imports: @@ -24,13 +25,9 @@ class UserProvider extends ChangeNotifier { ///登陆 Future setLogin(int token) async { _isLogin = true; - NetUtil() - .dio - .options - .headers - .putIfAbsent('butlerApp-admin-token', () => token); - HiveStore.appBox.put('token', token); - HiveStore.appBox.put('login', true); + NetUtil().auth(token); + await HiveStore.appBox.put('token', token); + await HiveStore.appBox.put('login', true); _profileModel = await updateProfile(); _infoModel = await updateUserInfo(); // await setCurrentHouse((_userDetailModel?.estateNames?.isEmpty ?? true) @@ -62,9 +59,12 @@ class UserProvider extends ChangeNotifier { } ///注销登录 - logout() { + logout() async { + await NetUtil().get(API.auth.logout, showMessage: true); + NetUtil().logout(); _isLogin = false; - HiveStore.appBox.delete('token'); + await HiveStore.appBox.delete('token'); + await HiveStore.appBox.put('login', false); notifyListeners(); } diff --git a/lib/utils/network/net_util.dart b/lib/utils/network/net_util.dart index a139cfa..b4b96d6 100644 --- a/lib/utils/network/net_util.dart +++ b/lib/utils/network/net_util.dart @@ -37,6 +37,7 @@ class NetUtil { onRequest: (RequestOptions options) async => options, onResponse: (Response response) async { LoggerData.addData(response); + print(response.headers); return response; }, onError: (DioError error) async { @@ -47,8 +48,12 @@ class NetUtil { } ///call auth after login - auth(String token) { - _dio.options.headers.putIfAbsent('Butler-Admin-Token', () => token); + auth(int token) { + _dio.options.headers.putIfAbsent('butlerApp-admin-token', () => token); + } + + logout() { + _dio.options.headers.remove('butlerApp-admin-token'); } /// ## alias of Dio().get diff --git a/pubspec.lock b/pubspec.lock index 338404b..3b500c3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -551,11 +551,9 @@ packages: power_logger: dependency: "direct main" description: - path: "." - ref: HEAD - resolved-ref: "5a6be230ed03e9da941b2c67018e4a6bc3e81759" - url: "http://192.168.2.201:8099/aku_fe/power_logger.git" - source: git + name: power_logger + url: "https://pub.flutter-io.cn" + source: hosted version: "0.1.0" pretty_json: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index f219dea..9152a80 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -51,9 +51,7 @@ dependencies: dio: - power_logger: - git: - url: http://192.168.2.201:8099/aku_fe/power_logger.git + power_logger: ^0.1.0 logger: ^0.9.4 aku_ui: git: