Merge branch 'dev-fixtoken-20200914' into 'release'

Dev fixtoken 20200914



See merge request !48

server/src/main/java/com/pica/cloud/account/account/server/util/TokenUtils.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -114,16 +115,10 @@ public class TokenUtils {
                 logger.info("oldToken: {} num: {}", oldToken, del);
 
                 // log_login 中查询出所有的token，并删除
-                List<String> tokenList =  logLoginMapper.selectTokenByAcctId(account.getAcctId());
-                if (StringUtil.isNotEmptyList(tokenList)) {
-                    for (int i = 0 ; i < tokenList.size(); i++) {
-                        String tokenTmp = "token-" + tokenList.get(i);
-                        if (StringUtils.isNotBlank(cacheClient.get(tokenTmp))) {
-                            del = cacheClient.del(tokenTmp);
-                            logger.info("oldToken: {} num: {} i：{}", tokenTmp, del, i);
-                        } else {
-                            logger.info("oldToken: {} 不存在 i：{}", tokenTmp, i);
-                        }
+                if ("app".equals(sourceType)) {
+                    List<String> tokenList =  logLoginMapper.selectTokenByAcctId(account.getAcctId());
+                    if (StringUtil.isNotEmptyList(tokenList)) {
+                        delToken(tokenList);
                     }
                 }
             }
@@ -190,4 +185,17 @@ public class TokenUtils {
         }
         return newToken;
     }
+
+    @Async
+    public void delToken(List<String> tokenList) {
+        for (int i = 0 ; i < tokenList.size(); i++) {
+            String tokenTmp = "token-" + tokenList.get(i);
+            if (StringUtils.isNotBlank(cacheClient.get(tokenTmp))) {
+                Long del = cacheClient.del(tokenTmp);
+                logger.info("oldToken: {} num: {} i：{}", tokenTmp, del, i);
+            } else {
+                logger.info("oldToken: {} 不存在 i：{}", tokenTmp, i);
+            }
+        }
+    }
 }