diff --git a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx index 1a35f60e2..1d1c0966b 100644 --- a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx @@ -99,7 +99,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat domains: { title: "全部域名", search: { - show: false + show: true }, type: "text", form: { @@ -129,7 +129,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat expiresTime: { title: "过期时间", search: { - show: true + show: false }, type: "date", form: { @@ -152,7 +152,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat certProvider: { title: "证书颁发机构", search: { - show: true + show: false }, type: "text", form: { diff --git a/packages/ui/certd-client/src/views/sys/settings/email/api.email.ts b/packages/ui/certd-client/src/views/sys/settings/email/api.email.ts index 9ed211735..65a181b02 100644 --- a/packages/ui/certd-client/src/views/sys/settings/email/api.email.ts +++ b/packages/ui/certd-client/src/views/sys/settings/email/api.email.ts @@ -1,5 +1,5 @@ import { request } from "/src/api/service"; -const apiPrefix = "/basic/email"; +const apiPrefix = "/mine/email"; export async function TestSend(receiver: string) { await request({ diff --git a/packages/ui/certd-server/src/controller/user/basic/app-controller.ts b/packages/ui/certd-server/src/controller/basic/app-controller.ts similarity index 100% rename from packages/ui/certd-server/src/controller/user/basic/app-controller.ts rename to packages/ui/certd-server/src/controller/basic/app-controller.ts diff --git a/packages/ui/certd-server/src/controller/user/basic/code-controller.ts b/packages/ui/certd-server/src/controller/basic/code-controller.ts similarity index 92% rename from packages/ui/certd-server/src/controller/user/basic/code-controller.ts rename to packages/ui/certd-server/src/controller/basic/code-controller.ts index 48d163a3b..09a90009d 100644 --- a/packages/ui/certd-server/src/controller/user/basic/code-controller.ts +++ b/packages/ui/certd-server/src/controller/basic/code-controller.ts @@ -1,8 +1,8 @@ import { Rule, RuleType } from '@midwayjs/validate'; import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from '@midwayjs/core'; import { BaseController, Constants } from '@certd/lib-server'; -import { CodeService } from '../../../modules/basic/service/code-service.js'; -import { EmailService } from '../../../modules/basic/service/email-service.js'; +import { CodeService } from '../../modules/basic/service/code-service.js'; +import { EmailService } from '../../modules/basic/service/email-service.js'; export class SmsCodeReq { @Rule(RuleType.string().required()) diff --git a/packages/ui/certd-server/src/controller/user/basic/file-controller.ts b/packages/ui/certd-server/src/controller/basic/file-controller.ts similarity index 100% rename from packages/ui/certd-server/src/controller/user/basic/file-controller.ts rename to packages/ui/certd-server/src/controller/basic/file-controller.ts diff --git a/packages/ui/certd-server/src/controller/user/basic/home-controller.ts b/packages/ui/certd-server/src/controller/basic/home-controller.ts similarity index 100% rename from packages/ui/certd-server/src/controller/user/basic/home-controller.ts rename to packages/ui/certd-server/src/controller/basic/home-controller.ts diff --git a/packages/ui/certd-server/src/controller/user/basic/settings-controller.ts b/packages/ui/certd-server/src/controller/basic/settings-controller.ts similarity index 100% rename from packages/ui/certd-server/src/controller/user/basic/settings-controller.ts rename to packages/ui/certd-server/src/controller/basic/settings-controller.ts diff --git a/packages/ui/certd-server/src/controller/user/basic/email-controller.ts b/packages/ui/certd-server/src/controller/user/mine/email-controller.ts similarity index 94% rename from packages/ui/certd-server/src/controller/user/basic/email-controller.ts rename to packages/ui/certd-server/src/controller/user/mine/email-controller.ts index 543090c73..856ba00e6 100644 --- a/packages/ui/certd-server/src/controller/user/basic/email-controller.ts +++ b/packages/ui/certd-server/src/controller/user/mine/email-controller.ts @@ -1,12 +1,12 @@ import { Body, Controller, Inject, Post, Provide } from '@midwayjs/core'; import { BaseController } from '@certd/lib-server'; -import { EmailService } from '../../../modules/basic/service/email-service.js'; import { Constants } from '@certd/lib-server'; +import { EmailService } from '../../../modules/basic/service/email-service.js'; /** */ @Provide() -@Controller('/api/basic/email') +@Controller('/api/mine/email') export class EmailController extends BaseController { @Inject() emailService: EmailService; diff --git a/packages/ui/certd-server/src/middleware/authority.ts b/packages/ui/certd-server/src/middleware/authority.ts index 01bdcfd53..5ceb76cd9 100644 --- a/packages/ui/certd-server/src/middleware/authority.ts +++ b/packages/ui/certd-server/src/middleware/authority.ts @@ -96,6 +96,7 @@ export class AuthorityMiddleware implements IWebMiddleware { ctx.body = Constants.res.permission; return; } + await next(); }; }