修改老版本无法登录的问题

2025-10-09 16:48:19 +08:00 · 2022-01-21 10:30:57 +08:00
parent 2932ad3a64
commit abc6130940
7 changed files with 152 additions and 119 deletions
--- a/lib/base/http/api.dart
+++ b/lib/base/http/api.dart
@@ -24,7 +24,18 @@ class Api {
      },
    );
  }
-
+  static Future<HttpResponse<LoginBean>> loginOld(
+      String userName,
+      String passWord,
+      ) async {
+    return await Http.post<LoginBean>(
+      Url.loginOld,
+      {
+        "username": userName,
+        "password": passWord,
+      },
+    );
+  }
  static Future<HttpResponse<LoginBean>> loginTwo(
    String userName,
    String passWord,
--- a/lib/base/http/http.dart
+++ b/lib/base/http/http.dart
@@ -5,6 +5,7 @@ import 'package:dio/dio.dart';
 import 'package:dio_log/dio_log.dart';
 import 'package:flutter/foundation.dart';
 import 'package:qinglong_app/base/http/token_interceptor.dart';
+import 'package:qinglong_app/base/http/url.dart';
 import 'package:qinglong_app/base/userinfo_viewmodel.dart';
 import 'package:qinglong_app/utils/extension.dart';

@@ -54,7 +55,7 @@ class Http {

      return decodeResponse<T>(response, serializationName, compute);
    } on DioError catch (e) {
-      return exceptionHandler<T>(e);
+      return exceptionHandler<T>(e, uri);
    }
  }

@@ -74,7 +75,7 @@ class Http {
        compute,
      );
    } on DioError catch (e) {
-      return exceptionHandler<T>(e);
+      return exceptionHandler<T>(e, uri);
    }
  }

@@ -94,7 +95,7 @@ class Http {
        compute,
      );
    } on DioError catch (e) {
-      return exceptionHandler<T>(e);
+      return exceptionHandler<T>(e, uri);
    }
  }

@@ -113,7 +114,7 @@ class Http {
        compute,
      );
    } on DioError catch (e) {
-      return exceptionHandler<T>(e);
+      return exceptionHandler<T>(e, uri);
    }
  }

@@ -125,8 +126,8 @@ class Http {
    }
  }

-  static HttpResponse<T> exceptionHandler<T>(DioError e) {
-    if (e.response?.data!= null && e.response?.data['code'] == 401) {
+  static HttpResponse<T> exceptionHandler<T>(DioError e, String path) {
+    if (e.response?.statusCode == 401 && !Url.inWhiteList(path)) {
      if (!getIt<UserInfoViewModel>().useSecretLogined) {
        exitLogin();
      }
--- a/lib/base/http/token_interceptor.dart
+++ b/lib/base/http/token_interceptor.dart
@@ -7,10 +7,8 @@ import '../userinfo_viewmodel.dart';
 class TokenInterceptor extends Interceptor {
  @override
  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
-    if (getIt<UserInfoViewModel>().token != null &&
-        getIt<UserInfoViewModel>().token!.isNotEmpty) {
-      options.headers["Authorization"] =
-          "Bearer " + getIt<UserInfoViewModel>().token!;
+    if (getIt<UserInfoViewModel>().token != null && getIt<UserInfoViewModel>().token!.isNotEmpty) {
+      options.headers["Authorization"] = "Bearer " + getIt<UserInfoViewModel>().token!;
    }

    options.headers["User-Agent"] =
@@ -18,18 +16,9 @@ class TokenInterceptor extends Interceptor {

    options.headers["Content-Type"] = "application/json;charset=UTF-8";

-    // '/api/user/login',
-    // '/open/auth/token',
-    // '/api/user/two-factor/login',
-    // '/api/system',
-    // '/api/user/init',
-    // '/api/user/notification/init'

-    if (options.path != Url.loginByClientId &&
-        options.path != Url.loginTwo &&
-        options.path != Url.login) {
-      options.queryParameters["t"] =
-          (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString();
+    if (!Url.inWhiteList(options.path)) {
+      options.queryParameters["t"] = (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString();
    }
    return handler.next(options);
  }
--- a/lib/base/http/url.dart
+++ b/lib/base/http/url.dart
@@ -3,6 +3,9 @@ import '../userinfo_viewmodel.dart';

 class Url {
  static get login => "/api/user/login";
+
+  static get loginOld => "/api/login";
+
  static get loginTwo => "/api/user/two-factor/login";
  static const loginByClientId = "/open/auth/token";
  static const user = "/api/user";
@@ -50,6 +53,7 @@ class Url {
  static get taskLogDetail => getIt<UserInfoViewModel>().useSecretLogined ? "/open/logs/" : "/api/logs/";

  static get scripts => getIt<UserInfoViewModel>().useSecretLogined ? "/open/scripts/files" : "/api/scripts/files";
+
  static get scriptUpdate => getIt<UserInfoViewModel>().useSecretLogined ? "/open/scripts" : "/api/scripts";

  static get scriptDetail => getIt<UserInfoViewModel>().useSecretLogined ? "/open/scripts/" : "/api/scripts/";
@@ -58,9 +62,6 @@ class Url {

  static get dependencyReinstall => getIt<UserInfoViewModel>().useSecretLogined ? "/open/dependencies/reinstall" : "/api/dependencies/reinstall";

-
-
-
  static intimeLog(String cronId) {
    return getIt<UserInfoViewModel>().useSecretLogined ? "/open/crons/$cronId/log" : "/api/crons/$cronId/log";
  }
@@ -68,4 +69,11 @@ class Url {
  static envMove(String envId) {
    return getIt<UserInfoViewModel>().useSecretLogined ? "/open/envs/$envId/move" : "/api/envs/$envId/move";
  }
+
+  static bool inWhiteList(String path) {
+    if (path == login || path == loginByClientId || path == loginTwo || path == loginOld) {
+      return true;
+    }
+    return false;
+  }
 }
--- a/lib/module/login/login_page.dart
+++ b/lib/module/login/login_page.dart
@@ -94,42 +94,24 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                        crossAxisAlignment: CrossAxisAlignment.start,
                        children: [
                          SizedBox(
-                            height: MediaQuery.of(context).size.height / 10,
+                            height: MediaQuery.of(context).size.height / 8,
                          ),
-                          SizedBox(
-                            height: 50,
-                            width: MediaQuery.of(context).size.width,
-                            child: Stack(
-                              children: [
-                                Positioned(
-                                  top: 0,
-                                  left: 0,
+                          Row(
+                            children: [
+                              Expanded(
+                                child: Align(
+                                  alignment: Alignment.centerLeft,
                                  child: Image.asset(
                                    "assets/images/login_tip.png",
                                    height: 45,
                                  ),
                                ),
-                                const Positioned(
-                                  top: 10,
-                                  left: 0,
-                                  child: Text(
-                                    "登录",
-                                    style: TextStyle(
-                                      fontSize: 30,
-                                      fontWeight: FontWeight.bold,
-                                    ),
-                                  ),
-                                ),
-                                Positioned(
-                                  top: 5,
-                                  right: 0,
-                                  child: Image.asset(
-                                    "assets/images/ql.png",
-                                    height: 45,
-                                  ),
-                                ),
-                              ],
-                            ),
+                              ),
+                              Image.asset(
+                                "assets/images/ql.png",
+                                height: 45,
+                              ),
+                            ],
                          ),
                          SizedBox(
                            height: MediaQuery.of(context).size.height / 15,
@@ -276,7 +258,9 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                      ),
                    ),
                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 25,),
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 25,
+                      ),
                      child: Row(
                        children: [
                          Checkbox(
@@ -307,7 +291,9 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                              ),
                            ),
                          ),
-                          SizedBox(width: 10,),
+                          SizedBox(
+                            width: 10,
+                          ),
                        ],
                      ),
                    ),
@@ -316,7 +302,9 @@ class _LoginPageState extends ConsumerState<LoginPage> {
                    ),
                    Container(
                      alignment: Alignment.center,
-                      padding: const EdgeInsets.symmetric(horizontal: 40,),
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 40,
+                      ),
                      child: SizedBox(
                        width: MediaQuery.of(context).size.width - 80,
                        child: IgnorePointer(
@@ -377,72 +365,26 @@ class _LoginPageState extends ConsumerState<LoginPage> {
    }
    if (response.success) {
      loginSuccess(response, userName, password);
+    } else if (loginByUserName() && response.code == 401) {
+      //可能用户使用的是老版本qinglong
+      HttpResponse<LoginBean> oldResponse = await Api.loginOld(userName, password);
+      if (oldResponse.success) {
+        loginSuccess(oldResponse, userName, password);
+      } else {
+        (oldResponse.message ?? "请检查网络情况").toast();
+        if (oldResponse.code == 420) {
+          twoFact(userName, password);
+        } else {
+          isLoading = false;
+          setState(() {});
+        }
+      }
    } else {
      print(response.code);
      (response.message ?? "请检查网络情况").toast();
      //420代表需要2步验证
      if (response.code == 420) {
-        String twoFact = "";
-        showCupertinoDialog(
-            context: context,
-            builder: (_) => CupertinoAlertDialog(
-                  title: const Text("两步验证"),
-                  content: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Material(
-                        color: Colors.transparent,
-                        child: TextField(
-                          onChanged: (value) {
-                            twoFact = value;
-                          },
-                          maxLines: 1,
-                          keyboardType: TextInputType.number,
-                          decoration: const InputDecoration(
-                            contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
-                            hintText: "请输入code",
-                          ),
-                          autofocus: true,
-                        ),
-                      ),
-                    ],
-                  ),
-                  actions: [
-                    CupertinoDialogAction(
-                      child: const Text(
-                        "取消",
-                        style: TextStyle(
-                          color: Color(0xff999999),
-                        ),
-                      ),
-                      onPressed: () {
-                        Navigator.of(context).pop();
-                      },
-                    ),
-                    CupertinoDialogAction(
-                      child: Text(
-                        "确定",
-                        style: TextStyle(
-                          color: primaryColor,
-                        ),
-                      ),
-                      onPressed: () async {
-                        Navigator.of(context).pop(true);
-                        HttpResponse<LoginBean> response = await Api.loginTwo(userName, password, twoFact);
-                        if (response.success) {
-                          loginSuccess(response, userName, password);
-                        } else {
-                          loginFailed(response);
-                        }
-                      },
-                    ),
-                  ],
-                )).then((value) {
-          if (value == null) {
-            isLoading = false;
-            setState(() {});
-          }
-        });
+        twoFact(userName, password);
      } else {
        isLoading = false;
        setState(() {});
@@ -475,4 +417,68 @@ class _LoginPageState extends ConsumerState<LoginPage> {
      return _userNameController.text.isNotEmpty && _passwordController.text.isNotEmpty;
    }
  }
+
+  void twoFact(String userName, String password) {
+    String twoFact = "";
+    showCupertinoDialog(
+        context: context,
+        builder: (_) => CupertinoAlertDialog(
+              title: const Text("两步验证"),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Material(
+                    color: Colors.transparent,
+                    child: TextField(
+                      onChanged: (value) {
+                        twoFact = value;
+                      },
+                      maxLines: 1,
+                      keyboardType: TextInputType.number,
+                      decoration: const InputDecoration(
+                        contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
+                        hintText: "请输入code",
+                      ),
+                      autofocus: true,
+                    ),
+                  ),
+                ],
+              ),
+              actions: [
+                CupertinoDialogAction(
+                  child: const Text(
+                    "取消",
+                    style: TextStyle(
+                      color: Color(0xff999999),
+                    ),
+                  ),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                  },
+                ),
+                CupertinoDialogAction(
+                  child: Text(
+                    "确定",
+                    style: TextStyle(
+                      color: primaryColor,
+                    ),
+                  ),
+                  onPressed: () async {
+                    Navigator.of(context).pop(true);
+                    HttpResponse<LoginBean> response = await Api.loginTwo(userName, password, twoFact);
+                    if (response.success) {
+                      loginSuccess(response, userName, password);
+                    } else {
+                      loginFailed(response);
+                    }
+                  },
+                ),
+              ],
+            )).then((value) {
+      if (value == null) {
+        isLoading = false;
+        setState(() {});
+      }
+    });
+  }
 }
--- a/lib/module/others/about_page.dart
+++ b/lib/module/others/about_page.dart
@@ -66,6 +66,21 @@ class _AboutPageState extends ConsumerState<AboutPage> {
                fontSize: 16,
              ),
            ),
+            const SizedBox(
+              height: 15,
+            ),
+            GestureDetector(
+              onTap: () {
+                _launchURL("https://t.me/qinglongapp");
+              },
+              child: Text(
+                "Telegram频道",
+                style: TextStyle(
+                  color: primaryColor,
+                  fontSize: 16,
+                ),
+              ),
+            ),
            const Spacer(),
            Row(
              children: [
--- a/lib/module/others/other_page.dart
+++ b/lib/module/others/other_page.dart
@@ -367,6 +367,9 @@ class _OtherPageState extends ConsumerState<OtherPage> {
                  }),
            ),
          ),
+          const SizedBox(
+            height: 30,
+          ),
        ],
      ),
    );