diff --git a/docker/run/docker-compose.yaml b/docker/run/docker-compose.yaml index f9597541..0f1c0dec 100644 --- a/docker/run/docker-compose.yaml +++ b/docker/run/docker-compose.yaml @@ -25,7 +25,7 @@ services: # - 8.8.4.4 # extra_hosts: # # ↓↓↓↓ -------------------------------------------------------- 这里可以配置自定义hosts,外网域名可以指向本地局域网ip地址 -# - "localdomain.comm:192.168.1.3" +# - "localdomain.com:192.168.1.3" environment: # 设置环境变量即可自定义certd配置 diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts index dac7f98e..3bf8deef 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts @@ -204,13 +204,16 @@ export class PipelineService extends BaseService { // } if (isComm()) { //校验pipelineCount - const userSuite = await this.userSuiteService.getMySuiteDetail(bean.userId); - if (userSuite?.pipelineCount.max != -1 && userSuite?.pipelineCount.used + 1 > userSuite?.pipelineCount.max) { - throw new NeedSuiteException(`对不起,您最多只能创建${userSuite?.pipelineCount.max}条流水线,请购买或升级套餐`); - } + const suiteSetting = await this.userSuiteService.getSuiteSetting(); + if (suiteSetting.enabled) { + const userSuite = await this.userSuiteService.getMySuiteDetail(bean.userId); + if (userSuite?.pipelineCount.max != -1 && userSuite?.pipelineCount.used + 1 > userSuite?.pipelineCount.max) { + throw new NeedSuiteException(`对不起,您最多只能创建${userSuite?.pipelineCount.max}条流水线,请购买或升级套餐`); + } - if (userSuite.domainCount.max != -1 && userSuite.domainCount.used + domains.length > userSuite.domainCount.max) { - throw new NeedSuiteException(`对不起,您最多只能添加${userSuite.domainCount.max}个域名,请购买或升级套餐`); + if (userSuite.domainCount.max != -1 && userSuite.domainCount.used + domains.length > userSuite.domainCount.max) { + throw new NeedSuiteException(`对不起,您最多只能添加${userSuite.domainCount.max}个域名,请购买或升级套餐`); + } } }