From 3c7eb2f5e26a1c883200caf7a35aacd042921126 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 9 Jun 2025 11:32:06 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=B0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/acme-client/src/auto.js         |  7 +-
 .../certd/monitor/site/setting/index.vue      |  4 +-
 .../views/certd/pipeline/pipeline/index.vue   | 92 +++++++++++++++++--
 .../dns-provider/aliyun-dns-provider.ts       |  1 -
 pnpm-lock.yaml                                | 82 ++++++++---------
 5 files changed, 131 insertions(+), 55 deletions(-)

diff --git a/packages/core/acme-client/src/auto.js b/packages/core/acme-client/src/auto.js
index 99e61411..88dfb881 100644
--- a/packages/core/acme-client/src/auto.js
+++ b/packages/core/acme-client/src/auto.js
@@ -216,12 +216,16 @@ export default async (client, userOpts) => {
         return promise;
     }
 
-    async function runPromisePa(tasks, waitTime = 5000) {
+    async function runPromisePa(tasks, waitTime = 8000) {
         const results = [];
+        let j = 0
         // eslint-disable-next-line no-await-in-loop,no-restricted-syntax
         for (const task of tasks) {
+            j++
+            log(`开始第${j}个任务`);
             results.push(task());
             // eslint-disable-next-line no-await-in-loop
+            log(`wait ${waitTime}s`)
             await wait(waitTime);
         }
         return Promise.all(results);
@@ -245,6 +249,7 @@ export default async (client, userOpts) => {
                 log(`跳过本地验证（skipChallengeVerification=true），等待 60s`);
                 await wait(60 * 1000);
             } else {
+                log("开始本地校验")
                 await runPromisePa(localVerifyTasks, 1000);
                 log(`本地校验完成，等待${waitDnsDiffuseTime}s`)
                 await wait(waitDnsDiffuseTime * 1000)
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue b/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue
index 6ec1784e..57a6bc2d 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue
@@ -18,7 +18,7 @@
           <div class="helper">监控请求重试次数</div>
         </a-form-item>
         <a-form-item label="监控定时设置" :name="['cron']">
-          <div class="flex">
+          <div class="flex flex-baseline">
             <cron-editor v-model="formState.cron" :disabled="!settingsStore.isPlus" :allow-every-min="userStore.isAdmin" />
             <vip-button class="ml-5" mode="button"></vip-button>
           </div>
@@ -71,7 +71,7 @@ const doSave = async (form: any) => {
 <style lang="less">
 .page-user-settings {
   .user-settings-form {
-    width: 600px;
+    width: 700px;
     margin: 20px;
   }
 }
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
index f3e9766d..3cb33d02 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
@@ -6,8 +6,28 @@
         <text-editable v-model="pipeline.title" :hover-show="false" :disabled="!editMode"></text-editable>
       </div>
       <div class="more flex items-center flex-1 justify-end">
+        <div v-if="isCert" class="flex items-center hidden md:block">
+          <a-tag class="mr-5 pointer" color="green" type="primary" text="查看证书" @click="viewCert(pipeline.id)">
+            <span class="flex"><fs-icon icon="ant-design:eye-outlined"></fs-icon> 查看证书</span>
+          </a-tag>
+          <a-tag class="mr-5 pointer" color="green" type="primary" text="下载证书" @click="downloadCert(pipeline.id)">
+            <span class="flex"> <fs-icon icon="ant-design:download-outlined"></fs-icon> 下载证书 </span>
+          </a-tag>
+        </div>
+
         <div class="flex items-center hidden md:block">
-          <a-tag v-if="nextTriggerTimes" color="blue">下次执行时间：{{ nextTriggerTimes }}</a-tag>
+          <a-tag v-if="nextTriggerTimes" color="blue">
+            <span class="flex">
+              <fs-icon icon="ant-design:time-outline"></fs-icon>
+              下次执行时间：{{ nextTriggerTimes }}
+            </span>
+          </a-tag>
+          <a-tag v-else-if="nextTriggerTimes === false" color="red">
+            <span class="flex">
+              <fs-icon icon="ant-design:time-outline"></fs-icon>
+              未设置触发源，不会自动执行
+            </span>
+          </a-tag>
         </div>
         <div class="basis-40 flex justify-end mr-10">
           <template v-if="editMode">
@@ -18,11 +38,6 @@
             <fs-button icon="ant-design:edit-outlined" type="primary" @click="edit">编辑</fs-button>
           </template>
         </div>
-
-        <div v-if="isCert" class="flex items-center hidden md:block">
-          <fs-button icon="ant-design:eye-outlined" class="mr-5" type="primary" text="查看证书" @click="viewCert(pipeline.id)"> </fs-button>
-          <fs-button icon="ant-design:download-outlined" class="mr-5" type="primary" text="下载证书" @click="downloadCert(pipeline.id)"> </fs-button>
-        </div>
       </div>
     </template>
 
@@ -251,7 +266,7 @@
                 @cancel="historyCancel()"
               ></pi-history-timeline-item>
             </template>
-            <a-empty v-if="histories.length === 0"> </a-empty>
+            <a-empty v-if="histories.length === 0"></a-empty>
           </a-timeline>
         </a-page-header>
       </div>
@@ -291,7 +306,17 @@ import { useCertViewer } from "/@/views/certd/pipeline/use";
 export default defineComponent({
   name: "PipelineEdit",
   // eslint-disable-next-line vue/no-unused-components
-  components: { FsIcon, PiHistoryTimelineItem, PiTaskForm, PiTriggerForm, PiTaskView, PiStatusShow, PiNotificationForm, VDraggable, TaskShortcuts },
+  components: {
+    FsIcon,
+    PiHistoryTimelineItem,
+    PiTaskForm,
+    PiTriggerForm,
+    PiTaskView,
+    PiStatusShow,
+    PiNotificationForm,
+    VDraggable,
+    TaskShortcuts,
+  },
   props: {
     pipelineId: {
       type: [Number, String],
@@ -324,7 +349,7 @@ export default defineComponent({
     const nextTriggerTimes = computed(() => {
       const triggers = pipeline.value.triggers;
       if (!triggers || triggers.length === 0) {
-        return null;
+        return false;
       }
       let nextTimes: any = [];
       for (const item of triggers) {
@@ -338,6 +363,7 @@ export default defineComponent({
     });
 
     const router = useRouter();
+
     function goBack() {
       router.back();
     }
@@ -393,8 +419,10 @@ export default defineComponent({
       }
       return true;
     }
+
     const intervalLoadHistoryRef = ref();
     const isLoadingHistory = ref(false);
+
     function watchNewHistoryList() {
       intervalLoadHistoryRef.value = setInterval(async () => {
         if (isLoadingHistory.value) {
@@ -418,6 +446,7 @@ export default defineComponent({
         }
       }, 3000);
     }
+
     onMounted(() => {
       watchNewHistoryList();
     });
@@ -448,7 +477,15 @@ export default defineComponent({
           return;
         }
         const detail: PipelineDetail = await props.options.getPipelineDetail({ pipelineId: value });
-        currentPipeline.value = _.merge({ title: "新管道流程", stages: [], triggers: [], notifications: [] }, detail.pipeline);
+        currentPipeline.value = _.merge(
+          {
+            title: "新管道流程",
+            stages: [],
+            triggers: [],
+            notifications: [],
+          },
+          detail.pipeline
+        );
         pipeline.value = currentPipeline.value;
         await loadHistoryList(true);
       },
@@ -563,6 +600,7 @@ export default defineComponent({
       function isLastStage(index: number) {
         return false;
       }
+
       return {
         stageAdd,
         isLastStage,
@@ -682,6 +720,7 @@ export default defineComponent({
       }
 
       const validateErrors: Ref = ref({});
+
       function addValidateError(taskId: string, error: any) {
         const errors = validateErrors.value[taskId] || [];
         validateErrors.value[taskId] = errors;
@@ -736,6 +775,7 @@ export default defineComponent({
       function hasValidateError(taskId: string) {
         return validateErrors.value[taskId] != null;
       }
+
       const save = async (offEdit = true) => {
         doValidate();
 
@@ -799,9 +839,11 @@ export default defineComponent({
       };
 
       const logsCollapse = ref(false);
+
       function toggleLogsCollapse() {
         logsCollapse.value = !logsCollapse.value;
       }
+
       return {
         historyView,
         historyCancel,
@@ -900,9 +942,11 @@ export default defineComponent({
       text-overflow: ellipsis;
       text-wrap: nowrap;
       display: flex;
+
       .back {
         margin-right: 10px;
       }
+
       .text-editable {
         width: 300px;
       }
@@ -912,47 +956,57 @@ export default defineComponent({
   .pi-status-show {
     display: inline-flex;
   }
+
   .fs-page-content {
     overflow-x: auto;
   }
+
   .layout {
     width: 100%;
     height: 100%;
     position: relative;
     display: flex;
     overflow-x: hidden;
+
     .layout-left {
       flex: 1;
       height: 100%;
     }
+
     .layout-right {
       width: 350px;
       height: 100%;
     }
   }
+
   .pipeline-container {
     width: 100%;
     height: 100%;
     position: relative;
     overflow: auto;
   }
+
   .pipeline {
     position: absolute;
     left: 0;
     top: 0;
     height: 100%;
+
     .stages {
       display: flex;
       overflow: auto;
       min-width: 100%;
       height: 100%;
+
       .stage {
         width: 300px;
         border-right: 1px solid #c7c7c7;
+
         .is-add {
           visibility: hidden;
           color: gray;
         }
+
         &:hover .is-add {
           visibility: visible;
         }
@@ -961,11 +1015,13 @@ export default defineComponent({
           padding: 20px;
           color: gray;
           display: flex;
+
           .stage-move-handle {
             cursor: move;
             margin-left: 4px;
           }
         }
+
         //.sortable-ghost {
         //  .line {
         //    visibility: hidden;
@@ -979,6 +1035,7 @@ export default defineComponent({
 
           &.line-left {
             left: 25px;
+
             .flow-line {
               border-right: 0;
             }
@@ -986,6 +1043,7 @@ export default defineComponent({
 
           &.line-right {
             right: 25px;
+
             .flow-line {
               border-left: 0;
             }
@@ -996,6 +1054,7 @@ export default defineComponent({
             border: 1px solid #c7c7c7;
             border-top: 0;
           }
+
           .add-stage-btn {
             display: inline-flex;
             visibility: hidden;
@@ -1005,6 +1064,7 @@ export default defineComponent({
             bottom: -12px;
             left: -12px;
             z-index: 100;
+
             &:hover {
               color: #1890ff;
             }
@@ -1017,6 +1077,7 @@ export default defineComponent({
 
             &.line-left {
               left: 0;
+
               .flow-line {
                 border-right: 0;
                 border-left: 0;
@@ -1025,6 +1086,7 @@ export default defineComponent({
 
             &.line-right {
               right: 0;
+
               .flow-line {
                 border-left: 0;
                 border-right: 0;
@@ -1044,13 +1106,16 @@ export default defineComponent({
             }
           }
         }
+
         &.last-stage {
           .line {
             width: 50% !important;
             right: auto;
+
             .flow-line {
               border-right: 0;
             }
+
             .add-stage-btn {
               visibility: hidden;
             }
@@ -1074,6 +1139,7 @@ export default defineComponent({
                 }
               }
             }
+
             .task {
               display: flex;
               flex-direction: column;
@@ -1086,6 +1152,7 @@ export default defineComponent({
                 &.in-edit {
                   margin-right: 28px;
                 }
+
                 &.disabled {
                 }
               }
@@ -1097,12 +1164,15 @@ export default defineComponent({
                 //font-size: 18px;
                 cursor: pointer;
                 z-index: 10;
+
                 &:hover {
                   color: #1890ff;
                 }
+
                 &.copy {
                   right: 30px;
                 }
+
                 &.drag {
                   right: 10px;
                   cursor: move;
@@ -1114,6 +1184,7 @@ export default defineComponent({
               }
 
               position: relative;
+
               .shortcut {
                 position: absolute;
                 bottom: -10px;
@@ -1128,6 +1199,7 @@ export default defineComponent({
 
   .layout-right {
     position: relative;
+
     &.collapsed {
       margin-right: -350px;
     }
diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts
index f7d2777c..8fbb27b9 100644
--- a/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts
@@ -101,7 +101,6 @@ export class AliyunDnsProvider extends AbstractDnsProvider {
     const requestOption = {
       method: 'POST',
     };
-
     try {
       const ret = await this.client.request('AddDomainRecord', params, requestOption);
       this.logger.info('添加域名解析成功:', JSON.stringify(options), ret.RecordId);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2c8f065b..4a26fa83 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -46,7 +46,7 @@ importers:
   packages/core/acme-client:
     dependencies:
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../basic
       '@peculiar/x509':
         specifier: ^1.11.0
@@ -207,10 +207,10 @@ importers:
   packages/core/pipeline:
     dependencies:
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../basic
       '@certd/plus-core':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../pro/plus-core
       dayjs:
         specifier: ^1.11.7
@@ -415,7 +415,7 @@ importers:
   packages/libs/lib-k8s:
     dependencies:
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/basic
       '@kubernetes/client-node':
         specifier: 0.21.0
@@ -455,16 +455,16 @@ importers:
   packages/libs/lib-server:
     dependencies:
       '@certd/acme-client':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/pipeline
       '@certd/plus-core':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../pro/plus-core
       '@midwayjs/cache':
         specifier: ~3.14.0
@@ -607,16 +607,16 @@ importers:
   packages/plugins/plugin-cert:
     dependencies:
       '@certd/acme-client':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../plugin-lib
       '@google-cloud/publicca':
         specifier: ^1.3.0
@@ -698,10 +698,10 @@ importers:
         specifier: ^3.787.0
         version: 3.810.0(aws-crt@1.26.2)
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/pipeline
       '@kubernetes/client-node':
         specifier: 0.21.0
@@ -789,19 +789,19 @@ importers:
   packages/pro/commercial-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/basic
       '@certd/lib-server':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../libs/lib-server
       '@certd/pipeline':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/pipeline
       '@certd/plugin-plus':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../plugin-plus
       '@certd/plus-core':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../plus-core
       '@midwayjs/core':
         specifier: ~3.20.3
@@ -886,22 +886,22 @@ importers:
         specifier: ^1.0.2
         version: 1.0.3
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/basic
       '@certd/lib-k8s':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../libs/lib-k8s
       '@certd/pipeline':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/pipeline
       '@certd/plugin-cert':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../plugins/plugin-cert
       '@certd/plugin-lib':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../plugins/plugin-lib
       '@certd/plus-core':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../plus-core
       ali-oss:
         specifier: ^6.21.0
@@ -1004,7 +1004,7 @@ importers:
   packages/pro/plus-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/basic
       dayjs:
         specifier: ^1.11.7
@@ -1294,10 +1294,10 @@ importers:
         version: 0.1.3(zod@3.24.4)
     devDependencies:
       '@certd/lib-iframe':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../libs/lib-iframe
       '@certd/pipeline':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/pipeline
       '@rollup/plugin-commonjs':
         specifier: ^25.0.7
@@ -1480,46 +1480,46 @@ importers:
         specifier: ^3.705.0
         version: 3.810.0(aws-crt@1.26.2)
       '@certd/acme-client':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/basic
       '@certd/commercial-core':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../pro/commercial-core
       '@certd/cv4pve-api-javascript':
         specifier: ^8.4.1
         version: 8.4.1
       '@certd/jdcloud':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../libs/lib-jdcloud
       '@certd/lib-huawei':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../libs/lib-huawei
       '@certd/lib-k8s':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../libs/lib-k8s
       '@certd/lib-server':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../libs/lib-server
       '@certd/midway-flyway-js':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../libs/midway-flyway-js
       '@certd/pipeline':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../core/pipeline
       '@certd/plugin-cert':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../plugins/plugin-cert
       '@certd/plugin-lib':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../plugins/plugin-lib
       '@certd/plugin-plus':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../pro/plugin-plus
       '@certd/plus-core':
-        specifier: ^1.35.0
+        specifier: ^1.35.1
         version: link:../../pro/plus-core
       '@huaweicloud/huaweicloud-sdk-cdn':
         specifier: ^3.1.120