Commit 23a289284fa029681f82c097d3b49325c805038f

Authored by fangcheng
1 parent 99b1500e0d
Exists in master

修改tokenservice保存用户

Showing 3 changed files with 33 additions and 55 deletions

parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java View file @ 23a2892
... ... @@ -121,7 +121,7 @@
121 121 }
122 122 //Organizations organizations = organizationsService.selectById( users.getOrgId());
123 123 Map<String, Object> result = InstanceUtils.newHashMap();
124   - String token = tokenService.createToken(users.getId());
  124 + String token = tokenService.createToken(users);
125 125 List<Roles> roles = rolesService.selectBatchIds(usersService.getRoleIdListByUserid(users.getId()));
126 126 List<Permissions> permissions = permissionsService.getUserPermission(users.getId());
127 127 Organizations org = organizationsService.selectById(users.getOrgId());
parent/hospital.web/src/main/java/com/lyms/hospital/service/token/TokenService.java View file @ 23a2892
1 1 package com.lyms.hospital.service.token;
2 2  
  3 +import com.lyms.base.common.entity.user.Users;
  4 +
3 5 /**
4 6 * Created by riecard on 15/9/22.
5 7 */
6 8  
... ... @@ -7,9 +9,9 @@
7 9 {
8 10  
9 11  
10   - String createToken(String userId);
  12 + String createToken(Users users);
11 13  
12   - String createToken(String userId, Integer second);
  14 + String createToken(Users users, Integer second);
13 15  
14 16 boolean resetToken(String token);
15 17  
16 18  
... ... @@ -18,10 +20,10 @@
18 20 boolean validToken(String token, Integer second);
19 21  
20 22 String getUserId(String token);
  23 +
  24 + Users getUsers(String token);
21 25  
22   - void deleteAllToken(String userId);
23   -
24   - void deleteAllToken(String userId, String prefix);
  26 + void deleteAllToken();
25 27  
26 28 void deleteToken(String token);
27 29  
parent/hospital.web/src/main/java/com/lyms/hospital/service/token/impl/TokenServiceImpl.java View file @ 23a2892
1 1 package com.lyms.hospital.service.token.impl;
2 2  
3 3 import java.io.Serializable;
4   -import java.util.List;
  4 +import java.util.Set;
5 5 import java.util.UUID;
6 6 import java.util.concurrent.TimeUnit;
7 7  
... ... @@ -10,6 +10,7 @@
10 10 import org.springframework.data.redis.core.RedisTemplate;
11 11 import org.springframework.stereotype.Service;
12 12  
  13 +import com.lyms.base.common.entity.user.Users;
13 14 import com.lyms.hospital.service.token.TokenService;
14 15 import com.lyms.util.SerializeUtils;
15 16 import com.lyms.util.TokenUtils;
16 17  
17 18  
18 19  
19 20  
... ... @@ -48,37 +49,18 @@
48 49 }
49 50  
50 51 @Override
51   - public String createToken(String userId, Integer second)
  52 + public String createToken(Users users, Integer second)
52 53 {
53 54 String token = getPrefix() + TokenUtils.getToken(UUID.randomUUID().toString());
54   - redisTemplate.opsForValue().set(token, userId);
  55 + redisTemplate.opsForValue().set(token, users);
55 56 redisTemplate.expire(token, second, TimeUnit.SECONDS);
56   -
57   -// List<Serializable> list = new ArrayList<Serializable>();
58   -// List<Serializable> delList = new ArrayList<Serializable>();
59   -// String tempKey = getPrefix() + userId;
60   -// Object obj = redisTemplate.opsForValue().get(tempKey);
61   -// if (obj != null)
62   -// {
63   -// list = (List<Serializable>) obj;
64   -// }
65   -// for (Serializable key : list)
66   -// {
67   -// if (!redisTemplate.hasKey(key))
68   -// {
69   -// delList.add(key);
70   -// }
71   -// }
72   -// list.removeAll(delList);
73   -// list.add(token);
74   -// redisTemplate.opsForValue().set(tempKey, SerializeUtils.serialize(list), second);
75 57 return token;
76 58 }
77 59  
78 60 @Override
79   - public String createToken(String userId)
  61 + public String createToken(Users users)
80 62 {
81   - return createToken(userId, getSeconds());
  63 + return createToken(users, getSeconds());
82 64 }
83 65  
84 66 @Override
85 67  
86 68  
... ... @@ -112,16 +94,29 @@
112 94 }
113 95 return false;
114 96 }
  97 +
  98 + @Override
  99 + public Users getUsers(String token)
  100 + {
  101 + Users users = (Users)redisTemplate.opsForValue().get(token);
  102 + if (users != null)
  103 + {
  104 + //redisTemplate.opsForValue().set(token, SerializeUtils.serialize(obj));
  105 + redisTemplate.expire(token, getSeconds(), TimeUnit.SECONDS);
  106 + return users;
  107 + }
  108 + return null;
  109 + }
115 110  
116 111 @Override
117 112 public String getUserId(String token)
118 113 {
119   - Object obj = redisTemplate.opsForValue().get(token);
120   - if (obj != null)
  114 + Users users = (Users)redisTemplate.opsForValue().get(token);
  115 + if (users != null)
121 116 {
122 117 //redisTemplate.opsForValue().set(token, SerializeUtils.serialize(obj));
123 118 redisTemplate.expire(token, getSeconds(), TimeUnit.SECONDS);
124   - return (String) obj;
  119 + return (String) users.getId();
125 120 }
126 121 return null;
127 122 }
128 123  
... ... @@ -133,29 +128,10 @@
133 128 }
134 129  
135 130 @Override
136   - public void deleteAllToken(String userId)
  131 + public void deleteAllToken()
137 132 {
138   - String tempKey = getPrefix() + "_tokenlist_" + userId;
139   - Object obj = redisTemplate.opsForValue().get(tempKey);
140   - if (obj != null)
141   - {
142   - List<Serializable> list = (List<Serializable>) obj;
143   - redisTemplate.delete(list);
144   - redisTemplate.delete(tempKey);
145   - }
146   - }
147   -
148   - @Override
149   - public void deleteAllToken(String userId, String prefix)
150   - {
151   - String tempKey = prefix + "_tokenlist_" + userId;
152   - Object obj = redisTemplate.opsForValue().get(tempKey);
153   - if (obj != null)
154   - {
155   - List<Serializable> list = (List<Serializable>) obj;
156   - redisTemplate.delete(list);
157   - redisTemplate.delete(tempKey);
158   - }
  133 + Set<Serializable> keys = redisTemplate.keys(getPrefix()+"*");
  134 + redisTemplate.delete(keys);
159 135 }
160 136 }