代码提交

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -81,7 +82,7 @@ public class ControllerAop {
         // 不需要添加请求头的接口
         String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
                 "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
-                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/common/duty-person/new-duty-detail","/equip/car/state/info"};
+                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/common/duty-person/new-duty-detail","/equip/car/state/info","equip/fire-fighting-system/getMonitoringCount","equip/fire-fighting-system/getMonitoringUnitList"};
         // 获取请求路径
         for (String uri : url) {
             if (request.getRequestURI().indexOf(uri) != -1) {
@@ -114,7 +115,14 @@ public class ControllerAop {
             fillRequestContext(request);
             token = RequestContext.getToken();
         }
+
+
         if (token != null) {
+            String authToken = RedisKey.buildReginKey(RequestContext.getExeUserId(), token);
+            if (redisUtils.hasKey(authToken) && TokenOperation.refresh(token)) {
+                return;
+            }
+
             String pattern = RedisKey.buildPatternKey(token);
             //验证token有效性，防止token失效
             AgencyUserModel userModel;