Merge remote-tracking branch 'remotes/origin/dev'

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.3
+
+* 解决2.10.12及以下版本无法登录的问题
+* 适配最新版qinglong 相关接口字段
+
 ## 1.0.2
 
 * 支持修改用户名密码(仅限使用用户名密码登录用户)

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,
@@ -103,6 +114,7 @@ class Api {
 
     if (id != null) {
       data["_id"] = id;
+      data["id"] = id;
       return await Http.put<NullResponse>(
         Url.addTask,
         data,
@@ -207,6 +219,7 @@ class Api {
 
     if (id != null) {
       data["_id"] = id;
+      data["id"] = id;
       return await Http.put<NullResponse>(
         Url.addEnv,
         data,

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) {
+  static HttpResponse<T> exceptionHandler<T>(DioError e, String path) {
-    if (e.response?.statusCode == 401) {
+    if (e.response?.statusCode == 401 && !Url.inWhiteList(path)) {
       if (!getIt<UserInfoViewModel>().useSecretLogined) {
         exitLogin();
       }

lib/base/http/token_interceptor.dart

@@ -7,18 +7,18 @@ import '../userinfo_viewmodel.dart';
 class TokenInterceptor extends Interceptor {
   @override
   void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
-    if (getIt<UserInfoViewModel>().token != null &&
+    if (getIt<UserInfoViewModel>().token != null && getIt<UserInfoViewModel>().token!.isNotEmpty) {
-        getIt<UserInfoViewModel>().token!.isNotEmpty) {
+      options.headers["Authorization"] = "Bearer " + getIt<UserInfoViewModel>().token!;
-      options.headers["Authorization"] =
-          "Bearer " + getIt<UserInfoViewModel>().token!;
     }
 
-    options.headers["User-Agent"] = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1";
+    options.headers["User-Agent"] =
+        "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1";
 
     options.headers["Content-Type"] = "application/json;charset=UTF-8";
-    if (options.path != Url.loginByClientId && options.path!= Url.loginTwo) {
+
-      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);
   }

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;
+  }
 }

lib/module/env/env_bean.dart

@@ -10,18 +10,11 @@ class EnvBean {
   String? name;
   String? remarks;
 
-  EnvBean(
+  EnvBean({this.value, this.sId, this.created, this.status, this.timestamp, this.name, this.remarks});
-      {this.value,
-      this.sId,
-      this.created,
-      this.status,
-      this.timestamp,
-      this.name,
-      this.remarks});
 
   EnvBean.fromJson(Map<String, dynamic> json) {
     value = json['value'];
-    sId = json['_id'];
+    sId = json.containsKey('_id') ? json['_id'].toString() : (json.containsKey('id') ? json['id'].toString() : "");
     created = json['created'];
     status = json['status'];
     timestamp = json['timestamp'];

lib/module/login/login_page.dart

@@ -94,43 +94,25 @@ 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(
+                          Row(
-                            height: 50,
-                            width: MediaQuery.of(context).size.width,
-                            child: Stack(
                             children: [
-                                Positioned(
+                              Expanded(
-                                  top: 0,
+                                child: Align(
-                                  left: 0,
+                                  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,
                               ),
-                                  ),
+                              Image.asset(
-                                ),
-                                Positioned(
-                                  top: 5,
-                                  right: 0,
-                                  child: 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,11 +365,60 @@ 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) {
+        twoFact(userName, password);
+      } else {
+        isLoading = false;
+        setState(() {});
+      }
+    }
+  }
+
+  void loginFailed(HttpResponse<LoginBean> response) {
+    (response.message ?? "请检查网络情况").toast();
+    isLoading = false;
+    setState(() {});
+  }
+
+  void loginSuccess(HttpResponse<LoginBean> response, String userName, String password) {
+    getIt<UserInfoViewModel>().updateToken(response.bean?.token ?? "");
+    getIt<UserInfoViewModel>().useSecretLogin(!loginByUserName());
+    if (rememberPassword) {
+      getIt<UserInfoViewModel>().updateUserName(userName, password);
+    }
+    Navigator.of(context).pushReplacementNamed(Routes.routeHomePage);
+  }
+
+  bool canClickLoginBtn() {
+    if (isLoading) return false;
+
+    if (_hostController.text.isEmpty) return false;
+    if (!loginByUserName()) {
+      return _cIdController.text.isNotEmpty && _cSecretController.text.isNotEmpty;
+    } else {
+      return _userNameController.text.isNotEmpty && _passwordController.text.isNotEmpty;
+    }
+  }
+
+  void twoFact(String userName, String password) {
     String twoFact = "";
     showCupertinoDialog(
         context: context,
@@ -443,36 +480,5 @@ class _LoginPageState extends ConsumerState<LoginPage> {
         setState(() {});
       }
     });
-      } else {
-        isLoading = false;
-        setState(() {});
-      }
-    }
-  }
-
-  void loginFailed(HttpResponse<LoginBean> response) {
-    (response.message ?? "请检查网络情况").toast();
-    isLoading = false;
-    setState(() {});
-  }
-
-  void loginSuccess(HttpResponse<LoginBean> response, String userName, String password) {
-    getIt<UserInfoViewModel>().updateToken(response.bean?.token ?? "");
-    getIt<UserInfoViewModel>().useSecretLogin(!loginByUserName());
-    if (rememberPassword) {
-      getIt<UserInfoViewModel>().updateUserName(userName, password);
-    }
-    Navigator.of(context).pushReplacementNamed(Routes.routeHomePage);
-  }
-
-  bool canClickLoginBtn() {
-    if (isLoading) return false;
-
-    if (_hostController.text.isEmpty) return false;
-    if (!loginByUserName()) {
-      return _cIdController.text.isNotEmpty && _cSecretController.text.isNotEmpty;
-    } else {
-      return _userNameController.text.isNotEmpty && _passwordController.text.isNotEmpty;
-    }
   }
 }

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: [

lib/module/others/other_page.dart

@@ -367,6 +367,9 @@ class _OtherPageState extends ConsumerState<OtherPage> {
                   }),
             ),
           ),
+          const SizedBox(
+            height: 30,
+          ),
         ],
       ),
     );

lib/module/task/task_bean.dart

@@ -43,7 +43,7 @@ class TaskBean {
       command = json['command'].toString();
       schedule = json['schedule'].toString();
       saved = json['saved'];
-      sId = json['_id'].toString();
+      sId = json.containsKey('_id') ? json['_id'].toString() : (json.containsKey('id') ? json['id'].toString() : "");
       created = json['created'];
       status = json['status'];
       timestamp = json['timestamp'].toString();

pubspec.lock

@@ -884,4 +884,4 @@ packages:
     version: "3.1.0"
 sdks:
   dart: ">=2.15.1 <3.0.0"
-  flutter: ">=2.5.0"
+  flutter: ">=2.8.1"

pubspec.yaml

@@ -1,10 +1,11 @@
 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.2+3
+version: 1.0.3+4
 
 environment:
   sdk: ">=2.15.1 <3.0.0"
+  flutter: ">=2.8.1"
 
 
 dependencies: