Leaf-WAI/qinglong_app
1
0
Fork 0
mirror of https://github.com/qinglong-app/qinglong_app.git synced 2025-10-09 16:48:19 +08:00
Code Issues Projects Releases Wiki Activity

修改域名输错之后无法登录的bug

Browse Source
This commit is contained in:
jyuesong
2022-01-20 11:16:18 +08:00
parent 747b15fdea
commit df9aa8e72f
4 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,5 +1,6 @@
## 1.0.2
* 支持修改用户名密码(仅限使用用户名密码登录用户)
* 支持脚本的编辑删除
* 支持client_id登录之后只启用部分模块

13
lib/base/http/http.dart
View File

@@ -22,9 +22,9 @@ class Http {
_dio = Dio(
BaseOptions(
baseUrl: host,
connectTimeout: 5000,
receiveTimeout: 5000,
sendTimeout: 5000,
connectTimeout: 50000,
receiveTimeout: 50000,
sendTimeout: 50000,
contentType: "application/json",
),
);
@@ -38,6 +38,10 @@ class Http {
}
}
static void clear() {
_dio = null;
}
static Future<HttpResponse<T>> get<T>(
String uri,
Map<String, String?>? json, {
@@ -124,8 +128,9 @@ class Http {
static HttpResponse<T> exceptionHandler<T>(DioError e) {
if (e.response?.statusCode == 401 && !getIt<UserInfoViewModel>().useSecretLogined) {
exitLogin();
}
return HttpResponse(success: false, message: "没有该模块的访问权限", code: 0);
}
return HttpResponse(success: false, message: e.message, code: 0);
}
static HttpResponse<T> decodeResponse<T>(

53
lib/module/login/login_page.dart
View File

@@ -22,8 +22,7 @@ class LoginPage extends ConsumerStatefulWidget {
}
class _LoginPageState extends ConsumerState<LoginPage> {
final TextEditingController _hostController =
TextEditingController(text: getIt<UserInfoViewModel>().host);
final TextEditingController _hostController = TextEditingController(text: getIt<UserInfoViewModel>().host);
final TextEditingController _userNameController = TextEditingController();
final TextEditingController _passwordController = TextEditingController();
final TextEditingController _cIdController = TextEditingController();
@@ -39,8 +38,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
super.initState();
useSecretLogin = getIt<UserInfoViewModel>().useSecretLogined;
if (getIt<UserInfoViewModel>().userName != null &&
getIt<UserInfoViewModel>().userName!.isNotEmpty) {
if (getIt<UserInfoViewModel>().userName != null && getIt<UserInfoViewModel>().userName!.isNotEmpty) {
if (getIt<UserInfoViewModel>().useSecretLogined) {
_cIdController.text = getIt<UserInfoViewModel>().userName!;
} else {
@@ -50,8 +48,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
} else {
rememberPassword = false;
}
if (getIt<UserInfoViewModel>().passWord != null &&
getIt<UserInfoViewModel>().passWord!.isNotEmpty) {
if (getIt<UserInfoViewModel>().passWord != null && getIt<UserInfoViewModel>().passWord!.isNotEmpty) {
if (getIt<UserInfoViewModel>().useSecretLogined) {
_cSecretController.text = getIt<UserInfoViewModel>().passWord!;
} else {
@@ -181,8 +178,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
},
controller: _userNameController,
decoration: const InputDecoration(
contentPadding:
EdgeInsets.fromLTRB(0, 5, 0, 5),
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入用户名",
),
autofocus: false,
@@ -204,8 +200,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
controller: _passwordController,
obscureText: true,
decoration: const InputDecoration(
contentPadding:
EdgeInsets.fromLTRB(0, 5, 0, 5),
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入密码",
),
autofocus: false,
@@ -239,8 +234,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
},
controller: _cIdController,
decoration: const InputDecoration(
contentPadding:
EdgeInsets.fromLTRB(0, 5, 0, 5),
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入client_id",
),
autofocus: false,
@@ -262,8 +256,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
controller: _cSecretController,
obscureText: true,
decoration: const InputDecoration(
contentPadding:
EdgeInsets.fromLTRB(0, 5, 0, 5),
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入client_secret",
),
autofocus: false,
@@ -294,8 +287,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
GestureDetector(
onTap: () {
cardKey.currentState?.toggleCard();
WidgetsBinding.instance
?.addPostFrameCallback((timeStamp) {
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) {
setState(() {});
});
},
@@ -319,14 +311,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
padding: const EdgeInsets.symmetric(
vertical: 5,
),
color: canClickLoginBtn()
? ref
.watch(themeProvider)
.themeColor
.buttonBgColor()
: Theme.of(context)
.primaryColor
.withOpacity(0.4),
color: canClickLoginBtn() ? ref.watch(themeProvider).themeColor.buttonBgColor() : Theme.of(context).primaryColor.withOpacity(0.4),
child: isLoading
? const CupertinoActivityIndicator()
: const Text(
@@ -338,14 +323,12 @@ class _LoginPageState extends ConsumerState<LoginPage> {
onPressed: () {
Http.pushedLoginPage = false;
Utils.hideKeyBoard(context);
getIt<UserInfoViewModel>()
.updateHost(_hostController.text);
getIt<UserInfoViewModel>().updateHost(_hostController.text);
Http.clear();
if (loginByUserName()) {
login(_userNameController.text,
_passwordController.text);
login(_userNameController.text, _passwordController.text);
} else {
login(_cIdController.text,
_cSecretController.text);
login(_cIdController.text, _cSecretController.text);
}
},
),
@@ -390,9 +373,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
} else {
HttpResponse<UserBean> userResponse = await Api.user();
if (userResponse.success) {
if (userResponse.bean != null &&
userResponse.bean!.twoFactorActivated != null &&
userResponse.bean!.twoFactorActivated!) {
if (userResponse.bean != null && userResponse.bean!.twoFactorActivated != null && userResponse.bean!.twoFactorActivated!) {
("你已开启两步验证,App暂不支持").toast();
isLoading = false;
setState(() {});
@@ -417,11 +398,9 @@ class _LoginPageState extends ConsumerState<LoginPage> {
if (_hostController.text.isEmpty) return false;
if (!loginByUserName()) {
return _cIdController.text.isNotEmpty &&
_cSecretController.text.isNotEmpty;
return _cIdController.text.isNotEmpty && _cSecretController.text.isNotEmpty;
} else {
return _userNameController.text.isNotEmpty &&
_passwordController.text.isNotEmpty;
return _userNameController.text.isNotEmpty && _passwordController.text.isNotEmpty;
}
}
}

2
pubspec.yaml
View File

@@ -1,7 +1,7 @@
name: qinglong_app
description: A new Flutter project.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.1+2
version: 1.0.2+3
environment:
sdk: ">=2.15.1 <3.0.0"