From 4e3250bfd3147619a2c9ab01f2f0a35e24482ca7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 3 Aug 2020 09:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=82=AE=E7=AE=B1=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E9=99=90=E5=88=B650?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/templates/system/user/add.html | 2 +-
 .../src/main/resources/templates/system/user/edit.html        | 2 +-
 .../main/resources/templates/system/user/profile/profile.html | 2 +-
 .../com/ruoyi/framework/shiro/service/SysLoginService.java    | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index c8124ca5..346a0ee6 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -47,7 +47,7 @@
                         <label class="col-sm-4 control-label is-required">邮箱：</label>
                         <div class="col-sm-8">
                             <div class="input-group">
-                                <input id="email" name="email" class="form-control email" type="text" maxlength="20" placeholder="请输入邮箱" required>
+                                <input id="email" name="email" class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱" required>
                                 <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
                             </div>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index c9b61d5b..6004a8c2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -48,7 +48,7 @@
                         <label class="col-sm-4 control-label is-required">邮箱：</label>
                         <div class="col-sm-8">
                             <div class="input-group">
-                                <input name="email" class="form-control email" type="text" maxlength="20" placeholder="请输入邮箱" th:field="*{email}" required>
+                                <input name="email" class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱" th:field="*{email}" required>
                                 <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
                             </div>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
index 4c762ad8..853d4a75 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
@@ -77,7 +77,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-2 control-label">邮箱：</label>
                                         <div class="col-sm-10">
-                                            <input type="text" class="form-control" name="email" th:field="*{email}" placeholder="请输入邮箱">
+                                            <input type="text" maxlength="50" class="form-control" name="email" th:field="*{email}" placeholder="请输入邮箱">
                                         </div>
                                     </div>
                                     <div class="form-group">
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
index 92ebe89d..788c0d57 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
@@ -71,6 +71,7 @@ public class SysLoginService
         // 查询用户信息
         SysUser user = userService.selectUserByLoginName(username);
 
+        /**
         if (user == null && maybeMobilePhoneNumber(username))
         {
             user = userService.selectUserByPhoneNumber(username);
@@ -80,6 +81,7 @@ public class SysLoginService
         {
             user = userService.selectUserByEmail(username);
         }
+        */
 
         if (user == null)
         {
@@ -106,6 +108,7 @@ public class SysLoginService
         return user;
     }
 
+    /**
     private boolean maybeEmail(String username)
     {
         if (!username.matches(UserConstants.EMAIL_PATTERN))
@@ -123,6 +126,7 @@ public class SysLoginService
         }
         return true;
     }
+    */
 
     /**
      * 记录登录信息