From 014a9f8dc1246db39e770239ebebc619c333bbc2 Mon Sep 17 00:00:00 2001
From: zhangxin10 <curtain.xin@gmail.com>
Date: Fri, 25 Dec 2015 10:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=82=AE=E4=BB=B6=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=80=89=E9=A1=B9=EF=BC=8C=E7=9B=AE=E5=89=8D=E9=83=BD?=
 =?UTF-8?q?=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E7=9A=84=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/cloud/controller/AlarmRuleCtl.java | 12 -----------
 .../src/main/webapp/ftl/applist.ftl           | 20 +++----------------
 2 files changed, 3 insertions(+), 29 deletions(-)

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 63462fa09..f50af2aee 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
@@ -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)) {
 			// 设置接口相关的信息
diff --git a/skywalking-webui/src/main/webapp/ftl/applist.ftl b/skywalking-webui/src/main/webapp/ftl/applist.ftl
index 73cf2644f..9f5721ce9 100644
--- a/skywalking-webui/src/main/webapp/ftl/applist.ftl
+++ b/skywalking-webui/src/main/webapp/ftl/applist.ftl
@@ -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{