Merge remote-tracking branch 'origin/v2-dev' into v2-dev

packages/ui/certd-server/src/config/config.default.ts

@@ -71,7 +71,7 @@ const development = {
         type: 'better-sqlite3',
         database: './data/db.sqlite',
         synchronize: false, // 如果第一次使用，不存在表，有同步的需求可以写 true
-        logging: false,
+        logging: true,
 
         // 配置实体模型 或者 entities: '/entity',
         entities: ['**/modules/**/entity/*.js', ...libServerEntities, ...commercialEntities, PipelineEntity, FlywayHistory, UserEntity],

packages/ui/certd-server/src/controller/basic/app-controller.ts

@@ -1,11 +1,18 @@
-import { Controller, Get, Provide } from '@midwayjs/core';
-import { BaseController, Constants } from '@certd/lib-server';
+import { Controller, Get, Inject, Provide } from '@midwayjs/core';
+import { BaseController, Constants, FileService, SysSettingsService, SysSiteInfo } from '@certd/lib-server';
 import { http, logger } from '@certd/basic';
+import { isComm } from '@certd/plus-core';
+
 /**
  */
 @Provide()
 @Controller('/api/app/')
 export class AppController extends BaseController {
+  @Inject()
+  sysSettingsService: SysSettingsService;
+  @Inject()
+  fileService: FileService;
+
   @Get('/latest', { summary: Constants.per.authOnly })
   async latest(): Promise<any> {
     const res = await http.request({
@@ -20,4 +27,21 @@ export class AppController extends BaseController {
       return this.ok('');
     }
   }
+
+  @Get('/favicon', { summary: Constants.per.guest })
+  public async getFavicon() {
+    if (isComm()) {
+      const siteInfo = await this.sysSettingsService.getSetting<SysSiteInfo>(SysSiteInfo);
+      const favicon = siteInfo.logo;
+      if (favicon) {
+        const redirect = '/api/basic/file/download?key=' + favicon;
+        this.ctx.response.redirect(redirect);
+        this.ctx.response.set('Cache-Control', 'public,max-age=25920');
+        return;
+      }
+    }
+    const redirect = '/static/images/logo/logo.svg';
+    this.ctx.response.redirect(redirect);
+    this.ctx.response.set('Cache-Control', 'public,max-age=25920');
+  }
 }

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

@@ -20,7 +20,8 @@ export class CnameProviderController extends BaseController {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
-    body.userId = this.getUserId();
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
     const res = await this.providerService.list({});
     return this.ok(res);
   }

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

@@ -39,7 +39,8 @@ export class CnameRecordController extends CrudController<CnameRecordService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
-    body.userId = this.getUserId();
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
     const list = await this.getService().list(body);
     return this.ok(list);
   }

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

@@ -25,7 +25,8 @@ export class UserSettingsController extends CrudController<UserSettingsService>
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
-    body.userId = this.getUserId();
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
     return super.list(body);
   }
 

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

@@ -37,7 +37,8 @@ export class AccessController extends CrudController<AccessService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
-    body.userId = this.getUserId();
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
     return super.list(body);
   }
 

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

@@ -78,9 +78,10 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
+    body.query = body.query ?? {};
     const isAdmin = await this.authService.isAdmin(this.ctx);
     if (!isAdmin) {
-      body.userId = this.getUserId();
+      body.query.userId = this.getUserId();
     }
     if (body.pipelineId == null) {
       return this.ok([]);

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

@@ -38,7 +38,8 @@ export class NotificationController extends CrudController<NotificationService>
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
-    body.userId = this.getUserId();
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
     return super.list(body);
   }
 

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

@@ -36,7 +36,8 @@ export class PipelineGroupController extends CrudController<PipelineGroupService
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body: any) {
-    body.userId = this.getUserId();
+    body.query = body.query ?? {};
+    body.query.userId = this.getUserId();
     return await super.list(body);
   }
 
@@ -67,7 +68,9 @@ export class PipelineGroupController extends CrudController<PipelineGroupService
   @Post('/all', { summary: Constants.per.authOnly })
   async all() {
     const list: any = await this.service.find({
-      userId: this.getUserId(),
+      where: {
+        userId: this.getUserId(),
+      },
     });
     return this.ok(list);
   }

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

@@ -14,9 +14,9 @@ export class SysPlusController extends BaseController {
 
   @Post('/active', { summary: 'sys:settings:edit' })
   async active(@Body(ALL) body) {
-    const { code } = body;
+    const { code, inviteCode } = body;
 
-    await this.plusService.active(code);
+    await this.plusService.active(code, inviteCode);
 
     return this.ok(true);
   }

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

@@ -29,20 +29,16 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
 
   @Post('/page', { summary: 'sys:settings:view' })
   async page(@Body(ALL) body) {
-    body.query = body.query ?? {};
-    body.query.userId = this.getUserId();
     return super.page(body);
   }
 
   @Post('/list', { summary: 'sys:settings:view' })
   async list(@Body(ALL) body) {
-    body.userId = this.getUserId();
     return super.list(body);
   }
 
   @Post('/add', { summary: 'sys:settings:edit' })
   async add(@Body(ALL) bean) {
-    bean.userId = this.getUserId();
     return super.add(bean);
   }
 

packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts

@@ -93,7 +93,7 @@ export class CnameRecordService extends BaseService<CnameRecordEntity> {
 
     const cnameKey = utils.id.simpleNanoId();
     const safeDomain = param.domain.replaceAll('.', '-');
-    param.recordValue = `${safeDomain}-${cnameKey}.${cnameProvider.domain}`;
+    param.recordValue = `${safeDomain}.${cnameKey}.${cnameProvider.domain}`;
   }
 
   async update(param: any) {