perf: 支持p7b证书格式

packages/ui/certd-client/src/views/sys/settings/tabs/payment.vue

@@ -8,7 +8,7 @@
       <a-form-item v-if="formState.yizhifu.enabled" label="易支付配置" :name="['yizhifu', 'accessId']" :required="true">
         <access-selector v-model="formState.yizhifu.accessId" type="yizhifu" from="sys" />
         <div class="helper">
-          <a href="https://certd.docmirror.cn/comm/payments/yizhifu.html">彩虹易支付配置帮助文档</a>
+          <a href="https://certd.docmirror.cn/guide/use/comm/payments/yizhifu.html">彩虹易支付配置帮助文档</a>
         </div>
       </a-form-item>
 
@@ -17,7 +17,7 @@
       </a-form-item>
       <a-form-item v-if="formState.alipay.enabled" label="支付宝配置" :name="['alipay', 'accessId']" :required="true">
         <access-selector v-model="formState.alipay.accessId" type="alipay" from="sys" />
-        <div class="helper">需要开通电脑网站支付， <a href="https://certd.docmirror.cn/comm/payments/alipay.html">支付宝配置帮助文档</a></div>
+        <div class="helper">需要开通电脑网站支付， <a href="https://certd.docmirror.cn/guide/use/comm/payments/alipay.html">支付宝配置帮助文档</a></div>
       </a-form-item>
 
       <a-form-item label="微信支付" :name="['wxpay', 'enabled']" :required="true">
@@ -25,7 +25,7 @@
       </a-form-item>
       <a-form-item v-if="formState.wxpay.enabled" label="微信支付配置" :name="['wxpay', 'accessId']" :required="true">
         <access-selector v-model="formState.wxpay.accessId" type="wxpay" from="sys" />
-        <div class="helper">需要开通Native支付， <a href="https://certd.docmirror.cn/comm/payments/wxpay.html">微信配置帮助文档</a></div>
+        <div class="helper">需要开通Native支付， <a href="https://certd.docmirror.cn/guide/use/comm/payments/wxpay.html">微信配置帮助文档</a></div>
       </a-form-item>
 
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 16 }">

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

@@ -39,6 +39,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
         { value: 'der', label: 'der，一般用于Apache' },
         { value: 'jks', label: 'jks，一般用于JAVA应用' },
         { value: 'one', label: '证书私钥一体，crt+key简单合并为一个pem文件' },
+        { value: 'p7b', label: 'p7b格式' },
       ],
     },
     required: true,
@@ -71,7 +72,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
     mergeScript: `
       return {
         show: ctx.compute(({form})=>{
-          return form.certType === 'pem';
+          return form.certType === 'pem' || form.certType === 'p7b' ;
         })
       }
     `,
@@ -169,6 +170,24 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
   })
   onePath!: string;
 
+  @TaskInput({
+    title: 'p7b证书保存路径',
+    helper: '填写应用原本的证书保存路径，路径要包含证书文件名，例如：/tmp/domain_cert.p7b',
+    component: {
+      placeholder: '/root/deploy/app/domain_cert.p7b',
+    },
+    mergeScript: `
+      return {
+        show: ctx.compute(({form})=>{
+          return form.certType === 'p7b';
+        })
+      }
+    `,
+    required: true,
+    rules: [{ type: 'filepath' }],
+  })
+  p7bPath!: string;
+
   @TaskInput({
     title: '主机登录配置',
     helper: 'access授权',
@@ -277,12 +296,17 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
   })
   hostOnePath!: string;
 
+  @TaskOutput({
+    title: 'p7b证书保存路径',
+  })
+  hostP7bPath!: string;
+
   async onInstance() {}
 
 
   async execute(): Promise<void> {
     const { cert, accessId } = this;
-    let { crtPath, keyPath, icPath, pfxPath, derPath, jksPath, onePath } = this;
+    let { crtPath, keyPath, icPath, pfxPath, derPath, jksPath, onePath,p7bPath } = this;
     const certReader = new CertReader(cert);
 
     const executeCmd = async ( script:string)=> {
@@ -308,6 +332,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
           env['HOST_DER_PATH'] = this.hostDerPath || '';
           env['HOST_JKS_PATH'] = this.hostJksPath || '';
           env['HOST_ONE_PATH'] = this.hostOnePath || '';
+          env['HOST_P7B_PATH'] = this.hostOnePath || '';
         }
 
         const scripts = script.split('\n');
@@ -320,7 +345,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
     }
 
     const handle = async (opts: CertReaderHandleContext) => {
-      const { tmpCrtPath, tmpKeyPath, tmpDerPath, tmpJksPath, tmpPfxPath, tmpIcPath, tmpOnePath } = opts;
+      const { tmpCrtPath, tmpKeyPath, tmpDerPath, tmpJksPath, tmpPfxPath, tmpIcPath, tmpOnePath ,tmpP7bPath} = opts;
 
       if (accessId == null) {
         this.logger.error('复制到当前主机功能已迁移到 “复制到本机”插件，请换成复制到本机插件');
@@ -392,6 +417,14 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
           remotePath: this.onePath,
         });
       }
+      if (this.p7bPath) {
+        this.logger.info(`上传p7b证书到主机：${this.p7bPath}`);
+        p7bPath = this.p7bPath.trim();
+        transports.push({
+          localPath: tmpP7bPath,
+          remotePath: this.p7bPath,
+        });
+      }
 
       this.logger.info('开始上传文件到服务器');
       await sshClient.uploadFiles({
@@ -410,6 +443,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
       this.hostDerPath = derPath;
       this.hostJksPath = jksPath;
       this.hostOnePath = onePath;
+      this.hostP7bPath = p7bPath;
     };
 
     //执行前置命令