From 65bea3457afcac6fccf0539da2500fba86d708a5 Mon Sep 17 00:00:00 2001
From: zuojunlin <zuo.jl@car1768.com>
Date: Fri, 8 Dec 2023 10:25:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81openid=E5=BF=85=E5=A1=AB=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=80=89=E5=A1=AB=20=20=20=20=202=E3=80=81webhuook=20?=
 =?UTF-8?q?url=E8=B7=9FlarkUrl=E5=AF=B9=E8=B1=A1=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8Cnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../retry/common/core/alarm/DingDingAttribute.java   |  2 +-
 .../easy/retry/common/core/alarm/LarkAttribute.java  |  2 +-
 .../common/core/alarm/strategy/DingdingAlarm.java    |  4 ++--
 .../retry/common/core/alarm/strategy/LarkAlarm.java  |  2 +-
 frontend/src/views/task/form/NotifyForm.vue          | 12 ++++++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/DingDingAttribute.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/DingDingAttribute.java
index dcdc4ffca..c8c3c4db6 100644
--- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/DingDingAttribute.java
+++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/DingDingAttribute.java
@@ -11,7 +11,7 @@ import java.util.List;
 @Data
 public class DingDingAttribute {
 
-    private String dingDingUrl;
+    private String webhookUrl;
 
     private List<String> ats;
 
diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/LarkAttribute.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/LarkAttribute.java
index e1fbeffd0..0c19beb68 100644
--- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/LarkAttribute.java
+++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/LarkAttribute.java
@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 public class LarkAttribute {
 
-    private String larkUrl;
+    private String webhookUrl;
 
     private List<String> ats;
 
diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/DingdingAlarm.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/DingdingAlarm.java
index 62caae59f..19aa62f8a 100644
--- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/DingdingAlarm.java
+++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/DingdingAlarm.java
@@ -26,7 +26,7 @@ public class DingdingAlarm extends AbstractAlarm<AlarmContext> {
 
         DingDingAttribute dingDingAttribute = JsonUtil.parseObject(context.getNotifyAttribute(), DingDingAttribute.class);
         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;
     }
@@ -34,7 +34,7 @@ public class DingdingAlarm extends AbstractAlarm<AlarmContext> {
     @Override
     public boolean syncSendMessage(AlarmContext context) {
         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
diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java
index b208345df..deb7fb2f0 100644
--- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java
+++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/LarkAlarm.java
@@ -63,7 +63,7 @@ public class LarkAlarm extends AbstractAlarm<AlarmContext> {
             .card(map).build();
 
         try {
-            HttpRequest post = HttpUtil.createPost(larkAttribute.getLarkUrl());
+            HttpRequest post = HttpUtil.createPost(larkAttribute.getWebhookUrl());
             HttpRequest request = post.body(JsonUtil.toJsonString(builder), ContentType.JSON.toString());
             HttpResponse execute = request.execute();
             LogUtils.debug(log, JsonUtil.toJsonString(execute));
diff --git a/frontend/src/views/task/form/NotifyForm.vue b/frontend/src/views/task/form/NotifyForm.vue
index 5be28b7b7..71d085dc8 100644
--- a/frontend/src/views/task/form/NotifyForm.vue
+++ b/frontend/src/views/task/form/NotifyForm.vue
@@ -163,14 +163,14 @@
             ]" />
         </a-form-item>
         <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
-            placeholder="请输入被@人手机号"
+            placeholder="请输入被@人手机号或钉钉号"
             type="textarea"
             v-if="this.notifyTypeValue === '1'"
             v-decorator="[
               'ats',
-              {rules: [{ required: true, message: '请输入被@人手机号', whitespace: true}]}
+              {rules: [{ required: false, message: '请输入被@人手机号或钉钉号', whitespace: true}]}
             ]" />
         </a-form-item>
         <a-form-item
@@ -192,7 +192,7 @@
             v-if="this.notifyTypeValue === '4'"
             v-decorator="[
               'ats',
-              {rules: [{ required: true, message: '请输入被@人open_id', whitespace: true}]}
+              {rules: [{ required: false, message: '请输入被@人open_id', whitespace: true}]}
             ]" />
         </a-form-item>
         <a-form-item
@@ -474,11 +474,11 @@ export default {
       if (this.notifyTypeValue === '1') {
         s =
           '钉钉Url:' + json['webhookUrl'] + ';' +
-          '被@人手机号:' + json['ats'] + ';'
+          '被@人手机号或钉钉号:' + json['ats'] + ';'
       } else if (this.notifyTypeValue === '4') {
         s =
           '飞书Url:' + json['webhookUrl'] + ';' +
-          '被@人用户id:' + json['ats'] + ';'
+          '被@人openid:' + json['ats'] + ';'
       }
       return s
     }