Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

portal-manager/src/main/java/com/mortals/xhx/base/framework/security/AuthTokenServiceImpl.java

@@ -50,7 +50,7 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
     @Value("${token.prefix:}")
     private String tokenPrefix;
 
-    protected static final Long MILLIS_SECOND = 1000l;
+    protected static final Long MILLIS_SECOND = 1l;
 
     protected static final Long MILLIS_MINUTE = 60 * MILLIS_SECOND;
 
@@ -238,10 +238,12 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
 //        String token = IdUtil.fastSimpleUUID();
 //        user.setToken(token);
         //todo 删除当前用户之前的令牌
-        Set<String> keys = cacheService.scan(SysConstains.LOGIN_TOKEN_KEY + user.getId());
-        if (!ObjectUtils.isEmpty(keys)) {
-            for (String key : keys) {
-                cacheService.del(key);
+        if (!user.isAdmin()) {
+            Set<String> keys = cacheService.scan(SysConstains.LOGIN_TOKEN_KEY + user.getId());
+            if (!ObjectUtils.isEmpty(keys)) {
+                for (String key : keys) {
+                    cacheService.del(key);
+                }
             }
         }
         refreshToken(user);