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

base-common/src/main/java/com/ozs/common/utils/StringUtils.java

@@ -40,6 +40,28 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return true;
     }
 
+    //为null,为"",为 "   " --- sunhh
+    public static boolean isEmptySunhh(final Object obj) {
+        int strLen;
+        if (obj == null) {
+            return true;
+        } else {
+            CharSequence cs = obj.toString().trim();
+            if ((strLen = cs.length()) == 0) {
+                return true;
+            } else if (obj.toString().trim().toLowerCase().equals("null")) {
+                return true;
+            } else {
+                for (int i = 0; i < strLen; i++) {
+                    if (Character.isWhitespace(cs.charAt(i)) == false) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
     /**
      * 空字符串
      */

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

@@ -10,6 +10,9 @@ import javax.servlet.http.HttpServletRequest;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.system.service.ISysDictTypeService;
 
+import lombok.extern.log4j.Log4j;
+import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -33,6 +36,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author hx
  */
+@Log4j2
 @Component
 public class TokenService {
     // 令牌自定义标识
@@ -140,6 +144,10 @@ public class TokenService {
             tokens = expireTime;
         }
         redisCache.setCacheObject(loginUser.getUsername(), token1, tokens, TimeUnit.MINUTES);
+        String userKey = getTokenKey(loginUser.getToken());
+        redisCache.setCacheObject(userKey, loginUser, tokens, TimeUnit.MINUTES);
+        log.info("token1-----" + token1);
+        log.info("loginUser-----" + loginUser.toString());
         return token1;
     }
 
@@ -150,8 +158,8 @@ public class TokenService {
      * @return 令牌
      */
     public String createTokenApp(LoginUser loginUser) {
-//        String token = IdUtils.fastUUID();
-        String token = loginUser.getUserId();
+        String token = IdUtils.fastUUID();
+//        String token = loginUser.getUserId();
         loginUser.setToken(token);
         setUserAgent(loginUser);
         refreshTokenApp(loginUser);
@@ -194,7 +202,13 @@ public class TokenService {
         } else {
             tokens = expireTime;
         }
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(Constants.LOGIN_USER_KEY, loginUser.getToken());
+        String token1 = createToken(claims);
+        redisCache.setCacheObject(loginUser.getUsername(), token1, tokens, TimeUnit.MINUTES);
         redisCache.setCacheObject(userKey, loginUser, tokens, TimeUnit.MINUTES);
+        log.info("token12-----" + token1);
+        log.info("loginUser2-----" + loginUser.toString());
     }
 
     /**