From 3b690cc31fa8e57cb0ec4079a0149050a0371c86 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 23 Oct 2025 00:05:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BC=80=E5=90=AF=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E6=9C=89=E6=95=88=E6=9C=9F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/system/settings/service/models.ts | 12 ++++ .../src/locales/langs/en-US/certd.ts | 18 +++-- .../src/locales/langs/zh-CN/certd.ts | 17 +++-- .../src/store/settings/api.basic.ts | 9 +++ .../src/views/certd/pipeline/crud.tsx | 7 +- .../src/views/sys/settings/index.vue | 3 + .../src/views/sys/settings/tabs/base.vue | 2 +- .../src/views/sys/settings/tabs/cert.vue | 71 +++++++++++++++++++ 8 files changed, 127 insertions(+), 12 deletions(-) create mode 100644 packages/ui/certd-client/src/views/sys/settings/tabs/cert.vue diff --git a/packages/libs/lib-server/src/system/settings/service/models.ts b/packages/libs/lib-server/src/system/settings/service/models.ts index af7ddf05..0419ac0a 100644 --- a/packages/libs/lib-server/src/system/settings/service/models.ts +++ b/packages/libs/lib-server/src/system/settings/service/models.ts @@ -37,6 +37,15 @@ export class SysPublicSettings extends BaseSettings { //验证码类型 captchaType?: string; captchaAddonId?:number; + + + + //流水线是否启用有效期 + pipelineValidTimeEnabled?: boolean = false; + + //证书域名添加到监控 + certDomainAddToMonitorEnabled?: boolean = false; + } export class SysPrivateSettings extends BaseSettings { @@ -51,6 +60,8 @@ export class SysPrivateSettings extends BaseSettings { dnsResultOrder? = ''; commonCnameEnabled?: boolean = true; + httpRequestTimeout?: number = 30; + sms?: { type?: string; config?: any; @@ -214,3 +225,4 @@ export class SysSafeSetting extends BaseSettings { }; } + diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts index e22f1443..0144395c 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts @@ -137,6 +137,7 @@ export default { triggerType: "Trigger Type", pipelineId: "Pipeline Id", }, + pi: { validTime: "Piepline Valid Time", validTimeHelper: "Not filled in means permanent validity", @@ -728,6 +729,13 @@ export default { addonTypeSelect: "Select type", sys: { setting: { + baseSetting: "Base Settings", + registerSetting: "Register Settings", + safeSetting: "Safe Settings", + paymentSetting: "Payment Settings", + captchaSetting: "Captcha Setting", + certSetting: "Certificate Settings", + showRunStrategy: "Show RunStrategy", showRunStrategyHelper: "Allow modify the run strategy of the task", @@ -737,11 +745,11 @@ export default { captchaTest: "Captcha Test", // 保存后再点击测试，请务必测试通过了，再开启登录验证码 captchaTestHelper: "Save and click test, please make sure the test is passed before enabling login captcha", - baseSetting: "Base Settings", - registerSetting: "Register Settings", - safeSetting: "Safe Settings", - paymentSetting: "Payment Settings", - captchaSetting: "Captcha Setting", + + pipelineValidTimeEnabled: "Enable Pipeline Valid Time", + pipelineValidTimeEnabledHelper: "Whether to enable the valid time of the pipeline", + certDomainAddToMonitorEnabled: "Add Domain to Certificate Monitor", + certDomainAddToMonitorEnabledHelper: "Whether to add the domain to the certificate monitor", }, }, modal: { diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts index 6939ea7e..a7ec59ca 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts @@ -730,6 +730,13 @@ export default { }, sys: { setting: { + baseSetting: "基本设置", + registerSetting: "注册设置", + safeSetting: "安全设置", + paymentSetting: "支付设置", + captchaSetting: "验证码设置", + certSetting: "证书设置", + showRunStrategy: "显示运行策略选择", showRunStrategyHelper: "任务设置中是否允许选择运行策略", @@ -738,11 +745,11 @@ export default { captchaType: "验证码配置", captchaTest: "测试验证码", captchaTestHelper: "保存后再点击测试，请务必测试通过了，再开启登录验证码", - baseSetting: "基本设置", - registerSetting: "注册设置", - safeSetting: "安全设置", - paymentSetting: "支付设置", - captchaSetting: "验证码设置", + + pipelineValidTimeEnabled: "流水线有效期", + pipelineValidTimeEnabledHelper: "是否启用流水线有效期", + certDomainAddToMonitorEnabled: "证书域名添加到证书监控", + certDomainAddToMonitorEnabledHelper: "创建证书流水线时是否可以选择将域名添加到证书监控", }, }, modal: { diff --git a/packages/ui/certd-client/src/store/settings/api.basic.ts b/packages/ui/certd-client/src/store/settings/api.basic.ts index ebe7b691..7868cc99 100644 --- a/packages/ui/certd-client/src/store/settings/api.basic.ts +++ b/packages/ui/certd-client/src/store/settings/api.basic.ts @@ -50,6 +50,12 @@ export type SysPublicSetting = { captchaEnabled?: boolean; captchaType?: number; captchaAddonId?: number; + + //流水线是否启用有效期 + pipelineValidTimeEnabled?: boolean; + + //证书域名添加到监控 + certDomainAddToMonitorEnabled?: boolean; }; export type SuiteSetting = { enabled?: boolean; @@ -63,6 +69,9 @@ export type SysPrivateSetting = { type?: string; config?: any; }; + + //http请求超时时间 + httpRequestTimeout?: number; }; export type SysInstallInfo = { siteId: string; diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx index edb3146f..523305d0 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx @@ -559,7 +559,9 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys title: t("certd.pi.validTime"), type: "date", form: { - show: true, + show: computed(() => { + return settingStore.isPlus && settingStore.sysPublic.pipelineValidTimeEnabled; + }), helper: t("certd.pi.validTimeHelper"), valueResolve({ form, key, value }) { if (value) { @@ -573,6 +575,9 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys }, }, column: { + show: computed(() => { + return settingStore.isPlus && settingStore.sysPublic.pipelineValidTimeEnabled; + }), sorter: true, width: 155, align: "center", diff --git a/packages/ui/certd-client/src/views/sys/settings/index.vue b/packages/ui/certd-client/src/views/sys/settings/index.vue index 6579f74d..a2022fe6 100644 --- a/packages/ui/certd-client/src/views/sys/settings/index.vue +++ b/packages/ui/certd-client/src/views/sys/settings/index.vue @@ -20,6 +20,9 @@ + + + diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue index 196edebb..69133252 100644 --- a/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue +++ b/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue @@ -1,6 +1,6 @@