chore:

packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts

@@ -72,10 +72,29 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     });
   }
 
-  async getCertInfo(param: { domains: string[]; userId: number }) {
-    const { domains, userId } = param;
+  async getCertInfo(params: { domains?: string; certId?: number; userId: number }) {
+    const { domains, certId, userId } = params;
+    if (certId) {
+      return await this.getCertInfoById({ id: certId, userId });
+    }
+    return await this.getCertInfoByDomains({
+      domains,
+      userId,
+    });
+  }
+
+  private async getCertInfoByDomains(params: { domains: string; userId: number }) {
+    const { domains, userId } = params;
+    if (!domains) {
+      throw new CodeException(Constants.res.openCertNotFound);
+    }
+    const domainArr = domains.split(',');
 
     const list = await this.find({
+      select: {
+        id: true,
+        domains: true,
+      },
       where: {
         userId,
       },
@@ -83,12 +102,25 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     //遍历查找
     const matched = list.find(item => {
       const itemDomains = item.domains.split(',');
-      return utils.domain.match(domains, itemDomains);
+      return utils.domain.match(domainArr, itemDomains);
     });
-    if (!matched || !matched.certInfo) {
+    if (!matched) {
       throw new CodeException(Constants.res.openCertNotFound);
     }
-    const certInfo = JSON.parse(matched.certInfo) as CertInfo;
+
+    return await this.getCertInfoById({ id: matched.id, userId: userId });
+  }
+
+  async getCertInfoById(req: { id: number; userId: number }) {
+    const entity = await this.info(req.id);
+    if (!entity || entity.userId !== req.userId) {
+      throw new CodeException(Constants.res.openCertNotFound);
+    }
+
+    if (!entity.certInfo) {
+      throw new CodeException(Constants.res.openCertNotReady);
+    }
+    const certInfo = JSON.parse(entity.certInfo) as CertInfo;
     const certReader = new CertReader(certInfo);
     return certReader.toCertInfo();
   }

packages/ui/certd-server/src/modules/open/service/open-key-service.ts

@@ -5,6 +5,7 @@ import { Repository } from 'typeorm';
 import { OpenKeyEntity } from '../entity/open-key.js';
 import { utils } from '@certd/basic';
 import crypto from 'crypto';
+import dayjs from 'dayjs';
 
 export type OpenKey = {
   userId: number;
@@ -85,4 +86,21 @@ export class OpenKeyService extends BaseService<OpenKeyEntity> {
       encrypt: encrypt,
     };
   }
+
+  async getApiToken(id: number) {
+    const entity = await this.repository.findOne({ where: { id } });
+    if (!entity) {
+      throw new Error('id不存在');
+    }
+    const { keyId, keySecret } = entity;
+    const openKey = {
+      keyId,
+      t: dayjs().unix(),
+      encrypt: false,
+      signType: 'md5',
+    };
+    const content = JSON.stringify(openKey);
+    const sign = utils.hash.md5(content + keySecret);
+    return Buffer.from(content).toString('base64') + '.' + sign;
+  }
 }