提交 80147152 编写于 作者: wu-sheng's avatar wu-sheng

1.修复#30,在邮件没有抄送人的情况下,不保存"mailCc":[""]。避免告警发送失败的问题。

2.修改#27,对应的文件名。修复部分机器无法访问的问题。
上级 734b14bf
......@@ -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);
......
......@@ -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";
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册