github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v2-dev' into v2-plugin

pull/370/head
xiaojunnuo 2025-04-10 00:22:51 +08:00
parent 0e36f03954 57309ae3d5
commit ec22070957
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/plugins/plugin-lib/src/ssh/ssh.ts
View File

@ -139,6 +139,7 @@ export class AsyncSsh2Client {
script: string, script: string,
opts: { opts: {
throwOnStdErr?: boolean; throwOnStdErr?: boolean;
env?: any;
} = {} } = {}
): Promise<string> { ): Promise<string> {
if (!script) { if (!script) {
@ -153,7 +154,7 @@ export class AsyncSsh2Client {
// } // }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.logger.info(`执行命令：[${this.connConf.host}][exec]: \n` + script); 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) { if (err) {
reject(err); reject(err);
return; return;
@ -456,7 +457,7 @@ export class SshClient {
script = envScripts.join(newLine) + newLine + script; script = envScripts.join(newLine) + newLine + script;
} }
} }
return await conn.exec(script as string); return await conn.exec(script as string, { env: options.env });
}, },
}); });
} }

3
packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts
View File

@ -381,7 +381,8 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
for (let i = 0; i < domains.length; i++) { for (let i = 0; i < domains.length; i++) {
env[`CERT_DOMAIN_${i}`] = domains[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_CRT_PATH'] = this.hostCrtPath || '';
env['HOST_KEY_PATH'] = this.hostKeyPath || ''; env['HOST_KEY_PATH'] = this.hostKeyPath || '';