From 7a0938890482ba0a5fa9d81184c69c276bf08b88 Mon Sep 17 00:00:00 2001 From: jade_ybx <18609134618@163.com> Date: Fri, 17 Jan 2025 18:57:52 +0800 Subject: [PATCH] =?UTF-8?q?ping=E6=8E=A5=E5=8F=A3=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=97=A0=E6=95=88=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E8=BF=9B=E8=A1=8C=E7=94=A8=E6=88=B7=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opengauss/admin/web/controller/ops/HostController.java | 4 ++-- .../admin/system/service/ops/impl/HostServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/openGauss-datakit/visualtool-api/src/main/java/org/opengauss/admin/web/controller/ops/HostController.java b/openGauss-datakit/visualtool-api/src/main/java/org/opengauss/admin/web/controller/ops/HostController.java index d7a907a41..1ccba7cdc 100644 --- a/openGauss-datakit/visualtool-api/src/main/java/org/opengauss/admin/web/controller/ops/HostController.java +++ b/openGauss-datakit/visualtool-api/src/main/java/org/opengauss/admin/web/controller/ops/HostController.java @@ -175,8 +175,8 @@ public class HostController extends BaseController { @GetMapping("/ping/{hostId}") public AjaxResult ping(@PathVariable String hostId, @RequestParam(value = "rootPassword", required = false) String rootPassword) { - boolean ping = hostService.ping(hostId, rootPassword); - return ping ? AjaxResult.success() : AjaxResult.error("Connectivity test failed"); + hostService.ping(hostId, rootPassword); + return AjaxResult.success(); } @DeleteMapping("/{hostId}") diff --git a/openGauss-datakit/visualtool-service/src/main/java/org/opengauss/admin/system/service/ops/impl/HostServiceImpl.java b/openGauss-datakit/visualtool-service/src/main/java/org/opengauss/admin/system/service/ops/impl/HostServiceImpl.java index d065b57de..dff272802 100644 --- a/openGauss-datakit/visualtool-service/src/main/java/org/opengauss/admin/system/service/ops/impl/HostServiceImpl.java +++ b/openGauss-datakit/visualtool-service/src/main/java/org/opengauss/admin/system/service/ops/impl/HostServiceImpl.java @@ -438,6 +438,9 @@ public class HostServiceImpl extends ServiceImpl i OpsHostUserEntity userEntity = opsHostUserEntities.stream().findAny().get(); SshLogin pingLogin = new SshLogin(hostEntity.getPublicIp(), hostEntity.getPort(), userEntity.getUsername(), encryptionUtils.decrypt(userEntity.getPassword())); + if (!jschExecutorService.checkOsUserExist(pingLogin)) { + throw new OpsException("check os user:" + userEntity.getUsername() + " is not exist."); + } return jschExecutorService.checkOsUserExist(pingLogin); } -- Gitee