From 9e80b0e01501851a2e37d3612d6f0fc03f58ce8d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 20 九月 2023 16:50:03 +0800
Subject: [PATCH] 添加proj4j坐标转换接口

---
 src/main/java/com/lf/server/service/sys/TokenService.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 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..ec92be1 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;
     }
@@ -153,13 +158,9 @@
 
         // 娓呴櫎缂撳瓨
         String tokenKey = RedisCacheKey.signTokenKey(token);
-        if (redisService.hasKey(tokenKey)) {
-            redisService.delete(tokenKey);
-        }
+        redisService.delete(tokenKey);
         String userKey = RedisCacheKey.signUserKey(te.getToken());
-        if (redisService.hasKey(userKey)) {
-            redisService.delete(userKey);
-        }
+        redisService.delete(userKey);
 
         // db锛岃缃护鐗岃繃鏈�
         te.setUpdateUser(ue.getId());
@@ -187,7 +188,7 @@
 
         // redis
         Object obj = redisService.get(tokenKey);
-        if (obj != null && obj instanceof TokenEntity) {
+        if (obj instanceof TokenEntity) {
             return (TokenEntity) obj;
         }
 
@@ -229,7 +230,7 @@
 
         // redis
         Object obj = redisService.get(userKey);
-        if (obj != null && obj instanceof UserEntity) {
+        if (obj instanceof UserEntity) {
             return (UserEntity) obj;
         }
 

--
Gitblit v1.9.3