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-12 18:17:27 +08:00
commit 5fd6ebb33d
3 changed files with 9 additions and 1 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/controller/WorkflowButtonSyncClientController.java
View File

@ -79,7 +79,7 @@ public class WorkflowButtonSyncClientController implements WorkflowButtonSyncCli
update.setId(button.getId()); update.setId(button.getId());
if (button.getCategory() == RouterCategoryEnum.JUMP) { if (button.getCategory() == RouterCategoryEnum.JUMP) {
UrlConfig urlConfig = new UrlConfig(); UrlConfig urlConfig = new UrlConfig();
urlConfig.applyUrlAsDefaults(workflowButton.getUrl()); urlConfig.setDefaultUrl(workflowButton.getUrl());
update.setUrlConfig(urlConfig); update.setUrlConfig(urlConfig);
} else { } else {
update.setApiUrl(workflowButton.getUrl()); update.setApiUrl(workflowButton.getUrl());

4
inside-notices/src/main/java/cn/axzo/msg/center/message/xxl/MigrateMessageTemplateV3Job.java
View File

@ -204,6 +204,10 @@ public class MigrateMessageTemplateV3Job {
if (CollectionUtils.isEmpty(routeButtons)) return Collections.emptyList(); if (CollectionUtils.isEmpty(routeButtons)) return Collections.emptyList();
ArrayList<MessageTemplateButtonV3> buttons = new ArrayList<>(); ArrayList<MessageTemplateButtonV3> buttons = new ArrayList<>();
for (MessageRouteButtonDTO routeButton : routeButtons) { for (MessageRouteButtonDTO routeButton : routeButtons) {
if (routeButton.getBtnCode().equals("BPMN_COPY")) {
// 跳过流程的抄送按钮，他们的链接没有配置，保存的时候校验通不过
continue;
}
MessageTemplateButtonV3 button = new MessageTemplateButtonV3(); MessageTemplateButtonV3 button = new MessageTemplateButtonV3();
button.setName(routeButton.getName()); button.setName(routeButton.getName());
button.setCode(routeButton.getBtnCode()); button.setCode(routeButton.getBtnCode());

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/domain/UrlConfig.java
View File

@ -115,6 +115,10 @@ public class UrlConfig {
appManager = null; appManager = null;
} }
public void setDefaultUrl(String url) {
applyUrlAsDefaults(url);
}
public void applyUrlAsDefaults(String url) { public void applyUrlAsDefaults(String url) {
getOrCreatePcOms().setOpenStrategy(WebPageOpenStrategy.CURRENT_PAGE); getOrCreatePcOms().setOpenStrategy(WebPageOpenStrategy.CURRENT_PAGE);
getOrCreatePcOms().setUrl(url); getOrCreatePcOms().setUrl(url);