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

Merge branch 'feature/REQ-3045' into dev

Browse Source
This commit is contained in:
yanglin 2024-10-21 18:13:59 +08:00
commit c7f03a958a
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,13 +75,12 @@ public class ModelV3Parser {
parsedModel.setGroups(copyGroups(templateModel.getGroups()));
parsedModel.setButtons(BeanMapper.copyList(templateModel.getButtons(), ParsedButtonV3.class));
UrlParser urlParser = new UrlParser(entity, routerParam, appendRouterParam);
TerminalUrlSelector urlSelector = new TerminalUrlSelector(terminalProvider);
ParsedModel3Walker.walkDown(parsedModel, new ParsedModel3Visitor() {
@Override
public void visitTemplateCardUrlConfig(UrlConfig urlConfig) {
if (urlParser.parseUrlConfig(urlConfig))
parsedModel.getTemplate().getOrCreateCardUrl().setUrl(parseUrlInfoForRequest(urlConfig));
urlParser.parseUrlConfig(urlConfig);
parsedModel.getTemplate().getOrCreateCardUrl().setUrl(parseUrlInfoForRequest(urlConfig));
}
@Override
@ -130,11 +129,10 @@ public class ModelV3Parser {
@Override
public void visitGroupDetailUrlConfig(ParsedGroupV3 group, UrlConfig urlConfig) {
if (urlParser.parseUrlConfig(urlConfig)) {
ParsedGroupDetail parsedDetail = group.getGroupInfo().getOrCreateDetail();
parsedDetail.setName(group.getName());
parsedDetail.setUrl(parseUrlInfoForRequest(urlConfig));
}
urlParser.parseUrlConfig(urlConfig);
ParsedGroupDetail parsedDetail = group.getGroupInfo().getOrCreateDetail();
parsedDetail.setName(group.getName());
parsedDetail.setUrl(parseUrlInfoForRequest(urlConfig));
}
@Override
@ -144,8 +142,8 @@ public class ModelV3Parser {
@Override
public void visitButtonUrlConfig(ParsedButtonV3 button, UrlConfig urlConfig) {
if (urlParser.parseUrlConfig(urlConfig))
button.setUrl(parseUrlInfoForRequest(urlConfig));
urlParser.parseUrlConfig(urlConfig);
button.setUrl(parseUrlInfoForRequest(urlConfig));
}
@Override
@ -215,9 +213,8 @@ public class ModelV3Parser {
final JSONObject routerParam;
@Nullable final JSONObject appendRouterParam;
boolean parseUrlConfig(UrlConfig urlConfig) {
void parseUrlConfig(UrlConfig urlConfig) {
UrlConfigWalker.walkDown(urlConfig, this);
return urlConfig.hasUrl();
}
@Override