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 7b21fbba..b6acaa44 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 264b8491..cacb5fdd 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 a62a22f5..b2e53634 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 e454bf3c..4b8ada16 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 7672e10e..d9620791 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 @@