Prechádzať zdrojové kódy

登录的token 用户做标记修改

小么熊🐻 2 rokov pred
rodič
commit
d6f1402c82

+ 2 - 2
nbjk-admin/src/main/resources/application-dev.yml

@@ -55,9 +55,9 @@ spring:
     redis:
         database: 2
         # 地址
-        host: sh-crs-lfzs3n8w.sql.tencentcdb.com
+        host: 1.15.26.233
         # 端口,默认为6379
-        port: 29466
+        port: 6379
         # 密码
         password: miaxis110
         # 连接超时时间

+ 4 - 3
nbjk-admin/src/main/resources/application-local.yml

@@ -55,11 +55,12 @@ spring:
     redis:
         database: 2
         # 地址
-        host: sh-crs-lfzs3n8w.sql.tencentcdb.com
+        host: 1.15.26.233
         # 端口,默认为6379
-        port: 29466
+        port: 6379
         # 密码
-        password: miaxis110
+        #password: miaxis110
+        Auth: miaxis110
         # 连接超时时间
         timeout: 10s
         lettuce:

+ 7 - 5
nbjk-admin/src/test/java/com/miaxis/test/Test.java

@@ -1,13 +1,11 @@
 package com.miaxis.test;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Random;
-import java.util.TimeZone;
-
 public class Test {
 
     public static void main(String[] args) {
+
+        /**
+
         long timestamp = 1682363931131L;
         // 将时间戳转换为Date对象
         Date date = new Date(timestamp);
@@ -20,6 +18,10 @@ public class Test {
         // 输出结果
         System.out.println(timeStr);
 
+        **/
+
+        System.out.println(System.currentTimeMillis());
+
     }
 
 }

+ 2 - 2
nbjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java

@@ -96,7 +96,7 @@ public class LoginUser implements UserDetails
 
     public LoginUser(UserInfo student) {
         this.student = student;
-        this.id= "student_"+student.getId();
+        this.id= "student:"+student.getId()+"_"+System.currentTimeMillis();
     }
 
     public String getToken()
@@ -123,7 +123,7 @@ public class LoginUser implements UserDetails
     {
         this.user = user;
         this.permissions = permissions;
-        this.id = "sysUser_"+user.getUserId();
+        this.id = "sysUser:"+user.getUserId()+"_"+System.currentTimeMillis();
     }
 
     @JsonIgnore

+ 10 - 5
nbjk-framework/src/main/java/com/miaxis/framework/web/service/TokenService.java

@@ -152,20 +152,25 @@ public class TokenService
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
         //如果不是系统用户
-        if (loginUser.getUser()== null){
+        //if (loginUser.getUser()== null){
             //确保唯一登录
-//            uniqueLogin(loginUser.getId(),userKey);
-        }
+            //uniqueLogin(loginUser.getId(),userKey,expireTime);
+
+        //}
+
+        //保存用户key(方便以后查找用户信息)
+        redisCache.setCacheObject(loginUser.getId(),userKey, expireTime,TimeUnit.MINUTES);
+        //保存JWT用户信息
         redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
 
     }
 
-    private void uniqueLogin(String id, String userKey) {
+    private void uniqueLogin(String id, String userKey,int timeout) {
         String key = redisCache.getCacheObject(id);
         if (key != null){
             redisCache.deleteObject(key);
         }
-        redisCache.setCacheObject(id,userKey);
+        redisCache.setCacheObject(id,userKey,timeout,TimeUnit.MINUTES);
 
     }