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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..03daa13 100644
--- a/screen-common/src/main/java/com/moral/util/TokenUtils.java
+++ b/screen-common/src/main/java/com/moral/util/TokenUtils.java
@@ -120,6 +120,11 @@
return userInfo;
}
+ public static Object getUserInfo() {
+ String token = getCurrentToken();
+ return getUserInfoByToken(token);
+ }
+
/**
* @Description: ������token
* @Param: [uid, token]
@@ -148,7 +153,7 @@
/**
- * @Description: ���������������������token0
+ * @Description: ���������������������token
* @Param: []
* @return: void
* @Author: ���������
--
Gitblit v1.8.0