Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-framework/src/main/java/com/ozs/framework/web/service/TokenService.java

@@ -5,7 +5,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -30,7 +29,8 @@ import org.springframework.util.ObjectUtils;
  * @author hx
  */
 @Component
-public class TokenService {
+public class TokenService
+{
     // 令牌自定义标识
     @Value("${token.header}")
     private String header;
@@ -61,25 +61,30 @@ public class TokenService {
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser(HttpServletRequest request) {
+    public LoginUser getLoginUser(HttpServletRequest request)
+    {
         // 获取请求携带的令牌
         String token = getToken(request);
-        if (StringUtils.isNotEmpty(token)) {
-            try {
+        if (StringUtils.isNotEmpty(token))
+        {
+            try
+            {
                 Claims claims = parseToken(token);
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
-                if (StringUtils.isEmpty(uuid)) {
+                if(StringUtils.isEmpty(uuid)){
                     uuid = (String) claims.get(Constants.LOGIN_USER_KEY_APP);
                 }
-                String userId = redisCache.getCacheObject("userId");
-                if (!token.equals(userId)) {
-                    return null;
-                }
+//                String userId = redisCache.getCacheObject("userId");
+//                if (!token.equals(userId)){
+//                    return null;
+//                }
                 String userKey = getTokenKey(uuid);
                 LoginUser user = redisCache.getCacheObject(userKey);
                 return user;
-            } catch (Exception e) {
+            }
+            catch (Exception e)
+            {
             }
         }
         return null;
@@ -88,8 +93,10 @@ public class TokenService {
     /**
      * 设置用户身份信息
      */
-    public void setLoginUser(LoginUser loginUser) {
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
+    public void setLoginUser(LoginUser loginUser)
+    {
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
+        {
             refreshToken(loginUser);
         }
     }
@@ -97,8 +104,10 @@ public class TokenService {
     /**
      * 删除用户身份信息
      */
-    public void delLoginUser(String token) {
-        if (StringUtils.isNotEmpty(token)) {
+    public void delLoginUser(String token)
+    {
+        if (StringUtils.isNotEmpty(token))
+        {
             String userKey = getTokenKey(token);
             redisCache.deleteObject(userKey);
         }
@@ -110,7 +119,8 @@ public class TokenService {
      * @param loginUser 用户信息
      * @return 令牌
      */
-    public String createToken(LoginUser loginUser) {
+    public String createToken(LoginUser loginUser)
+    {
         String token = IdUtils.fastUUID();
 //        String token = loginUser.getUserId();
         loginUser.setToken(token);
@@ -121,17 +131,17 @@ public class TokenService {
         claims.put(Constants.LOGIN_USER_KEY, token);
         String token1 = createToken(claims);
 //        redisCache.setCacheObject("userId", token1, expireTime, TimeUnit.MINUTES);
-        redisCache.setCacheObject("userId", token1);
+//        redisCache.setCacheObject("userId", token1);
         return token1;
     }
-
     /**
      * 创建令牌
      *
      * @param loginUser 用户信息
      * @return 令牌
      */
-    public String createTokenApp(LoginUser loginUser) {
+    public String createTokenApp(LoginUser loginUser)
+    {
 //        String token = IdUtils.fastUUID();
         String token = loginUser.getUserId();
         loginUser.setToken(token);
@@ -149,10 +159,12 @@ public class TokenService {
      * @param loginUser
      * @return 令牌
      */
-    public void verifyToken(LoginUser loginUser) {
+    public void verifyToken(LoginUser loginUser)
+    {
         long expireTime = loginUser.getExpireTime();
         long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
+        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
+        {
             refreshToken(loginUser);
         }
     }
@@ -162,20 +174,21 @@ public class TokenService {
      *
      * @param loginUser 登录信息
      */
-    public void refreshToken(LoginUser loginUser) {
+    public void refreshToken(LoginUser loginUser)
+    {
         loginUser.setLoginTime(System.currentTimeMillis());
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
         redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
     }
-
     /**
      * 刷新令牌有效期
      *
      * @param loginUser 登录信息
      */
-    public void refreshTokenApp(LoginUser loginUser) {
+    public void refreshTokenApp(LoginUser loginUser)
+    {
         loginUser.setLoginTime(System.currentTimeMillis());
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTimeApp * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
@@ -188,7 +201,8 @@ public class TokenService {
      *
      * @param loginUser 登录信息
      */
-    public void setUserAgent(LoginUser loginUser) {
+    public void setUserAgent(LoginUser loginUser)
+    {
         UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
         String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
         loginUser.setIpaddr(ip);
@@ -203,7 +217,8 @@ public class TokenService {
      * @param claims 数据声明
      * @return 令牌
      */
-    private String createToken(Map<String, Object> claims) {
+    private String createToken(Map<String, Object> claims)
+    {
         String token = Jwts.builder()
                 .setClaims(claims)
                 .signWith(SignatureAlgorithm.HS512, secret).compact();
@@ -216,7 +231,8 @@ public class TokenService {
      * @param token 令牌
      * @return 数据声明
      */
-    private Claims parseToken(String token) {
+    private Claims parseToken(String token)
+    {
         return Jwts.parser()
                 .setSigningKey(secret)
                 .parseClaimsJws(token)
@@ -229,7 +245,8 @@ public class TokenService {
      * @param token 令牌
      * @return 用户名
      */
-    public String getUsernameFromToken(String token) {
+    public String getUsernameFromToken(String token)
+    {
         Claims claims = parseToken(token);
         return claims.getSubject();
     }
@@ -240,18 +257,20 @@ public class TokenService {
      * @param request
      * @return token
      */
-    private String getToken(HttpServletRequest request) {
+    private String getToken(HttpServletRequest request)
+    {
         String token = request.getHeader(header);
-        if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
+        if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
+        {
             token = token.replace(Constants.TOKEN_PREFIX, "");
         }
         return token;
     }
 
-    private String getTokenKey(String uuid) {
+    private String getTokenKey(String uuid)
+    {
         return CacheConstants.LOGIN_TOKEN_KEY + uuid;
     }
-
     public LoginUser getLoginedUserByToken(String token) {
         try {
             Claims claims = parseToken(token);
@@ -264,7 +283,6 @@ public class TokenService {
         }
         return null;
     }
-
     public LoginUser getLoginedUserByTokenApp(String token) {
         try {
             Claims claims = parseToken(token);
@@ -277,7 +295,6 @@ public class TokenService {
         }
         return null;
     }
-
     /**
      * 判断是不是app token
      *
@@ -287,11 +304,11 @@ public class TokenService {
     public boolean getTagByToken(HttpServletRequest request) {
         try {
             String token = getToken(request);
-            if (StringUtils.isNotEmpty(token)) {
+            if(StringUtils.isNotEmpty(token)){
                 Claims claims = parseToken(token);
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY_APP);
-                if (StringUtils.isNotEmpty(uuid)) {
+                if(StringUtils.isNotEmpty(uuid)){
                     return true;
                 }
             }