From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-common/src/main/java/com/moral/util/TokenUtils.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 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 d6720fa..e51b7c0 100644
--- a/screen-common/src/main/java/com/moral/util/TokenUtils.java
+++ b/screen-common/src/main/java/com/moral/util/TokenUtils.java
@@ -76,7 +76,31 @@
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���
+ getRefreshTokenApp(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());
+ }
+ }
+ public static void getRefreshTokenApp(String token, Object userInfo) {
+ redisTemplate.opsForValue().set(token, userInfo);
+ }
/**
* @Description: ������token
@@ -85,7 +109,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 +123,9 @@
ResponseCodeEnum.TOKEN_INVALID.getMsg());
}
} catch (Exception e) {
- throw new TokenException(ResponseCodeEnum.TOKEN_INVALID.getCode(),
- ResponseCodeEnum.TOKEN_INVALID.getMsg());
+ return false;
}
+ return true;
}
@@ -120,6 +144,11 @@
return userInfo;
}
+ public static Object getUserInfo() {
+ String token = getCurrentToken();
+ return getUserInfoByToken(token);
+ }
+
/**
* @Description: ������token
* @Param: [uid, token]
@@ -128,6 +157,8 @@
* @Date: 2021/3/11
*/
public static void destoryToken(String uid, String token) {
+ if(ObjectUtils.isEmpty(uid)||ObjectUtils.isEmpty(token))
+ return;
redisTemplate.delete(token);
redisTemplate.opsForHash().delete("user_token", uid);
}
@@ -143,6 +174,7 @@
public static void destoryToken(String token) {
destoryToken(getUidByToken(token), token);
}
+
/**
* @Description: ���������������������token
@@ -168,7 +200,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