From de564e6fd990960ea5796eadfa3b3fda7866a256 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 26 十月 2020 10:53:54 +0800
Subject: [PATCH] V2.510231 1.密码规则修改,修改为:密码必须为8-20个字符,包含字母、数字和符号。 2.APP本地增加登录,密码错误锁定,连续错误5次登录锁定,锁定5分钟。 3.登录界面,增加登录账号的邮箱格式匹配检测。

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
index 1d87585..0aeab48 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
@@ -925,7 +925,7 @@
             int index = 0;
             int indexCount = 0;
 
-            var mFileList = dataList.FindAll ((obj) => obj.BackupFileName != "null" && obj.BackupFileName != UserConfig.configFile && obj.BackupFileName != UserInfo.GlobalRegisterFile && obj.BackupFileName != "AccountListDB");
+            var mFileList = dataList.FindAll ((obj) => obj.BackupFileName != "null" && obj.BackupFileName != UserConfig.configFile && obj.BackupFileName != UserInfo.GlobalRegisterFile && obj.BackupFileName != "AccountListDB" && obj.BackupFileName != CommonConfig.ConfigFile);
             if (maxThreads > mFileList.Count) {
                 maxThreads = mFileList.Count;
             }
@@ -1052,7 +1052,7 @@
         void UpLoadBackupFileToDBNew (string mBackupClassId, int maxThreads = 20)
         {
             var backuplist = IO.FileUtils.ReadFiles ();
-            var mFileList = backuplist.FindAll ((obj) => obj != "null" && obj != UserConfig.configFile && obj != UserInfo.GlobalRegisterFile && obj != "AccountListDB");
+            var mFileList = backuplist.FindAll ((obj) => obj != "null" && obj != UserConfig.configFile && obj != UserInfo.GlobalRegisterFile && obj != "AccountListDB" && obj != CommonConfig.ConfigFile);
             if (mFileList.Count <= 0) return;
 
             if (maxThreads > mFileList.Count) {

--
Gitblit v1.8.0