From c99939f435859662ec7aa4fdc7b5ed05f2be6493 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 8 Apr 2025 18:06:12 +0800
Subject: [PATCH] chore:

---
 packages/plugins/plugin-lib/src/ssh/ssh.ts                   | 5 +++--
 .../src/plugins/plugin-host/plugin/upload-to-host/index.ts   | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/plugins/plugin-lib/src/ssh/ssh.ts b/packages/plugins/plugin-lib/src/ssh/ssh.ts
index 34e678c9..41bb4049 100644
--- a/packages/plugins/plugin-lib/src/ssh/ssh.ts
+++ b/packages/plugins/plugin-lib/src/ssh/ssh.ts
@@ -139,6 +139,7 @@ export class AsyncSsh2Client {
     script: string,
     opts: {
       throwOnStdErr?: boolean;
+      env?: any;
     } = {}
   ): Promise<string> {
     if (!script) {
@@ -153,7 +154,7 @@ export class AsyncSsh2Client {
     // }
     return new Promise((resolve, reject) => {
       this.logger.info(`执行命令：[${this.connConf.host}][exec]: \n` + script);
-      this.conn.exec(script, (err: Error, stream: any) => {
+      this.conn.exec(script, { pty: true, env: opts.env }, (err: Error, stream: any) => {
         if (err) {
           reject(err);
           return;
@@ -456,7 +457,7 @@ export class SshClient {
             script = envScripts.join(newLine) + newLine + script;
           }
         }
-        return await conn.exec(script as string);
+        return await conn.exec(script as string, { env: options.env });
       },
     });
   }
diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts
index 9c7b4624..2e3d801e 100644
--- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts
@@ -381,7 +381,8 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
         for (let i = 0; i < domains.length; i++) {
           env[`CERT_DOMAIN_${i}`] = domains[i];
         }
-        env['CERT_EXPIRES'] = dayjs(certReader.getCrtDetail().expires).unix();
+        //环境变量必须是string
+        env['CERT_EXPIRES'] = ""+dayjs(certReader.getCrtDetail().expires).unix();
 
         env['HOST_CRT_PATH'] = this.hostCrtPath || '';
         env['HOST_KEY_PATH'] = this.hostKeyPath || '';