From 6a3fd334dd052166feaff30a11c6dfb24f0f99eb Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 07 八月 2023 11:10:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/TokenService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/lf/server/service/sys/TokenService.java b/src/main/java/com/lf/server/service/sys/TokenService.java
index 49965af..5203629 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -27,9 +27,6 @@
@Service
public class TokenService implements TokenMapper {
@Autowired
- public RedisService redisService;
-
- @Autowired
TokenMapper tokenMapper;
@Autowired
@@ -38,13 +35,20 @@
@Autowired
LoginService loginService;
+ @Autowired
+ RedisService redisService;
+
@Override
public Integer selectCount(String name, Integer type) {
+ name = StringHelper.getLikeUpperStr(name);
+
return tokenMapper.selectCount(name, type);
}
@Override
public List<TokenEntity> selectByPage(String name, Integer type, Integer limit, Integer offset) {
+ name = StringHelper.getLikeUpperStr(name);
+
return tokenMapper.selectByPage(name, type, limit, offset);
}
@@ -96,14 +100,15 @@
/**
* 鑾峰彇鏂扮殑浠ょ墝瀹炰綋绫�
*/
- public TokenEntity getNewToken(int userid, HttpServletRequest req) {
+ public TokenEntity getNewToken(UserEntity ue, HttpServletRequest req) {
TokenEntity te = new TokenEntity();
te.setToken(WebHelper.getGuid());
te.setDuration(SettingData.TOKEN_EXPIRE);
te.setExpire(WebHelper.getTimestamp(SettingData.TOKEN_EXPIRE));
te.setType(0);
te.setIp(WebHelper.getIpAddress(req));
- te.setCreateUser(userid);
+ te.setCreateUser(ue.getId());
+ te.setUname(ue.getUname());
return te;
}
@@ -187,7 +192,7 @@
// redis
Object obj = redisService.get(tokenKey);
- if (obj != null && obj instanceof TokenEntity) {
+ if (obj instanceof TokenEntity) {
return (TokenEntity) obj;
}
@@ -229,7 +234,7 @@
// redis
Object obj = redisService.get(userKey);
- if (obj != null && obj instanceof UserEntity) {
+ if (obj instanceof UserEntity) {
return (UserEntity) obj;
}
--
Gitblit v1.9.3