git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-23 17:31:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

完成钉钉机器人消息通知

Browse Source
This commit is contained in:
marvzhang
2020-01-15 13:04:59 +08:00
parent eab6b39603
commit ee0e231ad4
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/services/task.go
View File

@@ -813,11 +813,11 @@ func SendTaskEmail(u model.User, t model.Task, s model.Spider) {
}
func SendTaskDingTalk(u model.User, t model.Task, s model.Spider) {
statusMsg := "has finished"
statusMsg := "已完成"
if t.Status == constants.StatusError {
statusMsg = "has an error"
statusMsg = "发生错误"
}
title := fmt.Sprintf("[Crawlab] Task for \"%s\" %s", s.Name, statusMsg)
title := fmt.Sprintf("[Crawlab] \"%s\" 任务%s", s.Name, statusMsg)
content := GetTaskDingTalkMarkdownContent(t, s)
if err := notification.SendDingTalkNotification(u.Setting.DingTalkRobotWebhook, title, content); err != nil {
log.Errorf(err.Error())

42
frontend/src/views/setting/Setting.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="150px" :rules="rules"
<el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="200px" :rules="rules"
inline-message>
<el-form-item prop="username" :label="$t('Username')">
<el-input v-model="userInfo.username" disabled></el-input>
@@ -24,26 +24,8 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="ding_talk_app_key" :label="$t('DingTalk AppKey')">
<el-input v-model="userInfo.setting.ding_talk_app_key" :placeholder="$t('DingTalk AppKey')"></el-input>
</el-form-item>
<el-form-item prop="ding_talk_app_secret" :label="$t('DingTalk AppSecret')">
<template v-if="isShowDingTalkAppSecret">
<el-input
v-model="userInfo.setting.ding_talk_app_secret"
:placeholder="$t('DingTalk AppSecret')"
/>
<i class="icon el-icon-view" @click="toggleDingTalkAppSecret"></i>
</template>
<template v-else>
<el-input
v-model="userInfo.setting.ding_talk_app_secret"
type="password"
:placeholder="$t('DingTalk AppSecret')"
/>
<i class="icon el-icon-view" @click="toggleDingTalkAppSecret"></i>
</template>
<el-form-item prop="setting.ding_talk_robot_webhook" :label="$t('DingTalk Robot Webhook')">
<el-input v-model="userInfo.setting.ding_talk_robot_webhook" :placeholder="$t('DingTalk Robot Webhook')"></el-input>
</el-form-item>
<el-form-item>
<div class="buttons">
@@ -74,11 +56,20 @@ export default {
callback()
}
}
const validateDingTalkRobotWebhook = (rule, value, callback) => {
if (!value) return callback()
if (!value.match(/^https:\/\/oapi.dingtalk.com\/robot\/send\?access_token=[a-f0-9]+/i)) {
callback(new Error(this.$t('DingTalk Robot Webhook format invalid')))
} else {
callback()
}
}
return {
userInfo: { setting: {} },
rules: {
password: [{ trigger: 'blur', validator: validatePass }],
email: [{ trigger: 'blur', validator: validateEmail }]
email: [{ trigger: 'blur', validator: validateEmail }],
'setting.ding_talk_robot_webhook': [{ trigger: 'blur', validator: validateDingTalkRobotWebhook }]
},
isShowDingTalkAppSecret: false
}
@@ -97,8 +88,7 @@ export default {
password: this.userInfo.password,
email: this.userInfo.email,
notification_trigger: this.userInfo.setting.notification_trigger,
ding_talk_app_key: this.userInfo.setting.ding_talk_app_key,
ding_talk_app_secret: this.userInfo.setting.ding_talk_app_secret
ding_talk_robot_webhook: this.userInfo.setting.ding_talk_robot_webhook
})
if (!res || res.error) {
this.$message.error(res.error)
@@ -133,4 +123,8 @@ export default {
position: absolute;
color: #DCDFE6;
}
.setting-form >>> .el-form-item__label {
height: 40px;
}
</style>