diff --git a/packages/libs/lib-server/src/user/access/service/access-getter.ts b/packages/libs/lib-server/src/user/access/service/access-getter.ts index 1bbb75ea8..2333fc600 100644 --- a/packages/libs/lib-server/src/user/access/service/access-getter.ts +++ b/packages/libs/lib-server/src/user/access/service/access-getter.ts @@ -3,8 +3,8 @@ import { IAccessService } from '@certd/pipeline'; export class AccessGetter implements IAccessService { userId: number; projectId?: number; - getter: (id: any, userId?: number, projectId?: number) => Promise; - constructor(userId: number, projectId: number, getter: (id: any, userId: number, projectId?: number) => Promise) { + getter: (id: any, userId?: number, projectId?: number, ignorePermission?: boolean) => Promise; + constructor(userId: number, projectId: number, getter: (id: any, userId: number, projectId?: number, ignorePermission?: boolean) => Promise) { this.userId = userId; this.projectId = projectId; this.getter = getter; diff --git a/packages/ui/certd-server/src/configuration.ts b/packages/ui/certd-server/src/configuration.ts index 4ff9dfa95..a3450eaa3 100644 --- a/packages/ui/certd-server/src/configuration.ts +++ b/packages/ui/certd-server/src/configuration.ts @@ -20,7 +20,7 @@ import * as commercial from '@certd/commercial-core'; import * as upload from '@midwayjs/upload'; import { setLogger } from '@certd/acme-client'; import {HiddenMiddleware} from "./middleware/hidden.js"; -import * as swagger from '@midwayjs/swagger'; +// import * as swagger from '@midwayjs/swagger'; //@ts-ignore // process.env.UV_THREADPOOL_SIZE = 2 process.on('uncaughtException', error => { @@ -62,10 +62,10 @@ process.on('uncaughtException', error => { upload, libServer, commercial, - { - component: swagger, - enabledEnvironment: ['local'] - }, + // { + // component: swagger, + // enabledEnvironment: ['local'] + // }, { component: info, enabledEnvironment: ['local'], diff --git a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts index 551d6a46e..a71281da8 100644 --- a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts +++ b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts @@ -8,7 +8,7 @@ import { SysSettingsService, ValidateException } from "@certd/lib-server"; -import { CnameProvider, CnameRecord, IAccessService } from "@certd/pipeline"; +import { CnameProvider, CnameRecord } from "@certd/pipeline"; import { createDnsProvider, DomainParser, IDnsProvider } from "@certd/plugin-cert"; import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core"; import { InjectEntityModel } from "@midwayjs/typeorm"; @@ -252,7 +252,6 @@ export class CnameRecordService extends BaseService { } await this.getByDomain(bean.domain, bean.userId,bean.projectId); - const taskService = this.taskServiceBuilder.create({ userId: bean.userId, projectId: bean.projectId }); const subDomainGetter = await taskService.getSubDomainsGetter(); const domainParser = new DomainParser(subDomainGetter); @@ -290,10 +289,10 @@ export class CnameRecordService extends BaseService { }); } - const serviceGetter = this.taskServiceBuilder.create({ userId: bean.userId, projectId: bean.projectId }); - const accessGetter:IAccessService = await serviceGetter.get("accessService"); - const access = await accessGetter.getById(cnameProvider.accessId); - const context = { access, logger, http, utils, domainParser, serviceGetter }; + const record = await this.getWithAccessByDomain(bean.domain, bean.userId,bean.projectId); + + const access = record.cnameProvider.access + const context = { access, logger, http, utils, domainParser, serviceGetter:taskService }; const dnsProvider: IDnsProvider = await createDnsProvider({ dnsProviderType: cnameProvider.dnsProviderType, context