From 71ac8aae4aa694e1a23761e9761c9fba30b43a21 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 5 Sep 2024 00:04:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dwindows=E4=B8=8B?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C=E7=AC=AC=E4=BA=8C=E6=9D=A1?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/plugins/plugin-host/lib/ssh.ts        | 52 ++++++++++++++-----
 .../plugin/host-shell-execute/index.ts        |  6 ++-
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/packages/ui/certd-server/src/plugins/plugin-host/lib/ssh.ts b/packages/ui/certd-server/src/plugins/plugin-host/lib/ssh.ts
index fca1a52a..6f09fba8 100644
--- a/packages/ui/certd-server/src/plugins/plugin-host/lib/ssh.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-host/lib/ssh.ts
@@ -79,7 +79,8 @@ export class AsyncSsh2Client {
       this.logger.info('script 为空，取消执行');
       return;
     }
-    const iconv = await import('iconv-lite');
+    let iconv: any = await import('iconv-lite');
+    iconv = iconv.default;
     return new Promise((resolve, reject) => {
       this.logger.info(`执行命令：[${this.connConf.host}][exec]: ` + script);
       this.conn.exec(script, (err: Error, stream: any) => {
@@ -211,26 +212,49 @@ export class SshClient {
     });
   }
 
+  async isCmd(conn: AsyncSsh2Client) {
+    const spec = await conn.exec('echo %COMSPEC%');
+    if (spec.toString().trim() === '%COMSPEC%') {
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  /**
+   *
+   * Set-ItemProperty -Path "HKLM:\SOFTWARE\OpenSSH" -Name DefaultShell -Value "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe"
+   * Start-Service sshd
+   *
+   * Set-ItemProperty -Path "HKLM:\SOFTWARE\OpenSSH" -Name DefaultShell -Value "C:\Windows\System32\cmd.exe"
+   * @param options
+   */
   async exec(options: { connectConf: SshAccess; script: string | Array<string> }) {
     let { script } = options;
     const { connectConf } = options;
-    if (_.isArray(script)) {
-      script = script as Array<string>;
-      if (connectConf.windows) {
-        script = script.join('\r\n');
-      } else {
-        script = script.join('\n');
-      }
-    } else {
-      if (connectConf.windows) {
-        script = script.replaceAll('\n', '\r\n');
-      }
-    }
+
     this.logger.info('命令：', script);
     return await this._call({
       connectConf,
       callable: async (conn: AsyncSsh2Client) => {
-        return await conn.exec(script as string);
+        let isWinCmd = false;
+        if (connectConf.windows) {
+          isWinCmd = await this.isCmd(conn);
+        }
+        if (isWinCmd) {
+          //组合成&&的形式
+          if (typeof script === 'string') {
+            script = script.split('\n');
+          }
+          script = script as Array<string>;
+          script = script.join('&& ');
+        } else {
+          if (_.isArray(script)) {
+            script = script as Array<string>;
+            script = script.join('\n');
+          }
+        }
+        await conn.exec(script);
       },
     });
   }
diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts
index 3800d146..f9c7c951 100644
--- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts
@@ -40,9 +40,11 @@ export class HostShellExecutePlugin extends AbstractTaskPlugin {
     const { script, accessId } = this;
     const connectConf = await this.accessService.getById(accessId);
     const sshClient = new SshClient(this.logger);
-    await sshClient.shell({
+
+    const scripts = script.split('\n');
+    await sshClient.exec({
       connectConf,
-      script,
+      script: scripts,
     });
     // this.logger.info('exec res:', ret);
   }