Merge remote-tracking branch 'origin/master'

report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java

@@ -92,7 +92,6 @@ public class TokenFilter implements Filter {
                 && !uri.endsWith("/dataSet/testTransform")
                 && !uri.endsWith("/reportDashboard/getData")
                 && !uri.startsWith("/dict")
-                && !uri.startsWith("/dict")
         ) {
             //不允许删除
             String method = request.getMethod();
@@ -115,7 +114,9 @@ public class TokenFilter implements Filter {
         Filter.super.destroy();
     }
 
-    /** 根据名单，生成正则
+    /**
+     * 根据名单，生成正则
+     *
      * @param skipUrlList
      * @return
      */

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java

@@ -148,21 +148,20 @@ public class AccessUserServiceImpl implements AccessUserService {
 
         // 3.如果该用户登录未过期，这里允许一个用户在多个终端登录
         String tokenKey = String.format(BusinessConstant.GAEA_SECURITY_LOGIN_TOKEN, loginName);
-        String userKey = String.format(BusinessConstant.GAEA_SECURITY_LOGIN_USER, loginName);
         String token = "";
         GaeaUserDto gaeaUser = new GaeaUserDto();
-        if (cacheHelper.exist(tokenKey) && cacheHelper.exist(userKey)) {
+        if (cacheHelper.exist(tokenKey)) {
             token = cacheHelper.stringGet(tokenKey);
-            gaeaUser = JSONObject.parseObject(cacheHelper.stringGet(userKey), GaeaUserDto.class);
-            return gaeaUser;
-        }
-
-        // 4.生成用户token
+        } else {
+            // 生成用户token
             String uuid = GaeaUtils.UUID();
             token = jwtBean.createToken(loginName, uuid);
             cacheHelper.stringSetExpire(tokenKey, token, 3600);
+        }
+
+        // 4.读取用户最新人权限主信息
+        String userKey = String.format(BusinessConstant.GAEA_SECURITY_LOGIN_USER, loginName);
 
-        // 5.缓存用户权限主信息
         List<String> authorities = accessUserMapper.queryAuthoritiesByLoginName(loginName);
         gaeaUser.setLoginName(loginName);
         gaeaUser.setRealName(accessUser.getRealName());