gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

fix:1、openid必填改为选填

Browse Source 
2、webhuook url跟larkUrl对象解析错误，null
This commit is contained in:
zuojunlin 2023-12-08 10:25:50 +08:00 committed by byteblogs168
parent bae140a3a8
commit 65bea3457a
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/DingDingAttribute.java
View File

@ -11,7 +11,7 @@ import java.util.List;
@Data @Data
public class DingDingAttribute { public class DingDingAttribute {
private String dingDingUrl; private String webhookUrl;
private List<String> ats; private List<String> ats;

2
easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/LarkAttribute.java
View File

@ -14,7 +14,7 @@ import java.util.List;
@Data @Data
public class LarkAttribute { public class LarkAttribute {
private String larkUrl; private String webhookUrl;
private List<String> ats; private List<String> ats;

4
easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/DingdingAlarm.java
View File

@ -26,7 +26,7 @@ public class DingdingAlarm extends AbstractAlarm<AlarmContext> {
DingDingAttribute dingDingAttribute = JsonUtil.parseObject(context.getNotifyAttribute(), DingDingAttribute.class); DingDingAttribute dingDingAttribute = JsonUtil.parseObject(context.getNotifyAttribute(), DingDingAttribute.class);
threadPoolExecutor.execute(() -> threadPoolExecutor.execute(() ->
DingDingUtils.sendMessage(DingDingUtils.buildSendRequest(context.getTitle(), context.getText(),dingDingAttribute.getAts(),dingDingAttribute.isAtAll()), dingDingAttribute.getDingDingUrl())); DingDingUtils.sendMessage(DingDingUtils.buildSendRequest(context.getTitle(), context.getText(),dingDingAttribute.getAts(),dingDingAttribute.isAtAll()), dingDingAttribute.getWebhookUrl()));
return true; return true;
} }
@ -34,7 +34,7 @@ public class DingdingAlarm extends AbstractAlarm<AlarmContext> {
@Override @Override
public boolean syncSendMessage(AlarmContext context) { public boolean syncSendMessage(AlarmContext context) {
DingDingAttribute dingDingAttribute = JsonUtil.parseObject(context.getNotifyAttribute(), DingDingAttribute.class); DingDingAttribute dingDingAttribute = JsonUtil.parseObject(context.getNotifyAttribute(), DingDingAttribute.class);
return DingDingUtils.sendMessage(DingDingUtils.buildSendRequest(context.getTitle(), context.getText(),dingDingAttribute.getAts(),dingDingAttribute.isAtAll()), dingDingAttribute.getDingDingUrl()); return DingDingUtils.sendMessage(DingDingUtils.buildSendRequest(context.getTitle(), context.getText(),dingDingAttribute.getAts(),dingDingAttribute.isAtAll()), dingDingAttribute.getWebhookUrl());
} }
@Override @Override

2
easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java
View File

@ -63,7 +63,7 @@ public class LarkAlarm extends AbstractAlarm<AlarmContext> {
.card(map).build(); .card(map).build();
try { try {
HttpRequest post = HttpUtil.createPost(larkAttribute.getLarkUrl()); HttpRequest post = HttpUtil.createPost(larkAttribute.getWebhookUrl());
HttpRequest request = post.body(JsonUtil.toJsonString(builder), ContentType.JSON.toString()); HttpRequest request = post.body(JsonUtil.toJsonString(builder), ContentType.JSON.toString());
HttpResponse execute = request.execute(); HttpResponse execute = request.execute();
LogUtils.debug(log, JsonUtil.toJsonString(execute)); LogUtils.debug(log, JsonUtil.toJsonString(execute));

12
frontend/src/views/task/form/NotifyForm.vue
View File

@ -163,14 +163,14 @@
]" /> ]" />
</a-form-item> </a-form-item>
<a-form-item v-if="this.notifyTypeValue === '1'"> <a-form-item v-if="this.notifyTypeValue === '1'">
<span slot="label">被@人手机号&nbsp;<a :href="officialWebsite + '/pages/32e4a0/#被@人手机号是何物' +''" target="_blank"> <a-icon type="question-circle-o" /></a></span> <span slot="label">被@人手机号或钉钉号&nbsp;<a :href="officialWebsite + '/pages/32e4a0/#被被@人手机号或钉钉号是何物' +''" target="_blank"> <a-icon type="question-circle-o" /></a></span>
<a-input <a-input
placeholder="请输入被@人手机号" placeholder="请输入被@人手机号或钉钉号"
type="textarea" type="textarea"
v-if="this.notifyTypeValue === '1'" v-if="this.notifyTypeValue === '1'"
v-decorator="[ v-decorator="[
'ats', 'ats',
{rules: [{ required: true, message: '请输入被@人手机号', whitespace: true}]} {rules: [{ required: false, message: '请输入被@人手机号或钉钉号', whitespace: true}]}
]" /> ]" />
</a-form-item> </a-form-item>
<a-form-item <a-form-item
@ -192,7 +192,7 @@
v-if="this.notifyTypeValue === '4'" v-if="this.notifyTypeValue === '4'"
v-decorator="[ v-decorator="[
'ats', 'ats',
{rules: [{ required: true, message: '请输入被@人open_id', whitespace: true}]} {rules: [{ required: false, message: '请输入被@人open_id', whitespace: true}]}
]" /> ]" />
</a-form-item> </a-form-item>
<a-form-item <a-form-item
@ -474,11 +474,11 @@ export default {
if (this.notifyTypeValue === '1') { if (this.notifyTypeValue === '1') {
s = s =
'钉钉Url:' + json['webhookUrl'] + ';' + '钉钉Url:' + json['webhookUrl'] + ';' +
'被@人手机号:' + json['ats'] + ';' '被@人手机号或钉钉号:' + json['ats'] + ';'
} else if (this.notifyTypeValue === '4') { } else if (this.notifyTypeValue === '4') {
s = s =
'飞书Url:' + json['webhookUrl'] + ';' + '飞书Url:' + json['webhookUrl'] + ';' +
'被@人用户id:' + json['ats'] + ';' '被@人openid:' + json['ats'] + ';'
} }
return s return s
} }