wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3045: url

Browse Source
This commit is contained in:
yanglin 2024-10-23 15:26:57 +08:00
parent 6f3ff2695c
commit 6d08b4ba13
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/ModelV3Parser.java
View File

@ -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());

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/ModelV2PropsPopulator.java
View File

@ -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);

2
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/SessionUrlSelector.java
View File

@ -29,7 +29,7 @@ public class SessionUrlSelector {
/**
* 根据请求客户端真实的终端类型来选择对应的URL
*/
public Optional<SessionUrl> select(UrlConfig config) {
public Optional<SessionUrl> selectFrom(UrlConfig config) {
if (config == null) return Optional.empty();
// PC(CMS)
SessionUrl pcCms = selectWeb(CMS_WEB_PC, config.getPcCms());