Merge branch 'v2-dev' into v2

.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1))
+* 修复角色无法删除的bug ([66629a5](https://github.com/certd/certd/commit/66629a591aecc2d8364ea415c7afc3f9d0406562))
+* 修复Cname情况下，无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224))
+
+### Performance Improvements
+
+* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36))
+* 系统设置中的代理设置优化为可全局生效，环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf))
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044))
+* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 ### Bug Fixes

README.md

@@ -115,7 +115,7 @@ docker compose up -d
   * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
   * 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
 * 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
-* 设置每天自动运行，当证书过期前20天，会自动重新申请证书并部署
+* 设置每天自动运行，当证书过期前35天，会自动重新申请证书并部署
 
 
 ## 七、不同平台的设置说明

build.trigger

@@ -1 +1 @@
-21:55
+22:02

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1))
+* 修复角色无法删除的bug ([66629a5](https://github.com/certd/certd/commit/66629a591aecc2d8364ea415c7afc3f9d0406562))
+* 修复Cname情况下，无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224))
+
+### Performance Improvements
+
+* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36))
+* 系统设置中的代理设置优化为可全局生效，环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf))
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044))
+* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 ### Bug Fixes

docs/guide/index.md

@@ -26,7 +26,7 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工
     * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。
     * 我们所说的续期，其实就是按照全套流程重新申请一份新证书，然后重新部署上去。
 * 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
-* 设置每天自动运行，当证书过期前20天，会自动重新申请证书并部署
+* 设置每天自动运行，当证书过期前35天，会自动重新申请证书并部署
 
 ## 三、证书颁发机构对比
 * Let's Encrypt：申请最简单。

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.27.4"
+  "version": "1.27.5"
 }

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/publishlab/node-acme-client/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.27.4](https://github.com/publishlab/node-acme-client/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.27.4",
+    "version": "1.27.5",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.27.4",
+        "@certd/basic": "^1.27.5",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -65,5 +65,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+    "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/core/basic/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Performance Improvements
+
+* 系统设置中的代理设置优化为可全局生效，环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf))
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044))
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-21:51
+21:57

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.27.4",
+  "version": "1.27.5",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+  "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/core/basic/src/utils/util.request.ts

@@ -178,7 +178,10 @@ export function createAxiosService({ logger }: { logger: Logger }) {
       );
       logger.error('返回数据:', JSON.stringify(error.response?.data));
       if (error.response?.data) {
-        error.message = error.response.data.message || error.response.data.msg || error.response.data.error || error.response.data;
+        const message = error.response.data.message || error.response.data.msg || error.response.data.error;
+        if (typeof message === 'string') {
+          error.message = message;
+        }
       }
       if (error instanceof AggregateError) {
         logger.error('AggregateError', error);

packages/core/pipeline/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Performance Improvements
+
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.27.4",
+  "version": "1.27.5",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,8 +16,8 @@
     "test": "mocha   --loader=ts-node/esm"
   },
   "dependencies": {
-    "@certd/basic": "^1.27.4",
+    "@certd/basic": "^1.27.5",
-    "@certd/plus-core": "^1.27.4",
+    "@certd/plus-core": "^1.27.5",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+  "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/core/pipeline/src/access/registry.ts

@@ -1,4 +1,4 @@
-import { Registry } from "../registry/index.js";
+import { createRegistry } from "../registry/index.js";
 
 // @ts-ignore
-export const accessRegistry = new Registry("access");
+export const accessRegistry = createRegistry("access");

packages/core/pipeline/src/plugin/registry.ts

@@ -1,4 +1,4 @@
-import { OnRegisterContext, Registry } from "../registry/index.js";
+import { createRegistry, OnRegisterContext } from "../registry/index.js";
 import { AbstractTaskPlugin } from "./api.js";
 import { pluginGroups } from "./group.js";
 
@@ -13,4 +13,4 @@ const onRegister = ({ key, value }: OnRegisterContext<AbstractTaskPlugin>) => {
     }
   }
 };
-export const pluginRegistry = new Registry<AbstractTaskPlugin>("plugin", onRegister);
+export const pluginRegistry = createRegistry<AbstractTaskPlugin>("plugin", onRegister);

packages/core/pipeline/src/registry/registry.ts

@@ -88,3 +88,21 @@ export class Registry<T> {
     return item.define;
   }
 }
+
+export function createRegistry<T>(type: string, onRegister?: OnRegister<T>) {
+  const pipelineregistrycacheKey = "PIPELINE_REGISTRY_CACHE";
+  // @ts-ignore
+  let cached: any = global[pipelineregistrycacheKey];
+  if (!cached) {
+    cached = {};
+    // @ts-ignore
+    global[pipelineregistrycacheKey] = cached;
+  }
+
+  if (cached[type]) {
+    return cached[type];
+  }
+  const newRegistry = new Registry<T>(type, onRegister);
+  cached[type] = newRegistry;
+  return newRegistry;
+}

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 **Note:** Version bump only for package @certd/lib-huawei

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.27.4",
+  "version": "1.27.5",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
@@ -21,5 +21,5 @@
     "prettier": "^2.8.8",
     "tslib": "^2.8.1"
   },
-  "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+  "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 **Note:** Version bump only for package @certd/lib-iframe

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.27.4",
+  "version": "1.27.5",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,5 +30,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+  "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 **Note:** Version bump only for package @certd/lib-k8s

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.27.4",
+  "version": "1.27.5",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,7 +16,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/basic": "^1.27.4",
+    "@certd/basic": "^1.27.5",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+  "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Performance Improvements
+
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 ### Performance Improvements

packages/libs/lib-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.27.4",
+  "version": "1.27.5",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -27,10 +27,10 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.27.4",
+    "@certd/acme-client": "^1.27.5",
-    "@certd/basic": "^1.27.4",
+    "@certd/basic": "^1.27.5",
-    "@certd/pipeline": "^1.27.4",
+    "@certd/pipeline": "^1.27.5",
-    "@certd/plus-core": "^1.27.4",
+    "@certd/plus-core": "^1.27.5",
     "@midwayjs/cache": "~3.14.0",
     "@midwayjs/core": "~3.17.1",
     "@midwayjs/i18n": "~3.17.3",
@@ -61,5 +61,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+  "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/libs/lib-server/src/system/basic/service/plus-service.ts

@@ -108,6 +108,23 @@ export class PlusService {
     return res.accessToken;
   }
 
+  async getVipTrial() {
+    const plusRequestService = await this.getPlusRequestService();
+    await this.register();
+    const res = await plusRequestService.request({
+      url: '/activation/subject/vip/trialGet',
+      method: 'POST',
+    });
+    if (res.license) {
+      await this.updateLicense(res.license);
+      return {
+        duration: res.duration,
+      };
+    } else {
+      throw new Error('您已经领取过VIP试用了');
+    }
+  }
+
   async requestWithToken(config: HttpRequestConfig) {
     const plusRequestService = await this.getPlusRequestService();
     const token = await this.getAccessToken();

packages/libs/midway-flyway-js/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

packages/libs/midway-flyway-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.27.4",
+  "version": "1.27.5",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+  "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/plugins/plugin-cert/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1))
+
+### Performance Improvements
+
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 ### Bug Fixes

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.27.4",
+  "version": "1.27.5",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,9 +15,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.27.4",
+    "@certd/acme-client": "^1.27.5",
-    "@certd/basic": "^1.27.4",
+    "@certd/basic": "^1.27.5",
-    "@certd/pipeline": "^1.27.4",
+    "@certd/pipeline": "^1.27.5",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
@@ -40,5 +40,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "339554bdbf61c4784614747734a420e744e13bfb"
+  "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c"
 }

packages/plugins/plugin-cert/src/dns-provider/registry.ts

@@ -1,3 +1,3 @@
-import { Registry } from "@certd/pipeline";
+import { createRegistry } from "@certd/pipeline";
 
-export const dnsProviderRegistry = new Registry("dnsProvider");
+export const dnsProviderRegistry = createRegistry("dnsProvider");

packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts

@@ -73,7 +73,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   })
   renewDays!: number;
 
-
   @TaskInput({
     title: "成功后邮件通知",
     value: true,
@@ -141,7 +140,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     }
     this._result.pipelinePrivateVars.cert = cert;
 
-    if (cert.pfx == null || cert.der == null || cert.jks == null) {
+    if (isNew) {
       try {
         const converter = new CertConverter({ logger: this.logger });
         const res = await converter.convert({
@@ -152,21 +151,18 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
           const pfxBuffer = fs.readFileSync(res.pfxPath);
           cert.pfx = pfxBuffer.toString("base64");
           fs.unlinkSync(res.pfxPath);
-          isNew = true;
         }
 
         if (cert.der == null && res.derPath) {
           const derBuffer = fs.readFileSync(res.derPath);
           cert.der = derBuffer.toString("base64");
           fs.unlinkSync(res.derPath);
-          isNew = true;
         }
 
         if (cert.jks == null && res.jksPath) {
           const jksBuffer = fs.readFileSync(res.jksPath);
           cert.jks = jksBuffer.toString("base64");
           fs.unlinkSync(res.jksPath);
-          isNew = true;
         }
 
         this.logger.info("转换证书格式成功");
@@ -292,7 +288,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
   }
 
   /**
-   * 检查是否过期，默认提前20天
+   * 检查是否过期，默认提前35天
    * @param expires
    * @param maxDays
    * @returns {boolean}

packages/ui/certd-client/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1))
+* 修复Cname情况下，无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224))
+
+### Performance Improvements
+
+* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36))
+* 系统设置中的代理设置优化为可全局生效，环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf))
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 ### Performance Improvements

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.27.4",
+  "version": "1.27.5",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -65,8 +65,8 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.27.4",
+    "@certd/lib-iframe": "^1.27.5",
-    "@certd/pipeline": "^1.27.4",
+    "@certd/pipeline": "^1.27.5",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/components/cron-editor/index.vue

@@ -40,6 +40,7 @@ if (props.modelValue == null) {
 }
 const emit = defineEmits<{
   "update:modelValue": any;
+  change: any;
 }>();
 
 const errorMessage = ref<string | null>(null);

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

@@ -33,7 +33,7 @@
                       <span class="label">DNS类型：</span>
                       <span class="input">
                         <fs-dict-select
-                          v-model="item.dnsProviderType"
+                          v-model:value="item.dnsProviderType"
                           size="small"
                           :dict="dnsProviderTypeDict"
                           placeholder="DNS提供商"
@@ -79,6 +79,7 @@ import CnameVerifyPlan from "./cname-verify-plan.vue";
 import psl from "psl";
 import { Form } from "ant-design-vue";
 import { DomainsVerifyPlanInput } from "./type";
+import { CnameRecord } from "./api";
 defineOptions({
   name: "DomainsVerifyPlanEditor"
 });

packages/ui/certd-client/src/components/tutorial/tutorial-steps.vue

@@ -158,7 +158,7 @@ const steps = ref<Step[]>([
         title: "设置定时执行",
         descriptions: [
           "流水线测试成功，接下来配置定时触发，以后每天定时执行就不用管了",
-          "推荐配置每天运行一次，在到期前20天才会重新申请新证书并部署，没到期前会自动跳过，不会重复申请。"
+          "推荐配置每天运行一次，在到期前35天才会重新申请新证书并部署，没到期前会自动跳过，不会重复申请。"
         ]
       },
       {

packages/ui/certd-client/src/components/vip-button/api.ts

@@ -7,3 +7,11 @@ export async function doActive(form: any) {
     data: form
   });
 }
+
+export async function getVipTrial() {
+  return await request({
+    url: "/sys/plus/getVipTrial",
+    method: "post",
+    data: {}
+  });
+}

packages/ui/certd-client/src/components/vip-button/index.vue

@@ -12,13 +12,14 @@
   </div>
 </template>
 <script lang="tsx" setup>
-import { computed, reactive, ref } from "vue";
+import { computed, reactive } from "vue";
 import dayjs from "dayjs";
 import { message, Modal } from "ant-design-vue";
 import * as api from "./api";
 import { useSettingStore } from "/@/store/modules/settings";
 import { useRouter } from "vue-router";
 import { useUserStore } from "/@/store/modules/user";
+
 const settingStore = useSettingStore();
 const props = withDefaults(
   defineProps<{
@@ -129,21 +130,27 @@ function goAccount() {
   router.push("/sys/account");
 }
 
+async function getVipTrial() {
+  const res = await api.getVipTrial();
+  message.success(`恭喜，您已获得专业版${res.duration}天试用`);
+  await settingStore.init();
+}
+
 function openTrialModal() {
   Modal.destroyAll();
 
   modal.confirm({
     title: "7天专业版试用获取",
-    okText: "立即去绑定账号",
+    okText: "立即获取",
     onOk() {
-      goAccount();
+      getVipTrial();
     },
     width: 600,
     content: () => {
       return (
         <div class="flex-col mt-10 mb-10">
           <div>感谢您对开源项目的支持</div>
-          <div>绑定袖手账号后，即可获取7天专业版试用</div>
+          <div>点击确认，即可获取7天专业版试用</div>
         </div>
       );
     }

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

@@ -108,6 +108,7 @@ export default defineComponent({
         chooseForm.show = false;
         console.log("choose ok:", selectedId.value);
         refreshTarget(selectedId.value);
+        ctx.emit("change", selectedId.value);
         ctx.emit("update:modelValue", selectedId.value);
       }
     });

packages/ui/certd-client/src/views/certd/pipeline/detail.vue

@@ -140,7 +140,7 @@ async function onLoaded(pipeline: PipelineDetail) {
   }
   const res = await api.GetCount();
   LocalStorage.set("pipeline-count", res.count);
-  if (res.count <= 1) {
+  if (res.count <= 1 && editMode.value === true) {
     await nextTick();
     tourHandleOpen(true);
   }

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue

@@ -56,7 +56,7 @@
                       <a key="edit" @click="stepEdit(currentTask, element, index)">编辑</a>
                       <a key="edit" @click="stepCopy(currentTask, element, index)">复制</a>
                       <a key="remove" @click="stepDelete(currentTask, index)">删除</a>
-                      <a key="disabled" @click="element.disabled = !!!element.disabled">{{ element.disabled ? "启用" : "禁用" }}</a>
+                      <a key="disabled" @click="toggleDisabled(currentTask, element)">{{ element.disabled ? "启用" : "禁用" }}</a>
                       <fs-icon v-plus class="icon-button handle cursor-move" title="拖动排序" icon="ion:move-outline"></fs-icon>
                     </div>
                   </div>
@@ -88,6 +88,7 @@ import { CopyOutlined } from "@ant-design/icons-vue";
 import VDraggable from "vuedraggable";
 import { useUserStore } from "/@/store/modules/user";
 import { useSettingStore } from "/@/store/modules/settings";
+import { filter } from "lodash-es";
 export default {
   name: "PiTaskForm",
   components: { CopyOutlined, PiStepForm, VDraggable },
@@ -152,7 +153,11 @@ export default {
         });
       };
 
-      return { stepAdd, stepEdit, stepCopy, stepDelete, stepFormRef };
+      const toggleDisabled = (task: any, step: any) => {
+        step.disabled = !!!step.disabled;
+      };
+
+      return { stepAdd, stepEdit, stepCopy, stepDelete, toggleDisabled, stepFormRef };
     }
 
     /**
@@ -162,7 +167,7 @@ export default {
     function useTaskForm() {
       const mode = ref("add");
       const callback = ref();
-      const currentTask = ref({ title: undefined, steps: [] });
+      const currentTask = ref({ title: undefined, steps: [], disabled: false });
       provide("currentTask", currentTask);
       const taskFormRef: Ref<any> = ref(null);
       const taskDrawerVisible = ref(false);
@@ -219,6 +224,15 @@ export default {
           console.error("表单验证失败:", e);
           return;
         }
+        const task: any = currentTask.value;
+        const allDisabled = filter(task.steps, (item: any) => {
+          return item.disabled;
+        });
+        if (task.steps.length > 0 && task.steps.length === allDisabled.length) {
+          task.disabled = true;
+        } else {
+          task.disabled = false;
+        }
 
         callback.value("save", currentTask.value);
         taskDrawerClose();

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue

@@ -61,7 +61,6 @@ export default {
         if (currentHistory?.value?.logs != null) {
           node.logs = computed(() => {
             if (currentHistory?.value?.logs && currentHistory.value?.logs[node.node.id] != null) {
-              console.log("log changed", node.node.id);
               const logs = currentHistory.value?.logs[node.node.id];
               const list = [];
               for (let log of logs) {
@@ -86,7 +85,6 @@ export default {
             },
             async () => {
               let el = document.querySelector(`.pi-task-view-logs.${node.node.id}`);
-              console.log("el", el);
               //判断当前是否在底部
               const isBottom = el ? el.scrollHeight - el.scrollTop === el.clientHeight : true;
               await nextTick();

packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue

@@ -109,7 +109,7 @@
                                 </div>
                               </template>
                               <span class="flex-o w-100">
-                                <span class="ellipsis flex-1 task-title" :class="{ 'in-edit': editMode }">{{ task.title }}</span>
+                                <span class="ellipsis flex-1 task-title" :class="{ 'in-edit': editMode, deleted: task.disabled }">{{ task.title }}</span>
                                 <pi-status-show :status="task.status?.result"></pi-status-show>
                               </span>
                             </a-popover>
@@ -304,7 +304,6 @@ export default defineComponent({
     }
 
     const loadCurrentHistoryDetail = async () => {
-      console.log("load history logs");
       const detail: RunHistory = await props.options?.getHistoryDetail({ historyId: currentHistory.value.id });
       currentHistory.value.logs = detail.logs;
       _.merge(currentHistory.value.pipeline, detail.pipeline);
@@ -329,7 +328,6 @@ export default defineComponent({
       if (reload) {
         histories.value = [];
       }
-      console.log("load history list");
       const historyList = await props.options.getHistoryList({ pipelineId: pipeline.value.id });
       if (!historyList) {
         return;
@@ -885,6 +883,9 @@ export default defineComponent({
                 &.in-edit {
                   margin-right: 28px;
                 }
+                &.disabled{
+
+                }
               }
 
               .action {

packages/ui/certd-server/.npmrc

@@ -1,2 +1,2 @@
-link-workspace-packages=true
+link-workspace-packages=deep
 prefer-workspace-packages=true

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18)
+
+### Bug Fixes
+
+* 修复角色无法删除的bug ([66629a5](https://github.com/certd/certd/commit/66629a591aecc2d8364ea415c7afc3f9d0406562))
+
+### Performance Improvements
+
+* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d))
+* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044))
+* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572))
+* 专业版试用，无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232))
+
 ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14)
 
 ### Performance Improvements

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.27.4",
+  "version": "1.27.5",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -29,17 +29,17 @@
   },
   "dependencies": {
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/acme-client": "^1.27.4",
+    "@certd/acme-client": "^1.27.5",
-    "@certd/basic": "^1.27.4",
+    "@certd/basic": "^1.27.5",
-    "@certd/commercial-core": "^1.27.4",
+    "@certd/commercial-core": "^1.27.5",
-    "@certd/lib-huawei": "^1.27.4",
+    "@certd/lib-huawei": "^1.27.5",
-    "@certd/lib-k8s": "^1.27.4",
+    "@certd/lib-k8s": "^1.27.5",
-    "@certd/lib-server": "^1.27.4",
+    "@certd/lib-server": "^1.27.5",
-    "@certd/midway-flyway-js": "^1.27.4",
+    "@certd/midway-flyway-js": "^1.27.5",
-    "@certd/pipeline": "^1.27.4",
+    "@certd/pipeline": "^1.27.5",
-    "@certd/plugin-cert": "^1.27.4",
+    "@certd/plugin-cert": "^1.27.5",
-    "@certd/plugin-plus": "^1.27.4",
+    "@certd/plugin-plus": "^1.27.5",
-    "@certd/plus-core": "^1.27.4",
+    "@certd/plus-core": "^1.27.5",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
     "@koa/cors": "^5.0.0",
@@ -84,6 +84,7 @@
     "pg": "^8.12.0",
     "psl": "^1.9.0",
     "qiniu": "^7.12.0",
+    "qs": "^6.13.1",
     "querystring": "^0.2.1",
     "reflect-metadata": "^0.2.2",
     "rimraf": "^5.0.5",

packages/ui/certd-server/src/controller/sys/plus/plus-controller.ts

@@ -35,6 +35,12 @@ export class SysPlusController extends BaseController {
 
     return this.ok(true);
   }
+
+  @Post('/getVipTrial', { summary: 'sys:settings:edit' })
+  async getVipTrial(@Body(ALL) body) {
+    const res = await this.plusService.getVipTrial();
+    return this.ok(res);
+  }
   //
   // @Get('/test', { summary: Constants.per.guest })
   // async test() {

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

@@ -49,19 +49,31 @@ export class CloudflareDnsProvider extends AbstractDnsProvider<CloudflareRecord>
   }
 
   private async doRequestApi(url: string, data: any = null, method = 'post') {
-    const res = await this.http.request<any, any>({
+    try {
-      url,
+      const res = await this.http.request<any, any>({
-      method,
+        url,
-      headers: {
+        method,
-        'Content-Type': 'application/json',
+        headers: {
-        Authorization: `Bearer ${this.access.apiToken}`,
+          'Content-Type': 'application/json',
-      },
+          Authorization: `Bearer ${this.access.apiToken}`,
-      data,
+        },
-    });
+        data,
-    if (!res.success) {
+      });
-      throw new Error(`${JSON.stringify(res.errors)}`);
+
+      if (!res.success) {
+        throw new Error(`${JSON.stringify(res.errors)}`);
+      }
+      return res;
+    } catch (e: any) {
+      const data = e.response?.data;
+      if (data && data.success === false && data.errors && data.errors.length > 0) {
+        if (data.errors[0].code === 81058) {
+          this.logger.info('dns解析记录重复');
+          return null;
+        }
+      }
+      throw e;
     }
-    return res;
   }
 
   /**
@@ -88,14 +100,30 @@ export class CloudflareDnsProvider extends AbstractDnsProvider<CloudflareRecord>
       type: type,
       ttl: 60,
     });
-    const record = res.result as CloudflareRecord;
+    let record: any = null;
-    this.logger.info(`添加域名解析成功:fullRecord=${fullRecord},value=${value}`);
+    if (res == null) {
-    this.logger.info(`dns解析记录:${JSON.stringify(record)}`);
+      //重复的记录
-
+      this.logger.info(`dns解析记录重复，无需重复添加`);
+      record = await this.findRecord(zoneId, options);
+    } else {
+      record = res.result as CloudflareRecord;
+      this.logger.info(`添加域名解析成功:fullRecord=${fullRecord},value=${value}`);
+      this.logger.info(`dns解析记录:${JSON.stringify(record)}`);
+    }
     //本接口需要返回本次创建的dns解析记录，这个记录会在删除的时候用到
     return record;
   }
 
+  async findRecord(zoneId: string, options: CreateRecordOptions): Promise<CloudflareRecord | null> {
+    const { fullRecord, value } = options;
+    const url = `https://api.cloudflare.com/client/v4/zones/${zoneId}/dns_records?type=TXT&name=${fullRecord}&content=${value}`;
+    const res = await this.doRequestApi(url, null, 'get');
+    if (res.result.length === 0) {
+      return null;
+    }
+    return res.result[0] as CloudflareRecord;
+  }
+
   /**
    *  删除dns解析记录,清理申请痕迹
    * @param options
@@ -105,7 +133,7 @@ export class CloudflareDnsProvider extends AbstractDnsProvider<CloudflareRecord>
     const record = options.recordRes;
     this.logger.info('删除域名解析：', fullRecord, value);
     if (!record) {
-      this.logger.info('record不存在');
+      this.logger.info('record为空，不执行删除');
       return;
     }
     //这里调用删除txt dns解析记录接口

packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts

@@ -1,6 +1,7 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
 import { CertInfo, CertReader } from '@certd/plugin-cert';
-import { isDev } from '@certd/basic';
+import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-plus';
+import { optionsUtils } from '@certd/basic/dist/utils/util.options.js';
 
 @IsTaskPlugin({
   name: 'demoTest',
@@ -13,8 +14,6 @@ import { isDev } from '@certd/basic';
       runStrategy: RunStrategy.SkipWhenSucceed,
     },
   },
-  // 你开发的插件要删除此项，否则不会在生产环墋中显示
-  deprecated: isDev() ? '测试插件,生产环境不显示' : undefined,
 })
 export class DemoTestPlugin extends AbstractTaskPlugin {
   //测试参数
@@ -65,6 +64,10 @@ export class DemoTestPlugin extends AbstractTaskPlugin {
   })
   cert!: CertInfo;
 
+  @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
+  //前端可以展示，当前申请的证书域名列表
+  certDomains!: string[];
+
   //授权选择框
   @TaskInput({
     title: 'demo授权',
@@ -78,7 +81,23 @@ export class DemoTestPlugin extends AbstractTaskPlugin {
   })
   accessId!: string;
 
+  @TaskInput(
+    createRemoteSelectInputDefine({
+      title: '从后端获取选项',
+      helper: '选择时可以从后端获取选项',
+      typeName: 'demoTest',
+      action: DemoTestPlugin.prototype.onGetSiteList.name,
+      //当以下参数变化时，触发获取选项
+      watches: ['certDomains', 'accessId'],
+      required: true,
+    })
+  )
+  siteName!: string | string[];
+
+  //插件实例化时执行的方法
   async onInstance() {}
+
+  //插件执行方法
   async execute(): Promise<void> {
     const { select, text, cert, accessId } = this;
 
@@ -102,6 +121,40 @@ export class DemoTestPlugin extends AbstractTaskPlugin {
     this.logger.info('switch:', this.switch);
     this.logger.info('授权id:', accessId);
   }
+
+  //此方法演示，如何让前端在添加插件时可以从后端获取选项，这里是后端返回选项的方法
+  async onGetSiteList() {
+    if (!this.accessId) {
+      throw new Error('请选择Access授权');
+    }
+
+    // @ts-ignore
+    const access = await this.accessService.getById(this.accessId);
+
+    // const siteRes = await this.ctx.http.request({
+    //   url: '你的服务端获取选项的请求地址',
+    //   method: 'GET',
+    //   data: {
+    //    token:access.xxxx
+    //   }, //请求参数
+    // });
+    //以下是模拟数据
+    const siteRes = [
+      { id: 1, siteName: 'site1.com' },
+      { id: 2, siteName: 'site2.com' },
+      { id: 3, siteName: 'site2.com' },
+    ];
+    //转换为前端所需要的格式
+    const options = siteRes.map((item: any) => {
+      return {
+        value: item.siteName,
+        label: item.siteName,
+        domain: item.siteName,
+      };
+    });
+    //将站点域名名称根据证书域名进行匹配分组，分成匹配的和不匹配的两组选项，返回给前端，供用户选择
+    return optionsUtils.buildGroupOptions(options, this.certDomains);
+  }
 }
 //实例化一下，注册插件
 new DemoTestPlugin();

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

@@ -105,6 +105,10 @@ export class HuaweiDnsProvider extends AbstractDnsProvider {
   async removeRecord(options: RemoveRecordOptions<any>): Promise<any> {
     const { fullRecord, value } = options.recordReq;
     const record = options.recordRes;
+    if (!record) {
+      this.logger.info('解析记录recordId为空，不执行删除', fullRecord, value);
+      return;
+    }
     const req: ApiRequestOptions = {
       url: `${this.dnsEndpoint}/v2/zones/${record.zone_id}/recordsets/${record.id}`,
       method: 'DELETE',

packages/ui/certd-server/src/plugins/plugin-namesilo/access.ts

@@ -0,0 +1,28 @@
+import { IsAccess, AccessInput, BaseAccess } from '@certd/pipeline';
+
+/**
+ * 这个注解将注册一个授权配置
+ * 在certd的后台管理系统中，用户可以选择添加此类型的授权
+ */
+@IsAccess({
+  name: 'namesilo',
+  title: 'namesilo授权',
+  desc: '',
+})
+export class NamesiloAccess extends BaseAccess {
+  /**
+   * 授权属性配置
+   */
+  @AccessInput({
+    title: 'API Key',
+    component: {
+      placeholder: 'api key',
+    },
+    helper: '前往 [获取API Key](https://www.namesilo.com/account/api-manager)',
+    required: true,
+    encrypt: true,
+  })
+  apiKey = '';
+}
+
+new NamesiloAccess();

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

@@ -0,0 +1,109 @@
+import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
+import { Autowire } from '@certd/pipeline';
+import { HttpClient, ILogger } from '@certd/basic';
+import qs from 'qs';
+import { NamesiloAccess } from './access.js';
+import { merge } from 'lodash-es';
+
+export type NamesiloRecord = {
+  record_id: string;
+};
+
+// 这里通过IsDnsProvider注册一个dnsProvider
+@IsDnsProvider({
+  name: 'namesilo',
+  title: 'namesilo',
+  desc: 'namesilo dns provider',
+  // 这里是对应的 cloudflare的access类型名称
+  accessType: 'namesilo',
+})
+export class NamesiloDnsProvider extends AbstractDnsProvider<NamesiloRecord> {
+  // 通过Autowire传递context
+  @Autowire()
+  logger!: ILogger;
+  access!: NamesiloAccess;
+  http!: HttpClient;
+  async onInstance() {
+    //一些初始化的操作
+    // 也可以通过ctx成员变量传递context， 与Autowire效果一样
+    this.access = this.ctx.access as NamesiloAccess;
+    this.http = this.ctx.http;
+  }
+
+  private async doRequest(url: string, params: any = null) {
+    params = merge(
+      {
+        version: 1,
+        type: 'json',
+        key: this.access.apiKey,
+      },
+      params
+    );
+    const qsString = qs.stringify(params);
+    url = `${url}?${qsString}`;
+    const res = await this.http.request<any, any>({
+      url,
+      baseURL: 'https://www.namesilo.com',
+      method: 'get',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+
+    if (res.reply?.code !== '300') {
+      throw new Error(`${JSON.stringify(res.reply.detail)}`);
+    }
+    return res.reply;
+  }
+
+  /**
+   * 创建dns解析记录，用于验证域名所有权
+   */
+  async createRecord(options: CreateRecordOptions): Promise<NamesiloRecord> {
+    /**
+     * fullRecord: '_acme-challenge.test.example.com',
+     * value: 一串uuid
+     * type: 'TXT',
+     * domain: 'example.com'
+     */
+    const { fullRecord, hostRecord, value, type, domain } = options;
+    this.logger.info('添加域名解析：', fullRecord, value, type, domain);
+
+    //domain=namesilo.com&rrtype=A&rrhost=test&rrvalue=55.55.55.55&rrttl=7207
+    const record: any = await this.doRequest('/api/dnsAddRecord', {
+      domain,
+      rrtype: type,
+      rrhost: hostRecord,
+      rrvalue: value,
+      rrttl: 10,
+    });
+
+    //本接口需要返回本次创建的dns解析记录，这个记录会在删除的时候用到
+    return record;
+  }
+
+  /**
+   *  删除dns解析记录,清理申请痕迹
+   * @param options
+   */
+  async removeRecord(options: RemoveRecordOptions<NamesiloRecord>): Promise<void> {
+    const { fullRecord, value } = options.recordReq;
+    const record = options.recordRes;
+    this.logger.info('删除域名解析：', fullRecord, value);
+    if (!record && !record.record_id) {
+      this.logger.info('record为空，不执行删除');
+      return;
+    }
+    //这里调用删除txt dns解析记录接口
+
+    const recordId = record.record_id;
+    await this.doRequest('/api/dnsDeleteRecord', {
+      domain: options.recordReq.domain,
+      record_id: recordId,
+    });
+    this.logger.info(`删除域名解析成功:fullRecord=${fullRecord},value=${value}`);
+  }
+}
+
+//实例化这个provider，将其自动注册到系统中
+new NamesiloDnsProvider();

packages/ui/certd-server/src/plugins/plugin-namesilo/index.ts

@@ -0,0 +1,2 @@
+export * from './dns-provider.js';
+export * from './access.js';

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

@@ -65,15 +65,33 @@ export class TencentDnsProvider extends AbstractDnsProvider {
     } catch (e: any) {
       if (e?.code === 'InvalidParameter.DomainRecordExist') {
         this.logger.info('域名解析已存在,无需重复添加:', fullRecord, value);
-        return {};
+        return await this.findRecord(options);
       }
       throw e;
     }
   }
 
+  async findRecord(options: CreateRecordOptions): Promise<any> {
+    const params = {
+      Domain: options.domain,
+      RecordType: [options.type],
+      Keyword: options.hostRecord,
+      RecordValue: options.value,
+    };
+    const ret = await this.client.DescribeRecordFilterList(params);
+    if (ret.RecordList && ret.RecordList.length > 0) {
+      this.logger.info('已存在解析记录:', ret.RecordList);
+      return ret.RecordList[0];
+    }
+    return {};
+  }
+
   async removeRecord(options: RemoveRecordOptions<any>) {
     const { fullRecord, value, domain } = options.recordReq;
     const record = options.recordRes;
+    if (!record) {
+      this.logger.info('解析记录recordId为空，不执行删除', fullRecord, value);
+    }
     const params = {
       Domain: domain,
       RecordId: record.RecordId,

step.md

@@ -89,7 +89,7 @@
 ### 7. 定时触发
 配置定时触发，以后每天定时执行    
 cron格式，例如： `0 0 3 * * *` 表示每天凌晨3点执行     
-到期前20天会自动申请新证书并部署，没到期前不会重复申请    
+到期前35天会自动申请新证书并部署，没到期前不会重复申请    
 ![](packages/ui/certd-client/public/static/doc/images/14-timer.png)
 
 ### 8. 邮件通知