chore: project

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

@@ -71,6 +71,9 @@ export class SiteInfoEntity {
   @Column({ name: 'group_id', comment: '分组id' })
   groupId: number;
 
+  @Column({ name: 'ip_address', comment: 'IP地址', length: 128 })
+  ipAddress: string;
+
   @Column({ name: 'project_id', comment: '项目id' })
   projectId: number;
 

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

@@ -40,12 +40,12 @@ export class CertInfoFacade  {
     }
     const domainArr = domains.split(',');
 
-    const matchedList = await this.certInfoService.getMatchCertList({domains:domainArr,userId})
+    const matchedList = await this.certInfoService.getMatchCertList({domains:domainArr,userId,projectId})
 
     if (matchedList.length === 0 ) {
       if(req.autoApply === true){
         //自动申请，先创建自动申请流水线
-        const pipeline:PipelineEntity = await this.createAutoPipeline({domains:domainArr,userId})
+        const pipeline:PipelineEntity = await this.createAutoPipeline({domains:domainArr,userId,projectId})
         await this.triggerApplyPipeline({pipelineId:pipeline.id})
       }else{
         throw new CodeException({
@@ -103,9 +103,9 @@ export class CertInfoFacade  {
     return matched;
   }
 
-  async createAutoPipeline(req:{domains:string[],userId:number}){
+  async createAutoPipeline(req:{domains:string[],userId:number,projectId:number}){
 
-    const verifierGetter = new DomainVerifierGetter(req.userId, this.domainService)
+    const verifierGetter = new DomainVerifierGetter(req.userId, req.projectId, this.domainService)
 
     const allDomains = []
     for (const item of req.domains) {
@@ -133,6 +133,7 @@ export class CertInfoFacade  {
     return await this.pipelineService.createAutoPipeline({
       domains: req.domains,
       email,
+      projectId: req.projectId,
       userId: req.userId,
       from: "OpenAPI"
     })

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

@@ -32,7 +32,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
   }
 
   async getUserDomainCount(userId: number) {
-    if (!userId) {
+    if (userId==null) {
       throw new Error('userId is required');
     }
     return await this.repository.sum('domainCount', {
@@ -84,8 +84,8 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     });
   }
 
-  async getMatchCertList(params: { domains: string[]; userId: number }) {
-    const { domains, userId } = params;
+  async getMatchCertList(params: { domains: string[]; userId: number,projectId?:number }) {
+    const { domains, userId,projectId } = params;
     if (!domains) {
       throw new CodeException({
         ...Constants.res.openCertNotFound,
@@ -102,6 +102,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
       },
       where: {
         userId,
+        projectId,
       },
       order: {
         id: 'DESC',