chore: 目录调整，controller转移到外部单独的目录

packages/ui/certd-server/src/configuration.ts

@@ -5,7 +5,7 @@ import * as cache from '@midwayjs/cache';
 import * as validate from '@midwayjs/validate';
 import * as info from '@midwayjs/info';
 import * as staticFile from '@midwayjs/static-file';
-import * as cron from './modules/plugin/cron/index.js';
+import * as cron from './modules/cron/index.js';
 import * as flyway from '@certd/midway-flyway-js';
 import cors from '@koa/cors';
 import { GlobalExceptionMiddleware } from './middleware/global-exception.js';

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

@@ -3,8 +3,8 @@ import { ALL, Inject } from '@midwayjs/core';
 import { Body } from '@midwayjs/core';
 import { Controller, Post, Provide } from '@midwayjs/core';
 import { BaseController } from '@certd/lib-server';
-import { CodeService } from '../service/code-service.js';
-import { EmailService } from '../service/email-service.js';
+import { CodeService } from '../../modules/basic/service/code-service.js';
+import { EmailService } from '../../modules/basic/service/email-service.js';
 import { Constants } from '@certd/lib-server';
 export class SmsCodeReq {
   @Rule(RuleType.number().required())

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

@@ -1,6 +1,6 @@
 import { Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController } from '@certd/lib-server';
-import { EmailService } from '../service/email-service.js';
+import { EmailService } from '../../modules/basic/service/email-service.js';
 import { Constants } from '@certd/lib-server';
 
 /**

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

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants } from '@certd/lib-server';
-import { CnameRecordService } from '../service/cname-record-service.js';
-import { CnameProviderService } from '../../sys/cname/service/cname-provider-service.js';
+import { CnameRecordService } from '../../modules/cname/service/cname-record-service.js';
+import { CnameProviderService } from '../../modules/cname/service/cname-provider-service.js';
 
 /**
  * 授权

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

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController } from '@certd/lib-server';
-import { CnameRecordService } from '../service/cname-record-service.js';
+import { CnameRecordService } from '../../modules/cname/service/cname-record-service.js';
 
 /**
  * 授权

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

@@ -1,5 +1,5 @@
 import { Body, Controller, Inject, Post, Provide, ALL } from '@midwayjs/core';
-import { LoginService } from '../service/login-service.js';
+import { LoginService } from '../../modules/login/service/login-service.js';
 import { BaseController } from '@certd/lib-server';
 import { Constants } from '@certd/lib-server';
 

packages/ui/certd-server/src/controller/login/register-controller.ts

@@ -1,8 +1,8 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController } from '@certd/lib-server';
 import { Constants } from '@certd/lib-server';
-import { UserService } from '../../sys/authority/service/user-service.js';
-import { UserEntity } from '../../sys/authority/entity/user.js';
+import { UserService } from '../../modules/sys/authority/service/user-service.js';
+import { UserEntity } from '../../modules/sys/authority/entity/user.js';
 import { SysSettingsService } from '@certd/lib-server';
 
 /**

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

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
 import { BaseController, Constants } from '@certd/lib-server';
-import { UserService } from '../../sys/authority/service/user-service.js';
-import { RoleService } from '../../sys/authority/service/role-service.js';
+import { UserService } from '../../modules/sys/authority/service/user-service.js';
+import { RoleService } from '../../modules/sys/authority/service/role-service.js';
 
 /**
  */

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

@@ -1,8 +1,8 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '@certd/lib-server';
 import { Constants } from '@certd/lib-server';
-import { UserSettingsService } from '../service/user-settings-service.js';
-import { UserSettingsEntity } from '../entity/user-settings.js';
+import { UserSettingsService } from '../../modules/mine/service/user-settings-service.js';
+import { UserSettingsEntity } from '../../modules/mine/entity/user-settings.js';
 
 /**
  */

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

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '@certd/lib-server';
-import { AccessService } from '../service/access-service.js';
+import { AccessService } from '../../modules/pipeline/service/access-service.js';
 import { Constants } from '@certd/lib-server';
 
 /**

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

@@ -1,5 +1,5 @@
 import { ALL, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { DnsProviderService } from '../service/dns-provider-service.js';
+import { DnsProviderService } from '../../modules/pipeline/service/dns-provider-service.js';
 import { BaseController } from '@certd/lib-server';
 import { Constants } from '@certd/lib-server';
 

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

@@ -13,9 +13,9 @@ import {
   utils,
 } from '@certd/pipeline';
 import { BaseController } from '@certd/lib-server';
-import { AccessService } from '../service/access-service.js';
-import { EmailService } from '../../basic/service/email-service.js';
-import { AccessGetter } from '../service/access-getter.js';
+import { AccessService } from '../../modules/pipeline/service/access-service.js';
+import { EmailService } from '../../modules/basic/service/email-service.js';
+import { AccessGetter } from '../../modules/pipeline/service/access-getter.js';
 
 @Provide()
 @Controller('/api/pi/handle')

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

@@ -1,14 +1,14 @@
 import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CommonException, Constants, CrudController, PermissionException } from '@certd/lib-server';
-import { PipelineEntity } from '../entity/pipeline.js';
-import { HistoryService } from '../service/history-service.js';
-import { HistoryLogService } from '../service/history-log-service.js';
-import { HistoryEntity } from '../entity/history.js';
-import { HistoryLogEntity } from '../entity/history-log.js';
-import { PipelineService } from '../service/pipeline-service.js';
+import { PipelineEntity } from '../../modules/pipeline/entity/pipeline.js';
+import { HistoryService } from '../../modules/pipeline/service/history-service.js';
+import { HistoryLogService } from '../../modules/pipeline/service/history-log-service.js';
+import { HistoryEntity } from '../../modules/pipeline/entity/history.js';
+import { HistoryLogEntity } from '../../modules/pipeline/entity/history-log.js';
+import { PipelineService } from '../../modules/pipeline/service/pipeline-service.js';
 import * as fs from 'fs';
 import { logger } from '@certd/pipeline';
-import { AuthService } from '../../sys/authority/service/auth-service.js';
+import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
 import { SysSettingsService } from '@certd/lib-server';
 import { In } from 'typeorm';
 

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

@@ -1,9 +1,9 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { Constants, CrudController, SysSettingsService } from '@certd/lib-server';
-import { PipelineService } from '../service/pipeline-service.js';
-import { PipelineEntity } from '../entity/pipeline.js';
-import { HistoryService } from '../service/history-service.js';
-import { AuthService } from '../../sys/authority/service/auth-service.js';
+import { PipelineService } from '../../modules/pipeline/service/pipeline-service.js';
+import { PipelineEntity } from '../../modules/pipeline/entity/pipeline.js';
+import { HistoryService } from '../../modules/pipeline/service/history-service.js';
+import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
 
 /**
  * 证书

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

@@ -0,0 +1,28 @@
+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';
+
+/**
+ * 插件
+ */
+@Provide()
+@Controller('/api/pi/plugin')
+export class PluginController extends BaseController {
+  @Inject()
+  service: BuiltInPluginService;
+
+  @Post('/list', { summary: Constants.per.authOnly })
+  async list(@Query(ALL) query: any) {
+    query.userId = this.getUserId();
+    const list = this.service.getList();
+    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();
+    return this.ok(group);
+  }
+}

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

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { AccessService } from '../../pipeline/service/access-service.js';
-import { AccessController } from '../../pipeline/controller/access-controller.js';
+import { AccessService } from '../../../modules/pipeline/service/access-service.js';
+import { AccessController } from '../../pipeline/access-controller.js';
 import { checkComm } from '@certd/pipeline';
 
 /**

packages/ui/certd-server/src/controller/sys/authority/permission-controller.ts

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '@certd/lib-server';
-import { PermissionService } from '../service/permission-service.js';
+import { PermissionService } from '../../../modules/sys/authority/service/permission-service.js';
 
 /**
  * 权限资源

packages/ui/certd-server/src/controller/sys/authority/role-controller.ts

@@ -1,6 +1,6 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '@certd/lib-server';
-import { RoleService } from '../service/role-service.js';
+import { RoleService } from '../../../modules/sys/authority/service/role-service.js';
 
 /**
  * 系统用户

packages/ui/certd-server/src/controller/sys/authority/user-controller.ts

@@ -1,8 +1,8 @@
 import { Provide, Controller, Post, Inject, Body, Query, ALL } from '@midwayjs/core';
-import { UserService } from '../service/user-service.js';
+import { UserService } from '../../../modules/sys/authority/service/user-service.js';
 import { CrudController } from '@certd/lib-server';
-import { RoleService } from '../service/role-service.js';
-import { PermissionService } from '../service/permission-service.js';
+import { RoleService } from '../../../modules/sys/authority/service/role-service.js';
+import { PermissionService } from '../../../modules/sys/authority/service/permission-service.js';
 import { Constants } from '@certd/lib-server';
 
 /**

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

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { CrudController } from '@certd/lib-server';
-import { CnameProviderService } from '../service/cname-provider-service.js';
 import { merge } from 'lodash-es';
+import { CnameProviderService } from '../../../modules/cname/service/cname-provider-service.js';
 
 /**
  * 授权

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

@@ -1,7 +1,7 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
 import { merge } from 'lodash-es';
 import { CrudController } from '@certd/lib-server';
-import { PluginService } from '../service/plugin-service.js';
+import { PluginService } from '../../../modules/plugin/service/plugin-service.js';
 import { checkComm } from '@certd/pipeline';
 
 /**

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

@@ -1,10 +1,9 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CrudController, SysPrivateSettings, SysPublicSettings, SysSettingsService } from '@certd/lib-server';
-import { SysSettingsEntity } from '../entity/sys-settings.js';
+import { CrudController, SysPrivateSettings, SysPublicSettings, SysSettingsEntity, SysSettingsService } from '@certd/lib-server';
 import * as _ from 'lodash-es';
-import { PipelineService } from '../../../pipeline/service/pipeline-service.js';
-import { UserSettingsService } from '../../../mine/service/user-settings-service.js';
-import { getEmailSettings } from '../fix.js';
+import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
+import { UserSettingsService } from '../../../modules/mine/service/user-settings-service.js';
+import { getEmailSettings } from '../../../modules/sys/settings/fix.js';
 import { http, logger } from '@certd/pipeline';
 
 /**

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

@@ -4,13 +4,13 @@ import { Repository } from 'typeorm';
 import { BaseService, ValidateException } from '@certd/lib-server';
 import { CnameRecordEntity, CnameRecordStatusType } from '../entity/cname-record.js';
 import { v4 as uuidv4 } from 'uuid';
-import { CnameProviderService } from '../../sys/cname/service/cname-provider-service.js';
-import { CnameProviderEntity } from '../../sys/cname/entity/cname_provider.js';
 import { createDnsProvider, IDnsProvider, parseDomain } from '@certd/plugin-cert';
 import { cache, http, logger, utils } from '@certd/pipeline';
 import { AccessService } from '../../pipeline/service/access-service.js';
 import { isDev } from '../../../utils/env.js';
 import { walkTxtRecord } from '@certd/acme-client';
+import { CnameProviderService } from './cname-provider-service.js';
+import { CnameProviderEntity } from '../entity/cname_provider.js';
 
 type CnameCheckCacheValue = {
   validating: boolean;

packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts

@@ -8,7 +8,7 @@ import { Executor, isPlus, Pipeline, ResultType, RunHistory, UserInfo } from '@c
 import { AccessService } from './access-service.js';
 import { DbStorage } from './db-storage.js';
 import { StorageService } from './storage-service.js';
-import { Cron } from '../../plugin/cron/cron.js';
+import { Cron } from '../../cron/cron.js';
 import { HistoryService } from './history-service.js';
 import { HistoryEntity } from '../entity/history.js';
 import { HistoryLogEntity } from '../entity/history-log.js';

packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts

@@ -1,9 +1,10 @@
-import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
+import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { BaseService } from '@certd/lib-server';
 import { PluginEntity } from '../entity/plugin.js';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
 import { checkComm } from '@certd/pipeline';
+import { BuiltInPluginService } from '../../pipeline/service/plugin-service.js';
 
 @Provide()
 @Scope(ScopeEnum.Singleton)
@@ -11,6 +12,9 @@ export class PluginService extends BaseService<PluginEntity> {
   @InjectEntityModel(PluginEntity)
   repository: Repository<PluginEntity>;
 
+  @Inject()
+  builtInPluginService: BuiltInPluginService;
+
   //@ts-ignore
   getRepository() {
     checkComm();

packages/ui/certd-server/src/modules/sys/settings/entity/sys-settings.ts

@@ -1,33 +0,0 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-/**
- */
-@Entity('sys_settings')
-export class SysSettingsEntity {
-  @PrimaryGeneratedColumn()
-  id: number;
-  @Column({ comment: 'key', length: 100 })
-  key: string;
-  @Column({ comment: '名称', length: 100 })
-  title: string;
-
-  @Column({ name: 'setting', comment: '设置', length: 1024, nullable: true })
-  setting: string;
-
-  // public 公开读，私有写， private 私有读，私有写
-  @Column({ name: 'access', comment: '访问权限' })
-  access: string;
-
-  @Column({
-    name: 'create_time',
-    comment: '创建时间',
-    default: () => 'CURRENT_TIMESTAMP',
-  })
-  createTime: Date;
-  @Column({
-    name: 'update_time',
-    comment: '修改时间',
-    default: () => 'CURRENT_TIMESTAMP',
-  })
-  updateTime: Date;
-}