diff --git a/packages/ui/certd-server/.gitignore b/packages/ui/certd-server/.gitignore index 0379b41d2..eff795c33 100755 --- a/packages/ui/certd-server/.gitignore +++ b/packages/ui/certd-server/.gitignore @@ -11,8 +11,8 @@ run/ *.un~ .tsbuildinfo .tsbuildinfo.* -./data -./test/**/*.js +/test/**/*.js /test/setup.js /test/setup.ts +/data/ diff --git a/packages/ui/certd-server/src/modules/license/model.ts b/packages/ui/certd-server/src/modules/license/model.ts new file mode 100644 index 000000000..2026a37c5 --- /dev/null +++ b/packages/ui/certd-server/src/modules/license/model.ts @@ -0,0 +1,9 @@ +export class License { + crt: string; + expireTime: number; + activeTime: number; + + async load() { + // load license.pem + } +} 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 fd98ddd81..d3362f776 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 @@ -1,12 +1,4 @@ -import { - AbstractTaskPlugin, - IAccessService, - ILogger, - IsTaskPlugin, - RunStrategy, - TaskInput, - TaskOutput, -} from '@certd/pipeline'; +import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline'; import { SshClient } from '../../lib/ssh.js'; import { CertInfo, CertReader } from '@certd/plugin-cert'; import * as fs from 'fs'; @@ -120,20 +112,13 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin { this.logger.info('复制到目标路径'); this.copyFile(saveCrtPath, crtPath); this.copyFile(saveKeyPath, keyPath); - this.logger.info( - '证书复制成功:crtPath=', - crtPath, - ',keyPath=', - keyPath - ); + this.logger.info('证书复制成功:crtPath=', crtPath, ',keyPath=', keyPath); } else { if (!accessId) { throw new Error('主机登录授权配置不能为空'); } this.logger.info('准备上传文件到服务器'); - const connectConf: SshAccess = await this.accessService.getById( - accessId - ); + const connectConf: SshAccess = await this.accessService.getById(accessId); const sshClient = new SshClient(this.logger); await sshClient.uploadFiles({ connectConf, @@ -149,12 +134,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin { ], mkdirs: this.mkdirs, }); - this.logger.info( - '证书上传成功:crtPath=', - crtPath, - ',keyPath=', - keyPath - ); + this.logger.info('证书上传成功:crtPath=', crtPath, ',keyPath=', keyPath); } } catch (e) { this.logger.error(`上传失败:${e.message}`);