Merge branch 'api' into hive2.0

jyy

2021-01-26 ec0c71cc88407098e0c088dbf1e44cddf856b8f8

 zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java

@@ -66,7 +66,7 @@
        }

        String userStr = redisClient.getCachedValue(token);
        redisClient.resetExpire(token);
//        redisClient.resetExpire(token);
        if (StringUtils.isBlank(userStr)) {
            ajaxResult.setInfo("login time out");
            response.getWriter().write(new ObjectMapper().writeValueAsString(ajaxResult));