From 80147152d2b32ee8280bb47bedae5958c7dd38e3 Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 19 Feb 2016 17:10:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D#30=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=B2=A1=E6=9C=89=E6=8A=84=E9=80=81=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=B8=8D=E4=BF=9D?= =?UTF-8?q?=E5=AD=98"mailCc":[""]=E3=80=82=E9=81=BF=E5=85=8D=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=202.=E4=BF=AE=E6=94=B9#27=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D=E3=80=82=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E6=9C=BA=E5=99=A8=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ai/cloud/controller/AlarmRuleCtl.java | 8 ++++++-- .../main/java/com/ai/cloud/controller/AppMaintainCtl.java | 6 ++---- .../src/main/webapp/ftl/app/{createApp.ftl => newApp.ftl} | 0 3 files changed, 8 insertions(+), 6 deletions(-) rename skywalking-webui/src/main/webapp/ftl/app/{createApp.ftl => newApp.ftl} (100%) 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