hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持手机号码、邮箱登录

Browse Source
This commit is contained in:
RuoYi
2018-05-18 23:20:19 +08:00
parent a624ac009e
commit fab59267ed
17 changed files with 360 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/application.yml
View File

@ -66,7 +66,7 @@ shiro:
# 首页地址
indexUrl: /index
# 验证码开关
captchaEbabled: true
captchaEbabled: false
# 验证码类型 math 数组计算 char 字符
captchaType: math
cookie:

30
src/main/resources/mybatis/system/UserMapper.xml
View File

@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectUserByName" parameterType="String" resultMap="UserResult">
<select id="selectUserByLoginName" parameterType="String" resultMap="UserResult">
select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.phonenumber, u.sex, u.avatar, u.password, u.salt, u.status, u.refuse_des, u.create_time,
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.status as dept_status
from sys_user u
@ -54,10 +54,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where u.login_name = #{userName}
</select>
<select id="checkUserNameUnique" parameterType="String" resultType="int">
<select id="selectUserByPhoneNumber" parameterType="String" resultMap="UserResult">
select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.phonenumber, u.sex, u.avatar, u.password, u.salt, u.status, u.refuse_des, u.create_time,
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.status as dept_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
where u.phonenumber = #{phonenumber}
</select>
<select id="selectUserByEmail" parameterType="String" resultMap="UserResult">
select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.phonenumber, u.sex, u.avatar, u.password, u.salt, u.status, u.refuse_des, u.create_time,
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.status as dept_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
where u.email = #{email}
</select>
<select id="checkLoginNameUnique" parameterType="String" resultType="int">
select count(*) from sys_user where login_name=#{loginName}
</select>
<select id="checkPhoneUnique" parameterType="String" resultMap="UserResult">
select user_id, phonenumber from sys_user where phonenumber=#{phonenumber}
</select>
<select id="checkEmailUnique" parameterType="String" resultMap="UserResult">
select user_id, email from sys_user where email=#{email}
</select>
<select id="selectUserById" parameterType="Long" resultMap="UserResult">
select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.phonenumber, u.sex, u.avatar, u.password, u.salt, u.status, u.refuse_des, u.create_time,
d.dept_id, d.parent_id, d.dept_name, d.order_num, d.status as dept_status

40
src/main/resources/static/ruoyi/system/user/add.js
View File

@ -5,7 +5,7 @@ $("#form-user-add").validate({
minlength: 2,
maxlength: 20,
remote: {
url: ctx + "system/user/checkUserNameUnique",
url: ctx + "system/user/checkLoginNameUnique",
type: "post",
dataType: "json",
data: {
@ -32,16 +32,50 @@ $("#form-user-add").validate({
},
email:{
required:true,
email:true
email:true,
remote: {
url: ctx + "system/user/checkEmailUnique",
type: "post",
dataType: "json",
data: {
name: function () {
return $.trim($("#email").val());
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
}
}
},
phonenumber:{
required:true,
remote: {
url: ctx + "system/user/checkPhoneUnique",
type: "post",
dataType: "json",
data: {
name: function () {
return $.trim($("#phonenumber").val());
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
}
}
},
},
messages: {
"loginName": {
remote: "用户已经存在"
}
},
"email": {
remote: "Email已经存在"
},
"phonenumber":{
remote: "手机号码已经存在"
}
},
submitHandler:function(form){
add();

44
src/main/resources/static/ruoyi/system/user/edit.js
View File

@ -8,12 +8,54 @@ $("#form-user-edit").validate({
},
email:{
required:true,
email:true
email:true,
remote: {
url: ctx + "system/user/checkEmailUnique",
type: "post",
dataType: "json",
data: {
"userId": function() {
return $("input[name='userId']").val();
},
"email": function() {
return $("input[name='email']").val();
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
}
}
},
phonenumber:{
required:true,
remote: {
url: ctx + "system/user/checkPhoneUnique",
type: "post",
dataType: "json",
data: {
"userId": function() {
return $("input[name='userId']").val();
},
"phonenumber": function() {
return $("input[name='phonenumber']").val();
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
}
}
},
},
messages: {
"email": {
remote: "Email已经存在"
},
"phonenumber":{
remote: "手机号码已经存在"
}
},
submitHandler:function(form){
update();
}

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

@ -36,7 +36,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">邮箱：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="email">
<input class="form-control" type="text" name="email" id="email">
</div>
</div>
<div class="form-group">

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

@ -31,7 +31,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">邮箱：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="email" th:value="${user.email}">
<input class="form-control" type="text" name="email" id="email" th:value="${user.email}">
</div>
</div>
<div class="form-group">