From f2815bc12d693b929eae4d2e323d2aa12a6ab3e8 Mon Sep 17 00:00:00 2001 From: jsonwan Date: Thu, 15 Jul 2021 14:23:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=80=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=9D=83=E9=99=90=E6=8A=A5=E9=94=99?= =?UTF-8?q?=20#97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/util/CustomCollectionUtils.java | 15 ++++++++++ .../util/CustomCollectionUtilsTest.java | 23 +++++++++++++++ .../analysis/api/op/impl/OpResourceImpl.java | 2 +- .../web/impl/WebStatisticsResourceImpl.java | 2 +- .../{listener => }/StatisticConfig.java | 4 +-- .../analysis/service/AppStatisticService.java | 2 +- .../service/CommonStatisticService.java | 29 +++++++++++++++++-- .../service/FastFileStatisticService.java | 2 +- .../service/FastScriptStatisticService.java | 2 +- .../service/HostStatisticService.java | 2 +- .../service/ScriptStatisticService.java | 2 +- .../analysis/service/TagStatisticService.java | 2 +- .../statistics/StatisticsTaskScheduler.java | 2 +- .../task/ClearExpiredStatisticsTask.java | 2 +- .../task/PastStatisticsMakeupTask.java | 2 +- .../task/impl/app/AppStatisticsTask.java | 2 +- .../interceptor/UriPermissionInterceptor.java | 21 +++++++------- 17 files changed, 89 insertions(+), 27 deletions(-) create mode 100644 src/backend/commons/common/src/test/java/com/tencent/bk/job/common/util/CustomCollectionUtilsTest.java rename src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/config/{listener => }/StatisticConfig.java (95%) diff --git a/src/backend/commons/common/src/main/java/com/tencent/bk/job/common/util/CustomCollectionUtils.java b/src/backend/commons/common/src/main/java/com/tencent/bk/job/common/util/CustomCollectionUtils.java index 6a43c60de5..96640709a0 100644 --- a/src/backend/commons/common/src/main/java/com/tencent/bk/job/common/util/CustomCollectionUtils.java +++ b/src/backend/commons/common/src/main/java/com/tencent/bk/job/common/util/CustomCollectionUtils.java @@ -30,6 +30,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; +import java.util.Set; /** * @Description @@ -38,6 +39,20 @@ */ public class CustomCollectionUtils { + public static List mergeList(List list1, List list2) { + if (list1 == null || list1.isEmpty()) return list2; + if (list2 == null || list2.isEmpty()) return list1; + Set set = new HashSet<>(list1); + List resultList = new ArrayList<>(list1); + list2.forEach(it -> { + if (!set.contains(it)) { + resultList.add(it); + set.add(it); + } + }); + return resultList; + } + public static List getNoDuplicateList(String rawStr, String separator) { if (rawStr == null || rawStr.isEmpty()) { return new ArrayList<>(); diff --git a/src/backend/commons/common/src/test/java/com/tencent/bk/job/common/util/CustomCollectionUtilsTest.java b/src/backend/commons/common/src/test/java/com/tencent/bk/job/common/util/CustomCollectionUtilsTest.java new file mode 100644 index 0000000000..e2243c7342 --- /dev/null +++ b/src/backend/commons/common/src/test/java/com/tencent/bk/job/common/util/CustomCollectionUtilsTest.java @@ -0,0 +1,23 @@ +package com.tencent.bk.job.common.util; + +import org.junit.jupiter.api.Test; + +import java.util.Arrays; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class CustomCollectionUtilsTest { + + @Test + void testMergeList() { + List list1 = Arrays.asList(1L, 2L); + List list2 = Arrays.asList(1L, 3L, 4L); + assertThat(CustomCollectionUtils.mergeList(null, null)).isNull(); + assertThat(CustomCollectionUtils.mergeList(list1, null)).hasSize(2); + assertThat(CustomCollectionUtils.mergeList(null, list2)).hasSize(3); + List mergedList = CustomCollectionUtils.mergeList(list1, list2); + assertThat(mergedList).hasSize(4); + mergedList.forEach(System.out::println); + } +} diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/op/impl/OpResourceImpl.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/op/impl/OpResourceImpl.java index d649e295f0..8953abc627 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/op/impl/OpResourceImpl.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/op/impl/OpResourceImpl.java @@ -25,7 +25,7 @@ package com.tencent.bk.job.analysis.api.op.impl; import com.tencent.bk.job.analysis.api.op.OpResource; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.analysis.model.op.*; import com.tencent.bk.job.analysis.task.statistics.StatisticsTaskScheduler; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/web/impl/WebStatisticsResourceImpl.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/web/impl/WebStatisticsResourceImpl.java index 2cb318bfa1..3d3e1a3694 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/web/impl/WebStatisticsResourceImpl.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/web/impl/WebStatisticsResourceImpl.java @@ -25,7 +25,7 @@ package com.tencent.bk.job.analysis.api.web.impl; import com.tencent.bk.job.analysis.api.web.WebStatisticsResource; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.consts.DimensionEnum; import com.tencent.bk.job.analysis.consts.DistributionMetricEnum; import com.tencent.bk.job.analysis.consts.ResourceEnum; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/config/listener/StatisticConfig.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/config/StatisticConfig.java similarity index 95% rename from src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/config/listener/StatisticConfig.java rename to src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/config/StatisticConfig.java index 7ea45dd8a0..a2798a2df7 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/config/listener/StatisticConfig.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/config/StatisticConfig.java @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -package com.tencent.bk.job.analysis.config.listener; +package com.tencent.bk.job.analysis.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; @@ -50,7 +50,7 @@ public class StatisticConfig { @Value("${job.analysis.statistics.yoy.days:7}") private Integer yoyDays; - @Value("${job.analysis.statistics.tag.num.max:100}") + @Value("${job.analysis.statistics.tag.num.max:120}") private Integer maxTagNum; /** diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/AppStatisticService.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/AppStatisticService.java index 25ee7bb4c0..585e731671 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/AppStatisticService.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/AppStatisticService.java @@ -25,7 +25,7 @@ package com.tencent.bk.job.analysis.service; import com.fasterxml.jackson.core.type.TypeReference; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.analysis.model.dto.SimpleAppInfoDTO; import com.tencent.bk.job.analysis.model.web.CommonStatisticWithRateVO; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/CommonStatisticService.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/CommonStatisticService.java index f42c85c5c6..492df6f571 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/CommonStatisticService.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/CommonStatisticService.java @@ -24,10 +24,12 @@ package com.tencent.bk.job.analysis.service; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.fasterxml.jackson.core.type.TypeReference; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.consts.DistributionMetricEnum; import com.tencent.bk.job.analysis.consts.TotalMetricEnum; import com.tencent.bk.job.analysis.dao.StatisticsDAO; +import com.tencent.bk.job.analysis.model.dto.SimpleAppInfoDTO; import com.tencent.bk.job.analysis.model.web.CommonDistributionVO; import com.tencent.bk.job.analysis.model.web.CommonStatisticWithRateVO; import com.tencent.bk.job.analysis.model.web.CommonTrendElementVO; @@ -35,12 +37,19 @@ import com.tencent.bk.job.analysis.util.calc.SimpleMomYoyCalculator; import com.tencent.bk.job.common.statistics.consts.StatisticsConstants; import com.tencent.bk.job.common.statistics.model.dto.StatisticsDTO; +import com.tencent.bk.job.common.util.CustomCollectionUtils; import com.tencent.bk.job.common.util.date.DateUtils; +import com.tencent.bk.job.common.util.json.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Service @@ -60,6 +69,15 @@ public CommonStatisticService(StatisticsDAO statisticsDAO, StatisticConfig stati this.appService = appService; } + public List getJoinedAppIdList(String date) { + StatisticsDTO statisticsDTO = statisticsDAO.getStatistics(StatisticsConstants.DEFAULT_APP_ID, + StatisticsConstants.RESOURCE_APP, StatisticsConstants.DIMENSION_APP_STATISTIC_TYPE, + StatisticsConstants.DIMENSION_VALUE_APP_STATISTIC_TYPE_APP_LIST, date); + List applicationDTOList = JsonUtils.fromJson(statisticsDTO.getValue(), + new TypeReference>() { + }); + return applicationDTOList.parallelStream().map(SimpleAppInfoDTO::getId).collect(Collectors.toList()); + } /** * @param statisticsDTO @@ -166,7 +184,12 @@ public int compare(CommonTrendElementVO o1, CommonTrendElementVO o2) { public List listByPerApp(String resource, TotalMetricEnum metric, List appIdList, String date) { - List statisticsDTOList = statisticsDAO.getStatisticsList(appIdList, null, resource, + // 增加筛选范围：已接入的业务 + List scopedAppIdList = CustomCollectionUtils.mergeList(appIdList, getJoinedAppIdList(date)); + List statisticsDTOList = statisticsDAO.getStatisticsList( + scopedAppIdList, + null, + resource, StatisticsConstants.DIMENSION_GLOBAL_STATISTIC_TYPE, StatisticsConstants.DIMENSION_VALUE_GLOBAL_STATISTIC_TYPE_PREFIX + metric.name(), date); List perAppStatisticVOList = new ArrayList<>(); diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/FastFileStatisticService.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/FastFileStatisticService.java index 8d86a24431..85c21787be 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/FastFileStatisticService.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/FastFileStatisticService.java @@ -24,7 +24,7 @@ package com.tencent.bk.job.analysis.service; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.analysis.model.web.DayDistributionElementVO; import com.tencent.bk.job.common.statistics.consts.StatisticsConstants; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/FastScriptStatisticService.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/FastScriptStatisticService.java index 34008209d4..e4cafba34f 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/FastScriptStatisticService.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/FastScriptStatisticService.java @@ -24,7 +24,7 @@ package com.tencent.bk.job.analysis.service; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.analysis.model.web.DayDistributionElementVO; import com.tencent.bk.job.common.statistics.consts.StatisticsConstants; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/HostStatisticService.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/HostStatisticService.java index a5304ade1f..d6780771de 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/HostStatisticService.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/HostStatisticService.java @@ -24,7 +24,7 @@ package com.tencent.bk.job.analysis.service; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.analysis.model.web.CommonDistributionVO; import com.tencent.bk.job.common.statistics.consts.StatisticsConstants; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/ScriptStatisticService.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/ScriptStatisticService.java index 921039527e..f72ae92907 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/ScriptStatisticService.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/ScriptStatisticService.java @@ -24,7 +24,7 @@ package com.tencent.bk.job.analysis.service; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.analysis.model.web.ScriptCiteStatisticVO; import com.tencent.bk.job.common.statistics.consts.StatisticsConstants; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/TagStatisticService.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/TagStatisticService.java index 7f95a0e32e..cde280943c 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/TagStatisticService.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/TagStatisticService.java @@ -25,7 +25,7 @@ package com.tencent.bk.job.analysis.service; import com.fasterxml.jackson.core.type.TypeReference; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.analysis.model.web.CommonDistributionVO; import com.tencent.bk.job.common.statistics.consts.StatisticsConstants; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/StatisticsTaskScheduler.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/StatisticsTaskScheduler.java index 9e85c90d0b..b5e7079cbb 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/StatisticsTaskScheduler.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/StatisticsTaskScheduler.java @@ -24,7 +24,7 @@ package com.tencent.bk.job.analysis.task.statistics; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.task.statistics.task.*; import com.tencent.bk.job.common.redis.util.LockUtils; import com.tencent.bk.job.common.redis.util.RedisKeyHeartBeatThread; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/ClearExpiredStatisticsTask.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/ClearExpiredStatisticsTask.java index fee9adab61..40b5ccc111 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/ClearExpiredStatisticsTask.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/ClearExpiredStatisticsTask.java @@ -24,7 +24,7 @@ package com.tencent.bk.job.analysis.task.statistics.task; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.common.statistics.consts.StatisticsConstants; import com.tencent.bk.job.common.util.TimeUtil; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/PastStatisticsMakeupTask.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/PastStatisticsMakeupTask.java index dcb1cad179..b5090ddec8 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/PastStatisticsMakeupTask.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/PastStatisticsMakeupTask.java @@ -24,7 +24,7 @@ package com.tencent.bk.job.analysis.task.statistics.task; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.common.statistics.consts.StatisticsConstants; import com.tencent.bk.job.common.util.TimeUtil; diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/impl/app/AppStatisticsTask.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/impl/app/AppStatisticsTask.java index 7d3894bd0c..a566e18a9c 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/impl/app/AppStatisticsTask.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/task/statistics/task/impl/app/AppStatisticsTask.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.tencent.bk.job.analysis.client.ExecuteMetricsClient; -import com.tencent.bk.job.analysis.config.listener.StatisticConfig; +import com.tencent.bk.job.analysis.config.StatisticConfig; import com.tencent.bk.job.analysis.dao.StatisticsDAO; import com.tencent.bk.job.analysis.model.dto.SimpleAppInfoDTO; import com.tencent.bk.job.analysis.service.BasicServiceManager; diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/common/interceptor/UriPermissionInterceptor.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/common/interceptor/UriPermissionInterceptor.java index a24e8098c2..68d2b030c9 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/common/interceptor/UriPermissionInterceptor.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/common/interceptor/UriPermissionInterceptor.java @@ -27,8 +27,8 @@ import com.tencent.bk.job.common.RequestIdLogger; import com.tencent.bk.job.common.iam.constant.ActionId; import com.tencent.bk.job.common.iam.exception.InSufficientPermissionException; -import com.tencent.bk.job.common.iam.service.WebAuthService; -import com.tencent.bk.job.common.model.permission.AuthResultVO; +import com.tencent.bk.job.common.iam.model.AuthResult; +import com.tencent.bk.job.common.iam.service.AuthService; import com.tencent.bk.job.common.util.JobContextUtil; import com.tencent.bk.job.common.util.SimpleRequestIdLogger; import lombok.extern.slf4j.Slf4j; @@ -58,10 +58,11 @@ public class UriPermissionInterceptor extends HandlerInterceptorAdapter { private final String URI_PATTERN_PUBLIC_SCRIPT = "/web/public_script/**"; private final String URI_PATTERN_PUBLIC_TAG = "/web/public_tag/**"; private final String URI_PATTERN_SERVICE_INFO = "/web/serviceInfo/**"; - private WebAuthService authService; + private AuthService authService; private PathMatcher pathMatcher; + @Autowired - public UriPermissionInterceptor(WebAuthService authService) { + public UriPermissionInterceptor(AuthService authService) { this.authService = authService; this.pathMatcher = new AntPathMatcher(); } @@ -101,19 +102,19 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons "controlUriPatterns=" + getControlUriPatternsList()); //仅超级管理员可使用管理相关接口 if (pathMatcher.match(URI_PATTERN_NOTIFY_BLACKLIST, uri)) { - AuthResultVO authResult = authService.auth(true, username, ActionId.GLOBAL_SETTINGS); + AuthResult authResult = authService.auth(true, username, ActionId.GLOBAL_SETTINGS); if (!authResult.isPass()) { - throw new InSufficientPermissionException(new Object[]{authResult}); + throw new InSufficientPermissionException(authResult); } } else if (pathMatcher.match(URI_PATTERN_GLOBAL_SETTINGS, uri)) { - AuthResultVO authResult = authService.auth(true, username, ActionId.GLOBAL_SETTINGS); + AuthResult authResult = authService.auth(true, username, ActionId.GLOBAL_SETTINGS); if (!authResult.isPass()) { - throw new InSufficientPermissionException(new Object[]{authResult}); + throw new InSufficientPermissionException(authResult); } } else if (pathMatcher.match(URI_PATTERN_SERVICE_INFO, uri)) { - AuthResultVO authResult = authService.auth(true, username, ActionId.SERVICE_STATE_ACCESS); + AuthResult authResult = authService.auth(true, username, ActionId.SERVICE_STATE_ACCESS); if (!authResult.isPass()) { - throw new InSufficientPermissionException(new Object[]{authResult}); + throw new InSufficientPermissionException(authResult); } } return true;