From 4e93ae8104a2b47b898659de59029fa710390fb5 Mon Sep 17 00:00:00 2001 From: ywqiu Date: Wed, 20 Aug 2025 15:02:03 +0800 Subject: [PATCH 1/3] fix: limit findByAppId pageIndex max 200 --- .../com/arextest/storage/service/ScenePoolService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java b/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java index c5cc9c41..8e35e151 100644 --- a/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java +++ b/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java @@ -27,6 +27,7 @@ public class ScenePoolService { private static final int DEFAULT_LIMIT = 200; private static final String CLEAR_LIMIT_KEY = "clear.pool.limit"; private static final int MAX_PAGE_SIZE = 300; + private static final int MAX_PAGE_INDEX = 200; private static final int MAX_ITERATIONS = 200; private static final int MAX_LIMIT = 5000; private static final int MIN_LIMIT = 0; @@ -84,6 +85,7 @@ public SceneDTO findRecordsByAppId(String appId, String category, Integer pageIn } pageSize = Math.min(pageSize, MAX_PAGE_SIZE); + pageIndex = Math.min(pageIndex, MAX_PAGE_INDEX); SceneDTO sceneDTO = new SceneDTO(); long count = provider.countByAppId(appId); @@ -92,6 +94,11 @@ public SceneDTO findRecordsByAppId(String appId, String category, Integer pageIn sceneDTO.setSceneList(Collections.emptyList()); return sceneDTO; } + if (pageIndex == MAX_PAGE_INDEX) { + sceneDTO.setTotal(0L); + sceneDTO.setSceneList(Collections.emptyList()); + return sceneDTO; + } List scenes = provider.findRecordsByAppId(appId, pageIndex, pageSize); sceneDTO.setSceneList(scenes); From f10b1d7f647ddae75da50fcdbcbb6f0b63e0195b Mon Sep 17 00:00:00 2001 From: ywqiu Date: Wed, 20 Aug 2025 15:06:46 +0800 Subject: [PATCH 2/3] fix: limit findByAppId pageIndex max 200 --- .../com/arextest/storage/service/ScenePoolService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java b/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java index 8e35e151..080db967 100644 --- a/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java +++ b/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java @@ -88,14 +88,14 @@ public SceneDTO findRecordsByAppId(String appId, String category, Integer pageIn pageIndex = Math.min(pageIndex, MAX_PAGE_INDEX); SceneDTO sceneDTO = new SceneDTO(); - long count = provider.countByAppId(appId); - sceneDTO.setTotal(count); - if (count == 0L) { + if (pageIndex == MAX_PAGE_INDEX) { + sceneDTO.setTotal(0L); sceneDTO.setSceneList(Collections.emptyList()); return sceneDTO; } - if (pageIndex == MAX_PAGE_INDEX) { - sceneDTO.setTotal(0L); + long count = provider.countByAppId(appId); + sceneDTO.setTotal(count); + if (count == 0L) { sceneDTO.setSceneList(Collections.emptyList()); return sceneDTO; } From b04f7ff1e5b451e1c8c46dbe39b8884966ac7e38 Mon Sep 17 00:00:00 2001 From: ywqiu Date: Wed, 20 Aug 2025 15:47:46 +0800 Subject: [PATCH 3/3] edit version to 2.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bdc7703f..8c0d3c09 100644 --- a/pom.xml +++ b/pom.xml @@ -449,7 +449,7 @@ - 2.0.8 + 2.0.9 3.3.2 1.8