From 11e10f09802301f7e9696bf28718beb3d0d13a48 Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 25 Oct 2024 17:53:17 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3045:=20=E5=8D=8F=E5=8A=A9=E5=8E=9F?= =?UTF-8?q?=E7=94=9F=E8=B7=B3=E5=BE=85=E5=8A=9E=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/message/service/todo/ModelV2PropsPopulator.java | 3 +-- .../axzo/msg/center/message/service/todo/TodoRespBuilder.java | 2 +- .../java/cn/axzo/msg/center/service/pending/ModelVersion.java | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/ModelV2PropsPopulator.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/ModelV2PropsPopulator.java index 73b7214b..e6556668 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/ModelV2PropsPopulator.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/ModelV2PropsPopulator.java @@ -120,8 +120,7 @@ public class ModelV2PropsPopulator implements ParsedModel3Visitor { private void adaptTodoDetailPageForNativeApp() { if (response.getDetailRouter() != null) return; if (!cfg.isAdaptTodoDetailPageForNativeApp()) return; - ModelVersion version = ModelVersion.of( - request == null ? null : request.getModelVersion()); + ModelVersion version = ModelVersion.of(request); if (version.isNot(ModelVersion.V2)) return; DetailRouterDTO detail = new DetailRouterDTO(); response.setDetailRouter(detail); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java index ff06f4f5..a20a8280 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java @@ -265,7 +265,7 @@ class TodoRespBuilder { if (request == null) { modelV3Builder.run(); } else { - ModelVersion version = ModelVersion.of(request.getModelVersion()); + ModelVersion version = ModelVersion.of(request); if (version.is(ModelVersion.V2) || version.is(ModelVersion.ALL)) ParsedModel3Walker.walkDown(parsedModel, new ModelV2PropsPopulator(cfg, response, request)); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/ModelVersion.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/ModelVersion.java index 2770a580..349bf045 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/ModelVersion.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/ModelVersion.java @@ -26,6 +26,10 @@ public class ModelVersion { private final Integer versionNumber; + public static ModelVersion of(ClientRequest request) { + return of(request == null ? null : request.getModelVersion()); + } + public static ModelVersion of(Integer version) { // attack? if (version != null && (version > MAX_VERSION_NUMBER || version < MIN_VERSION_NUMBER))