From 6d08b4ba13870f102a5aa3bf7b4d0c5696e0fb31 Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 23 Oct 2024 15:26:57 +0800 Subject: [PATCH] REQ-3045: url --- .../msg/center/message/service/impl/v3/ModelV3Parser.java | 2 +- .../service/pending/response/v3/ModelV2PropsPopulator.java | 4 ++-- .../service/pending/response/v3/model/SessionUrlSelector.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java index 513a256a..080f7159 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java @@ -180,7 +180,7 @@ public class ModelV3Parser { }); url.setAppTerminalType(terminalProvider == null ? null : terminalProvider.getAppTerminalType()); - new SessionUrlSelector(terminalProvider).select(urlConfig).ifPresent(terminalUrl -> { + new SessionUrlSelector(terminalProvider).selectFrom(urlConfig).ifPresent(terminalUrl -> { url.setUrl(terminalUrl.getUrl().getUrl()); if (terminalUrl.getUrl() instanceof WebUrl) url.setWebOpenStrategy(((WebUrl) terminalUrl.getUrl()).getOpenStrategy()); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ModelV2PropsPopulator.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ModelV2PropsPopulator.java index fd98f836..c183f045 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ModelV2PropsPopulator.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ModelV2PropsPopulator.java @@ -67,7 +67,7 @@ public class ModelV2PropsPopulator implements ParsedModel3Visitor { return; } if (sessionUrlSelector == null) return; - sessionUrlSelector.select(buttonV3.getUrlConfig()).ifPresent(terminalUrl -> { + sessionUrlSelector.selectFrom(buttonV3.getUrlConfig()).ifPresent(terminalUrl -> { ButtonRouterDTO buttonV2 = factory.get(); buttonV2.setUrl(terminalUrl.getUrl().getUrl()); buttonV2.setTerminalType(terminalUrl.getTerminalType()); @@ -77,7 +77,7 @@ public class ModelV2PropsPopulator implements ParsedModel3Visitor { @Override public void visitTemplateCardUrlConfig(UrlConfig urlConfig) { if (sessionUrlSelector == null) return; - sessionUrlSelector.select(urlConfig).ifPresent(terminalUrl -> { + sessionUrlSelector.selectFrom(urlConfig).ifPresent(terminalUrl -> { DetailRouterDTO detail = new DetailRouterDTO(); response.setDetailRouter(detail); detail.setShowStrategy(BizDetailShowStrategyEnum.JUMP_TO); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlSelector.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlSelector.java index d40b3102..f0c1d26d 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlSelector.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlSelector.java @@ -29,7 +29,7 @@ public class SessionUrlSelector { /** * 根据请求客户端真实的终端类型来选择对应的URL */ - public Optional select(UrlConfig config) { + public Optional selectFrom(UrlConfig config) { if (config == null) return Optional.empty(); // PC(CMS) SessionUrl pcCms = selectWeb(CMS_WEB_PC, config.getPcCms());