From 5eb4aa3a0eab9ffa729c8e813cbf973d9683cc13 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 16 Mar 2026 22:51:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BE=A4=E6=99=96?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=B6=E6=8A=A5addSecret=20undefine?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 10 ++++++++++ packages/core/basic/src/utils/util.log.ts | 5 +++-- .../src/components/plugins/common/remote-select.vue | 1 - .../certd-client/src/views/certd/mine/user-profile.vue | 1 - .../src/views/certd/pipeline/certd-form/use.tsx | 4 ++-- .../certd-client/src/views/certd/pipeline/detail.vue | 3 ++- .../ui/certd-server/metadata/deploy_CertApply.yaml | 2 +- .../ui/certd-server/metadata/deploy_CertApplyLego.yaml | 2 +- .../src/controller/user/pipeline/handle-controller.ts | 2 +- .../controller/user/pipeline/pipeline-controller.ts | 2 +- .../ui/certd-server/src/modules/mine/service/models.ts | 2 +- .../src/modules/pipeline/service/pipeline-service.ts | 7 ++++++- .../plugins/plugin-cert/plugin/cert-plugin/apply.ts | 2 +- .../plugin-cert/plugin/cert-plugin/custom/index.ts | 2 +- .../plugin-cert/plugin/cert-plugin/lego/index.ts | 2 +- 15 files changed, 31 insertions(+), 16 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 17becab83..2b5cda608 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -79,5 +79,15 @@ "PLUS_SERVER_BASE_URL": "http://127.0.0.1:11007" } } + ], + "compounds": [ + { + "name": "all", + "configurations": [ + "server", + "client", + ], + "stopAll": false + }, ] } \ No newline at end of file diff --git a/packages/core/basic/src/utils/util.log.ts b/packages/core/basic/src/utils/util.log.ts index 77f3f2ab9..28f8e2910 100644 --- a/packages/core/basic/src/utils/util.log.ts +++ b/packages/core/basic/src/utils/util.log.ts @@ -19,6 +19,7 @@ export function resetLogConfigure() { } resetLogConfigure(); export const logger: ILogger = log4js.getLogger("default") as any; +logger.addSecret = (secret: string) => {}; export function resetLogFilePath(filePath: string) { logFilePath = filePath; @@ -106,8 +107,8 @@ export class PipelineLogger implements ILogger { logger: ILogger; customWriter!: (text: string) => void; - constructor(name: string, write: (text: string) => void) { - this.customWriter = write; + constructor(name: string, write?: (text: string) => void) { + this.customWriter = write || (() => {}); //@ts-ignore this.logger = log4js.getLogger(name); } diff --git a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue index 7ca1a5ce7..d9dd1c3ba 100644 --- a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue +++ b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue @@ -90,7 +90,6 @@ const getPluginType: any = inject("get:plugin:type", () => { return "plugin"; }); -debugger; const searchKeyRef = ref(""); const optionsRef = ref([]); const message = ref(""); diff --git a/packages/ui/certd-client/src/views/certd/mine/user-profile.vue b/packages/ui/certd-client/src/views/certd/mine/user-profile.vue index 7ec089e60..74c274430 100644 --- a/packages/ui/certd-client/src/views/certd/mine/user-profile.vue +++ b/packages/ui/certd-client/src/views/certd/mine/user-profile.vue @@ -308,7 +308,6 @@ async function doRegisterPasskey(deviceName: string) { }, }; console.log("credential", credential, response); - debugger; const verifyRes: any = await api.verifyPasskeyRegistration(response, options.challenge, deviceName); await loadPasskeys(); diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx index 1124b7041..adde7fb35 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx @@ -115,7 +115,7 @@ export function useCertPipelineCreator() { label: "name", }); - const DEFAULT_RENEW_DAYS = settingStore.sysPublic.defaultCertRenewDays || settingStore.sysPublic.defaultWillExpireDays || 15; + const DEFAULT_RENEW_DAYS = settingStore.sysPublic.defaultCertRenewDays || settingStore.sysPublic.defaultWillExpireDays || 20; merge(inputs, { renewDays: { @@ -347,7 +347,7 @@ export function useCertPipelineCreator() { title: "申请证书", runnableType: "step", input: { - renewDays: 15, + renewDays: 20, ...pluginInput, }, strategy: { diff --git a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue index 2d3c40f33..fd3c3d9db 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue @@ -30,12 +30,13 @@ const pipelineOptions: PipelineOptions = { return { pipeline: { id: detail.pipeline.id, - userId: detail.pipeline.userId, stages: [], triggers: [], ...JSON.parse(detail.pipeline.content || "{}"), type: detail.pipeline.type, from: detail.pipeline.from, + userId: detail.pipeline.userId, + projectId: detail.pipeline.projectId, }, validTime: detail.pipeline.validTime, webhookKey: detail.pipeline.webhookKey, diff --git a/packages/ui/certd-server/metadata/deploy_CertApply.yaml b/packages/ui/certd-server/metadata/deploy_CertApply.yaml index 851a11497..467b892bf 100644 --- a/packages/ui/certd-server/metadata/deploy_CertApply.yaml +++ b/packages/ui/certd-server/metadata/deploy_CertApply.yaml @@ -3,7 +3,7 @@ default: strategy: runStrategy: 0 input: - renewDays: 15 + renewDays: 20 forceUpdate: false name: CertApply title: 证书申请（JS版） diff --git a/packages/ui/certd-server/metadata/deploy_CertApplyLego.yaml b/packages/ui/certd-server/metadata/deploy_CertApplyLego.yaml index 0d176c016..a3e720e49 100644 --- a/packages/ui/certd-server/metadata/deploy_CertApplyLego.yaml +++ b/packages/ui/certd-server/metadata/deploy_CertApplyLego.yaml @@ -3,7 +3,7 @@ default: strategy: runStrategy: 0 input: - renewDays: 15 + renewDays: 20 forceUpdate: false name: CertApplyLego icon: ph:certificate diff --git a/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts index 8490bffee..de0ffb8d3 100644 --- a/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts +++ b/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts @@ -41,7 +41,7 @@ export class HandleController extends BaseController { if (body.record.id > 0) { const oldEntity = await this.accessService.info(body.record.id); if (oldEntity) { - if (oldEntity.userId !== this.getUserId()) { + if (oldEntity.userId !== userId) { throw new Error('access not found'); } if (oldEntity.projectId && oldEntity.projectId !== projectId) { diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts index 56a9c6bdf..a78c651b4 100644 --- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts +++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts @@ -33,7 +33,7 @@ const pipelineExample = ` "title": "申请证书", // 步骤标题 "runnableType": "step", // 类型标识 "input": { //输入参数 ，根据插件的配置有不同的参数，具体参数建议通过浏览器F12进行查看 - "renewDays": 15, + "renewDays": 20, }, "strategy": { // 策略 "runStrategy": 0 // 运行策略，0：正常执行，1：成功后跳过 diff --git a/packages/ui/certd-server/src/modules/mine/service/models.ts b/packages/ui/certd-server/src/modules/mine/service/models.ts index c6aa9cfd5..1c24bce28 100644 --- a/packages/ui/certd-server/src/modules/mine/service/models.ts +++ b/packages/ui/certd-server/src/modules/mine/service/models.ts @@ -28,7 +28,7 @@ export class UserSiteMonitorSetting extends BaseSettings { cron?:string = undefined; retryTimes?:number = 3; dnsServer?:string[] = undefined; - certValidDays?:number = 10; + certValidDays?:number = 14; } export class UserEmailSetting extends BaseSettings { 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 23dad4933..7ae7e3ae0 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 @@ -648,6 +648,11 @@ export class PipelineService extends BaseService { pipeline.id = id; } + if(entity.userId !=null){ + pipeline.userId = entity.userId; + pipeline.projectId = entity.projectId; + } + if (!pipeline.stages || pipeline.stages.length === 0) { return; } @@ -1285,7 +1290,7 @@ export class PipelineService extends BaseService { title: "申请证书", runnableType: "step", input: { - renewDays: 18, + renewDays: 20, domains: req.domains, email: req.email, "challengeType": "auto", diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts index 7e13c171b..c7ad13f5e 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts @@ -90,7 +90,7 @@ const preferredChainMergeScript = (() => { desc: "免费通配符域名证书申请，支持多个域名打到同一个证书上", default: { input: { - renewDays: 15, + renewDays: 20, forceUpdate: false, }, strategy: { diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/custom/index.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/custom/index.ts index b20f160e1..d9a6f843c 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/custom/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/custom/index.ts @@ -61,7 +61,7 @@ import dayjs from "dayjs"; export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin { @TaskInput({ title: "过期前提醒", - value: 10, + value: 20, component: { name: "a-input-number", vModel: "value", diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts index 93f617952..76dbaab40 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/lego/index.ts @@ -16,7 +16,7 @@ import { PrivateKeyType } from "./dns.js"; desc: "支持海量DNS解析提供商，推荐使用，一样的免费通配符域名证书申请，支持多个域名打到同一个证书上", default: { input: { - renewDays: 15, + renewDays: 20, forceUpdate: false, }, strategy: {