From f4f8417e4d393ec1f3b588253ca001b80802377a Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Thu, 5 Jan 2023 14:57:31 +0800
Subject: [PATCH] [ agent ] [ status ] - accomplish agent status - 4

---
 agent/pom.xml                                 |  8 --
 .../agent/status/AgentStatusCollector.java    | 38 +++++++--
 .../agent/status/hardware/NetworkInfo.java    | 27 ------
 common/pom.xml                                | 12 +++
 .../wdd/common/beans}/status/AgentStatus.java | 10 +--
 .../io/wdd/common/beans/status}/CpuInfo.java  |  2 +-
 .../io/wdd/common/beans/status}/CpuTicks.java |  2 +-
 .../io/wdd/common/beans/status/DiskInfo.java  | 71 ++++++++++++++++
 .../wdd/common/beans/status}/MemoryInfo.java  |  6 +-
 .../wdd/common/beans/status/NetworkInfo.java  | 60 +++++++++++++
 .../java/io/wdd/common/utils}/DataUnit.java   |  2 +-
 .../io/wdd/common/utils}/FormatUtils.java     |  2 +-
 pom.xml                                       | 22 ++---
 .../execute/result/CreateStreamReader.java    | 18 ++--
 .../result/RedisStreamReaderConfig.java       | 34 +++++++-
 .../service/CoreExecutionServiceImpl.java     |  4 +-
 .../rpc/execute/web/ExecutionController.java  | 15 +++-
 .../rpc/status/AgentStatusStreamReader.java   | 84 +++++++++++++++++++
 .../impl/CoreServerServiceImpl.java           | 20 ++++-
 19 files changed, 352 insertions(+), 85 deletions(-)
 delete mode 100644 agent/src/main/java/io/wdd/agent/status/hardware/NetworkInfo.java
 rename {agent/src/main/java/io/wdd/agent => common/src/main/java/io/wdd/common/beans}/status/AgentStatus.java (63%)
 rename {agent/src/main/java/io/wdd/agent/status/hardware => common/src/main/java/io/wdd/common/beans/status}/CpuInfo.java (98%)
 rename {agent/src/main/java/io/wdd/agent/status/hardware => common/src/main/java/io/wdd/common/beans/status}/CpuTicks.java (98%)
 create mode 100644 common/src/main/java/io/wdd/common/beans/status/DiskInfo.java
 rename {agent/src/main/java/io/wdd/agent/status/hardware => common/src/main/java/io/wdd/common/beans/status}/MemoryInfo.java (89%)
 create mode 100644 common/src/main/java/io/wdd/common/beans/status/NetworkInfo.java
 rename {agent/src/main/java/io/wdd/agent/status/hardware/config => common/src/main/java/io/wdd/common/utils}/DataUnit.java (96%)
 rename {agent/src/main/java/io/wdd/agent/status/hardware/config => common/src/main/java/io/wdd/common/utils}/FormatUtils.java (94%)
 create mode 100644 server/src/main/java/io/wdd/rpc/status/AgentStatusStreamReader.java

diff --git a/agent/pom.xml b/agent/pom.xml
index 36215b7..93bc353 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -39,14 +39,6 @@
         </dependency>
 
 
-        <!-- Operating System and Hardware Information library for Java -->
-        <dependency>
-            <groupId>com.github.oshi</groupId>
-            <artifactId>oshi-core-java11</artifactId>
-            <version>6.4.0</version>
-        </dependency>
-
-
     </dependencies>
 
     <dependencyManagement>
diff --git a/agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java b/agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java
index 7879d42..5cf4663 100644
--- a/agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java
+++ b/agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java
@@ -4,8 +4,12 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.wdd.agent.config.beans.init.AgentServerInfo;
 import io.wdd.agent.config.utils.TimeUtils;
-import io.wdd.agent.status.hardware.CpuInfo;
-import io.wdd.agent.status.hardware.MemoryInfo;
+import io.wdd.common.beans.status.CpuInfo;
+import io.wdd.common.beans.status.DiskInfo;
+import io.wdd.common.beans.status.MemoryInfo;
+import io.wdd.common.beans.status.NetworkInfo;
+import io.wdd.common.beans.status.AgentStatus;
+import io.wdd.common.utils.FormatUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.connection.stream.StringRecord;
@@ -13,6 +17,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import oshi.SystemInfo;
+import oshi.hardware.HWDiskStore;
 import oshi.hardware.HardwareAbstractionLayer;
 import oshi.software.os.OperatingSystem;
 
@@ -20,6 +25,7 @@ import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -61,13 +67,19 @@ public class AgentStatusCollector {
         agentStatus.setCpuInfo(new CpuInfo(hardware.getProcessor(), 1000));
 
         /* Memory */
-        agentStatus.setMemoryInfo(new MemoryInfo().build(hardware.getMemory()));
+        agentStatus.setMemoryInfo(
+                MemoryInfo.build(hardware.getMemory())
+        );
 
         /* Storage */
-        agentStatus.setDiskStoreInfo(hardware.getDiskStores());
+        agentStatus.setDiskStoreInfo(
+                DiskInfo.mapFromDiskStore(hardware.getDiskStores())
+                );
 
         /* Network */
-        agentStatus.setNetworkInfo(hardware.getNetworkIFs(false));
+        agentStatus.setNetworkInfo(
+                NetworkInfo.mapFromNetworkIFS(hardware.getNetworkIFs(false))
+        );
 
         /* operating system info */
         agentStatus.setOsInfo(os);
@@ -78,10 +90,21 @@ public class AgentStatusCollector {
         return agentStatus;
     }
 
+    /**
+     * when server first time boot up
+     * the server info are not collected completely
+     *  this will be executed to update or complete the octopus agent server info
+     */
+    @Scheduled(initialDelay = 180000)
+    public void updateAgentServerInfo(){
 
-    // agent boot up 60s then start to report its status
+
+
+    }
+
+    // agent boot up 120s then start to report its status
     // at the fix rate of 15s
-    @Scheduled(initialDelay = 60000, fixedRate = 5000)
+    @Scheduled(initialDelay = 60000, fixedRate = 15000)
     public void sendAgentStatusToRedis() {
 
         try {
@@ -101,5 +124,4 @@ public class AgentStatusCollector {
 
     }
 
-
 }
diff --git a/agent/src/main/java/io/wdd/agent/status/hardware/NetworkInfo.java b/agent/src/main/java/io/wdd/agent/status/hardware/NetworkInfo.java
deleted file mode 100644
index 2a34f1d..0000000
--- a/agent/src/main/java/io/wdd/agent/status/hardware/NetworkInfo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.wdd.agent.status.hardware;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-import oshi.hardware.NetworkIF;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@SuperBuilder(toBuilder = true)
-public class NetworkInfo {
-
-
-    public static List<NetworkInfo> mapFromNetworkIFS(List<NetworkIF> networkIFList){
-
-        return networkIFList.stream().map(
-                networkIF -> NetworkInfo.builder()
-                        .build()
-        ).collect(Collectors.toList());
-    }
-}
diff --git a/common/pom.xml b/common/pom.xml
index 5060808..e660761 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,6 +19,18 @@
         <java.version>11</java.version>
     </properties>
 
+    <dependencies>
+
+        <!-- Operating System and Hardware Information library for Java -->
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core-java11</artifactId>
+            <version>6.4.0</version>
+        </dependency>
+
+
+    </dependencies>
+
 <!--    <build>-->
 <!--        <plugins>-->
 <!--            <plugin>-->
diff --git a/agent/src/main/java/io/wdd/agent/status/AgentStatus.java b/common/src/main/java/io/wdd/common/beans/status/AgentStatus.java
similarity index 63%
rename from agent/src/main/java/io/wdd/agent/status/AgentStatus.java
rename to common/src/main/java/io/wdd/common/beans/status/AgentStatus.java
index b8e012b..16e1e61 100644
--- a/agent/src/main/java/io/wdd/agent/status/AgentStatus.java
+++ b/common/src/main/java/io/wdd/common/beans/status/AgentStatus.java
@@ -1,14 +1,10 @@
-package io.wdd.agent.status;
+package io.wdd.common.beans.status;
 
 
-import io.wdd.agent.status.hardware.CpuInfo;
-import io.wdd.agent.status.hardware.MemoryInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import oshi.hardware.HWDiskStore;
-import oshi.hardware.NetworkIF;
 import oshi.software.os.OperatingSystem;
 
 import java.util.List;
@@ -30,9 +26,9 @@ public class AgentStatus {
 
     MemoryInfo memoryInfo;
 
-    List<HWDiskStore> diskStoreInfo;
+    List<DiskInfo> diskStoreInfo;
 
-    List<NetworkIF> networkInfo;
+    List<NetworkInfo> networkInfo;
 
     OperatingSystem osInfo;
 
diff --git a/agent/src/main/java/io/wdd/agent/status/hardware/CpuInfo.java b/common/src/main/java/io/wdd/common/beans/status/CpuInfo.java
similarity index 98%
rename from agent/src/main/java/io/wdd/agent/status/hardware/CpuInfo.java
rename to common/src/main/java/io/wdd/common/beans/status/CpuInfo.java
index 961f5a3..c2e4d55 100644
--- a/agent/src/main/java/io/wdd/agent/status/hardware/CpuInfo.java
+++ b/common/src/main/java/io/wdd/common/beans/status/CpuInfo.java
@@ -1,4 +1,4 @@
-package io.wdd.agent.status.hardware;
+package io.wdd.common.beans.status;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/agent/src/main/java/io/wdd/agent/status/hardware/CpuTicks.java b/common/src/main/java/io/wdd/common/beans/status/CpuTicks.java
similarity index 98%
rename from agent/src/main/java/io/wdd/agent/status/hardware/CpuTicks.java
rename to common/src/main/java/io/wdd/common/beans/status/CpuTicks.java
index 9d49680..6d4d587 100644
--- a/agent/src/main/java/io/wdd/agent/status/hardware/CpuTicks.java
+++ b/common/src/main/java/io/wdd/common/beans/status/CpuTicks.java
@@ -1,4 +1,4 @@
-package io.wdd.agent.status.hardware;
+package io.wdd.common.beans.status;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/common/src/main/java/io/wdd/common/beans/status/DiskInfo.java b/common/src/main/java/io/wdd/common/beans/status/DiskInfo.java
new file mode 100644
index 0000000..085e0a2
--- /dev/null
+++ b/common/src/main/java/io/wdd/common/beans/status/DiskInfo.java
@@ -0,0 +1,71 @@
+package io.wdd.common.beans.status;
+
+import io.wdd.common.utils.FormatUtils;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import oshi.hardware.HWDiskStore;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder(toBuilder = true)
+public class DiskInfo {
+
+    String name;
+
+    String model;
+
+    String serial;
+
+    String size;
+
+
+    private List<PartitionInfo> partitionInfoList;
+
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @SuperBuilder(toBuilder = true)
+    private static class PartitionInfo{
+
+        String path;
+
+        String type;
+
+        String size;
+
+        String mountPoint;
+
+    }
+
+    public static List<DiskInfo> mapFromDiskStore(List<HWDiskStore> hwDiskStoreList){
+
+        return hwDiskStoreList.stream().map(
+                hwDiskStore -> DiskInfo.builder()
+                        .name(hwDiskStore.getName())
+                        .model(hwDiskStore.getModel())
+                        .serial(hwDiskStore.getSerial())
+                        .size(FormatUtils.formatData(hwDiskStore.getSize()))
+                        .partitionInfoList(
+                                // partition should also be got from stream
+                                hwDiskStore.getPartitions().stream().map(partition -> DiskInfo.PartitionInfo.builder()
+                                        .path(partition.getIdentification())
+                                        .size(FormatUtils.formatData(partition.getSize()))
+                                        .type(partition.getType())
+                                        .mountPoint(partition.getMountPoint())
+                                        .build()
+                                ).collect(Collectors.toList())
+                        )
+                        .build()
+        ).collect(Collectors.toList());
+
+    }
+
+
+}
diff --git a/agent/src/main/java/io/wdd/agent/status/hardware/MemoryInfo.java b/common/src/main/java/io/wdd/common/beans/status/MemoryInfo.java
similarity index 89%
rename from agent/src/main/java/io/wdd/agent/status/hardware/MemoryInfo.java
rename to common/src/main/java/io/wdd/common/beans/status/MemoryInfo.java
index d7f2248..528e6ea 100644
--- a/agent/src/main/java/io/wdd/agent/status/hardware/MemoryInfo.java
+++ b/common/src/main/java/io/wdd/common/beans/status/MemoryInfo.java
@@ -1,6 +1,6 @@
-package io.wdd.agent.status.hardware;
+package io.wdd.common.beans.status;
 
-import io.wdd.agent.status.hardware.config.FormatUtils;
+import io.wdd.common.utils.FormatUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -30,7 +30,7 @@ public class MemoryInfo {
 
     String swapUsage;
 
-    public MemoryInfo build(GlobalMemory memory) {
+    public static MemoryInfo build(GlobalMemory memory) {
 
         VirtualMemory virtualMemory = memory.getVirtualMemory();
         return MemoryInfo.builder()
diff --git a/common/src/main/java/io/wdd/common/beans/status/NetworkInfo.java b/common/src/main/java/io/wdd/common/beans/status/NetworkInfo.java
new file mode 100644
index 0000000..04b5e7d
--- /dev/null
+++ b/common/src/main/java/io/wdd/common/beans/status/NetworkInfo.java
@@ -0,0 +1,60 @@
+package io.wdd.common.beans.status;
+
+
+import io.wdd.common.utils.FormatUtils;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import oshi.hardware.NetworkIF;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder(toBuilder = true)
+public class NetworkInfo {
+
+    private String name;
+    private String displayName;
+
+    private String macAddr;
+
+    private String mtu;
+
+    private String[] ipv4Addr;
+    private String[] ipv6Addr;
+
+    private String trafficRecv;
+
+    private String trafficSend;
+
+    public static List<NetworkInfo> mapFromNetworkIFS(List<NetworkIF> networkIFList) {
+
+        return networkIFList.stream().map(networkIF -> NetworkInfo.builder().name(networkIF.getName()).displayName(networkIF.getDisplayName()).mtu(String.valueOf(networkIF.getMTU())).macAddr(networkIF.getMacaddr()).ipv4Addr(generateIPDICRFromNetworkIFList(networkIF, 4)).ipv6Addr(generateIPDICRFromNetworkIFList(networkIF, 6)).trafficSend(FormatUtils.formatData(networkIF.getBytesSent())).trafficRecv(FormatUtils.formatData(networkIF.getBytesRecv())).build()).collect(Collectors.toList());
+    }
+
+    private static String[] generateIPDICRFromNetworkIFList(NetworkIF networkIF, int Ipv4OrIpv6) {
+
+        String[] iPAddr;
+        Short[] subnetMasks;
+
+        if (Ipv4OrIpv6 == 4) {
+            iPAddr = networkIF.getIPv4addr();
+            subnetMasks = networkIF.getSubnetMasks();
+        } else {
+            iPAddr = networkIF.getIPv6addr();
+            subnetMasks = networkIF.getPrefixLengths();
+        }
+
+        String[] result = new String[iPAddr.length];
+        for (int index = 0; index < iPAddr.length; index++) {
+            result[index] = iPAddr[index] + "/" + subnetMasks[index];
+        }
+
+        return result;
+    }
+}
diff --git a/agent/src/main/java/io/wdd/agent/status/hardware/config/DataUnit.java b/common/src/main/java/io/wdd/common/utils/DataUnit.java
similarity index 96%
rename from agent/src/main/java/io/wdd/agent/status/hardware/config/DataUnit.java
rename to common/src/main/java/io/wdd/common/utils/DataUnit.java
index 777e57d..c535c3e 100644
--- a/agent/src/main/java/io/wdd/agent/status/hardware/config/DataUnit.java
+++ b/common/src/main/java/io/wdd/common/utils/DataUnit.java
@@ -1,4 +1,4 @@
-package io.wdd.agent.status.hardware.config;
+package io.wdd.common.utils;
 
 import org.springframework.util.unit.DataSize;
 
diff --git a/agent/src/main/java/io/wdd/agent/status/hardware/config/FormatUtils.java b/common/src/main/java/io/wdd/common/utils/FormatUtils.java
similarity index 94%
rename from agent/src/main/java/io/wdd/agent/status/hardware/config/FormatUtils.java
rename to common/src/main/java/io/wdd/common/utils/FormatUtils.java
index 5081041..916d134 100644
--- a/agent/src/main/java/io/wdd/agent/status/hardware/config/FormatUtils.java
+++ b/common/src/main/java/io/wdd/common/utils/FormatUtils.java
@@ -1,4 +1,4 @@
-package io.wdd.agent.status.hardware.config;
+package io.wdd.common.utils;
 
 import java.text.DecimalFormat;
 
diff --git a/pom.xml b/pom.xml
index a50c600..239a4aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,10 +35,10 @@
 
     <dependencies>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- spring cloud -->
         <dependency>
@@ -67,10 +67,10 @@
             <version>${alibaba-cloud.version}</version>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -126,15 +126,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
 
@@ -147,7 +147,7 @@
     </dependencies>
 
 
-    <dependencyManagement>
+    <!--<dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.shell</groupId>
@@ -157,7 +157,7 @@
                 <scope>import</scope>
             </dependency>
         </dependencies>
-    </dependencyManagement>
+    </dependencyManagement>-->
 
     <!--<build>
         <plugins>
diff --git a/server/src/main/java/io/wdd/rpc/execute/result/CreateStreamReader.java b/server/src/main/java/io/wdd/rpc/execute/result/CreateStreamReader.java
index 9373180..273c337 100644
--- a/server/src/main/java/io/wdd/rpc/execute/result/CreateStreamReader.java
+++ b/server/src/main/java/io/wdd/rpc/execute/result/CreateStreamReader.java
@@ -8,10 +8,9 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.data.redis.stream.StreamMessageListenerContainer;
 import org.springframework.stereotype.Component;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 
-import static io.wdd.rpc.execute.result.RedisStreamReaderConfig.REDIS_STREAM_LISTENER_CONTAINER;
+import static io.wdd.rpc.execute.result.RedisStreamReaderConfig.COMMAND_RESULT_REDIS_STREAM_LISTENER_CONTAINER;
 
 
 @Component
@@ -25,7 +24,7 @@ public class CreateStreamReader implements ApplicationContextAware {
     private RedisStreamReaderConfig redisStreamReaderConfig;
 
 
-    private HashMap<String, StreamMessageListenerContainer> REDIS_STREAM_LISTENER_CONTAINER_CACHE = new HashMap<>(16);
+    private final HashMap<String, StreamMessageListenerContainer> REDIS_STREAM_LISTENER_CONTAINER_CACHE = new HashMap<>(16);
 
 
     @Override
@@ -33,7 +32,7 @@ public class CreateStreamReader implements ApplicationContextAware {
         this.applicationContext = applicationContext;
     }
 
-    public void registerStreamReader(String streamKey) {
+    public void registerStreamReader(String redisStreamListenerContainerBeanName, String streamKey) {
 
         // prepare the environment
         prepareEnv();
@@ -51,11 +50,11 @@ public class CreateStreamReader implements ApplicationContextAware {
         modifyStreamReader(streamKey);
 
         // re-create the REDIS_STREAM_LISTENER_CONTAINER
-        createStreamReader(streamKey);
+        createStreamReader(redisStreamListenerContainerBeanName, streamKey);
 
     }
 
-    private void prepareEnv(){
+    private void prepareEnv() {
 
         getBeanFactory();
 
@@ -68,16 +67,16 @@ public class CreateStreamReader implements ApplicationContextAware {
     }
 
 
-    private void getBeanFactory(){
+    private void getBeanFactory() {
         this.beanFactory = applicationContext.getAutowireCapableBeanFactory();
     }
 
-    private void createStreamReader(String streamKey) {
+    private void createStreamReader(String redisStreamListenerContainerBeanName, String streamKey) {
 
         log.debug("start to create the redis stream listener container");
         // create the lazy bean
 
-        StreamMessageListenerContainer streamMessageListenerContainer = applicationContext.getBean(REDIS_STREAM_LISTENER_CONTAINER, StreamMessageListenerContainer.class);
+        StreamMessageListenerContainer streamMessageListenerContainer = applicationContext.getBean(redisStreamListenerContainerBeanName, StreamMessageListenerContainer.class);
 
         REDIS_STREAM_LISTENER_CONTAINER_CACHE.put(streamKey, streamMessageListenerContainer);
 
@@ -102,7 +101,6 @@ public class CreateStreamReader implements ApplicationContextAware {
 
     private void destroyStreamReader(String streamKey) {
 
-        log.debug("start to destroy {}", REDIS_STREAM_LISTENER_CONTAINER);
 
         String oldStreamKey = redisStreamReaderConfig.getStreamKey();
 
diff --git a/server/src/main/java/io/wdd/rpc/execute/result/RedisStreamReaderConfig.java b/server/src/main/java/io/wdd/rpc/execute/result/RedisStreamReaderConfig.java
index 81c2f38..1e1591c 100644
--- a/server/src/main/java/io/wdd/rpc/execute/result/RedisStreamReaderConfig.java
+++ b/server/src/main/java/io/wdd/rpc/execute/result/RedisStreamReaderConfig.java
@@ -1,6 +1,7 @@
 package io.wdd.rpc.execute.result;
 
 
+import io.wdd.rpc.status.AgentStatusStreamReader;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -22,7 +23,9 @@ public class RedisStreamReaderConfig {
     @Resource
     private RedisConnectionFactory redisConnectionFactory;
 
-    public static final String REDIS_STREAM_LISTENER_CONTAINER = "redisStreamListenerContainer";
+    public static final String COMMAND_RESULT_REDIS_STREAM_LISTENER_CONTAINER = "commandResultRedisStreamListenerContainer";
+
+    public static final String AGENT_STATUS_REDIS_STREAM_LISTENER_CONTAINER = "agentStatusRedisStreamListenerContainer";
 
     private String streamKey = "cccc";
 
@@ -34,10 +37,10 @@ public class RedisStreamReaderConfig {
         return streamKey;
     }
 
-    @Bean(value = REDIS_STREAM_LISTENER_CONTAINER)
+    @Bean(value = COMMAND_RESULT_REDIS_STREAM_LISTENER_CONTAINER)
     @Scope("prototype")
     @Lazy
-    public StreamMessageListenerContainer<String, MapRecord<String, String, String>> redisStreamListenerContainer(){
+    public StreamMessageListenerContainer<String, MapRecord<String, String, String>> commandResultRedisStreamListenerContainer(){
 
         StreamMessageListenerContainer.StreamMessageListenerContainerOptions<String, MapRecord<String, String, String>> options = StreamMessageListenerContainer.StreamMessageListenerContainerOptions
                 .builder()
@@ -60,6 +63,31 @@ public class RedisStreamReaderConfig {
         return listenerContainer;
     }
 
+    @Bean(value = AGENT_STATUS_REDIS_STREAM_LISTENER_CONTAINER)
+    @Scope("prototype")
+    @Lazy
+    public StreamMessageListenerContainer<String, MapRecord<String, String, String>> agentStatusRedisStreamListenerContainer(){
+
+        StreamMessageListenerContainer.StreamMessageListenerContainerOptions<String, MapRecord<String, String, String>> options = StreamMessageListenerContainer.StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofSeconds(2))
+                .build();
+
+        StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = StreamMessageListenerContainer.create(redisConnectionFactory, options);
+
+        listenerContainer.receive(
+
+                StreamOffset.create(streamKey, ReadOffset.lastConsumed()),
+
+                new AgentStatusStreamReader(
+                        "OctopusServer",
+                        "OctopusServer",
+                        "OctopusServer")
+
+        );
+
+        return listenerContainer;
+    }
 
 
 }
diff --git a/server/src/main/java/io/wdd/rpc/execute/service/CoreExecutionServiceImpl.java b/server/src/main/java/io/wdd/rpc/execute/service/CoreExecutionServiceImpl.java
index 8419a37..2121b57 100644
--- a/server/src/main/java/io/wdd/rpc/execute/service/CoreExecutionServiceImpl.java
+++ b/server/src/main/java/io/wdd/rpc/execute/service/CoreExecutionServiceImpl.java
@@ -17,6 +17,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static io.wdd.rpc.execute.result.RedisStreamReaderConfig.COMMAND_RESULT_REDIS_STREAM_LISTENER_CONTAINER;
+
 @Service
 @Slf4j
 public class CoreExecutionServiceImpl implements CoreExecutionService {
@@ -68,7 +70,7 @@ public class CoreExecutionServiceImpl implements CoreExecutionService {
         log.debug("set consumer group for the stream key with => [ {} ]", resultKey);
 
         // change the redis stream listener container
-        createStreamReader.registerStreamReader(resultKey);
+        createStreamReader.registerStreamReader(COMMAND_RESULT_REDIS_STREAM_LISTENER_CONTAINER, resultKey);
 
         // send the message
         messageSender.send(octopusMessage);
diff --git a/server/src/main/java/io/wdd/rpc/execute/web/ExecutionController.java b/server/src/main/java/io/wdd/rpc/execute/web/ExecutionController.java
index db8b67b..b697e74 100644
--- a/server/src/main/java/io/wdd/rpc/execute/web/ExecutionController.java
+++ b/server/src/main/java/io/wdd/rpc/execute/web/ExecutionController.java
@@ -13,6 +13,9 @@ import javax.annotation.Nullable;
 import javax.annotation.Resource;
 import java.util.List;
 
+import static io.wdd.rpc.execute.result.RedisStreamReaderConfig.AGENT_STATUS_REDIS_STREAM_LISTENER_CONTAINER;
+import static io.wdd.rpc.execute.result.RedisStreamReaderConfig.COMMAND_RESULT_REDIS_STREAM_LISTENER_CONTAINER;
+
 @RestController
 @RequestMapping("octopus/server/executor")
 public class ExecutionController {
@@ -47,7 +50,17 @@ public class ExecutionController {
             @RequestParam(value = "streamKey") String streamKey
     ) {
 
-        createStreamReader.registerStreamReader(streamKey);
+        createStreamReader.registerStreamReader(COMMAND_RESULT_REDIS_STREAM_LISTENER_CONTAINER ,streamKey);
+
+    }
+
+
+    @PostMapping("/agentStatusStream")
+    public void getAgentStatus(
+            @RequestParam(value = "streamKey") String streamKey
+    ) {
+
+        createStreamReader.registerStreamReader(AGENT_STATUS_REDIS_STREAM_LISTENER_CONTAINER ,streamKey);
 
     }
 
diff --git a/server/src/main/java/io/wdd/rpc/status/AgentStatusStreamReader.java b/server/src/main/java/io/wdd/rpc/status/AgentStatusStreamReader.java
new file mode 100644
index 0000000..7c63825
--- /dev/null
+++ b/server/src/main/java/io/wdd/rpc/status/AgentStatusStreamReader.java
@@ -0,0 +1,84 @@
+package io.wdd.rpc.status;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.wdd.common.beans.status.AgentStatus;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.RecordId;
+import org.springframework.data.redis.stream.StreamListener;
+
+@Getter
+@Setter
+@Slf4j
+public class AgentStatusStreamReader implements StreamListener<String, MapRecord<String,String, String >> {
+
+    // https://medium.com/nerd-for-tech/event-driven-architecture-with-redis-streams-using-spring-boot-a81a1c9a4cde
+
+    //https://segmentfault.com/a/1190000040946712
+
+    //https://docs.spring.io/spring-data/redis/docs/2.5.5/reference/html/#redis.streams.receive.containers
+
+    /**
+     * 消费者类型：独立消费、消费组消费
+     */
+    private String consumerType;
+    /**
+     * 消费组
+     */
+    private String group;
+    /**
+     * 消费组中的某个消费者
+     */
+    private String consumerName;
+
+
+    public AgentStatusStreamReader(String consumerType, String group, String consumerName) {
+        this.consumerType = consumerType;
+        this.group = group;
+        this.consumerName = consumerName;
+    }
+
+    @Override
+    public void onMessage(MapRecord<String, String, String> message) {
+
+        String streamKey = message.getStream();
+        RecordId messageId = message.getId();
+        String key = (String) message.getValue().keySet().toArray()[0];
+        String value = message.getValue().get(key);
+
+
+        log.info("Octopus Agent [ {} ] status of [ {} ] Time is [ {} ] stream recordId is [{}]", streamKey, key, key, messageId);
+
+        // print to console
+        printPrettyAgentStatus(value);
+
+    }
+
+    private void printPrettyAgentStatus(String valueString){
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+
+        try {
+
+            String tmp = objectMapper.readValue(valueString, new TypeReference<String>() {
+            });
+
+            AgentStatus agentStatus = objectMapper.readValue(tmp, new TypeReference<AgentStatus>() {
+            });
+
+            System.out.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(agentStatus));
+
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+
+}
diff --git a/server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java b/server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java
index 854f0c7..02edb94 100644
--- a/server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java
+++ b/server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java
@@ -11,6 +11,7 @@ import io.wdd.server.coreService.CoreServerService;
 import io.wdd.server.service.*;
 import io.wdd.server.utils.EntityUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 
@@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -85,8 +87,22 @@ public class CoreServerServiceImpl implements CoreServerService {
     @Override
     public boolean serverCreateOrUpdate(ServerInfoVO serverInfoVO) {
 
-        ServerInfoPO serverInfoPO = EntityUtils.cvToTarget(serverInfoVO, ServerInfoPO.class);
-        return serverInfoService.saveOrUpdate(serverInfoPO);
+        ServerInfoPO po = new LambdaQueryChainWrapper<ServerInfoPO>(serverInfoService.getBaseMapper())
+                .eq(ServerInfoPO::getServerName, serverInfoVO.getServerName()).one();
+
+        if (ObjectUtils.isNotEmpty(po)) {
+            try {
+                org.apache.commons.beanutils.BeanUtils.copyProperties(po, serverInfoVO);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            } catch (InvocationTargetException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            po = EntityUtils.cvToTarget(serverInfoVO, ServerInfoPO.class);
+        }
+
+        return serverInfoService.saveOrUpdate(po);
     }
 
     @Override