From 92446c339936f98f08f654b8971a7393d8435224 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 30 May 2024 10:54:18 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=B8=8A=E4=BC=A0=E5=88=B0=E4=B8=BB?=
 =?UTF-8?q?=E6=9C=BA=E6=8F=92=E4=BB=B6=E6=94=AF=E6=8C=81=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=88=B0=E6=9C=AC=E6=9C=BA=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/plugin/cert-plugin/index.ts           | 28 +++++---
 packages/ui/certd-client/src/style/certd.less | 20 ++++++
 .../ui/certd-client/src/style/common.less     |  4 ++
 .../access/access-selector/access/crud.tsx    |  2 +-
 .../certd/access/access-selector/index.vue    | 14 +++-
 .../pipeline/service/access-service.ts        |  4 +-
 .../plugin/upload-to-host/index.ts            | 64 ++++++++++++++-----
 7 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts
index 7b21fbba3..b6acaa44e 100644
--- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts
+++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts
@@ -1,12 +1,23 @@
-import { AbstractTaskPlugin, Decorator, HttpClient, IAccessService, IContext, IsTaskPlugin, RunStrategy, Step, TaskInput, TaskOutput } from "@certd/pipeline";
+import {
+  AbstractTaskPlugin,
+  Decorator,
+  HttpClient,
+  IAccessService,
+  IContext,
+  IsTaskPlugin,
+  RunStrategy,
+  Step,
+  TaskInput,
+  TaskOutput
+} from "@certd/pipeline";
 import dayjs from "dayjs";
-import { AcmeService, CertInfo } from "./acme";
+import {AcmeService, CertInfo} from "./acme";
 import _ from "lodash";
-import { Logger } from "log4js";
-import { DnsProviderDefine, dnsProviderRegistry } from "../../dns-provider";
-import { CertReader } from "./cert-reader";
+import {Logger} from "log4js";
+import {DnsProviderDefine, dnsProviderRegistry} from "../../dns-provider";
+import {CertReader} from "./cert-reader";
 import JSZip from "jszip";
-import { fileUtils } from "@certd/pipeline";
+
 export { CertReader };
 export type { CertInfo };
 
@@ -150,7 +161,7 @@ export class CertApplyPlugin extends AbstractTaskPlugin {
     const cert: CertInfo = certReader.toCertInfo();
     this.cert = cert;
     // this.logger.info(JSON.stringify(certReader.detail));
-    const applyTime = dayjs(certReader.detail.validity.notBefore).format("YYYYMMDDHHmmss");
+    const applyTime = dayjs(certReader.detail.validity.notBefore).format("YYYYMMDD_HHmmss");
     await this.zipCert(cert, applyTime);
   }
 
@@ -162,8 +173,7 @@ export class CertApplyPlugin extends AbstractTaskPlugin {
     const filename = `cert_${domain_name}_${applyTime}.zip`;
     const content = await zip.generateAsync({ type: "nodebuffer" });
     this.saveFile(filename, content);
-    this.logger.info(`getFileRootDir:${fileUtils.getFileRootDir("11")}`);
-    this.logger.info(`保存文件:${filename}`);
+    this.logger.info(`已保存文件:${filename}`);
   }
 
   /**
diff --git a/packages/ui/certd-client/src/style/certd.less b/packages/ui/certd-client/src/style/certd.less
index 264b84919..cacb5fdda 100644
--- a/packages/ui/certd-client/src/style/certd.less
+++ b/packages/ui/certd-client/src/style/certd.less
@@ -10,3 +10,23 @@
   justify-content: center;
   align-items: center;
 }
+
+.cd-icon-button{
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+   cursor: pointer;
+}
+
+.cd-flex{
+    display: flex;
+    justify-content: left;
+    align-items: center;
+}
+
+.cd-flex-inline{
+  display: inline-flex;
+  justify-content: left;
+  align-items: center;
+}
+
diff --git a/packages/ui/certd-client/src/style/common.less b/packages/ui/certd-client/src/style/common.less
index a62a22f58..b2e536345 100644
--- a/packages/ui/certd-client/src/style/common.less
+++ b/packages/ui/certd-client/src/style/common.less
@@ -55,6 +55,10 @@ h1, h2, h3, h4, h5, h6 {
   margin-left:5px;
 }
 
+.mr-5{
+  margin-right: 5px;
+}
+
 .mt-10{
   margin-top:10px;
 }
diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
index e454bf3c3..4b8ada16c 100644
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
@@ -64,7 +64,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         }
       },
       rowHandle: {
-        width: "150px"
+        width: "180px"
       },
       table: {
         rowSelection: {
diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue b/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue
index 7672e10e2..d96207914 100644
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="pi-access-selector">
-    <span v-if="target.name" class="mlr-5">{{ target.name }}</span>
+    <span v-if="target.name" class="mr-5 cd-flex-inline">
+      <span class="mr-5">{{ target.name }}</span>
+      <fs-icon class="cd-icon-button" icon="ion:close-circle-outline" @click="clear"></fs-icon>
+    </span>
     <span v-else class="mlr-5 gray">请选择</span>
     <a-button @click="chooseForm.open">选择</a-button>
     <a-form-item-rest v-if="chooseForm.show">
@@ -42,6 +45,13 @@ export default defineComponent({
         target.value = await api.GetObj(value);
       }
     }
+
+    function clear(){
+      selectedId.value = "";
+      target.value = null
+      ctx.emit("update:modelValue", selectedId.value);
+    }
+
     watch(
       () => {
         return props.modelValue;
@@ -89,7 +99,9 @@ export default defineComponent({
       }
     });
 
+
     return {
+      clear,
       target,
       selectedId,
       providerDefine,
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts
index c3fb5648f..21ef15399 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts
@@ -23,6 +23,9 @@ export class AccessService
 
   async getById(id: any): Promise<any> {
     const entity = await this.info(id);
+    if (entity == null) {
+      throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
+    }
     // const access = accessRegistry.get(entity.type);
     const setting = JSON.parse(entity.setting);
     return {
@@ -38,5 +41,4 @@ export class AccessService
   getDefineByType(type: string) {
     return accessRegistry.getDefine(type);
   }
-
 }
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 c049fd7e8..5e474bdd4 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
@@ -14,6 +14,7 @@ import * as fs from 'fs';
 @IsTaskPlugin({
   name: 'uploadCertToHost',
   title: '上传证书到主机',
+  desc: '也支持复制证书到本机',
   default: {
     strategy: {
       runStrategy: RunStrategy.SkipWhenSucceed,
@@ -53,10 +54,22 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
       name: 'pi-access-selector',
       type: 'ssh',
     },
-    rules: [{ required: true, message: '此项必填' }],
+    rules: [{ required: false, message: '' }],
   })
   accessId!: string;
 
+  @TaskInput({
+    title: '复制到当前主机',
+    helper:
+      '开启后，将直接复制到当前主机某个目录，由于是docker启动，实际上复制到的是docker容器内的目录，你需要事先在docker-compose.yaml中配置主机目录映射： volumes: /your_target_path:/your_target_path',
+    component: {
+      name: 'a-switch',
+      value: false,
+      vModel: 'checked',
+    },
+  })
+  copyToThisHost!: boolean;
+
   @TaskOutput({
     title: '证书保存路径',
   })
@@ -74,29 +87,46 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
     this.accessService = this.ctx.accessService;
     this.logger = this.ctx.logger;
   }
+
+  copyFile(srcFile: string, destFile: string) {
+    const dir = destFile.substring(0, destFile.lastIndexOf('/'));
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.copyFileSync(srcFile, destFile);
+  }
   async execute(): Promise<void> {
     const { crtPath, keyPath, cert, accessId } = this;
     const certReader = new CertReader(cert);
-    const connectConf = await this.accessService.getById(accessId);
-    const sshClient = new SshClient(this.logger);
 
     const saveCrtPath = certReader.saveToFile('crt');
     const saveKeyPath = certReader.saveToFile('key');
 
-    await sshClient.uploadFiles({
-      connectConf,
-      transports: [
-        {
-          localPath: saveCrtPath,
-          remotePath: crtPath,
-        },
-        {
-          localPath: saveKeyPath,
-          remotePath: keyPath,
-        },
-      ],
-    });
-    this.logger.info('证书上传成功：crtPath=', crtPath, ',keyPath=', keyPath);
+    if (this.copyToThisHost) {
+      this.copyFile(saveCrtPath, crtPath);
+      this.copyFile(saveKeyPath, keyPath);
+      this.logger.info('证书复制成功：crtPath=', crtPath, ',keyPath=', keyPath);
+    } else {
+      if (!accessId) {
+        throw new Error('主机登录授权配置不能为空');
+      }
+      const connectConf = await this.accessService.getById(accessId);
+      const sshClient = new SshClient(this.logger);
+      await sshClient.uploadFiles({
+        connectConf,
+        transports: [
+          {
+            localPath: saveCrtPath,
+            remotePath: crtPath,
+          },
+          {
+            localPath: saveKeyPath,
+            remotePath: keyPath,
+          },
+        ],
+      });
+      this.logger.info('证书上传成功：crtPath=', crtPath, ',keyPath=', keyPath);
+    }
 
     //删除临时文件
     fs.unlinkSync(saveCrtPath);