From c8cc61e84189d8f986f7c4657d543408021b3da0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 12:46:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-common/src/main/java/com/moral/util/TokenUtils.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/TokenUtils.java b/screen-common/src/main/java/com/moral/util/TokenUtils.java
index e580762..32fe383 100644
--- a/screen-common/src/main/java/com/moral/util/TokenUtils.java
+++ b/screen-common/src/main/java/com/moral/util/TokenUtils.java
@@ -76,6 +76,27 @@
                     ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
         }
     }
+    public static String getTokenApp(String uid, Object userInfo) {
+        //������������token
+        try {
+            //������token
+            String token = TokenEncryptUtils.encoded(uid + "/" + System.currentTimeMillis() / 1000);
+            //������������token
+            String oldToken = (String) redisTemplate.opsForHash().get("user_token", uid);
+            if (oldToken != null)
+                redisTemplate.delete(oldToken);
+            //���token���������value���
+            redisTemplate.opsForValue().set(token, userInfo);
+            //redisTemplate.expire(token, validity_time, TimeUnit.SECONDS);
+            //���token���������Hash���
+            redisTemplate.opsForHash().put("user_token", uid, token);
+            return token;
+        } catch (Exception e) {
+            log.error("token���������������" + e.getMessage());
+            throw new TokenException(ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode(),
+                    ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
+        }
+    }
 
 
     /**
@@ -85,7 +106,7 @@
      * @Author: ���������
      * @Date: 2021/3/10
      */
-    public static void checkToken(String token) {
+    public static boolean checkToken(String token) {
         try {
             String[] tokenArray = TokenEncryptUtils.decoded(token).split("/");
             //������token������������
@@ -99,9 +120,9 @@
                         ResponseCodeEnum.TOKEN_INVALID.getMsg());
             }
         } catch (Exception e) {
-            throw new TokenException(ResponseCodeEnum.TOKEN_INVALID.getCode(),
-                    ResponseCodeEnum.TOKEN_INVALID.getMsg());
+            return false;
         }
+        return true;
     }
 
 
@@ -118,6 +139,11 @@
             throw new TokenException(ResponseCodeEnum.TOKEN_INVALID.getCode(),
                     ResponseCodeEnum.TOKEN_INVALID.getMsg());
         return userInfo;
+    }
+
+    public static Object getUserInfo() {
+        String token = getCurrentToken();
+        return getUserInfoByToken(token);
     }
 
     /**
@@ -146,6 +172,7 @@
         destoryToken(getUidByToken(token), token);
     }
 
+
     /**
      * @Description: ���������������������token
      * @Param: []
@@ -170,7 +197,11 @@
      * @Date: 2021/5/21
      */
     public static String getTokenById(Integer id) {
-         return (String)redisTemplate.opsForHash().get("user_token", String.valueOf(id));
+         return (String) getTokenById(id.toString());
+    }
+
+    public static String getTokenById(String id) {
+        return (String)redisTemplate.opsForHash().get("user_token", String.valueOf(id));
     }
 
 

--
Gitblit v1.8.0