From ac20dc99bf1f463365dba071973e08fffbd294b4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 14 七月 2023 14:12:21 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/sys/TokenService.java |   15 ++++++++-------
 1 files changed, 8 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 9d487f7..5203629 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -8,7 +8,6 @@
 import com.lf.server.helper.StringHelper;
 import com.lf.server.helper.WebHelper;
 import com.lf.server.mapper.sys.TokenMapper;
-import com.lf.server.service.all.PermsService;
 import com.lf.server.service.all.RedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,18 +36,19 @@
     LoginService loginService;
 
     @Autowired
-    public RedisService redisService;
-
-    @Autowired
-    public  PermsService permsService;
+    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);
     }
 
@@ -100,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;
     }

--
Gitblit v1.9.3