🔨 优化安装逻辑.

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostAgentController.java

@@ -45,6 +45,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 主机探针端点 api
@@ -90,9 +91,8 @@ public class HostAgentController {
     @PostMapping("/install")
     @Operation(summary = "安装主机探针")
     @PreAuthorize("@ss.hasPermission('asset:host:install-agent')")
-    public Boolean installAgent(@Validated @RequestBody HostAgentInstallRequest request) {
-        hostAgentService.installAgent(request);
-        return true;
+    public Map<String, Long> installAgent(@Validated @RequestBody HostAgentInstallRequest request) {
+        return hostAgentService.installAgent(request);
     }
 
     @DemoDisableApi

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostAgentService.java

@@ -27,6 +27,7 @@ import org.dromara.visor.module.asset.entity.vo.HostAgentStatusVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 主机探针 服务类
@@ -49,8 +50,9 @@ public interface HostAgentService {
      * 安装探针
      *
      * @param request request
+     * @return agentKey:installId
      */
-    void installAgent(HostAgentInstallRequest request);
+    Map<String, Long> installAgent(HostAgentInstallRequest request);
 
     /**
      * 上传探针发布包

orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java

@@ -22,6 +22,7 @@
  */
 package org.dromara.visor.module.asset.service.impl;
 
+import cn.orionsec.kit.lang.function.Functions;
 import cn.orionsec.kit.lang.utils.Exceptions;
 import cn.orionsec.kit.lang.utils.Strings;
 import cn.orionsec.kit.lang.utils.collect.Lists;
@@ -133,7 +134,7 @@ public class HostAgentServiceImpl implements HostAgentService {
     }
 
     @Override
-    public void installAgent(HostAgentInstallRequest request) {
+    public Map<String, Long> installAgent(HostAgentInstallRequest request) {
         // 查询主机信息
         List<Long> idList = request.getIdList();
         List<HostDO> hosts = hostDAO.selectBatchIds(idList);
@@ -181,6 +182,12 @@ public class HostAgentServiceImpl implements HostAgentService {
             // 执行任务
             AgentInstaller.start(params);
         }
+
+        // 返回
+        return agentLogs.stream()
+                .collect(Collectors.toMap(HostAgentLogDO::getAgentKey,
+                        HostAgentLogDO::getId,
+                        Functions.right()));
     }
 
     @Override