perf: 证书仓库

packages/ui/certd-server/db/migration/v10020__open.sql

@@ -0,0 +1,15 @@
+CREATE TABLE "cd_open_key"
+(
+  "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+  "user_id"     integer,
+  "key_id"      varchar(50),
+  "key_secret"  varchar(100),
+  "disabled"    boolean  NOT NULL DEFAULT (false),
+  "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP),
+  "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+);
+
+
+
+CREATE INDEX "index_open_key_user_id" ON "cd_open_key" ("user_id");
+CREATE INDEX "index_open_key_key_id" ON "cd_open_key" ("key_id");

packages/ui/certd-server/src/controller/openapi/v1/cert-controller.ts

@@ -1,9 +1,9 @@
 import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CodeException, Constants, EncryptService } from '@certd/lib-server';
-import { CertInfoService } from '../../modules/monitor/service/cert-info-service.js';
+import { CertInfoService } from '../../../modules/monitor/service/cert-info-service.js';
 import { CertInfo } from '@certd/plugin-cert';
-import { OpenKey } from '../../modules/open/service/open-key-service.js';
-import { BaseOpenController } from './base-open-controller.js';
+import { OpenKey } from '../../../modules/open/service/open-key-service.js';
+import { BaseOpenController } from '../base-open-controller.js';
 
 export type CertGetReq = {
   domains: string;
@@ -12,7 +12,7 @@ export type CertGetReq = {
 /**
  */
 @Provide()
-@Controller('/open/cert')
+@Controller('/api/v1/cert')
 export class OpenCertController extends BaseOpenController {
   @Inject()
   certInfoService: CertInfoService;

packages/ui/certd-server/src/controller/sys/access/access-controller.ts

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { AccessService, Constants } from '@certd/lib-server';
-import { AccessController } from '../../pipeline/access-controller.js';
+import { AccessController } from '../../user/pipeline/access-controller.js';
 import { checkComm } from '@certd/plus-core';
 
 /**

packages/ui/certd-server/src/controller/user/basic/email-controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController } from '@certd/lib-server';
-import { EmailService } from '../../modules/basic/service/email-service.js';
+import { EmailService } from '../../../modules/basic/service/email-service.js';
 import { Constants } from '@certd/lib-server';
 
 /**

packages/ui/certd-server/src/controller/user/cname/cname-provider-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants } from '@certd/lib-server';
-import { CnameRecordService } from '../../modules/cname/service/cname-record-service.js';
-import { CnameProviderService } from '../../modules/cname/service/cname-provider-service.js';
+import { CnameRecordService } from '../../../modules/cname/service/cname-record-service.js';
+import { CnameProviderService } from '../../../modules/cname/service/cname-provider-service.js';
 
 /**
  * 授权

packages/ui/certd-server/src/controller/user/cname/cname-record-controller.ts

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController } from '@certd/lib-server';
-import { CnameRecordService } from '../../modules/cname/service/cname-record-service.js';
+import { CnameRecordService } from '../../../modules/cname/service/cname-record-service.js';
 
 /**
  * 授权

packages/ui/certd-server/src/controller/user/dashboard/statistic-controller.ts

@@ -1,9 +1,9 @@
 import { Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants } from '@certd/lib-server';
-import { UserService } from '../../modules/sys/authority/service/user-service.js';
-import { RoleService } from '../../modules/sys/authority/service/role-service.js';
-import { PipelineService } from '../../modules/pipeline/service/pipeline-service.js';
-import { HistoryService } from '../../modules/pipeline/service/history-service.js';
+import { UserService } from '../../../modules/sys/authority/service/user-service.js';
+import { RoleService } from '../../../modules/sys/authority/service/role-service.js';
+import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
+import { HistoryService } from '../../../modules/pipeline/service/history-service.js';
 
 export type ChartItem = {
   name: string;

packages/ui/certd-server/src/controller/user/login/login-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
-import { LoginService } from '../../modules/login/service/login-service.js';
+import { LoginService } from '../../../modules/login/service/login-service.js';
 import { BaseController, Constants, SysPublicSettings, SysSettingsService } from '@certd/lib-server';
-import { CodeService } from '../../modules/basic/service/code-service.js';
+import { CodeService } from '../../../modules/basic/service/code-service.js';
 import { checkComm } from '@certd/plus-core';
 
 /**

packages/ui/certd-server/src/controller/user/login/register-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants, SysSettingsService } from '@certd/lib-server';
-import { RegisterType, UserService } from '../../modules/sys/authority/service/user-service.js';
-import { CodeService } from '../../modules/basic/service/code-service.js';
+import { RegisterType, UserService } from '../../../modules/sys/authority/service/user-service.js';
+import { CodeService } from '../../../modules/basic/service/code-service.js';
 import { checkComm, checkPlus } from '@certd/plus-core';
 
 export type RegisterReq = {

packages/ui/certd-server/src/controller/user/mine/mine-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants } from '@certd/lib-server';
-import { UserService } from '../../modules/sys/authority/service/user-service.js';
-import { RoleService } from '../../modules/sys/authority/service/role-service.js';
+import { UserService } from '../../../modules/sys/authority/service/user-service.js';
+import { RoleService } from '../../../modules/sys/authority/service/role-service.js';
 
 /**
  */

packages/ui/certd-server/src/controller/user/mine/user-settings-controller.ts

@@ -1,8 +1,8 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '@certd/lib-server';
 import { Constants } from '@certd/lib-server';
-import { UserSettingsService } from '../../modules/mine/service/user-settings-service.js';
-import { UserSettingsEntity } from '../../modules/mine/entity/user-settings.js';
+import { UserSettingsService } from '../../../modules/mine/service/user-settings-service.js';
+import { UserSettingsEntity } from '../../../modules/mine/entity/user-settings.js';
 
 /**
  */

packages/ui/certd-server/src/controller/user/monitor/cert-info-controller.ts

@@ -1,8 +1,8 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController } from '@certd/lib-server';
-import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
-import { CertInfoService } from '../../modules/monitor/index.js';
-import { PipelineService } from '../../modules/pipeline/service/pipeline-service.js';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { CertInfoService } from '../../../modules/monitor/index.js';
+import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
 
 /**
  */

packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController } from '@certd/lib-server';
-import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
-import { SiteInfoService } from '../../modules/monitor/index.js';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { SiteInfoService } from '../../../modules/monitor/service/site-info-service.js';
 
 /**
  */

packages/ui/certd-server/src/controller/user/open/open-key-controller.ts

@@ -0,0 +1,64 @@
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
+import { Constants, CrudController } from '@certd/lib-server';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { OpenKeyService } from '../../../modules/open/service/open-key-service.js';
+
+/**
+ */
+@Provide()
+@Controller('/api/open/key')
+export class OpenKeyController extends CrudController<OpenKeyService> {
+  @Inject()
+  service: OpenKeyService;
+  @Inject()
+  authService: AuthService;
+
+  getService(): OpenKeyService {
+    return this.service;
+  }
+
+  @Post('/page', { summary: Constants.per.authOnly })
+  async page(@Body(ALL) body: any) {
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
+    const res = await this.service.page({
+      query: body.query,
+      page: body.page,
+      sort: body.sort,
+    });
+    return this.ok(res);
+  }
+
+  @Post('/list', { summary: Constants.per.authOnly })
+  async list(@Body(ALL) body: any) {
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
+    return await super.list(body);
+  }
+
+  @Post('/add', { summary: Constants.per.authOnly })
+  async add(@Body(ALL) bean: any) {
+    bean.userId = this.getUserId();
+    const res = await this.service.add(bean);
+    return this.ok(res);
+  }
+
+  @Post('/update', { summary: Constants.per.authOnly })
+  async update(@Body(ALL) bean) {
+    await this.service.checkUserId(bean.id, this.getUserId());
+    delete bean.userId;
+    await this.service.update(bean);
+    return this.ok();
+  }
+  @Post('/info', { summary: Constants.per.authOnly })
+  async info(@Query('id') id: number) {
+    await this.service.checkUserId(id, this.getUserId());
+    return await super.info(id);
+  }
+
+  @Post('/delete', { summary: Constants.per.authOnly })
+  async delete(@Query('id') id: number) {
+    await this.service.checkUserId(id, this.getUserId());
+    return await super.delete(id);
+  }
+}

packages/ui/certd-server/src/controller/user/pipeline/access-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController } from '@certd/lib-server';
 import { AccessService } from '@certd/lib-server';
-import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
 import { AccessDefine } from '@certd/pipeline';
 
 /**

packages/ui/certd-server/src/controller/user/pipeline/cert-controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { PipelineService } from '../../modules/pipeline/service/pipeline-service.js';
+import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
 import { BaseController, Constants } from '@certd/lib-server';
-import { StorageService } from '../../modules/pipeline/service/storage-service.js';
+import { StorageService } from '../../../modules/pipeline/service/storage-service.js';
 
 @Provide()
 @Controller('/api/pi/cert')

packages/ui/certd-server/src/controller/user/pipeline/dns-provider-controller.ts

@@ -1,5 +1,5 @@
 import { ALL, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { DnsProviderService } from '../../modules/pipeline/service/dns-provider-service.js';
+import { DnsProviderService } from '../../../modules/pipeline/service/dns-provider-service.js';
 import { BaseController } from '@certd/lib-server';
 import { Constants } from '@certd/lib-server';
 

packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts

@@ -11,9 +11,9 @@ import {
   TaskInstanceContext,
 } from '@certd/pipeline';
 import { AccessService, AccessGetter } from '@certd/lib-server';
-import { EmailService } from '../../modules/basic/service/email-service.js';
+import { EmailService } from '../../../modules/basic/service/email-service.js';
 import { http, HttpRequestConfig, logger, mergeUtils, utils } from '@certd/basic';
-import { NotificationService } from '../../modules/pipeline/service/notification-service.js';
+import { NotificationService } from '../../../modules/pipeline/service/notification-service.js';
 
 @Provide()
 @Controller('/api/pi/handle')

packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts

@@ -1,14 +1,14 @@
 import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CommonException, Constants, CrudController, PermissionException } from '@certd/lib-server';
-import { PipelineEntity } from '../../modules/pipeline/entity/pipeline.js';
-import { HistoryService } from '../../modules/pipeline/service/history-service.js';
-import { HistoryLogService } from '../../modules/pipeline/service/history-log-service.js';
-import { HistoryEntity } from '../../modules/pipeline/entity/history.js';
-import { HistoryLogEntity } from '../../modules/pipeline/entity/history-log.js';
-import { PipelineService } from '../../modules/pipeline/service/pipeline-service.js';
+import { PipelineEntity } from '../../../modules/pipeline/entity/pipeline.js';
+import { HistoryService } from '../../../modules/pipeline/service/history-service.js';
+import { HistoryLogService } from '../../../modules/pipeline/service/history-log-service.js';
+import { HistoryEntity } from '../../../modules/pipeline/entity/history.js';
+import { HistoryLogEntity } from '../../../modules/pipeline/entity/history-log.js';
+import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
 import * as fs from 'fs';
 import { logger } from '@certd/basic';
-import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
 import { SysSettingsService } from '@certd/lib-server';
 import { In } from 'typeorm';
 

packages/ui/certd-server/src/controller/user/pipeline/notification-controller.ts

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController, ValidateException } from '@certd/lib-server';
-import { NotificationService } from '../../modules/pipeline/service/notification-service.js';
-import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
+import { NotificationService } from '../../../modules/pipeline/service/notification-service.js';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
 import { NotificationDefine } from '@certd/pipeline';
 import { checkPlus } from '@certd/plus-core';
 

packages/ui/certd-server/src/modules/auto/auto-e-pipeline-emitter-register.ts

@@ -0,0 +1,22 @@
+import { Autoload, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
+import { CertInfoService } from '../monitor/index.js';
+import { pipelineEmitter } from '@certd/pipeline';
+import { CertReader, EVENT_CERT_APPLY_SUCCESS } from '@certd/plugin-cert';
+import { PipelineEvent } from '@certd/pipeline/dist/service/emit.js';
+
+@Autoload()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class AutoEPipelineEmitterRegister {
+  @Inject()
+  certInfoService: CertInfoService;
+
+  @Init()
+  async init() {
+    await this.onCertApplySuccess();
+  }
+  async onCertApplySuccess() {
+    pipelineEmitter.on(EVENT_CERT_APPLY_SUCCESS, async (event: PipelineEvent<CertReader>) => {
+      await this.certInfoService.updateCert(event.pipeline.id, event.event);
+    });
+  }
+}

packages/ui/certd-server/src/modules/basic/service/code-service.ts

@@ -1,4 +1,4 @@
-import { Inject, Provide } from '@midwayjs/core';
+import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { cache, isDev, randomNumber } from '@certd/basic';
 import { SysSettingsService, SysSiteInfo } from '@certd/lib-server';
 import { SmsServiceFactory } from '../sms/factory.js';
@@ -13,6 +13,7 @@ import { isComm } from '@certd/plus-core';
 /**
  */
 @Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class CodeService {
   @Inject()
   sysSettingsService: SysSettingsService;

packages/ui/certd-server/src/modules/login/service/login-service.ts

@@ -1,4 +1,4 @@
-import { Config, Inject, Provide } from '@midwayjs/core';
+import { Config, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { UserService } from '../../sys/authority/service/user-service.js';
 import jwt from 'jsonwebtoken';
 import { CommonException } from '@certd/lib-server';
@@ -14,6 +14,7 @@ import { CodeService } from '../../basic/service/code-service.js';
  * 系统用户
  */
 @Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class LoginService {
   @Inject()
   userService: UserService;

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

@@ -22,7 +22,7 @@ export class CertInfoEntity {
   pipelineId: number;
 
   @Column({ name: 'apply_time', comment: '申请时间' })
-  applyTime: string;
+  applyTime: number;
 
   @Column({ name: 'from_type', comment: '来源' })
   fromType: string;

packages/ui/certd-server/src/modules/monitor/index.ts

@@ -0,0 +1,5 @@
+export * from './entity/site-info.js';
+export * from './entity/cert-info.js';
+
+export * from './service/cert-info-service.js';
+export * from './service/site-info-service.js';

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

@@ -1,4 +1,4 @@
-import { Provide } from '@midwayjs/core';
+import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { BaseService, CodeException, Constants, PageReq } from '@certd/lib-server';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
@@ -7,6 +7,7 @@ import { utils } from '@certd/basic';
 import { CertInfo, CertReader } from '@certd/plugin-cert';
 
 @Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class CertInfoService extends BaseService<CertInfoEntity> {
   @InjectEntityModel(CertInfoEntity)
   repository: Repository<CertInfoEntity>;
@@ -91,4 +92,28 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     const certReader = new CertReader(certInfo);
     return certReader.toCertInfo();
   }
+
+  async updateCert(pipelineId: number, certReader: CertReader) {
+    const found = await this.repository.findOne({
+      where: {
+        pipelineId,
+      },
+    });
+    if (!found) {
+      return;
+    }
+    const bean = new CertInfoEntity();
+    bean.id = found.id;
+    const certInfo = certReader.toCertInfo();
+    bean.certInfo = JSON.stringify(certInfo);
+    bean.applyTime = new Date().getTime();
+    const domains = certReader.detail.domains.altNames;
+    bean.domains = domains.join(',');
+    bean.domain = domains[0];
+    bean.domainCount = domains.length;
+    bean.expiresTime = certReader.expires;
+    bean.certProvider = certReader.detail.issuer.commonName;
+
+    await this.addOrUpdate(bean);
+  }
 }

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

@@ -1,4 +1,4 @@
-import { Inject, Provide } from '@midwayjs/core';
+import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { BaseService, NeedSuiteException, NeedVIPException, SysSettingsService } from '@certd/lib-server';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
@@ -12,6 +12,7 @@ import { isComm, isPlus } from '@certd/plus-core';
 import { UserSuiteService } from '@certd/commercial-core';
 
 @Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class SiteInfoService extends BaseService<SiteInfoEntity> {
   @InjectEntityModel(SiteInfoEntity)
   repository: Repository<SiteInfoEntity>;

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

@@ -5,13 +5,13 @@ export class OpenKeyEntity {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @Column({ name: 'user_id', comment: '用户id', unique: true })
+  @Column({ name: 'user_id', comment: '用户id' })
   userId: number;
 
-  @Column({ name: 'key_id', comment: 'keyId', unique: true })
+  @Column({ name: 'key_id', comment: 'keyId' })
   keyId: string;
 
-  @Column({ name: 'key_secret', comment: 'keySecret', unique: true })
+  @Column({ name: 'key_secret', comment: 'keySecret' })
   keySecret: string;
 
   @Column({ name: 'create_time', comment: '创建时间', default: () => 'CURRENT_TIMESTAMP' })

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

@@ -1,4 +1,4 @@
-import { Provide } from '@midwayjs/core';
+import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { BaseService, Constants, CodeException, PageReq } from '@certd/lib-server';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
@@ -13,6 +13,7 @@ export type OpenKey = {
   encrypt: boolean;
 };
 @Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class OpenKeyService extends BaseService<OpenKeyEntity> {
   @InjectEntityModel(OpenKeyEntity)
   repository: Repository<OpenKeyEntity>;

packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts

@@ -1,5 +1,5 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
-import { CertInfo, CertReader } from '@certd/plugin-cert';
+import { CertInfo } from '@certd/plugin-cert';
 import { DogeClient } from '../../lib/index.js';
 import dayjs from 'dayjs';
 
@@ -68,11 +68,10 @@ export class DogeCloudDeployToCDNPlugin extends AbstractTaskPlugin {
   }
 
   async updateCert() {
-    const certReader = new CertReader(this.cert);
     const data = await this.dogeClient.request('/cdn/cert/upload.json', {
       note: 'certd-' + dayjs().format('YYYYMMDDHHmmss'),
-      cert: certReader.crt,
-      private: certReader.key,
+      cert: this.cert.crt,
+      private: this.cert.key,
     });
     return data.id;
   }