From 417971d15dc55f91a48b266965648f858065274e Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sun, 13 Oct 2024 21:59:29 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8Ccontroller=E8=BD=AC=E7=A7=BB=E5=88=B0=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E5=8D=95=E7=8B=AC=E7=9A=84=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui/certd-server/src/configuration.ts | 2 +- .../basic}/code-controller.ts | 4 +-- .../basic}/email-controller.ts | 2 +- .../basic}/file-controller.ts | 0 .../basic}/home-controller.ts | 0 .../basic}/settings-controller.ts | 0 .../cname}/cname-provider-controller.ts | 4 +-- .../cname}/cname-record-controller.ts | 2 +- .../login}/login-controller.ts | 2 +- .../login}/register-controller.ts | 4 +-- .../mine}/mine-controller.ts | 4 +-- .../mine}/user-settings-controller.ts | 4 +-- .../pipeline}/access-controller.ts | 2 +- .../pipeline}/dns-provider-controller.ts | 2 +- .../pipeline}/handle-controller.ts | 6 ++-- .../pipeline}/history-controller.ts | 14 ++++---- .../pipeline}/pipeline-controller.ts | 8 ++--- .../controller/pipeline/plugin-controller.ts | 28 ++++++++++++++++ .../sys/access/access-controller.ts | 4 +-- .../sys/account/account-controller.ts | 0 .../sys/authority}/permission-controller.ts | 2 +- .../sys/authority}/role-controller.ts | 2 +- .../sys/authority}/user-controller.ts | 6 ++-- .../sys/cname}/cname-provider-controller.ts | 2 +- .../sys/plugin}/plugin-controller.ts | 2 +- .../sys/plus/plus-controller.ts | 0 .../sys/settings}/sys-settings-controller.ts | 9 +++-- .../{sys => }/cname/entity/cname_provider.ts | 0 .../cname/service/cname-provider-service.ts | 0 .../cname/service/cname-record-service.ts | 4 +-- .../{plugin => }/cron/configuration.ts | 0 .../src/modules/{plugin => }/cron/cron.ts | 0 .../src/modules/{plugin => }/cron/index.ts | 0 .../pipeline/service/pipeline-service.ts | 2 +- .../modules/{sys => }/plugin/entity/plugin.ts | 0 .../plugin/service/plugin-service.ts | 6 +++- .../sys/settings/entity/sys-settings.ts | 33 ------------------- 37 files changed, 79 insertions(+), 81 deletions(-) rename packages/ui/certd-server/src/{modules/basic/controller => controller/basic}/code-controller.ts (88%) rename packages/ui/certd-server/src/{modules/basic/controller => controller/basic}/email-controller.ts (87%) rename packages/ui/certd-server/src/{modules/basic/controller => controller/basic}/file-controller.ts (100%) rename packages/ui/certd-server/src/{modules/basic/controller => controller/basic}/home-controller.ts (100%) rename packages/ui/certd-server/src/{modules/basic/controller => controller/basic}/settings-controller.ts (100%) rename packages/ui/certd-server/src/{modules/cname/controller => controller/cname}/cname-provider-controller.ts (77%) rename packages/ui/certd-server/src/{modules/cname/controller => controller/cname}/cname-record-controller.ts (96%) rename packages/ui/certd-server/src/{modules/login/controller => controller/login}/login-controller.ts (89%) rename packages/ui/certd-server/src/{modules/login/controller => controller/login}/register-controller.ts (84%) rename packages/ui/certd-server/src/{modules/mine/controller => controller/mine}/mine-controller.ts (83%) rename packages/ui/certd-server/src/{modules/mine/controller => controller/mine}/user-settings-controller.ts (91%) rename packages/ui/certd-server/src/{modules/pipeline/controller => controller/pipeline}/access-controller.ts (96%) rename packages/ui/certd-server/src/{modules/pipeline/controller => controller/pipeline}/dns-provider-controller.ts (90%) rename packages/ui/certd-server/src/{modules/pipeline/controller => controller/pipeline}/handle-controller.ts (92%) rename packages/ui/certd-server/src/{modules/pipeline/controller => controller/pipeline}/history-controller.ts (91%) rename packages/ui/certd-server/src/{modules/pipeline/controller => controller/pipeline}/pipeline-controller.ts (90%) create mode 100644 packages/ui/certd-server/src/controller/pipeline/plugin-controller.ts rename packages/ui/certd-server/src/{modules => controller}/sys/access/access-controller.ts (90%) rename packages/ui/certd-server/src/{modules => controller}/sys/account/account-controller.ts (100%) rename packages/ui/certd-server/src/{modules/sys/authority/controller => controller/sys/authority}/permission-controller.ts (91%) rename packages/ui/certd-server/src/{modules/sys/authority/controller => controller/sys/authority}/role-controller.ts (95%) rename packages/ui/certd-server/src/{modules/sys/authority/controller => controller/sys/authority}/user-controller.ts (90%) rename packages/ui/certd-server/src/{modules/sys/cname/controller => controller/sys/cname}/cname-provider-controller.ts (95%) rename packages/ui/certd-server/src/{modules/sys/plugin/controller => controller/sys/plugin}/plugin-controller.ts (95%) rename packages/ui/certd-server/src/{modules => controller}/sys/plus/plus-controller.ts (100%) rename packages/ui/certd-server/src/{modules/sys/settings/controller => controller/sys/settings}/sys-settings-controller.ts (92%) rename packages/ui/certd-server/src/modules/{sys => }/cname/entity/cname_provider.ts (100%) rename packages/ui/certd-server/src/modules/{sys => }/cname/service/cname-provider-service.ts (100%) rename packages/ui/certd-server/src/modules/{plugin => }/cron/configuration.ts (100%) rename packages/ui/certd-server/src/modules/{plugin => }/cron/cron.ts (100%) rename packages/ui/certd-server/src/modules/{plugin => }/cron/index.ts (100%) rename packages/ui/certd-server/src/modules/{sys => }/plugin/entity/plugin.ts (100%) rename packages/ui/certd-server/src/modules/{sys => }/plugin/service/plugin-service.ts (74%) delete mode 100644 packages/ui/certd-server/src/modules/sys/settings/entity/sys-settings.ts diff --git a/packages/ui/certd-server/src/configuration.ts b/packages/ui/certd-server/src/configuration.ts index 9e3db2ef..90c02700 100644 --- a/packages/ui/certd-server/src/configuration.ts +++ b/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'; diff --git a/packages/ui/certd-server/src/modules/basic/controller/code-controller.ts b/packages/ui/certd-server/src/controller/basic/code-controller.ts similarity index 88% rename from packages/ui/certd-server/src/modules/basic/controller/code-controller.ts rename to packages/ui/certd-server/src/controller/basic/code-controller.ts index b2742525..cf88e054 100644 --- a/packages/ui/certd-server/src/modules/basic/controller/code-controller.ts +++ b/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()) diff --git a/packages/ui/certd-server/src/modules/basic/controller/email-controller.ts b/packages/ui/certd-server/src/controller/basic/email-controller.ts similarity index 87% rename from packages/ui/certd-server/src/modules/basic/controller/email-controller.ts rename to packages/ui/certd-server/src/controller/basic/email-controller.ts index 801cabe4..1d9de9f3 100644 --- a/packages/ui/certd-server/src/modules/basic/controller/email-controller.ts +++ b/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'; /** diff --git a/packages/ui/certd-server/src/modules/basic/controller/file-controller.ts b/packages/ui/certd-server/src/controller/basic/file-controller.ts similarity index 100% rename from packages/ui/certd-server/src/modules/basic/controller/file-controller.ts rename to packages/ui/certd-server/src/controller/basic/file-controller.ts diff --git a/packages/ui/certd-server/src/modules/basic/controller/home-controller.ts b/packages/ui/certd-server/src/controller/basic/home-controller.ts similarity index 100% rename from packages/ui/certd-server/src/modules/basic/controller/home-controller.ts rename to packages/ui/certd-server/src/controller/basic/home-controller.ts diff --git a/packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts b/packages/ui/certd-server/src/controller/basic/settings-controller.ts similarity index 100% rename from packages/ui/certd-server/src/modules/basic/controller/settings-controller.ts rename to packages/ui/certd-server/src/controller/basic/settings-controller.ts diff --git a/packages/ui/certd-server/src/modules/cname/controller/cname-provider-controller.ts b/packages/ui/certd-server/src/controller/cname/cname-provider-controller.ts similarity index 77% rename from packages/ui/certd-server/src/modules/cname/controller/cname-provider-controller.ts rename to packages/ui/certd-server/src/controller/cname/cname-provider-controller.ts index 4e9ad522..2aca6a6d 100644 --- a/packages/ui/certd-server/src/modules/cname/controller/cname-provider-controller.ts +++ b/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'; /** * 授权 diff --git a/packages/ui/certd-server/src/modules/cname/controller/cname-record-controller.ts b/packages/ui/certd-server/src/controller/cname/cname-record-controller.ts similarity index 96% rename from packages/ui/certd-server/src/modules/cname/controller/cname-record-controller.ts rename to packages/ui/certd-server/src/controller/cname/cname-record-controller.ts index 9d1c6ab0..da9b758f 100644 --- a/packages/ui/certd-server/src/modules/cname/controller/cname-record-controller.ts +++ b/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'; /** * 授权 diff --git a/packages/ui/certd-server/src/modules/login/controller/login-controller.ts b/packages/ui/certd-server/src/controller/login/login-controller.ts similarity index 89% rename from packages/ui/certd-server/src/modules/login/controller/login-controller.ts rename to packages/ui/certd-server/src/controller/login/login-controller.ts index b6e86a51..2605c8b0 100644 --- a/packages/ui/certd-server/src/modules/login/controller/login-controller.ts +++ b/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'; diff --git a/packages/ui/certd-server/src/modules/login/controller/register-controller.ts b/packages/ui/certd-server/src/controller/login/register-controller.ts similarity index 84% rename from packages/ui/certd-server/src/modules/login/controller/register-controller.ts rename to packages/ui/certd-server/src/controller/login/register-controller.ts index fcb957e1..cffe0a14 100644 --- a/packages/ui/certd-server/src/modules/login/controller/register-controller.ts +++ b/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'; /** diff --git a/packages/ui/certd-server/src/modules/mine/controller/mine-controller.ts b/packages/ui/certd-server/src/controller/mine/mine-controller.ts similarity index 83% rename from packages/ui/certd-server/src/modules/mine/controller/mine-controller.ts rename to packages/ui/certd-server/src/controller/mine/mine-controller.ts index c4a21ae2..570cf076 100644 --- a/packages/ui/certd-server/src/modules/mine/controller/mine-controller.ts +++ b/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'; /** */ diff --git a/packages/ui/certd-server/src/modules/mine/controller/user-settings-controller.ts b/packages/ui/certd-server/src/controller/mine/user-settings-controller.ts similarity index 91% rename from packages/ui/certd-server/src/modules/mine/controller/user-settings-controller.ts rename to packages/ui/certd-server/src/controller/mine/user-settings-controller.ts index ea5f06da..9ab7f3f9 100644 --- a/packages/ui/certd-server/src/modules/mine/controller/user-settings-controller.ts +++ b/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'; /** */ diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts b/packages/ui/certd-server/src/controller/pipeline/access-controller.ts similarity index 96% rename from packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts rename to packages/ui/certd-server/src/controller/pipeline/access-controller.ts index e83fa4bc..c8d0d01e 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts +++ b/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'; /** diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts b/packages/ui/certd-server/src/controller/pipeline/dns-provider-controller.ts similarity index 90% rename from packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts rename to packages/ui/certd-server/src/controller/pipeline/dns-provider-controller.ts index bc4087a0..4d496337 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts +++ b/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'; diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/handle-controller.ts b/packages/ui/certd-server/src/controller/pipeline/handle-controller.ts similarity index 92% rename from packages/ui/certd-server/src/modules/pipeline/controller/handle-controller.ts rename to packages/ui/certd-server/src/controller/pipeline/handle-controller.ts index 6eb001d4..819a772d 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/handle-controller.ts +++ b/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') diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts b/packages/ui/certd-server/src/controller/pipeline/history-controller.ts similarity index 91% rename from packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts rename to packages/ui/certd-server/src/controller/pipeline/history-controller.ts index 19661739..10e0804d 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts +++ b/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'; diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts b/packages/ui/certd-server/src/controller/pipeline/pipeline-controller.ts similarity index 90% rename from packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts rename to packages/ui/certd-server/src/controller/pipeline/pipeline-controller.ts index c6cd8b4e..3ea6e5f9 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts +++ b/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'; /** * 证书 diff --git a/packages/ui/certd-server/src/controller/pipeline/plugin-controller.ts b/packages/ui/certd-server/src/controller/pipeline/plugin-controller.ts new file mode 100644 index 00000000..49736158 --- /dev/null +++ b/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); + } +} diff --git a/packages/ui/certd-server/src/modules/sys/access/access-controller.ts b/packages/ui/certd-server/src/controller/sys/access/access-controller.ts similarity index 90% rename from packages/ui/certd-server/src/modules/sys/access/access-controller.ts rename to packages/ui/certd-server/src/controller/sys/access/access-controller.ts index 8b43da71..c1e2ed3d 100644 --- a/packages/ui/certd-server/src/modules/sys/access/access-controller.ts +++ b/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'; /** diff --git a/packages/ui/certd-server/src/modules/sys/account/account-controller.ts b/packages/ui/certd-server/src/controller/sys/account/account-controller.ts similarity index 100% rename from packages/ui/certd-server/src/modules/sys/account/account-controller.ts rename to packages/ui/certd-server/src/controller/sys/account/account-controller.ts diff --git a/packages/ui/certd-server/src/modules/sys/authority/controller/permission-controller.ts b/packages/ui/certd-server/src/controller/sys/authority/permission-controller.ts similarity index 91% rename from packages/ui/certd-server/src/modules/sys/authority/controller/permission-controller.ts rename to packages/ui/certd-server/src/controller/sys/authority/permission-controller.ts index 21b1c664..d04376df 100644 --- a/packages/ui/certd-server/src/modules/sys/authority/controller/permission-controller.ts +++ b/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'; /** * 权限资源 diff --git a/packages/ui/certd-server/src/modules/sys/authority/controller/role-controller.ts b/packages/ui/certd-server/src/controller/sys/authority/role-controller.ts similarity index 95% rename from packages/ui/certd-server/src/modules/sys/authority/controller/role-controller.ts rename to packages/ui/certd-server/src/controller/sys/authority/role-controller.ts index 09df604c..5a1d7011 100644 --- a/packages/ui/certd-server/src/modules/sys/authority/controller/role-controller.ts +++ b/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'; /** * 系统用户 diff --git a/packages/ui/certd-server/src/modules/sys/authority/controller/user-controller.ts b/packages/ui/certd-server/src/controller/sys/authority/user-controller.ts similarity index 90% rename from packages/ui/certd-server/src/modules/sys/authority/controller/user-controller.ts rename to packages/ui/certd-server/src/controller/sys/authority/user-controller.ts index 0f46cb7d..5d30caa5 100644 --- a/packages/ui/certd-server/src/modules/sys/authority/controller/user-controller.ts +++ b/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'; /** diff --git a/packages/ui/certd-server/src/modules/sys/cname/controller/cname-provider-controller.ts b/packages/ui/certd-server/src/controller/sys/cname/cname-provider-controller.ts similarity index 95% rename from packages/ui/certd-server/src/modules/sys/cname/controller/cname-provider-controller.ts rename to packages/ui/certd-server/src/controller/sys/cname/cname-provider-controller.ts index 4e31695e..6e9614d5 100644 --- a/packages/ui/certd-server/src/modules/sys/cname/controller/cname-provider-controller.ts +++ b/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'; /** * 授权 diff --git a/packages/ui/certd-server/src/modules/sys/plugin/controller/plugin-controller.ts b/packages/ui/certd-server/src/controller/sys/plugin/plugin-controller.ts similarity index 95% rename from packages/ui/certd-server/src/modules/sys/plugin/controller/plugin-controller.ts rename to packages/ui/certd-server/src/controller/sys/plugin/plugin-controller.ts index cb2dead4..642a8a9e 100644 --- a/packages/ui/certd-server/src/modules/sys/plugin/controller/plugin-controller.ts +++ b/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'; /** diff --git a/packages/ui/certd-server/src/modules/sys/plus/plus-controller.ts b/packages/ui/certd-server/src/controller/sys/plus/plus-controller.ts similarity index 100% rename from packages/ui/certd-server/src/modules/sys/plus/plus-controller.ts rename to packages/ui/certd-server/src/controller/sys/plus/plus-controller.ts diff --git a/packages/ui/certd-server/src/modules/sys/settings/controller/sys-settings-controller.ts b/packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts similarity index 92% rename from packages/ui/certd-server/src/modules/sys/settings/controller/sys-settings-controller.ts rename to packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts index 7ca5738d..2acdc87a 100644 --- a/packages/ui/certd-server/src/modules/sys/settings/controller/sys-settings-controller.ts +++ b/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'; /** diff --git a/packages/ui/certd-server/src/modules/sys/cname/entity/cname_provider.ts b/packages/ui/certd-server/src/modules/cname/entity/cname_provider.ts similarity index 100% rename from packages/ui/certd-server/src/modules/sys/cname/entity/cname_provider.ts rename to packages/ui/certd-server/src/modules/cname/entity/cname_provider.ts diff --git a/packages/ui/certd-server/src/modules/sys/cname/service/cname-provider-service.ts b/packages/ui/certd-server/src/modules/cname/service/cname-provider-service.ts similarity index 100% rename from packages/ui/certd-server/src/modules/sys/cname/service/cname-provider-service.ts rename to packages/ui/certd-server/src/modules/cname/service/cname-provider-service.ts diff --git a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts b/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts index 49698abb..fd073291 100644 --- a/packages/ui/certd-server/src/modules/cname/service/cname-record-service.ts +++ b/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; diff --git a/packages/ui/certd-server/src/modules/plugin/cron/configuration.ts b/packages/ui/certd-server/src/modules/cron/configuration.ts similarity index 100% rename from packages/ui/certd-server/src/modules/plugin/cron/configuration.ts rename to packages/ui/certd-server/src/modules/cron/configuration.ts diff --git a/packages/ui/certd-server/src/modules/plugin/cron/cron.ts b/packages/ui/certd-server/src/modules/cron/cron.ts similarity index 100% rename from packages/ui/certd-server/src/modules/plugin/cron/cron.ts rename to packages/ui/certd-server/src/modules/cron/cron.ts diff --git a/packages/ui/certd-server/src/modules/plugin/cron/index.ts b/packages/ui/certd-server/src/modules/cron/index.ts similarity index 100% rename from packages/ui/certd-server/src/modules/plugin/cron/index.ts rename to packages/ui/certd-server/src/modules/cron/index.ts 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 00694afb..3723276a 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 @@ -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'; diff --git a/packages/ui/certd-server/src/modules/sys/plugin/entity/plugin.ts b/packages/ui/certd-server/src/modules/plugin/entity/plugin.ts similarity index 100% rename from packages/ui/certd-server/src/modules/sys/plugin/entity/plugin.ts rename to packages/ui/certd-server/src/modules/plugin/entity/plugin.ts diff --git a/packages/ui/certd-server/src/modules/sys/plugin/service/plugin-service.ts b/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts similarity index 74% rename from packages/ui/certd-server/src/modules/sys/plugin/service/plugin-service.ts rename to packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts index 2f42a2ac..85015b90 100644 --- a/packages/ui/certd-server/src/modules/sys/plugin/service/plugin-service.ts +++ b/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 { @InjectEntityModel(PluginEntity) repository: Repository; + @Inject() + builtInPluginService: BuiltInPluginService; + //@ts-ignore getRepository() { checkComm(); diff --git a/packages/ui/certd-server/src/modules/sys/settings/entity/sys-settings.ts b/packages/ui/certd-server/src/modules/sys/settings/entity/sys-settings.ts deleted file mode 100644 index 9c713981..00000000 --- a/packages/ui/certd-server/src/modules/sys/settings/entity/sys-settings.ts +++ /dev/null @@ -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; -}