diff --git a/skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java b/skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java index c920c2b40..0e15deef7 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java @@ -231,7 +231,9 @@ public class AlarmRuleCtl { ConfigArgs configArgs = new ConfigArgs(); configArgs.setPeriod(json.getInteger("period")); MailInfo mailInfo = new MailInfo(); - mailInfo.setMailCc(json.getString("mailCc").toString().trim().split(",")); + if(json.containsKey("mailCc") && !StringUtil.isBlank(json.getString("mailCc"))){ + mailInfo.setMailCc(json.getString("mailCc").toString().trim().split(",")); + } mailInfo.setMailTo(json.getString("mailTo").toString().trim().split(",")); configArgs.setMailInfo(mailInfo); ruleMVO.setConfigArgs(configArgs); @@ -322,7 +324,9 @@ public class AlarmRuleCtl { ConfigArgs configArgs = new ConfigArgs(); configArgs.setPeriod(json.getInteger("period")); MailInfo mailInfo = new MailInfo(); - mailInfo.setMailCc(json.getString("mailCc").toString().trim().split(",")); + if(json.containsKey("mailCc") && !StringUtil.isBlank(json.getString("mailCc"))){ + mailInfo.setMailCc(json.getString("mailCc").toString().trim().split(",")); + } mailInfo.setMailTo(json.getString("mailTo").toString().trim().split(",")); configArgs.setMailInfo(mailInfo); ruleMVO.setConfigArgs(configArgs); diff --git a/skywalking-webui/src/main/java/com/ai/cloud/controller/AppMaintainCtl.java b/skywalking-webui/src/main/java/com/ai/cloud/controller/AppMaintainCtl.java index 3554bdce9..2a4a1b8f4 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/controller/AppMaintainCtl.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/controller/AppMaintainCtl.java @@ -2,13 +2,11 @@ package com.ai.cloud.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; @Controller -@RequestMapping("/app") public class AppMaintainCtl { - @RequestMapping("/create") + @RequestMapping("/app/create") public String create() { - return "app/createApp"; + return "app/newApp"; } } diff --git a/skywalking-webui/src/main/webapp/ftl/app/createApp.ftl b/skywalking-webui/src/main/webapp/ftl/app/newApp.ftl similarity index 100% rename from skywalking-webui/src/main/webapp/ftl/app/createApp.ftl rename to skywalking-webui/src/main/webapp/ftl/app/newApp.ftl