From 3ef517e0de71dbc6d1791574d90f2f1bc47aedd5 Mon Sep 17 00:00:00 2001
From: zwzw1219 <zwzw1219@192.168.1.111>
Date: Sun, 15 Oct 2017 22:43:05 +0800
Subject: [PATCH] 1

---
 doc/db/boot_security.sql                              |  6 +++---
 .../server/service/impl/TokenServiceImpl.java         |  2 +-
 src/main/resources/mybatis-mappers/NoticeMapper.xml   |  2 +-
 src/main/resources/mybatis-mappers/SysLogsMapper.xml  |  2 +-
 src/main/resources/static/js/common.js                | 11 ++---------
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/doc/db/boot_security.sql b/doc/db/boot_security.sql
index 7e54337..755ea8b 100644
--- a/doc/db/boot_security.sql
+++ b/doc/db/boot_security.sql
@@ -442,7 +442,7 @@ DROP TABLE IF EXISTS `sys_user`;
 CREATE TABLE `sys_user` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `username` varchar(50) NOT NULL,
-  `password` varchar(32) NOT NULL,
+  `password` varchar(60) NOT NULL,
   `nickname` varchar(255) DEFAULT NULL,
   `headImgUrl` varchar(255) DEFAULT NULL,
   `phone` varchar(11) DEFAULT NULL,
@@ -460,8 +460,8 @@ CREATE TABLE `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 ('2', 'user', '72c2e62dba72e5f178542313803f33d1', '用户', null, '', '', '', null, '1', '1', '2017-08-01 21:47:18', '2017-08-01 21:47:18');
+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', '$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
diff --git a/src/main/java/com/boot/security/server/service/impl/TokenServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/TokenServiceImpl.java
index fc2dded..918ff09 100644
--- a/src/main/java/com/boot/security/server/service/impl/TokenServiceImpl.java
+++ b/src/main/java/com/boot/security/server/service/impl/TokenServiceImpl.java
@@ -29,7 +29,7 @@ public class TokenServiceImpl implements TokenService {
 
 	@Override
 	public Token saveToken(LoginUser loginUser) {
-		String oldToken = idTokenRedisTemplate.opsForValue().get(loginUser.getId());
+		String oldToken = getTokenByUserId(loginUser.getId());
 		if (!StringUtils.isEmpty(oldToken)) {
 			deleteToken(oldToken);
 		}
diff --git a/src/main/resources/mybatis-mappers/NoticeMapper.xml b/src/main/resources/mybatis-mappers/NoticeMapper.xml
index 2d14518..2a0f9a3 100644
--- a/src/main/resources/mybatis-mappers/NoticeMapper.xml
+++ b/src/main/resources/mybatis-mappers/NoticeMapper.xml
@@ -33,7 +33,7 @@
 		limit #{offset}, #{limit}
 	</select>
 
-	<select id="listReadUsers" resultType="User">
+	<select id="listReadUsers" resultType="SysUser">
 		select u.* from
 		t_notice_read r inner join sys_user u
 		on u.id = r.userId
diff --git a/src/main/resources/mybatis-mappers/SysLogsMapper.xml b/src/main/resources/mybatis-mappers/SysLogsMapper.xml
index c9a491a..c9a5198 100644
--- a/src/main/resources/mybatis-mappers/SysLogsMapper.xml
+++ b/src/main/resources/mybatis-mappers/SysLogsMapper.xml
@@ -9,7 +9,7 @@
 		<result column="remark" property="remark" />
 		<result column="flag" property="flag" />
 		<result column="createTime" property="createTime" />
-		<association property="user" javaType="User">
+		<association property="user" javaType="SysUser">
 			<result property="id" column="userId" />
 			<result property="username" column="username" />
 			<result property="nickname" column="nickname" />
diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js
index bd32b52..6a600b3 100644
--- a/src/main/resources/static/js/common.js
+++ b/src/main/resources/static/js/common.js
@@ -38,17 +38,10 @@ function loginInfo(){
 	var user = "";
     $.ajax({
         type : 'get',
-        url : '/sys/login',
+        url : '/users/current?token='+localStorage.getItem("token"),
         async: false,
         success : function(data){
-            if(data != null && data != ""){
-                user = data;
-            }
-        },
-        error: function(xhr,textStatus,errorThrown){
-            var msg = xhr.responseText;
-            var response = JSON.parse(msg);
-            $("#info").html(response.message);
+           user = data;
         }
     });