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 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 @@ ]" /> - 被@人手机号  + 被@人手机号或钉钉号