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 16:37:25 +08:00
commit 9ee6aee99d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,8 +78,8 @@ public class ModelV3Parser {
@Override
public void visitTemplateCardUrlConfig(UrlConfig urlConfig) {
urlParser.parseUrlConfig(urlConfig);
parsedModel.getTemplate().getOrCreateCardUrl().setUrl(parseUrlInfoForRequest(urlConfig));
if (urlParser.parseUrlConfig(urlConfig))
parsedModel.getTemplate().getOrCreateCardUrl().setUrl(parseUrlInfoForRequest(urlConfig));
}
@Override
@ -111,10 +111,11 @@ public class ModelV3Parser {
@Override
public void visitGroupDetailUrlConfig(ParsedGroupV3 group, UrlConfig urlConfig) {
urlParser.parseUrlConfig(urlConfig);
ParsedGroupDetail parsedDetail = group.getGroupInfo().getOrCreateDetail();
parsedDetail.setName(group.getName());
parsedDetail.setUrl(parseUrlInfoForRequest(urlConfig));
if (urlParser.parseUrlConfig(urlConfig)) {
ParsedGroupDetail parsedDetail = group.getGroupInfo().getOrCreateDetail();
parsedDetail.setName(group.getName());
parsedDetail.setUrl(parseUrlInfoForRequest(urlConfig));
}
}
@Override
@ -124,8 +125,8 @@ public class ModelV3Parser {
@Override
public void visitButtonUrlConfig(ParsedButtonV3 button, UrlConfig urlConfig) {
urlParser.parseUrlConfig(urlConfig);
button.setUrl(parseUrlInfoForRequest(urlConfig));
if (urlParser.parseUrlConfig(urlConfig))
button.setUrl(parseUrlInfoForRequest(urlConfig));
}
@Override
@ -189,8 +190,9 @@ public class ModelV3Parser {
final JSONObject routerParam;
@Nullable final JSONObject appendRouterParam;
void parseUrlConfig(UrlConfig urlConfig) {
boolean parseUrlConfig(UrlConfig urlConfig) {
UrlConfigWalker.walkDown(urlConfig, this);
return urlConfig.hasUrl();
}
@Override