perf: [comm] 支持插件管理

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

@@ -28,7 +28,12 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
       }
     };
 
-    const pageRet = await this.getService().page(body?.query, body?.page, body?.sort, bq);
+    const pageRet = await this.getService().page({
+      query: body.query,
+      page: body.page,
+      order: body.order,
+      buildQuery: bq,
+    });
     return this.ok(pageRet);
   }
 

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

@@ -12,10 +12,6 @@ export class AccessController extends CrudController<AccessService> {
   @Inject()
   service: AccessService;
 
-  userId() {
-    return this.getUserId();
-  }
-
   getService(): AccessService {
     return this.service;
   }
@@ -23,36 +19,45 @@ export class AccessController extends CrudController<AccessService> {
   @Post('/page', { summary: Constants.per.authOnly })
   async page(@Body(ALL) body) {
     body.query = body.query ?? {};
-    body.query.userId = this.userId();
-    return await super.page(body);
+    delete body.query.userId;
+    const buildQuery = qb => {
+      qb.where('user_id = :userId', { userId: this.getUserId() });
+    };
+    const res = await this.service.page({
+      query: body.query,
+      page: body.page,
+      order: body.order,
+      buildQuery,
+    });
+    return this.ok(res);
   }
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
-    body.userId = this.userId();
+    body.userId = this.getUserId();
     return super.list(body);
   }
 
   @Post('/add', { summary: Constants.per.authOnly })
   async add(@Body(ALL) bean) {
-    bean.userId = this.userId();
+    bean.userId = this.getUserId();
     return super.add(bean);
   }
 
   @Post('/update', { summary: Constants.per.authOnly })
   async update(@Body(ALL) bean) {
-    await this.service.checkUserId(bean.id, this.userId());
+    await this.service.checkUserId(bean.id, this.getUserId());
     return super.update(bean);
   }
   @Post('/info', { summary: Constants.per.authOnly })
   async info(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.userId());
+    await this.service.checkUserId(id, this.getUserId());
     return super.info(id);
   }
 
   @Post('/delete', { summary: Constants.per.authOnly })
   async delete(@Query('id') id: number) {
-    await this.service.checkUserId(id, this.userId());
+    await this.service.checkUserId(id, this.getUserId());
     return super.delete(id);
   }
 

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

@@ -48,8 +48,11 @@ export class HistoryController extends CrudController<HistoryService> {
     let pipelineIds: any = null;
     const pipelineTitle = body.query?.pipelineTitle;
     if (pipelineTitle) {
-      const pipelines = await this.pipelineService.list(pipelineQuery, null, qb => {
-        qb.where('title like :title', { title: `%${pipelineTitle}%` });
+      const pipelines = await this.pipelineService.list({
+        query: pipelineQuery,
+        buildQuery: qb => {
+          qb.where('title like :title', { title: `%${pipelineTitle}%` });
+        },
       });
       pipelineIds = pipelines.map(p => p.id);
     }
@@ -62,7 +65,12 @@ export class HistoryController extends CrudController<HistoryService> {
       }
     };
 
-    const res = await this.service.page(body?.query, body?.page, body?.sort, buildQuery);
+    const res = await this.service.page({
+      query: body.query,
+      page: body.page,
+      order: body.order,
+      buildQuery,
+    });
     return this.ok(res);
   }
 
@@ -78,7 +86,11 @@ export class HistoryController extends CrudController<HistoryService> {
     const buildQuery = qb => {
       qb.limit(10);
     };
-    const listRet = await this.getService().list(body, { prop: 'id', asc: false }, buildQuery);
+    const listRet = await this.getService().list({
+      query: body,
+      order: { prop: 'id', asc: false },
+      buildQuery,
+    });
     return this.ok(listRet);
   }
 

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

@@ -44,7 +44,12 @@ export class PipelineController extends CrudController<PipelineService> {
       body.sort = { prop: 'order', asc: false };
     }
 
-    const pageRet = await this.getService().page(body?.query, body?.page, body?.sort, buildQuery);
+    const pageRet = await this.getService().page({
+      query: body.query,
+      page: body.page,
+      order: body.order,
+      buildQuery,
+    });
     return this.ok(pageRet);
   }
 

packages/ui/certd-server/src/controller/pipeline/plugin-controller.ts

@@ -1,7 +1,6 @@
 import { ALL, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { BaseController } from '@certd/lib-server';
-import { BuiltInPluginService } from '../../modules/pipeline/service/plugin-service.js';
-import { Constants } from '@certd/lib-server';
+import { BaseController, Constants } from '@certd/lib-server';
+import { PluginService } from '../../modules/plugin/service/plugin-service.js';
 
 /**
  * 插件
@@ -10,19 +9,19 @@ import { Constants } from '@certd/lib-server';
 @Controller('/api/pi/plugin')
 export class PluginController extends BaseController {
   @Inject()
-  service: BuiltInPluginService;
+  service: PluginService;
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Query(ALL) query: any) {
     query.userId = this.getUserId();
-    const list = this.service.getList();
+    const list = await this.service.getEnabledBuiltInList();
     return this.ok(list);
   }
 
   @Post('/groups', { summary: Constants.per.authOnly })
   async groups(@Query(ALL) query: any) {
     query.userId = this.getUserId();
-    const group = this.service.getGroups();
+    const group = await this.service.getEnabledBuildInGroup();
     return this.ok(group);
   }
 }

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

@@ -16,14 +16,14 @@ export class SysAccessController extends AccessController {
     return this.service2;
   }
 
-  userId() {
+  getUserId() {
     checkComm();
     return 0;
   }
 
   @Post('/page', { summary: 'sys:settings:view' })
   async page(@Body(ALL) body: any) {
-    return await await super.page(body);
+    return await super.page(body);
   }
 
   @Post('/list', { summary: 'sys:settings:view' })

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

@@ -61,8 +61,8 @@ export class PluginController extends CrudController<PluginService> {
   }
 
   @Post('/setDisabled', { summary: 'sys:settings:edit' })
-  async setDisabled(@Body('id') id: number, @Body('disabled') disabled: boolean) {
-    await this.service.setDisabled(id, disabled);
+  async setDisabled(@Body(ALL) body: { id: number; name: string; type: string; disabled: boolean }) {
+    await this.service.setDisabled(body);
     return this.ok();
   }
 }