zwzw1219 2017-10-15 22:43:05 +08:00
parent 329a90e771
commit 3ef517e0de
5 changed files with 8 additions and 15 deletions

View File

@ -442,7 +442,7 @@ DROP TABLE IF EXISTS `sys_user`;
CREATE TABLE `sys_user` ( CREATE TABLE `sys_user` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`username` varchar(50) NOT NULL, `username` varchar(50) NOT NULL,
`password` varchar(32) NOT NULL, `password` varchar(60) NOT NULL,
`nickname` varchar(255) DEFAULT NULL, `nickname` varchar(255) DEFAULT NULL,
`headImgUrl` varchar(255) DEFAULT NULL, `headImgUrl` varchar(255) DEFAULT NULL,
`phone` varchar(11) DEFAULT NULL, `phone` varchar(11) DEFAULT NULL,
@ -460,8 +460,8 @@ CREATE TABLE `sys_user` (
-- ---------------------------- -- ----------------------------
-- Records of sys_user -- Records of sys_user
-- ---------------------------- -- ----------------------------
INSERT INTO `sys_user` VALUES ('1', 'admin', '1015ed3b5f1345911198c995f9ad097e', '管理员', null, '', '', '', '1998-07-01', '0', '1', '2017-04-10 15:21:38', '2017-07-06 09:20:19'); INSERT INTO `sys_user` VALUES ('1', 'admin', '$2a$10$iYM/H7TrSaLs7XyIWQdGwe1xf4cdmt3nwMja6RT0wxG5YY1RjN0EK', '管理员', null, '', '', '', '1998-07-01', '0', '1', '2017-04-10 15:21:38', '2017-07-06 09:20:19');
INSERT INTO `sys_user` VALUES ('2', 'user', '72c2e62dba72e5f178542313803f33d1', '用户', null, '', '', '', null, '1', '1', '2017-08-01 21:47:18', '2017-08-01 21:47:18'); INSERT INTO `sys_user` VALUES ('2', 'user', '$2a$10$ooGb4wjT7Hg3zgU2RhZp6eVu3jvG29i/U4L6VRwiZZ4.DZ0OOEAHu', '用户', null, '', '', '', null, '1', '1', '2017-08-01 21:47:18', '2017-08-01 21:47:18');
-- ---------------------------- -- ----------------------------
-- Table structure for t_job -- Table structure for t_job

View File

@ -29,7 +29,7 @@ public class TokenServiceImpl implements TokenService {
@Override @Override
public Token saveToken(LoginUser loginUser) { public Token saveToken(LoginUser loginUser) {
String oldToken = idTokenRedisTemplate.opsForValue().get(loginUser.getId()); String oldToken = getTokenByUserId(loginUser.getId());
if (!StringUtils.isEmpty(oldToken)) { if (!StringUtils.isEmpty(oldToken)) {
deleteToken(oldToken); deleteToken(oldToken);
} }

View File

@ -33,7 +33,7 @@
limit #{offset}, #{limit} limit #{offset}, #{limit}
</select> </select>
<select id="listReadUsers" resultType="User"> <select id="listReadUsers" resultType="SysUser">
select u.* from select u.* from
t_notice_read r inner join sys_user u t_notice_read r inner join sys_user u
on u.id = r.userId on u.id = r.userId

View File

@ -9,7 +9,7 @@
<result column="remark" property="remark" /> <result column="remark" property="remark" />
<result column="flag" property="flag" /> <result column="flag" property="flag" />
<result column="createTime" property="createTime" /> <result column="createTime" property="createTime" />
<association property="user" javaType="User"> <association property="user" javaType="SysUser">
<result property="id" column="userId" /> <result property="id" column="userId" />
<result property="username" column="username" /> <result property="username" column="username" />
<result property="nickname" column="nickname" /> <result property="nickname" column="nickname" />

View File

@ -38,18 +38,11 @@ function loginInfo(){
var user = ""; var user = "";
$.ajax({ $.ajax({
type : 'get', type : 'get',
url : '/sys/login', url : '/users/current?token='+localStorage.getItem("token"),
async: false, async: false,
success : function(data){ success : function(data){
if(data != null && data != ""){
user = data; user = data;
} }
},
error: function(xhr,textStatus,errorThrown){
var msg = xhr.responseText;
var response = JSON.parse(msg);
$("#info").html(response.message);
}
}); });
return user; return user;