kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

移除邮件模板选项，目前都采用统一的邮件模板发送

This commit is contained in:
zhangxin10 2015-12-25 10:52:13 +08:00
parent 35fde12f6d
commit 014a9f8dc1
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java
View File

@ -166,11 +166,6 @@ public class AlarmRuleCtl {
if (json.containsKey("mailCc")) {
mailCc = json.getString("mailCc").replace("\n", "");
}
if (!json.containsKey("mailTemp")) {
reJson.put(Constants.JSON_RESULT_KEY_RESULT, Constants.JSON_RESULT_KEY_RESULT_FAIL);
reJson.put(Constants.JSON_RESULT_KEY_RESULT_MSG, "未找到邮件模板信息");
return reJson.toJSONString();
}
} else if (Constants.TODO_TYPE_1.equals(todoType)) {
if (!json.containsKey("urlCall")) {
reJson.put(Constants.JSON_RESULT_KEY_RESULT, Constants.JSON_RESULT_KEY_RESULT_FAIL);
@ -232,7 +227,6 @@ public class AlarmRuleCtl {
}
mailInfo.put("mailTo", mailToList);
mailInfo.put("mailTemp", json.getString("mailTemp"));
confArgs.put("mailInfo", mailInfo);
} else if (Constants.TODO_TYPE_1.equals(todoType)) {
// 设置接口相关的信息
@ -311,11 +305,6 @@ public class AlarmRuleCtl {
if (json.containsKey("mailCc")) {
mailCc = json.getString("mailCc").replace("\n", "");
}
if (!json.containsKey("mailTemp")) {
reJson.put(Constants.JSON_RESULT_KEY_RESULT, Constants.JSON_RESULT_KEY_RESULT_FAIL);
reJson.put(Constants.JSON_RESULT_KEY_RESULT_MSG, "未找到邮件模板信息");
return reJson.toJSONString();
}
} else if (Constants.TODO_TYPE_1.equals(todoType)) {
if (!json.containsKey("urlCall")) {
reJson.put(Constants.JSON_RESULT_KEY_RESULT, Constants.JSON_RESULT_KEY_RESULT_FAIL);
@ -345,7 +334,6 @@ public class AlarmRuleCtl {
}
mailInfo.put("mailTo", mailToList);
mailInfo.put("mailTemp", json.getString("mailTemp"));
confArgs.put("mailInfo", mailInfo);
} else if (Constants.TODO_TYPE_1.equals(todoType)) {
// 设置接口相关的信息

20
skywalking-webui/src/main/webapp/ftl/applist.ftl
View File

@ -63,17 +63,11 @@
</div>
</div>
<div class="form-group">
<label for="mailTemp" class="col-sm-4 control-label">抄送人地址：</label>
<label for="mailCc" class="col-sm-4 control-label">抄送人地址：</label>
<div class="col-sm-4">
<textarea class="form-control" id="mailCc" rows="3" placeholder="抄送人地址，请英文逗号,分割"></textarea>
</div>
</div>
<div class="form-group">
<label for="mailTemp" class="col-sm-4 control-label">邮件模板：</label>
<div class="col-sm-4">
<textarea class="form-control" id="mailTemp" rows="4" placeholder="邮件模板"></textarea>
</div>
</div>
</div>
<div class="form-group" id="callBackDiv" style="display:none">
<label for="urlCall" class="col-sm-4 control-label">回调接口：</label>
@ -258,7 +252,6 @@
}else {
$("#mailTo").val(confArg.mailInfo.mailTo);
$("#mailCc").val(confArg.mailInfo.mailCc);
$("#mailTemp").val(confArg.mailInfo.mailTemp);
}
$("#ruleId").val(obj.ruleId);
$("#crtRuleBtn").text("修改规则");
@ -318,7 +311,6 @@
}else {
$("#mailTo").val(confArg.mailInfo.mailTo);
$("#mailCc").val(confArg.mailInfo.mailCc);
$("#mailTemp").val(confArg.mailInfo.mailTemp);
}
$("#ruleId").val(obj.ruleId);
$("#crtRuleBtn").text("修改规则");
@ -330,7 +322,6 @@
$("#urlCall").val("");
$("#mailTo").val("");
$("#mailCc").val("");
$("#mailTemp").val("");
$("#ruleId").val("");
$("#crtRuleBtn").text("创建规则");
$("#cannelRuleBtn").text("取消创建");
@ -371,13 +362,8 @@
return false;
}
var urlCall = $("#urlCall").val();
var mailTemp = $("#mailTemp").val();
var todoContent = "";
if(todoType == 0){
if(mailTemp == null || mailTemp.length < 1){
alert("邮件模板不能为空");
return false;
}
var mailTo = $("#mailTo").val();
var mailCc = $("#mailCc").val();
}else if(todoType == 1){
@ -399,7 +385,7 @@
}
var urlStr = '${base}/alarmRule/modify';
if(todoType ==0){
jsonData = "{ruleId:'"+ruleId+"',appId:'"+appId+"',period:'"+period+"',isGlobal:'"+isGlobal+"',todoType:'"+todoType+"',mailTemp:'"+mailTemp+"',mailTo:'"+mailTo+"',mailCc:'"+mailCc+"'}";
jsonData = "{ruleId:'"+ruleId+"',appId:'"+appId+"',period:'"+period+"',isGlobal:'"+isGlobal+"',todoType:'"+todoType+"',mailTo:'"+mailTo+"',mailCc:'"+mailCc+"'}";
}else if(todoType ==1){
jsonData = "{ruleId:'"+ruleId+"',appId:'"+appId+"',period:'"+period+"',isGlobal:'"+isGlobal+"',todoType:'"+todoType+"',urlCall:'"+urlCall+"'}";
}else{
@ -430,7 +416,7 @@
//调用创建规则
var urlStr = '${base}/alarmRule/create';
if(todoType ==0){
jsonData = "{appId:'"+appId+"',period:'"+period+"',isGlobal:'"+isGlobal+"',todoType:'"+todoType+"',mailTemp:'"+mailTemp+"',mailTo:'"+mailTo+"',mailCc:'"+mailCc+"'}";
jsonData = "{appId:'"+appId+"',period:'"+period+"',isGlobal:'"+isGlobal+"',todoType:'"+todoType+"',mailTo:'"+mailTo+"',mailCc:'"+mailCc+"'}";
}else if(todoType ==1){
jsonData = "{appId:'"+appId+"',period:'"+period+"',isGlobal:'"+isGlobal+"',todoType:'"+todoType+"',urlCall:'"+urlCall+"'}";
}else{