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:12:41 +08:00
commit e7e7194322
2 changed files with 8 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

@ -162,7 +162,7 @@ public class ModelV3Parser {
}
public UrlInfoForRequest parseUrlInfoForRequest(UrlConfig urlConfig,
TerminalProvider terminalProvider) {
TerminalProvider terminalProvider) {
UrlInfoForRequest urlInfo = new UrlInfoForRequest();
urlInfo.setHasAppUrl(hasAppUrl(urlConfig));
if (terminalProvider != null) {

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

@ -31,7 +31,9 @@ public class ParsedModel3Walker {
private static void visitCard(ParsedModel3Visitor visitor,
ParsedTemplateV3 template) {
CardUrlConfig cardUrlConfig = template.getCardUrlConfig();
if (cardUrlConfig != null && cardUrlConfig.getUrlConfig() != null) {
if (cardUrlConfig != null
&& cardUrlConfig.getUrlConfig() != null
&& cardUrlConfig.getUrlConfig().hasUrl()) {
visitor.visitTemplateCardUrlConfig(cardUrlConfig.getUrlConfig());
visitor.exitTemplateCardUrlConfig(cardUrlConfig.getUrlConfig());
}
@ -70,7 +72,8 @@ public class ParsedModel3Walker {
ParsedGroupInfo groupInfo) {
if (groupInfo.getDetail() == null) return;
visitor.visitGroupDetailConfig(group, groupInfo.getDetail());
if (groupInfo.getDetail().getUrlConfig() != null) {
if (groupInfo.getDetail().getUrlConfig() != null
&& groupInfo.getDetail().getUrlConfig().hasUrl()) {
visitor.visitGroupDetailUrlConfig(group, groupInfo.getDetail().getUrlConfig());
visitor.exitGroupDetailUrlConfig(group, groupInfo.getDetail().getUrlConfig());
}
@ -92,7 +95,8 @@ public class ParsedModel3Walker {
private static void visitButton(ParsedModel3Visitor visitor,
ParsedButtonV3 button) {
visitor.visitButton(button);
if (button.getUrlConfig() != null) {
if (button.getUrlConfig() != null
&& button.getUrlConfig().hasUrl()) {
visitor.visitButtonUrlConfig(button, button.getUrlConfig());
visitor.exitButtonUrlConfig(button, button.getUrlConfig());
}