fix: 修复群晖测试时报addSecret undefine错误

.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
+        },
     ]
 }

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) {
+  constructor(name: string, write?: (text: string) => void) {
-    this.customWriter = write;
+    this.customWriter = write || (() => {});
     //@ts-ignore
     this.logger = log4js.getLogger(name);
   }

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("");

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();

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: {

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,

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版）

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

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) {

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：成功后跳过

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 {

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

@@ -648,6 +648,11 @@ export class PipelineService extends BaseService<PipelineEntity> {
       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<PipelineEntity> {
                   title: "申请证书",
                   runnableType: "step",
                   input: {
-                    renewDays: 18,
+                    renewDays: 20,
                     domains: req.domains,
                     email: req.email,
                     "challengeType": "auto",

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: {

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",

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: {