Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
014a9f8d
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
014a9f8d
编写于
12月 25, 2015
作者:
Z
zhangxin10
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
移除邮件模板选项,目前都采用统一的邮件模板发送
上级
35fde12f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
29 deletion
+3
-29
skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java
...i/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java
+0
-12
skywalking-webui/src/main/webapp/ftl/applist.ftl
skywalking-webui/src/main/webapp/ftl/applist.ftl
+3
-17
未找到文件。
skywalking-webui/src/main/java/com/ai/cloud/controller/AlarmRuleCtl.java
浏览文件 @
014a9f8d
...
...
@@ -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
))
{
// 设置接口相关的信息
...
...
skywalking-webui/src/main/webapp/ftl/applist.ftl
浏览文件 @
014a9f8d
...
...
@@ -63,17 +63,11 @@
</div>
</div>
<div
class=
"form-group"
>
<label
for=
"mail
Temp
"
class=
"col-sm-4 control-label"
>
抄送人地址:
</label>
<label
for=
"mail
Cc
"
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
+
"
',mailT
emp:'
"
+
mailTemp
+
"
',mailT
o:'
"
+
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
+
"
',mailT
emp:'
"
+
mailTemp
+
"
',mailT
o:'
"
+
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
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录