perf: 支持从提供商导入域名列表

packages/plugins/plugin-lib/src/cert/dns-provider/api.ts

@@ -31,7 +31,8 @@ export type DnsProviderContext = {
 export type DomainRecord = {
   id: string;
   domain: string;
-  thirdDns: boolean;
+  registrationDate: number;
+  expirationDate: number;
 };
 
 export interface IDnsProvider<T = any> {

packages/ui/certd-client/src/components/icon-select.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-select>
+  <a-select :value="value" @update:value="onChange">
     <a-select-option v-for="item of options" :key="item.value" :value="item.value" :label="item.label">
       <span class="flex-o">
         <fs-icon :icon="item.icon" class="fs-16 color-blue mr-5" />
@@ -12,5 +12,11 @@
 <script lang="ts" setup>
 const props = defineProps<{
   options: { value: any; label: string; icon: string }[];
+  value: any;
 }>();
+
+const emit = defineEmits(["update:value"]);
+function onChange(value: any) {
+  emit("update:value", value);
+}
 </script>

packages/ui/certd-client/src/components/plugins/cert/dns-provider-selector/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <icon-select class="dns-provider-selector" :value="modelValue" :options="options" @update:value="onChanged"> </icon-select>
+  <icon-select class="dns-provider-selector" :value="modelValue" :options="options" @update:value="atChange"> </icon-select>
 </template>
 
 <script lang="ts">
@@ -37,7 +37,7 @@ export default {
     }
     onCreate();
 
-    function onChanged(value: any) {
+    function atChange(value: any) {
       ctx.emit("update:modelValue", value);
       onSelectedChange(value);
     }
@@ -52,7 +52,7 @@ export default {
     }
     return {
       options,
-      onChanged,
+      atChange,
     };
   },
 };

packages/ui/certd-client/src/views/certd/access/access-selector/index.vue

@@ -72,7 +72,7 @@ export default defineComponent({
     }
 
     async function emitValue(value) {
-      if (pipeline?.value && target?.value && pipeline.value.userId !== target.value.userId) {
+      if (pipeline && pipeline?.value && target?.value && pipeline.value.userId !== target.value.userId) {
         message.error("对不起，您不能修改他人流水线的授权");
         return;
       }

packages/ui/certd-client/src/views/certd/cert/domain/api.ts

@@ -57,3 +57,11 @@ export async function DeleteBatch(ids: any[]) {
     data: { ids },
   });
 }
+
+export async function SyncSubmit(body: any) {
+  return await request({
+    url: apiPrefix + "/sync/submit",
+    method: "post",
+    data: body,
+  });
+}

packages/ui/certd-client/src/views/certd/cert/domain/crud.tsx

@@ -8,6 +8,7 @@ import { useSettingStore } from "/@/store/settings";
 import { Dicts } from "/@/components/plugins/lib/dicts";
 import { createAccessApi } from "/@/views/certd/access/api";
 import { Modal } from "ant-design-vue";
+import { useDomainImport } from "./use";
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
@@ -49,6 +50,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const dnsProviderTypeDict = dict({
     url: "pi/dnsProvider/dnsProviderTypeDict",
   });
+
+  const openDomainImportDialog = useDomainImport();
   return {
     crudOptions: {
       settings: {
@@ -88,6 +91,18 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           }
         },
       },
+      actionbar: {
+        buttons: {
+          import: {
+            title: "从域名提供商导入域名",
+            type: "primary",
+            text: "从域名提供商导入",
+            click: () => {
+              openDomainImportDialog();
+            },
+          },
+        },
+      },
       columns: {
         id: {
           title: "ID",

packages/ui/certd-client/src/views/certd/cert/domain/use.tsx

@@ -1,5 +1,7 @@
+import { message } from "ant-design-vue";
 import * as api from "./api";
 import { useFormDialog } from "/@/use/use-dialog";
+import { compute } from "@fast-crud/fast-crud";
 
 export function useDomainImport() {
   const { openFormDialog } = useFormDialog();
@@ -7,11 +9,42 @@ export function useDomainImport() {
   const columns = {
     dnsProviderType: {
       title: "域名提供商",
-      type: "select",
+      type: "text",
+      form: {
+        component: {
+          name: "dns-provider-selector",
+        },
+        on: {
+          //@ts-ignore
+          onSelectedChange: ({ form, $event }) => {
+            form.dnsProviderAccessType = $event.accessType;
+          },
+        },
+        //@ts-ignore
+        valueChange({ form }) {
+          form.dnsProviderAccessId = null;
+        },
+      },
+    },
+    dnsProviderAccessType: {
+      title: "域名提供商访问类型",
+      type: "text",
+      form: {
+        show: false,
+      },
     },
     dnsProviderAccessId: {
-      title: "域名提供商访问ID",
+      title: "域名提供商授权",
-      type: "input",
+      type: "text",
+      form: {
+        component: {
+          name: "access-selector",
+          vModel: "modelValue",
+          type: compute(({ form }) => {
+            return form.dnsProviderAccessType || form.dnsProviderType;
+          }),
+        },
+      },
     },
   };
 
@@ -20,9 +53,11 @@ export function useDomainImport() {
       title: "从域名提供商导入域名",
       columns: columns,
       onSubmit: async (form: any) => {
-        await api.Save({
+        await api.SyncSubmit({
-          title: form.title,
+          dnsProviderType: form.dnsProviderType,
+          dnsProviderAccessId: form.dnsProviderAccessId,
         });
+        message.success("导入任务已提交");
       },
     });
   };

packages/ui/certd-server/db/migration/v10037__domain_sync.sql

@@ -0,0 +1,3 @@
+ALTER TABLE cd_domain ADD COLUMN from_type varchar(20);
+ALTER TABLE cd_domain ADD COLUMN registration_date integer;
+ALTER TABLE cd_domain ADD COLUMN expiration_date integer;

packages/ui/certd-server/src/modules/cert/entity/domain.ts

@@ -25,6 +25,15 @@ export class DomainEntity {
   @Column({ comment: '是否禁用', name: 'disabled' })
   disabled: boolean;
 
+  @Column({ comment: '注册时间', name: 'registration_date' })
+  registrationDate: number;
+
+  @Column({ comment: '过期时间', name: 'expiration_date' })
+  expirationDate: number;
+
+  @Column({ comment: '来源', name: 'from', length: 50 })
+  fromType: string;
+
 
   @Column({ comment: 'http上传类型', name: 'http_uploader_type', length: 50 })
   httpUploaderType: string;

packages/ui/certd-server/src/modules/cert/service/domain-service.ts

@@ -226,13 +226,19 @@ export class DomainService extends BaseService<DomainEntity> {
         }
       })
       if (old) {
+        const updateObj :any={
+           id: old.id,
+          registrationDate: domainRecord.registrationDate,
+          expirationDate: domainRecord.expirationDate,
+        }
+        if (old.fromType !== 'manual'){
+          //如果不是手动的，更新校验配置
+          updateObj.dnsProviderType = dnsProviderType
+          updateObj.dnsProviderAccess = dnsProviderAccessId
+          updateObj.challengeType = challengeType
+        }
         //更新
-        await this.update({
+        await this.update(updateObj)
-          id: old.id,
-          dnsProviderType,
-          dnsProviderAccess: dnsProviderAccessId,
-          challengeType,
-        })
       } else {
         //添加
         await this.add({
@@ -241,6 +247,10 @@ export class DomainService extends BaseService<DomainEntity> {
           dnsProviderType,
           dnsProviderAccess: dnsProviderAccessId,
           challengeType,
+          disabled: false,
+          fromType: 'auto',
+          registrationDate: domainRecord.registrationDate,
+          expirationDate: domainRecord.expirationDate,
         })
       }
     }
@@ -254,10 +264,6 @@ export class DomainService extends BaseService<DomainEntity> {
         }
         //处理
         for (const domainRecord of pageRes.list) {
-          if (domainRecord.thirdDns) {
-            //域名由第三方dns解析，不导入
-            continue
-          }
           await importDomain(domainRecord)
         }
 

packages/ui/certd-server/src/modules/cname/service/common-provider.ts

@@ -1,6 +1,7 @@
-import {CreateRecordOptions, DnsProviderContext, IDnsProvider, RemoveRecordOptions} from '@certd/plugin-cert';
+import {CreateRecordOptions, DnsProviderContext, DomainRecord, IDnsProvider, RemoveRecordOptions} from '@certd/plugin-cert';
 import {PlusService} from '@certd/lib-server';
 import punycode from 'punycode.js'
+import { Pager, PageRes } from '@certd/pipeline';
 export type CommonCnameProvider = {
   id: number;
   domain: string;
@@ -23,6 +24,9 @@ export class CommonDnsProvider implements IDnsProvider {
     this.config = opts.config;
     this.plusService = opts.plusService;
   }
+  getDomainListPage(pager: Pager): Promise<PageRes<DomainRecord>> {
+    throw new Error('公共CNAME服务不支持获取域名列表');
+  }
 
   /**
    * 中文转英文

packages/ui/certd-server/src/plugins/plugin-aliyun/dns-provider/aliyun-dns-provider.ts

@@ -1,6 +1,7 @@
-import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
+import { AbstractDnsProvider, CreateRecordOptions, DomainRecord, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
 import { AliyunAccess } from '../../plugin-lib/aliyun/access/aliyun-access.js';
 import { AliyunClient } from '../../plugin-lib/aliyun/index.js';
+import { Pager, PageRes } from '@certd/pipeline';
 
 
 @IsDnsProvider({
@@ -153,6 +154,33 @@ export class AliyunDnsProvider extends AbstractDnsProvider {
       throw e
     }
   }
+
+  async getDomainListPage(pager: Pager) :Promise<PageRes<DomainRecord>> {
+    const params = {
+      RegionId: 'cn-hangzhou',
+      PageSize: pager.pageSize,
+      PageNumber: pager.pageNo,
+    };
+
+    const requestOption = {
+      method: 'POST',
+    };
+
+    const ret = await this.client.request(
+      'DescribeDomains',
+      params,
+      requestOption
+    );
+    const list = ret.Domains?.Domain?.map(item => ({
+      id: item.DomainId,
+      domain: item.DomainName,
+    })) || []
+
+    return {
+      list,
+      total: ret.TotalCount,
+    }
+  }
 }
 
 new AliyunDnsProvider();