From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-common/src/main/java/com/moral/util/TokenUtils.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 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 9bc1d5e..03daa13 100644
--- a/screen-common/src/main/java/com/moral/util/TokenUtils.java
+++ b/screen-common/src/main/java/com/moral/util/TokenUtils.java
@@ -10,8 +10,11 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.util.concurrent.TimeUnit;
/**
@@ -78,7 +81,7 @@
/**
* @Description: ������token
* @Param: [type, token] type��� ���������������manage ���������������api
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/3/10
*/
@@ -105,7 +108,7 @@
/**
* @Description: ������token������������������
* @Param: [token]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/3/11
*/
@@ -117,6 +120,11 @@
return userInfo;
}
+ public static Object getUserInfo() {
+ String token = getCurrentToken();
+ return getUserInfoByToken(token);
+ }
+
/**
* @Description: ������token
* @Param: [uid, token]
@@ -125,9 +133,12 @@
* @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);
}
+
/**
* @Description: ������token
@@ -140,6 +151,35 @@
destoryToken(getUidByToken(token), token);
}
+
+ /**
+ * @Description: ���������������������token
+ * @Param: []
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/5/21
+ */
+ public static void destoryToken() {
+ destoryToken(getCurrentToken());
+ }
+
+ public static void destoryToken(Integer id) {
+ String token = getTokenById(id);
+ destoryToken(String.valueOf(id),token);
+ }
+
+ /**
+ * @Description: ������id������token
+ * @Param: []
+ * @return: java.lang.String
+ * @Author: ���������
+ * @Date: 2021/5/21
+ */
+ public static String getTokenById(Integer id) {
+ return (String)redisTemplate.opsForHash().get("user_token", String.valueOf(id));
+ }
+
+
/**
* @Description: ������TOKEN������Id
* @Param: [token]
@@ -152,6 +192,18 @@
return string[0];
}
+ /**
+ * @Description: ���������������������token
+ * @Param: []
+ * @return: java.lang.String
+ * @Author: ���������
+ * @Date: 2021/5/21
+ */
+ public static String getCurrentToken() {
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return request.getHeader("token");
+ }
+
/**
* @Description: token������
--
Gitblit v1.8.0