From 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 11:12:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-common/src/main/java/com/moral/util/TokenUtils.java | 13 +++++++++----
1 files changed, 9 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 eafb27f..d82f09e 100644
--- a/screen-common/src/main/java/com/moral/util/TokenUtils.java
+++ b/screen-common/src/main/java/com/moral/util/TokenUtils.java
@@ -85,7 +85,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 +99,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 +118,11 @@
throw new TokenException(ResponseCodeEnum.TOKEN_INVALID.getCode(),
ResponseCodeEnum.TOKEN_INVALID.getMsg());
return userInfo;
+ }
+
+ public static Object getUserInfo() {
+ String token = getCurrentToken();
+ return getUserInfoByToken(token);
}
/**
@@ -148,7 +153,7 @@
/**
- * @Description: ���������������������token0
+ * @Description: ���������������������token
* @Param: []
* @return: void
* @Author: ���������
--
Gitblit v1.8.0