From a5a486507d489ad6aa7e2035d73855fe644b79e1 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Fri, 8 Dec 2023 14:14:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=202.5.0=201.=E4=BF=AE=E5=A4=8D=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E7=BC=96=E8=BE=91=E5=BC=82=E5=B8=B8=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8F=91=E9=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  4 ++-
 easy-retry-server/.gitignore                  | 32 +++++++++++++++++++
 .../listener/JobTaskFailAlarmListener.java    |  6 +---
 .../easy-retry-server-starter/.gitignore      |  2 +-
 frontend/src/views/job/form/JobNotifyForm.vue | 11 ++++---
 frontend/src/views/task/form/NotifyForm.vue   |  5 ++-
 6 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 easy-retry-server/.gitignore

diff --git a/.gitignore b/.gitignore
index 363a18eb..0f1422b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 HELP.md
-/target/
+target/
 !.mvn/wrapper/maven-wrapper.jar
 
 ### STS ###
@@ -30,3 +30,5 @@ HELP.md
 
 # Maven ignore
 .flattened-pom.xml
+
+data/
diff --git a/easy-retry-server/.gitignore b/easy-retry-server/.gitignore
new file mode 100644
index 00000000..d4847f3c
--- /dev/null
+++ b/easy-retry-server/.gitignore
@@ -0,0 +1,32 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/
+
+# Maven ignore
+.flattened-pom.xml
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/listener/JobTaskFailAlarmListener.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/listener/JobTaskFailAlarmListener.java
index ca80ec2f..3c3d0171 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/listener/JobTaskFailAlarmListener.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/listener/JobTaskFailAlarmListener.java
@@ -80,7 +80,7 @@ public class JobTaskFailAlarmListener extends AbstractJobAlarm<JobTaskFailAlarmE
     @Override
     protected AlarmContext buildAlarmContext(JobAlarmInfo alarmDTO, NotifyConfigInfo notifyConfig) {
         // 预警
-        AlarmContext context = AlarmContext.build()
+        return AlarmContext.build()
                 .text(jobTaskFailTextMessagesFormatter,
                         EnvironmentUtils.getActiveProfile(),
                         alarmDTO.getGroupName(),
@@ -90,10 +90,6 @@ public class JobTaskFailAlarmListener extends AbstractJobAlarm<JobTaskFailAlarmE
                         DateUtils.toNowFormat(DateUtils.NORM_DATETIME_PATTERN))
                 .title("{}环境 JOB任务失败", EnvironmentUtils.getActiveProfile())
                 .notifyAttribute(notifyConfig.getNotifyAttribute());
-        Alarm<AlarmContext> alarmType = easyRetryAlarmFactory.getAlarmType(notifyConfig.getNotifyType());
-        alarmType.asyncSendMessage(context);
-
-        return context;
     }
 
     @Override
diff --git a/easy-retry-server/easy-retry-server-starter/.gitignore b/easy-retry-server/easy-retry-server-starter/.gitignore
index 28b51ee1..a73f4141 100644
--- a/easy-retry-server/easy-retry-server-starter/.gitignore
+++ b/easy-retry-server/easy-retry-server-starter/.gitignore
@@ -1,5 +1,5 @@
 HELP.md
-../target/
+target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
diff --git a/frontend/src/views/job/form/JobNotifyForm.vue b/frontend/src/views/job/form/JobNotifyForm.vue
index 3f568a47..8c4fc771 100644
--- a/frontend/src/views/job/form/JobNotifyForm.vue
+++ b/frontend/src/views/job/form/JobNotifyForm.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: true, message: '请输入被@人手机号或钉钉号', whitespace: true}]}
             ]" />
         </a-form-item>
         <a-form-item
@@ -211,6 +211,7 @@
           label="密码">
           <a-input
             placeholder="请输入密码"
+            type="password"
             v-if="this.notifyTypeValue === '2'"
             v-decorator="[
               'pass',
@@ -384,7 +385,9 @@ export default {
         if (this.formType === 'edit') {
           const formData = pick(JSON.parse(this.notifyAttribute), ['webhookUrl', 'ats', 'user', 'pass', 'host', 'port', 'from', 'tos'])
           this.notifyAttributeForm.getFieldDecorator(`webhookUrl`, { initialValue: formData.webhookUrl, preserve: true })
-          this.notifyAttributeForm.getFieldDecorator(`ats`, { initialValue: formData.ats.join(','), preserve: true })
+          if (formData.ats) {
+            this.notifyAttributeForm.getFieldDecorator(`ats`, { initialValue: formData.ats.join(','), preserve: true })
+          }
           this.notifyAttributeForm.getFieldDecorator(`user`, { initialValue: formData.user, preserve: true })
           this.notifyAttributeForm.getFieldDecorator(`pass`, { initialValue: formData.pass, preserve: true })
           this.notifyAttributeForm.getFieldDecorator(`host`, { initialValue: formData.host, preserve: true })
diff --git a/frontend/src/views/task/form/NotifyForm.vue b/frontend/src/views/task/form/NotifyForm.vue
index 71d085dc..109cdbe4 100644
--- a/frontend/src/views/task/form/NotifyForm.vue
+++ b/frontend/src/views/task/form/NotifyForm.vue
@@ -211,6 +211,7 @@
           label="密码">
           <a-input
             placeholder="请输入密码"
+            type="password"
             v-if="this.notifyTypeValue === '2'"
             v-decorator="[
               'pass',
@@ -384,7 +385,9 @@ export default {
         if (this.formType === 'edit') {
           const formData = pick(JSON.parse(this.notifyAttribute), ['webhookUrl', 'ats', 'user', 'pass', 'host', 'port', 'from', 'tos'])
           this.notifyAttributeForm.getFieldDecorator(`webhookUrl`, { initialValue: formData.webhookUrl, preserve: true })
-          this.notifyAttributeForm.getFieldDecorator(`ats`, { initialValue: formData.ats.join(','), preserve: true })
+          if (formData.ats) {
+            this.notifyAttributeForm.getFieldDecorator(`ats`, { initialValue: formData.ats.join(','), preserve: true })
+          }
           this.notifyAttributeForm.getFieldDecorator(`user`, { initialValue: formData.user, preserve: true })
           this.notifyAttributeForm.getFieldDecorator(`pass`, { initialValue: formData.pass, preserve: true })
           this.notifyAttributeForm.getFieldDecorator(`host`, { initialValue: formData.host, preserve: true })