commit

Dockerfile

@@ -1,11 +0,0 @@
-FROM openjdk:8-jre-slim
-MAINTAINER xuxueli
-
-ENV PARAMS=""
-
-ENV TZ=PRC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-ADD target/xxl-job-admin-*.jar /app.jar
-
-ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

src/main/java/com/xxl/job/admin/controller/LiveController.java

@@ -0,0 +1,21 @@
+package com.xxl.job.admin.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: EurekaController
+ * @Author: xda
+ * @Date: 2021/5/11 13:37
+ */
+@RestController
+public class LiveController {
+
+
+    @RequestMapping(value = "/isLive", method = RequestMethod.GET)
+    public String isLive() {
+        return "job-admin is ok!";
+    }
+
+}

src/main/java/com/xxl/job/admin/core/alarm/impl/DingJobAlarm.java

@@ -33,14 +33,17 @@ public class DingJobAlarm implements JobAlarm {
     @Value("${work_env:}")
     private String workEnv;
 
-    @Value("${dingAccessToken}")
+    @Value("${dingAccessToken:}")
     private String dingAccessToken;
 
+    @Value("${dingTalkNotify:false}")
+    private Boolean dingTalkNotify;
+
     @Override
     public boolean doAlarm(XxlJobInfo info, XxlJobLog jobLog) {
         boolean alarmResult = true;
         // send monitor email
-        if (info != null) {
+        if (info != null && dingTalkNotify) {
             Map<String, Object> map = loadEmailJobAlarmTemplate(info, jobLog, workEnv);
             // 发送钉钉消息
             try {

src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
-apollo:
-  bootstrap:
-    enabled: true
-    namespaces: application
+#apollo:
+#  bootstrap:
+#    enabled: true
+#    namespaces: application