更新

common/src/main/java/cn/reghao/autodop/common/httpc/DefaultWebRequest.java → common/src/main/java/cn/reghao/autodop/common/http/DefaultWebRequest.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.httpc;
+package cn.reghao.autodop.common.http;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HeaderElement;

common/src/main/java/cn/reghao/autodop/common/httpc/HttpApi.java → common/src/main/java/cn/reghao/autodop/common/http/HttpApi.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.httpc;
+package cn.reghao.autodop.common.http;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/httpc/WebRequest.java → common/src/main/java/cn/reghao/autodop/common/http/WebRequest.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.httpc;
+package cn.reghao.autodop.common.http;
 
 import java.util.Map;
 

common/src/main/java/cn/reghao/autodop/common/httpc/WebResponse.java → common/src/main/java/cn/reghao/autodop/common/http/WebResponse.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.httpc;
+package cn.reghao.autodop.common.http;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -12,6 +12,6 @@ import lombok.Data;
 @Data
 @AllArgsConstructor
 public class WebResponse {
-    private Integer statusCode;
+    private int statusCode;
     private String body;
 }

dagent/src/main/java/cn/reghao/autodop/dagent/utils/amqp/DagentConsumerConfig.java

@@ -52,8 +52,8 @@ public class DagentConsumerConfig {
     public SimpleMessageListenerContainer messageListenerContainer(ConnectionFactory connectionFactory) {
         SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
         container.setConnectionFactory(connectionFactory);
-        container.setMessageListener(dagentConsumer);
         container.addQueues(dagentQueue());
+        container.setMessageListener(dagentConsumer);
         return container;
     }
 }

dagent/src/main/resources/banner.txt

@@ -1,26 +1,6 @@
-                              _.._        ,------------.
-                           ,'      `.    (I want you! )
-                          /  __) __` \    `-,----------'
-                         (  (`-`(-')  ) _.-'
-                         /)  \  = /  (
-                        /'    |--' .  \
-                       (  ,---|  `-.)__`
-                        )(  `-.,--'   _`-.
-                       '/,'          (  Uu",
-                        (_       ,    `/,-' )
-                        `.__,  : `-'/  /`--'
-                          |     `--'  |
-                          `   `-._   /
-                           \        (
-                           /\ .      \.
-                          / |` \     ,-\
-                         /  \| .)   /   \
-                        ( ,'|\    ,'     :
-                        | \,`.`--"/      }
-                        `,'    \  |,'    /
-                       / "-._   `-/      |
-                       "-.   "-.,'|     ;
-                      /        _/["---'""]
-                     :        /  |"-     '
-                     '           |      /
-                                 `      |
+     _                        _
+  __| | __ _  __ _  ___ _ __ | |_
+ / _` |/ _` |/ _` |/ _ \ '_ \| __|
+| (_| | (_| | (_| |  __/ | | | |_
+ \__,_|\__,_|\__, |\___|_| |_|\__|
+             |___/

dmaster/pom.xml

@@ -23,13 +23,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
-            <scope>true</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>

dmaster/src/main/java/cn/reghao/autodop/dmaster/cluster/controller/MachineController.java

@@ -4,6 +4,8 @@ import cn.reghao.autodop.dmaster.cluster.service.MachineService;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author reghao
  * @date 2019-11-15 08:44:50
@@ -17,4 +19,9 @@ public class MachineController {
     public MachineController(MachineService machineService) {
         this.machineService = machineService;
     }
+
+    @GetMapping("/test")
+    public String test(HttpServletRequest request) {
+        return request.getHeader("user-agent");
+    }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/HealthCheckJob.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.monitor;
 
-import cn.reghao.autodop.common.httpc.DefaultWebRequest;
-import cn.reghao.autodop.common.httpc.WebRequest;
-import cn.reghao.autodop.common.httpc.WebResponse;
+import cn.reghao.autodop.common.http.DefaultWebRequest;
+import cn.reghao.autodop.common.http.WebRequest;
+import cn.reghao.autodop.common.http.WebResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/notifier/DingNotify.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.utils.notifier;
 
-import cn.reghao.autodop.common.httpc.DefaultWebRequest;
-import cn.reghao.autodop.common.httpc.WebRequest;
-import cn.reghao.autodop.common.httpc.WebResponse;
+import cn.reghao.autodop.common.http.DefaultWebRequest;
+import cn.reghao.autodop.common.http.WebRequest;
+import cn.reghao.autodop.common.http.WebResponse;
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/notifier/SmsNotify.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.utils.notifier;
 
-import cn.reghao.autodop.common.httpc.DefaultWebRequest;
-import cn.reghao.autodop.common.httpc.WebRequest;
-import cn.reghao.autodop.common.httpc.WebResponse;
+import cn.reghao.autodop.common.http.DefaultWebRequest;
+import cn.reghao.autodop.common.http.WebRequest;
+import cn.reghao.autodop.common.http.WebResponse;
 import cn.reghao.autodop.dmaster.app.entity.config.NotifierConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.dom4j.DocumentHelper;

dmaster/src/main/resources/application.yml

@@ -5,6 +5,8 @@ spring:
     name: autodop-master
   profiles:
     active: @profile.active@
+  banner:
+    location: classpath:banner.txt
   servlet:
     multipart:
       max-file-size: 1GB

dmaster/src/main/resources/banner.txt

@@ -0,0 +1,5 @@
+     _                     _
+  __| |_ __ ___   __ _ ___| |_ ___ _ __
+ / _` | '_ ` _ \ / _` / __| __/ _ \ '__|
+| (_| | | | | | | (_| \__ \ ||  __/ |
+ \__,_|_| |_| |_|\__,_|___/\__\___|_|

pom.xml

@@ -38,6 +38,12 @@
     </repositories>-->
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+            <scope>true</scope>
+        </dependency>
         <!--<dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>