github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

用户邮箱长度限制50

pull/195/head
RuoYi 2020-08-03 09:56:57 +08:00
parent 6d5b261c7d
commit 3d2d88287a
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/templates/system/user/add.html
View File

@ -47,7 +47,7 @@
<label class="col-sm-4 control-label is-required">邮箱：</label> <label class="col-sm-4 control-label is-required">邮箱：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <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> <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
</div> </div>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/user/edit.html
View File

@ -48,7 +48,7 @@
<label class="col-sm-4 control-label is-required">邮箱：</label> <label class="col-sm-4 control-label is-required">邮箱：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <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> <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
</div> </div>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
View File

@ -77,7 +77,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">邮箱：</label> <label class="col-sm-2 control-label">邮箱：</label>
<div class="col-sm-10"> <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> </div>
<div class="form-group"> <div class="form-group">

4
ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
View File

@ -71,6 +71,7 @@ public class SysLoginService
// 查询用户信息 // 查询用户信息
SysUser user = userService.selectUserByLoginName(username); SysUser user = userService.selectUserByLoginName(username);
/**
if (user == null && maybeMobilePhoneNumber(username)) if (user == null && maybeMobilePhoneNumber(username))
{ {
user = userService.selectUserByPhoneNumber(username); user = userService.selectUserByPhoneNumber(username);
@ -80,6 +81,7 @@ public class SysLoginService
{ {
user = userService.selectUserByEmail(username); user = userService.selectUserByEmail(username);
} }
*/
if (user == null) if (user == null)
{ {
@ -106,6 +108,7 @@ public class SysLoginService
return user; return user;
} }
/**
private boolean maybeEmail(String username) private boolean maybeEmail(String username)
{ {
if (!username.matches(UserConstants.EMAIL_PATTERN)) if (!username.matches(UserConstants.EMAIL_PATTERN))
@ -123,6 +126,7 @@ public class SysLoginService
} }
return true; return true;
} }
*/
/** /**
* 记录登录信息 * 记录登录信息