chore:

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-verify-plan.vue

@@ -24,10 +24,7 @@ defineOptions({
   name: "CnameVerifyPlan"
 });
 
-const emit = defineEmits<{
-  "update:modelValue": any;
-  change: Record<string, any>;
-}>();
+const emit = defineEmits(["update:modelValue", "change"]);
 
 const props = defineProps<{
   modelValue: Record<string, any>;

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/http-verify-plan.vue

@@ -0,0 +1,106 @@
+<template>
+  <table class="http-verify-plan">
+    <thead>
+      <tr>
+        <td style="width: 160px">网站域名</td>
+        <td style="width: 100px; text-align: center">上传方式</td>
+        <td style="width: 150px">上传授权</td>
+        <td style="width: 200px">网站根目录路径</td>
+      </tr>
+    </thead>
+    <tbody v-if="records" class="http-record-body">
+      <template v-for="(item, key) of records" :key="key">
+        <tr>
+          <td class="domain">
+            {{ item.domain }}
+          </td>
+          <td>
+            <fs-dict-select v-model:value="item.httpUploaderType" :dict="uploaderTypeDict" @change="onRecordChange"></fs-dict-select>
+          </td>
+          <td>
+            <access-selector v-model="item.httpUploaderAccess" :type="item.httpUploaderType" @change="onRecordChange"></access-selector>
+          </td>
+          <td>
+            <a-input v-model:value="item.httpUploadRootDir" placeholder="网站根目录，如：/www/wwwroot" @change="onRecordChange"></a-input>
+          </td>
+        </tr>
+      </template>
+    </tbody>
+  </table>
+</template>
+
+<script lang="ts" setup>
+import { Ref, ref, watch } from "vue";
+import { HttpRecord } from "/@/components/plugins/cert/domains-verify-plan-editor/type";
+import { dict } from "@fast-crud/fast-crud";
+
+defineOptions({
+  name: "HttpVerifyPlan"
+});
+
+const emit = defineEmits(["update:modelValue", "change"]);
+
+const props = defineProps<{
+  modelValue: Record<string, any>;
+}>();
+
+const records: Ref<Record<string, HttpRecord>> = ref({});
+
+watch(
+  () => {
+    return props.modelValue;
+  },
+  (value: any) => {
+    if (value) {
+      records.value = {
+        ...value
+      };
+    }
+  },
+  {
+    immediate: true
+  }
+);
+
+function onRecordChange() {
+  emit("update:modelValue", records.value);
+  emit("change", records.value);
+}
+
+const uploaderTypeDict = dict({
+  data: [
+    { label: "SFTP/SSH", value: "ssh" },
+    { label: "FTP", value: "ftp" },
+    { label: "阿里云OSS", value: "alioss" },
+    { label: "腾讯云COS", value: "tencentcos" },
+    { label: "七牛OSS", value: "qiniuoss" }
+  ]
+});
+</script>
+
+<style lang="less">
+.http-verify-plan {
+  width: 100%;
+  table-layout: fixed;
+  tbody tr td {
+    border-top: 1px solid #e8e8e8 !important;
+  }
+  tr {
+    td {
+      border: 0 !important;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+      &.center {
+        text-align: center;
+      }
+    }
+    //&:last-child {
+    //  td {
+    //    border-bottom: 0 !important;
+    //  }
+    //}
+  }
+}
+</style>

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/index.vue

@@ -13,7 +13,7 @@
         <table class="plan-table">
           <thead>
             <tr>
-              <th>域名</th>
+              <th style="min-width: 100px">主域名</th>
               <th>验证方式</th>
               <th>验证计划</th>
             </tr>
@@ -59,7 +59,7 @@
                     <cname-verify-plan v-model="item.cnameVerifyPlan" @change="onPlanChanged" />
                   </div>
                   <div v-if="item.type === 'http'" class="plan-http">
-                    <cname-verify-plan v-model="item.cnameVerifyPlan" @change="onPlanChanged" />
+                    <http-verify-plan v-model="item.httpVerifyPlan" @change="onPlanChanged" />
                   </div>
                 </div>
               </td>
@@ -79,6 +79,7 @@ import { ref, watch } from "vue";
 import { dict, FsDictSelect } from "@fast-crud/fast-crud";
 import AccessSelector from "/@/views/certd/access/access-selector/index.vue";
 import CnameVerifyPlan from "./cname-verify-plan.vue";
+import HttpVerifyPlan from "./http-verify-plan.vue";
 import psl from "psl";
 import { Form } from "ant-design-vue";
 import { DomainsVerifyPlanInput } from "./type";
@@ -95,12 +96,17 @@ const challengeTypeOptions = ref<any[]>([
   {
     label: "CNAME验证",
     value: "cname"
+  },
+  {
+    label: "HTTP验证",
+    value: "http"
   }
 ]);
 
 const props = defineProps<{
   modelValue?: DomainsVerifyPlanInput;
   domains?: string[];
+  defaultType?: string;
 }>();
 
 const emit = defineEmits<{
@@ -132,6 +138,16 @@ function showError(error: string) {
 
 type DomainGroup = Record<string, Record<string, CnameRecord>>;
 
+watch(
+  () => {
+    return props.defaultType;
+  },
+  (value: string) => {
+    planRef.value = {};
+    onDomainsChanged(props.domains);
+  }
+);
+
 function onDomainsChanged(domains: string[]) {
   console.log("域名变化", domains);
   if (domains == null) {
@@ -155,9 +171,7 @@ function onDomainsChanged(domains: string[]) {
       group = {};
       domainGroups[mainDomain] = group;
     }
-    group[domain] = {
-      id: 0
-    };
+    group[domain] = {};
   }
 
   for (const domain in domainGroups) {
@@ -166,27 +180,43 @@ function onDomainsChanged(domains: string[]) {
     if (!planItem) {
       planItem = {
         domain,
-        type: "cname",
+        //@ts-ignore
+        type: props.defaultType || "cname",
         //@ts-ignore
         cnameVerifyPlan: {
           ...subDomains
+        },
+        //@ts-ignore
+        httpVerifyPlan: {
+          ...subDomains
         }
       };
       planRef.value[domain] = planItem;
-    } else {
-      const cnamePlan = planItem.cnameVerifyPlan;
-      for (const subDomain in subDomains) {
-        if (!cnamePlan[subDomain]) {
-          //@ts-ignore
-          cnamePlan[subDomain] = {
-            id: 0
-          };
-        }
+    }
+    const cnamePlan = planItem.cnameVerifyPlan;
+    for (const subDomain in subDomains) {
+      //@ts-ignore
+      cnamePlan[subDomain] = {
+        id: 0
+      };
+    }
+    for (const subDomain of Object.keys(cnamePlan)) {
+      if (!subDomains[subDomain]) {
+        delete cnamePlan[subDomain];
       }
-      for (const subDomain of Object.keys(cnamePlan)) {
-        if (!subDomains[subDomain]) {
-          delete cnamePlan[subDomain];
-        }
+    }
+
+    // httpVerifyPlan
+    const httpPlan = planItem.httpVerifyPlan;
+    for (const subDomain in subDomains) {
+      //@ts-ignore
+      httpPlan[subDomain] = {
+        domain: subDomain
+      };
+    }
+    for (const subDomain of Object.keys(httpPlan)) {
+      if (!subDomains[subDomain]) {
+        delete httpPlan[subDomain];
       }
     }
   }

packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/validator.ts

@@ -1,12 +1,13 @@
 import Validator from "async-validator";
 import { DomainsVerifyPlanInput } from "./type";
 
-function checkCnameVerifyPlan(rule, value: DomainsVerifyPlanInput) {
+function checkDomainVerifyPlan(rule: any, value: DomainsVerifyPlanInput) {
   if (value == null) {
     return true;
   }
   for (const domain in value) {
-    if (value[domain].type === "cname") {
+    const type = value[domain].type;
+    if (type === "cname") {
       const subDomains = Object.keys(value[domain].cnameVerifyPlan);
       if (subDomains.length > 0) {
         for (const subDomain of subDomains) {
@@ -16,7 +17,21 @@ function checkCnameVerifyPlan(rule, value: DomainsVerifyPlanInput) {
           }
         }
       }
-    } else {
+    } else if (type === "http") {
+      const subDomains = Object.keys(value[domain].httpVerifyPlan);
+      if (subDomains.length > 0) {
+        for (const subDomain of subDomains) {
+          const plan = value[domain].httpVerifyPlan[subDomain];
+          if (plan.httpUploaderType == null) {
+            throw new Error(`域名${subDomain}的上传方式必须填写`);
+          } else if (plan.httpUploaderAccess == null) {
+            throw new Error(`域名${subDomain}的上传授权信息必须填写`);
+          } else if (plan.httpUploadRootDir == null) {
+            throw new Error(`域名${subDomain}的网站根路径必须填写`);
+          }
+        }
+      }
+    } else if (type === "dns") {
       if (value[domain].dnsProviderType == null || value[domain].dnsProviderAccessId == null) {
         throw new Error(`DNS模式下，域名${domain}的DNS类型和授权信息必须填写`);
       }
@@ -25,4 +40,4 @@ function checkCnameVerifyPlan(rule, value: DomainsVerifyPlanInput) {
   return true;
 }
 // 注册自定义验证器
-Validator.register("checkCnameVerifyPlan", checkCnameVerifyPlan);
+Validator.register("checkDomainVerifyPlan", checkDomainVerifyPlan);