Merge feature/host-deployment-enhancement: host batch import, batch deploy, SSH key auth

Author: laolupaojiao

easyshell-server/src/main/java/com/easyshell/server/controller/HostController.java

@@ -4,6 +4,7 @@
 import com.easyshell.server.repository.AgentTagRepository;
 import com.easyshell.server.repository.HostCredentialRepository;
 import org.springframework.transaction.annotation.Transactional;
+import com.easyshell.server.service.HostProvisionService;
 
 import com.easyshell.server.common.result.R;
 import com.easyshell.server.model.entity.Agent;
@@ -40,6 +41,8 @@ public class HostController {
 
     private final AgentTagRepository agentTagRepository;
     private final HostCredentialRepository credentialRepository;
+    private final HostProvisionService hostProvisionService;
+
 
     @GetMapping("/list")
     public R<List<Agent>> list() {
@@ -65,6 +68,17 @@ public R<Void> deleteHost(@PathVariable String agentId) {
         credentialRepository.findByIp(agent.getIp()).ifPresent(credentialRepository::delete);
         return R.ok();
     }
+
+    /**
+     * Delete a pending/failed host credential (before agent deployment).
+     * This is different from deleteHost which deletes an agent.
+     */
+    @DeleteMapping("/credential/{id}")
+    @Transactional
+    public R<Void> deleteCredential(@PathVariable Long id) {
+        hostProvisionService.deleteById(id);
+        return R.ok();
+    }
     @GetMapping("/{agentId}/tags")
     public R<List<TagVO>> agentTags(@PathVariable String agentId) {
         return R.ok(tagService.getAgentTags(agentId));

easyshell-server/src/main/java/com/easyshell/server/controller/HostProvisionController.java

@@ -6,7 +6,11 @@
 import com.easyshell.server.service.HostProvisionService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -20,7 +24,10 @@ public class HostProvisionController {
     @PostMapping
     public R<HostCredentialVO> provision(@Valid @RequestBody HostProvisionRequest request) {
         HostCredentialVO vo = hostProvisionService.provision(request);
-        hostProvisionService.startProvisionAsync(vo.getId());
+        // Only start async deploy if deployNow is true (default)
+        if (request.getDeployNow() == null || request.getDeployNow()) {
+            hostProvisionService.startProvisionAsync(vo.getId());
+        }
         return R.ok(vo);
     }
 
@@ -54,6 +61,13 @@ public R<HostCredentialVO> reinstall(@PathVariable String agentId) {
         return R.ok(vo);
     }
 
+    @PostMapping("/reinstall/credential/{credentialId}")
+    public R<HostCredentialVO> reinstallByCredential(@PathVariable Long credentialId) {
+        HostCredentialVO vo = hostProvisionService.reinstallByCredentialId(credentialId);
+        hostProvisionService.startProvisionAsync(vo.getId());
+        return R.ok(vo);
+    }
+
     @PostMapping("/reinstall/batch")
     public R<List<HostCredentialVO>> batchReinstall(@RequestBody List<String> agentIds) {
         return R.ok(hostProvisionService.batchReinstall(agentIds));
@@ -65,4 +79,28 @@ public R<HostCredentialVO> uninstall(@PathVariable String agentId) {
         hostProvisionService.startUninstallAsync(vo.getId());
         return R.ok(vo);
     }
+
+    @PostMapping("/deploy/batch")
+    public R<List<HostCredentialVO>> batchDeploy(@RequestBody List<Long> credentialIds) {
+        return R.ok(hostProvisionService.batchDeploy(credentialIds));
+    }
+
+    @PostMapping("/import/csv")
+    public R<List<HostCredentialVO>> importCsv(@RequestParam("file") MultipartFile file) throws Exception {
+        return R.ok(hostProvisionService.importFromCsv(file.getInputStream()));
+    }
+
+    @GetMapping("/import/template")
+    public ResponseEntity<byte[]> downloadTemplate() {
+        byte[] content = hostProvisionService.generateCsvTemplate();
+        return ResponseEntity.ok()
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=host_import_template.csv")
+                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                .body(content);
+    }
+
+    @GetMapping("/unified-list")
+    public R<List<HostCredentialVO>> unifiedList() {
+        return R.ok(hostProvisionService.listUnified());
+    }
 }

easyshell-server/src/main/java/com/easyshell/server/model/dto/HostProvisionRequest.java

@@ -18,6 +18,25 @@ public class HostProvisionRequest {
     @NotBlank(message = "SSH username is required")
     private String sshUsername;
 
-    @NotBlank(message = "SSH password is required")
     private String sshPassword;
+
+    /**
+     * Authentication type: password or key (default: password)
+     */
+    private String authType = "password";
+
+    /**
+     * SSH private key content (PEM format), used when authType=key
+     */
+    private String sshPrivateKey;
+
+    /**
+     * Display name / alias for the host
+     */
+    private String hostName;
+
+    /**
+     * Whether to deploy immediately after adding (default: true for backward compatibility)
+     */
+    private Boolean deployNow = true;
 }

easyshell-server/src/main/java/com/easyshell/server/model/entity/HostCredential.java

@@ -28,9 +28,27 @@ public class HostCredential extends BaseEntity {
     /**
      * AES-256-CBC encrypted SSH password (Base64 encoded)
      */
-    @Column(name = "ssh_password_encrypted", nullable = false, length = 512)
+    @Column(name = "ssh_password_encrypted", length = 512)
     private String sshPasswordEncrypted;
 
+    /**
+     * Authentication type: password or key
+     */
+    @Column(name = "auth_type", nullable = false, length = 20)
+    private String authType = "password";
+
+    /**
+     * AES-256-CBC encrypted SSH private key (Base64 encoded), used when authType=key
+     */
+    @Column(name = "ssh_private_key_encrypted", columnDefinition = "TEXT")
+    private String sshPrivateKeyEncrypted;
+
+    /**
+     * Display name / alias for the host
+     */
+    @Column(name = "host_name", length = 128)
+    private String hostName;
+
     /**
      * Associated agent ID after successful provisioning
      */

easyshell-server/src/main/java/com/easyshell/server/model/vo/HostCredentialVO.java

@@ -10,10 +10,28 @@ public class HostCredentialVO {
     private String ip;
     private Integer sshPort;
     private String sshUsername;
+    private String authType;
+    private String hostName;
     private String agentId;
     private String provisionStatus;
     private String provisionLog;
     private String errorMessage;
     private String createdAt;
     private String updatedAt;
+
+    // Agent-merged fields (null when no agent registered yet)
+    private String hostname;
+    private String os;
+    private String arch;
+    private String kernel;
+    private String cpuModel;
+    private Integer cpuCores;
+    private Long memTotal;
+    private String agentVersion;
+    private Integer agentStatus;
+    private String lastHeartbeat;
+    private Double cpuUsage;
+    private Double memUsage;
+    private Double diskUsage;
+    private String registeredAt;
 }

easyshell-server/src/main/java/com/easyshell/server/repository/HostCredentialRepository.java

@@ -9,4 +9,6 @@
 public interface HostCredentialRepository extends JpaRepository<HostCredential, Long> {
     Optional<HostCredential> findByIp(String ip);
     List<HostCredential> findAllByOrderByCreatedAtDesc();
+    List<HostCredential> findAllByProvisionStatusIn(List<String> statuses);
+    List<HostCredential> findAllByIdIn(List<Long> ids);
 }

easyshell-server/src/main/java/com/easyshell/server/service/HostProvisionService.java

@@ -4,6 +4,7 @@
 import com.easyshell.server.model.vo.HostCredentialVO;
 
 import java.util.List;
+import java.io.InputStream;
 
 public interface HostProvisionService {
     HostCredentialVO provision(HostProvisionRequest request);
@@ -15,7 +16,14 @@ public interface HostProvisionService {
     void startRetryAsync(Long credentialId);
     HostCredentialVO reinstall(String agentId);
     void startReinstallAsync(Long credentialId);
+    HostCredentialVO reinstallByCredentialId(Long credentialId);
     List<HostCredentialVO> batchReinstall(List<String> agentIds);
     HostCredentialVO uninstall(String agentId);
     void startUninstallAsync(Long credentialId);
+
+    // New methods for host deployment enhancement
+    List<HostCredentialVO> listUnified();
+    List<HostCredentialVO> batchDeploy(List<Long> credentialIds);
+    List<HostCredentialVO> importFromCsv(InputStream csvInputStream);
+    byte[] generateCsvTemplate();
 }