Merge remote-tracking branch 'origin/v2-dev' into v2-dev

2026-04-14 12:30:54 +08:00 · 2025-10-11 17:00:00 +08:00
parent 08094c2660 fda82c82b0
commit 9d4e2c98a3
167 changed files with 3871 additions and 1223 deletions
--- a/packages/core/acme-client/CHANGELOG.md
+++ b/packages/core/acme-client/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/publishlab/node-acme-client/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/acme-client
+
+# [1.37.0](https://github.com/publishlab/node-acme-client/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.36.25](https://github.com/publishlab/node-acme-client/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.36.24](https://github.com/publishlab/node-acme-client/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.36.23](https://github.com/publishlab/node-acme-client/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.36.22](https://github.com/publishlab/node-acme-client/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.36.21](https://github.com/publishlab/node-acme-client/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/acme-client
--- a/packages/core/acme-client/package.json
+++ b/packages/core/acme-client/package.json
@@ -3,7 +3,7 @@
    "description": "Simple and unopinionated ACME client",
    "private": false,
    "author": "nmorsman",
-    "version": "1.36.21",
+    "version": "1.37.1",
    "type": "module",
    "module": "scr/index.js",
    "main": "src/index.js",
@@ -18,7 +18,7 @@
        "types"
    ],
    "dependencies": {
-        "@certd/basic": "^1.36.21",
+        "@certd/basic": "^1.37.1",
        "@peculiar/x509": "^1.11.0",
        "asn1js": "^3.0.5",
        "axios": "^1.7.2",
@@ -52,7 +52,8 @@
        "lint-types": "tsd",
        "prepublishOnly": "npm run build-docs",
        "test": "mocha -t 60000 \"test/setup.js\" \"test/**/*.spec.js\"",
-        "pub": "npm publish"
+        "pub": "npm publish",
+        "compile": "tsc --skipLibCheck --watch"
    },
    "repository": {
        "type": "git",
@@ -69,5 +70,5 @@
    "bugs": {
        "url": "https://github.com/publishlab/node-acme-client/issues"
    },
-    "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+    "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/core/basic/CHANGELOG.md
+++ b/packages/core/basic/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/basic
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+### Performance Improvements
+
+* 优化连接失败的报错提示 ([71d8e7e](https://github.com/certd/certd/commit/71d8e7edd23ad63fdc01a92766b52ede5074fe7c))
+* 增加自签名证书提示 ([877c9c4](https://github.com/certd/certd/commit/877c9c4ff99f81d289f67afd96f440c0796b03ea))
+* dns支持新网域名解析 ([cf3a78e](https://github.com/certd/certd/commit/cf3a78e1145ff0505c87fbc485d9e731b1aa88a8))
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/basic
--- a/packages/core/basic/build.md
+++ b/packages/core/basic/build.md
@@ -1 +1 @@
-20:59
+20:32
--- a/packages/core/basic/package.json
+++ b/packages/core/basic/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@certd/basic",
  "private": false,
-  "version": "1.36.21",
+  "version": "1.37.1",
  "type": "module",
  "main": "./dist/index.js",
  "module": "./dist/index.js",
@@ -13,7 +13,8 @@
    "dev-build": "npm run build",
    "preview": "vite preview",
    "test": "mocha   --loader=ts-node/esm",
-    "pub": "npm publish"
+    "pub": "npm publish",
+    "compile": "tsc --skipLibCheck --watch"
  },
  "dependencies": {
    "axios": "^1.7.2",
@@ -45,5 +46,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/core/basic/src/utils/index.ts
+++ b/packages/core/basic/src/utils/index.ts
@@ -22,12 +22,14 @@ import { sp } from "./util.sp.js";
 import { hashUtils } from "./util.hash.js";
 import { promises } from "./util.promise.js";
 import { fileUtils } from "./util.file.js";
-import * as _ from "lodash-es";
 import { cache } from "./util.cache.js";
 import dayjs from "dayjs";
 import { domainUtils } from "./util.domain.js";
+export * from "./util.domain.js";
 import { optionsUtils } from "./util.options.js";
+export * from "./util.options.js";
 import { amountUtils } from "./util.amount.js";
+export * from "./util.amount.js";
 import { nanoid } from "nanoid";
 import * as id from "./util.id.js";
 import { locker } from "./util.lock.js";
@@ -43,7 +45,6 @@ export const utils = {
  hash: hashUtils,
  promises,
  file: fileUtils,
-  _,
  mergeUtils,
  cache,
  nanoid,
--- a/packages/core/basic/src/utils/util.hash.ts
+++ b/packages/core/basic/src/utils/util.hash.ts
@@ -17,10 +17,26 @@ function base64(data: string) {
 function base64Decode(data: string) {
  return Buffer.from(data, "base64").toString("utf8");
 }
+
+function toHex(data: number | string) {
+  if (typeof data === "number") {
+    return data.toString(16);
+  }
+  return Buffer.from(data).toString("hex");
+}
+function hexToStr(data: string) {
+  return Buffer.from(data, "hex").toString("utf8");
+}
+function hexToNumber(data: string) {
+  return parseInt(data, 16);
+}
 export const hashUtils = {
  md5,
  sha256,
  base64,
  base64Decode,
  hmacSha256,
+  toHex,
+  hexToStr,
+  hexToNumber,
 };
--- a/packages/core/basic/src/utils/util.request.ts
+++ b/packages/core/basic/src/utils/util.request.ts
@@ -207,10 +207,31 @@ export function createAxiosService({ logger }: { logger: ILogger }) {
        case 505:
          error.message = "HTTP版本不受支持";
          break;
+        case 302:
+          //重定向
+          return Promise.resolve(error.response);
        default:
          break;
      }
-      logger.error(`请求出错：status:${error.response?.status},statusText:${error.response?.statusText},url:${error.config?.url},method:${error.config?.method}。`);
+
+      const errorCode = error.code;
+      let errorMessage = null;
+      if (errorCode === "ECONNABORTED") {
+        errorMessage = "请求连接终止";
+      } else if (errorCode === "ETIMEDOUT") {
+        errorMessage = "请求连接超时";
+      } else if (errorCode === "ECONNRESET") {
+        errorMessage = "请求连接被重置";
+      } else if (errorCode === "ECONNREFUSED") {
+        errorMessage = "请求连接被服务端拒绝";
+      } else if (errorCode === "ENOTFOUND") {
+        errorMessage = "请求地址不存在";
+      }
+      if (errorMessage) {
+        error.message = errorMessage + "," + error.message;
+      }
+
+      logger.error(`请求出错：status:${error.response?.status || error.code},statusText:${error.response?.statusText || error.code},url:${error.config?.url},method:${error.config?.method}。`);
      logger.error("返回数据:", JSON.stringify(error.response?.data));
      if (error.response?.data) {
        const message = error.response.data.message || error.response.data.msg || error.response.data.error;
--- a/packages/core/basic/src/utils/util.sp.ts
+++ b/packages/core/basic/src/utils/util.sp.ts
@@ -1,8 +1,10 @@
 //转换为import
-import childProcess from 'child_process';
-import { safePromise } from './util.promise.js';
-import { ILogger, logger } from './util.log.js';
-import iconv from 'iconv-lite';
+//@ts-ignore
+import childProcess from "child_process";
+import { safePromise } from "./util.promise.js";
+import { ILogger, logger } from "./util.log.js";
+//@ts-ignore
+import iconv from "iconv-lite";
 export type ExecOption = {
  cmd: string | string[];
  env: any;
@@ -11,12 +13,12 @@ export type ExecOption = {
 };

 async function exec(opts: ExecOption): Promise<string> {
-  let cmd = '';
+  let cmd = "";
  const log = opts.logger || logger;
  if (opts.cmd instanceof Array) {
    for (const item of opts.cmd) {
      if (cmd) {
-        cmd += ' && ' + item;
+        cmd += " && " + item;
      } else {
        cmd = item;
      }
@@ -28,17 +30,18 @@ async function exec(opts: ExecOption): Promise<string> {
      cmd,
      {
        env: {
+          //@ts-ignore
          ...process.env,
          ...opts.env,
        },
        ...opts.options,
      },
-      (error, stdout, stderr) => {
+      (error: any, stdout: { toString: (arg0: string) => any }, stderr: any) => {
        if (error) {
          log.error(`exec error: ${error}`);
          reject(error);
        } else {
-          const res = stdout.toString('utf-8');
+          const res = stdout.toString("utf-8");
          log.info(`stdout: ${res}`);
          resolve(res);
        }
@@ -57,11 +60,12 @@ export type SpawnOption = {
 };

 function isWindows() {
-  return process.platform === 'win32';
+  // @ts-ignore
+  return process.platform === "win32";
 }
 function convert(buffer: any) {
  if (isWindows()) {
-    const decoded = iconv.decode(buffer, 'GBK');
+    const decoded = iconv.decode(buffer, "GBK");
    // 检查是否有有效字符
    return decoded && decoded.trim().length > 0 ? decoded : buffer.toString();
  } else {
@@ -74,12 +78,12 @@ function convert(buffer: any) {
 // }

 async function spawn(opts: SpawnOption): Promise<string> {
-  let cmd = '';
+  let cmd = "";
  const log = opts.logger || logger;
  if (opts.cmd instanceof Array) {
    for (const item of opts.cmd) {
      if (cmd) {
-        cmd += ' && ' + item;
+        cmd += " && " + item;
      } else {
        cmd = item;
      }
@@ -88,37 +92,47 @@ async function spawn(opts: SpawnOption): Promise<string> {
    cmd = opts.cmd;
  }
  log.info(`执行命令: ${cmd}`);
-  let stdout = '';
-  let stderr = '';
+  let stdout = "";
+  let stderr = "";
  return safePromise((resolve, reject) => {
    const ls = childProcess.spawn(cmd, {
      shell: true,
      env: {
+        //@ts-ignore
        ...process.env,
        ...opts.env,
      },
      ...opts.options,
    });
-    ls.stdout.on('data', data => {
+    ls.stdout.on("data", (data: string) => {
      data = convert(data);
      log.info(`stdout: ${data}`);
      stdout += data;
    });

-    ls.stderr.on('data', data => {
+    ls.stderr.on("data", (data: string) => {
      data = convert(data);
      log.warn(`stderr: ${data}`);
      stderr += data;
    });
-    ls.on('error', error => {
+    ls.on("error", (error: any) => {
      log.error(`child process error: ${error}`);
+      //@ts-ignore
+      error.stderr = stderr;
+      //@ts-ignore
+      error.stdout = stdout;
      reject(error);
    });

-    ls.on('close', (code: number) => {
+    ls.on("close", (code: number) => {
      if (code !== 0) {
        log.error(`child process exited with code ${code}`);
-        reject(new Error(stderr));
+        const e = new Error(stderr || "return " + code);
+        //@ts-ignore
+        e.stderr = stderr;
+        //@ts-ignore
+        e.stdout = stdout;
+        reject(e);
      } else {
        resolve(stdout);
      }
--- a/packages/core/pipeline/CHANGELOG.md
+++ b/packages/core/pipeline/CHANGELOG.md
@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/pipeline
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+### Performance Improvements
+
+* 手动上传证书优化，增加到期前报错提醒 ([3d42bfd](https://github.com/certd/certd/commit/3d42bfd479eaacc4a49c401224815a6e2a0204b0))
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/pipeline
--- a/packages/core/pipeline/package.json
+++ b/packages/core/pipeline/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@certd/pipeline",
  "private": false,
-  "version": "1.36.21",
+  "version": "1.37.1",
  "type": "module",
  "main": "./dist/index.js",
  "module": "./dist/index.js",
@@ -14,11 +14,12 @@
    "build3": "rollup -c",
    "preview": "vite preview",
    "test": "mocha   --loader=ts-node/esm",
-    "pub": "npm publish"
+    "pub": "npm publish",
+    "compile": "tsc --skipLibCheck --watch"
  },
  "dependencies": {
-    "@certd/basic": "^1.36.21",
-    "@certd/plus-core": "^1.36.21",
+    "@certd/basic": "^1.37.1",
+    "@certd/plus-core": "^1.37.1",
    "dayjs": "^1.11.7",
    "lodash-es": "^4.17.21",
    "reflect-metadata": "^0.1.13"
@@ -44,5 +45,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/core/pipeline/src/core/run-history.ts
+++ b/packages/core/pipeline/src/core/run-history.ts
@@ -120,10 +120,9 @@ export class RunHistory {
    delete e.stack;
    delete e.cause;
    if (runnable.runnableType === "step") {
-      this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> ：`, e, stack, cause);
-    } else {
-      this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> ：`, e.message);
+      this._loggers[runnable.id].error(stack, cause);
    }
+    this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> ：`, e.message);
  }

  finally(runnable: Runnable) {
--- a/packages/core/pipeline/src/service/cname.ts
+++ b/packages/core/pipeline/src/service/cname.ts
@@ -17,6 +17,7 @@ export type CnameRecord = {
  cnameProvider: CnameProvider;
  status: string;
  commonDnsProvider?: any;
+  mainDomain?: string;
 };

 export type ICnameProxyService = {
--- a/packages/libs/lib-huawei/CHANGELOG.md
+++ b/packages/libs/lib-huawei/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/lib-huawei
--- a/packages/libs/lib-huawei/package.json
+++ b/packages/libs/lib-huawei/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@certd/lib-huawei",
  "private": false,
-  "version": "1.36.21",
+  "version": "1.37.1",
  "main": "./dist/bundle.js",
  "module": "./dist/bundle.js",
  "types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
    "prettier": "^2.8.8",
    "tslib": "^2.8.1"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/libs/lib-iframe/CHANGELOG.md
+++ b/packages/libs/lib-iframe/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/lib-iframe
--- a/packages/libs/lib-iframe/package.json
+++ b/packages/libs/lib-iframe/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@certd/lib-iframe",
  "private": false,
-  "version": "1.36.21",
+  "version": "1.37.1",
  "type": "module",
  "main": "./dist/index.js",
  "module": "./dist/index.js",
@@ -31,5 +31,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/libs/lib-jdcloud/CHANGELOG.md
+++ b/packages/libs/lib-jdcloud/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/jdcloud
--- a/packages/libs/lib-jdcloud/package.json
+++ b/packages/libs/lib-jdcloud/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@certd/jdcloud",
-  "version": "1.36.21",
+  "version": "1.37.1",
  "description": "jdcloud openApi sdk",
  "main": "./dist/bundle.js",
  "module": "./dist/bundle.js",
@@ -61,5 +61,5 @@
      "fetch"
    ]
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/libs/lib-k8s/CHANGELOG.md
+++ b/packages/libs/lib-k8s/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/lib-k8s
--- a/packages/libs/lib-k8s/package.json
+++ b/packages/libs/lib-k8s/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@certd/lib-k8s",
  "private": false,
-  "version": "1.36.21",
+  "version": "1.37.1",
  "type": "module",
  "main": "./dist/index.js",
  "module": "./dist/index.js",
@@ -17,7 +17,7 @@
    "pub": "npm publish"
  },
  "dependencies": {
-    "@certd/basic": "^1.36.21",
+    "@certd/basic": "^1.37.1",
    "@kubernetes/client-node": "0.21.0"
  },
  "devDependencies": {
@@ -32,5 +32,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/libs/lib-server/CHANGELOG.md
+++ b/packages/libs/lib-server/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/lib-server
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+### Features
+
+* dist打包前检查 ([8f6e5bd](https://github.com/certd/certd/commit/8f6e5bd24b3b65fbfcba36c08f532a3abad2d606))
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+### Bug Fixes
+
+* 固定midwayjs版本，修复ui-server import 错误的bug ([eb4d125](https://github.com/certd/certd/commit/eb4d125eaf4a41e88c752d0c68993829589f8f27))
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+### Bug Fixes
+
+* 修复 ui-server 加载失败问题 ([c2ccdbe](https://github.com/certd/certd/commit/c2ccdbec9dd08bca4688eeb2f34d0105eec43ba1))
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+### Performance Improvements
+
+* 支持腾讯云验证码 ([03f317f](https://github.com/certd/certd/commit/03f317ffdb6595ce70e8a2302b05f390c52110c8))
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/lib-server
--- a/packages/libs/lib-server/package.json
+++ b/packages/libs/lib-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@certd/lib-server",
-  "version": "1.36.21",
+  "version": "1.37.1",
  "description": "midway with flyway, sql upgrade way ",
  "private": false,
  "type": "module",
@@ -17,7 +17,8 @@
    "lint": "mwts check",
    "lint:fix": "mwts fix",
    "prepublish": "npm run build",
-    "pub": "npm publish"
+    "pub": "npm publish",
+    "compile": "tsc --skipLibCheck --watch"
  },
  "keywords": [],
  "author": "greper",
@@ -27,18 +28,20 @@
  ],
  "license": "AGPL",
  "dependencies": {
-    "@certd/acme-client": "^1.36.21",
-    "@certd/basic": "^1.36.21",
-    "@certd/pipeline": "^1.36.21",
-    "@certd/plus-core": "^1.36.21",
-    "@midwayjs/cache": "~3.14.0",
-    "@midwayjs/core": "~3.20.3",
-    "@midwayjs/i18n": "~3.20.3",
-    "@midwayjs/info": "~3.20.3",
-    "@midwayjs/koa": "~3.20.3",
-    "@midwayjs/logger": "~3.4.2",
-    "@midwayjs/typeorm": "~3.20.3",
-    "@midwayjs/upload": "^3.20.3",
+    "@certd/acme-client": "^1.37.1",
+    "@certd/basic": "^1.37.1",
+    "@certd/pipeline": "^1.37.1",
+    "@certd/plugin-lib": "^1.37.1",
+    "@certd/plus-core": "^1.37.1",
+    "@midwayjs/cache": "3.14.0",
+    "@midwayjs/core": "3.20.11",
+    "@midwayjs/i18n": "3.20.13",
+    "@midwayjs/info": "3.20.13",
+    "@midwayjs/koa": "3.20.13",
+    "@midwayjs/logger": "3.4.2",
+    "@midwayjs/typeorm": "3.20.11",
+    "@midwayjs/upload": "3.20.13",
+    "@midwayjs/validate": "3.20.13",
    "better-sqlite3": "^11.1.2",
    "cross-env": "^7.0.3",
    "dayjs": "^1.11.7",
@@ -61,5 +64,5 @@
    "typeorm": "^0.3.11",
    "typescript": "^5.4.2"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/libs/lib-server/src/basic/exception/index.ts
+++ b/packages/libs/lib-server/src/basic/exception/index.ts
@@ -8,3 +8,5 @@ export * from './common-exception.js';
 export * from './not-found-exception.js';
 export * from './param-exception.js';
 export * from './site-off-exception.js';
+export * from './login-error-exception.js'
+export * from './code-error-exception.js'
--- a/packages/libs/lib-server/src/system/basic/index.ts
+++ b/packages/libs/lib-server/src/system/basic/index.ts
@@ -1,3 +1,4 @@
 export * from './service/plus-service.js';
 export * from './service/file-service.js';
 export * from './service/encryptor.js';
+export * from './service/ocr-service.js';
--- a/packages/libs/lib-server/src/system/basic/service/ocr-service.ts
+++ b/packages/libs/lib-server/src/system/basic/service/ocr-service.ts
@@ -0,0 +1,24 @@
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { PlusService } from "./plus-service.js";
+import { IOcrService } from "@certd/plugin-lib";
+
+/**
+ */
+@Provide("ocrService")
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class OcrService implements IOcrService {
+  @Inject()
+  plusService: PlusService;
+
+  async doOcrFromImage(opts: { image: string }): Promise<{ texts: string[] }> {
+    const res = await this.plusService.requestWithToken({
+      url: "/activation/certd/ocr",
+      method: "post",
+      data: {
+        image: opts.image
+      }
+    });
+    return res;
+  }
+
+}
--- a/packages/libs/lib-server/src/system/basic/service/plus-service.ts
+++ b/packages/libs/lib-server/src/system/basic/service/plus-service.ts
@@ -3,8 +3,8 @@ import { AppKey, PlusRequestService } from '@certd/plus-core';
 import { cache, http, HttpRequestConfig, logger } from '@certd/basic';
 import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js';
 import { merge } from 'lodash-es';
-
-@Provide()
+import fs from 'fs';
+@Provide("plusService")
@Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class PlusService {
  @Inject()
@@ -85,12 +85,31 @@ export class PlusService {

  async sendEmail(email: any) {
    const plusRequestService = await this.getPlusRequestService();
+
+    let attachments = email.attachments || [];
+    if (attachments.length > 0) {
+      const newAttachments: any[] = [];
+      attachments.forEach((item: any) => {
+        const name = item.filename || item.path.split('/').pop();
+        const body = item.content || fs.readFileSync(item.path);
+        const bodyBase64 = Buffer.from(body).toString('base64');
+        item = {
+          name,
+          body: bodyBase64,
+        };
+        newAttachments.push(item);
+      });
+      attachments = newAttachments;
+    }
+
    await plusRequestService.request({
      url: '/activation/emailSend',
      data: {
        subject: email.subject,
-        text: email.content,
        to: email.receivers,
+        text: email.content,
+        html: email.html,
+        attachments,
      },
    });
  }
--- a/packages/libs/lib-server/src/user/addon/api/api.ts
+++ b/packages/libs/lib-server/src/user/addon/api/api.ts
@@ -1,6 +1,13 @@
 import { HttpClient, ILogger, utils } from "@certd/basic";
 import {upperFirst} from "lodash-es";
-import { FormItemProps, PluginRequestHandleReq, Registrable } from "@certd/pipeline";
+import {
+  accessRegistry,
+  FormItemProps,
+  IAccessService,
+  IServiceGetter,
+  PluginRequestHandleReq,
+  Registrable
+} from "@certd/pipeline";


 export type AddonRequestHandleReqInput<T = any> = {
@@ -48,6 +55,7 @@ export type AddonContext = {
  http: HttpClient;
  logger: ILogger;
  utils: typeof utils;
+  serviceGetter: IServiceGetter;
 };

 export abstract class BaseAddon implements IAddon {
@@ -58,8 +66,45 @@ export abstract class BaseAddon implements IAddon {



+
  // eslint-disable-next-line @typescript-eslint/no-empty-function
  async onInstance() {}
+
+
+  async getAccess<T = any>(accessId: string | number, isCommon = false) {
+    if (accessId == null) {
+      throw new Error("您还没有配置授权");
+    }
+    const accessService = await this.ctx.serviceGetter.get<IAccessService>("accessService")
+    let res: any = null;
+    if (isCommon) {
+      res = await accessService.getCommonById(accessId);
+    } else {
+      res = await accessService.getById(accessId);
+    }
+    if (res == null) {
+      throw new Error("授权不存在，可能已被删除，请前往任务配置里面重新选择授权");
+    }
+    // @ts-ignore
+    if (this.logger?.addSecret) {
+      // 隐藏加密信息，不在日志中输出
+      const type = res._type;
+      const plugin = accessRegistry.get(type);
+      const define = plugin.define;
+      // @ts-ignore
+      const input = define.input;
+      for (const key in input) {
+        if (input[key].encrypt && res[key] != null) {
+          // @ts-ignore
+          this.logger.addSecret(res[key]);
+        }
+      }
+    }
+
+    return res as T;
+  }
+
+
  setCtx(ctx: AddonContext) {
    this.ctx = ctx;
    this.http = ctx.http;
--- a/packages/libs/lib-server/src/user/addon/index.ts
+++ b/packages/libs/lib-server/src/user/addon/index.ts
@@ -1,5 +1,3 @@
 export * from './api/index.js'
 export * from './entity/addon.js'
 export * from './service/addon-service.js'
-export * from './service/addon-getter.js'
-export * from './service/addon-sys-getter.js'
--- a/packages/libs/lib-server/src/user/addon/service/addon-getter.ts
+++ b/packages/libs/lib-server/src/user/addon/service/addon-getter.ts
@@ -1,18 +0,0 @@
-import { IAddonGetter } from "../api/index.js";
-
-export class AddonGetter implements IAddonGetter {
-  userId: number;
-  getter: <T>(id: any, userId?: number) => Promise<T>;
-  constructor(userId: number, getter: (id: any, userId: number) => Promise<any>) {
-    this.userId = userId;
-    this.getter = getter;
-  }
-
-  async getById<T = any>(id: any) {
-    return await this.getter<T>(id, this.userId);
-  }
-
-  async getCommonById<T = any>(id: any) {
-    return await this.getter<T>(id, 0);
-  }
-}
--- a/packages/libs/lib-server/src/user/addon/service/addon-service.ts
+++ b/packages/libs/lib-server/src/user/addon/service/addon-service.ts
@@ -1,16 +1,15 @@
 import { Provide, Scope, ScopeEnum } from "@midwayjs/core";
 import { InjectEntityModel } from "@midwayjs/typeorm";
 import { In, Repository } from "typeorm";
-import { AddonDefine, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
-import { addonRegistry, newAddon } from "../api/index.js";
+import { AddonDefine, BaseService, PageReq, ValidateException } from "../../../index.js";
+import { addonRegistry } from "../api/index.js";
 import { AddonEntity } from "../entity/addon.js";
-import { http, logger, utils } from "@certd/basic";

 /**
 * Addon
 */
@Provide()
-@Scope(ScopeEnum.Request, {allowDowngrade: true})
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class AddonService extends BaseService<AddonEntity> {
  @InjectEntityModel(AddonEntity)
  repository: Repository<AddonEntity>;
@@ -30,21 +29,21 @@ export class AddonService extends BaseService<AddonEntity> {

  async add(param) {
    let oldEntity = null;
-    if (param._copyFrom){
+    if (param._copyFrom) {
      oldEntity = await this.info(param._copyFrom);
      if (oldEntity == null) {
-        throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+        throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
      }
-      if (oldEntity.userId  !== param.userId) {
-        throw new ValidateException('您无权查看该Addon配置');
+      if (oldEntity.userId !== param.userId) {
+        throw new ValidateException("您无权查看该Addon配置");
      }
    }
-    if (!param.userId){
-      param.isSystem = true
-    }else{
-      param.isSystem = false
+    if (!param.userId) {
+      param.isSystem = true;
+    } else {
+      param.isSystem = false;
    }
-    delete param._copyFrom
+    delete param._copyFrom;
    return await super.add(param);
  }

@@ -56,7 +55,7 @@ export class AddonService extends BaseService<AddonEntity> {
  async update(param) {
    const oldEntity = await this.info(param.id);
    if (oldEntity == null) {
-      throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+      throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
    }
    return await super.update(param);
  }
@@ -64,63 +63,24 @@ export class AddonService extends BaseService<AddonEntity> {
  async getSimpleInfo(id: number) {
    const entity = await this.info(id);
    if (entity == null) {
-      throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+      throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
    }
    return {
      id: entity.id,
      name: entity.name,
      userId: entity.userId,
      addonType: entity.addonType,
-      type: entity.type,
+      type: entity.type
    };
  }

-  async getAddonById(id: any, checkUserId: boolean, userId?: number): Promise<any> {
-    const ctx = {
-      http: http,
-      logger: logger,
-      utils: utils,
-    };
-
-
-    if (!id){
-      //使用图片验证码
-      return await newAddon("captcha", "image", {},ctx);
-    }
-    const entity = await this.info(id);
-    if (entity == null) {
-      //使用图片验证码
-      return await newAddon("captcha", "image", {},ctx);
-    }
-    if (checkUserId) {
-      if (userId == null) {
-        throw new ValidateException('userId不能为空');
-      }
-      if (userId !== entity.userId) {
-        throw new PermissionException('您对该Addon无访问权限');
-      }
-    }
-
-    const setting =  JSON.parse(entity.setting ??"{}")
-    const input = {
-      id: entity.id,
-      ...setting,
-    };
-
-    return await newAddon(entity.addonType, entity.type, input,ctx);
-  }
-
-  async getById(id: any, userId: number): Promise<any> {
-    return await this.getAddonById(id, true, userId);
-  }
-

  getDefineList(addonType: string) {
    return addonRegistry.getDefineList();
  }

-  getDefineByType(type: string,prefix?: string)  {
-    return addonRegistry.getDefine(type,prefix) as AddonDefine;
+  getDefineByType(type: string, prefix?: string) {
+    return addonRegistry.getDefine(type, prefix) as AddonDefine;
  }


@@ -134,31 +94,30 @@ export class AddonService extends BaseService<AddonEntity> {
    return await this.repository.find({
      where: {
        id: In(ids),
-        userId,
+        userId
      },
      select: {
        id: true,
        name: true,
        addonType: true,
        type: true,
-        userId:true,
-        isSystem: true,
-      },
+        userId: true,
+        isSystem: true
+      }
    });

  }


-
-  async getDefault(userId: number,addonType: string): Promise<any> {
+  async getDefault(userId: number, addonType: string): Promise<any> {
    const res = await this.repository.findOne({
      where: {
        userId,
        addonType
      },
      order: {
-        isDefault: 'DESC',
-      },
+        isDefault: "DESC"
+      }
    });
    if (!res) {
      return null;
@@ -174,16 +133,16 @@ export class AddonService extends BaseService<AddonEntity> {
      type: res.type,
      name: res.name,
      userId: res.userId,
-      setting,
+      setting
    };
  }

-  async setDefault(id: number, userId: number,addonType:string) {
+  async setDefault(id: number, userId: number, addonType: string) {
    if (!id) {
-      throw new ValidateException('id不能为空');
+      throw new ValidateException("id不能为空");
    }
    if (!userId) {
-      throw new ValidateException('userId不能为空');
+      throw new ValidateException("userId不能为空");
    }
    await this.repository.update(
      {
@@ -191,7 +150,7 @@ export class AddonService extends BaseService<AddonEntity> {
        addonType
      },
      {
-        isDefault: false,
+        isDefault: false
      }
    );
    await this.repository.update(
@@ -201,22 +160,22 @@ export class AddonService extends BaseService<AddonEntity> {
        addonType
      },
      {
-        isDefault: true,
+        isDefault: true
      }
    );
  }

-  async getOrCreateDefault(opts:{addonType:string,type:string, inputs: any, userId: any}) {
-    const {addonType,type,inputs,userId} = opts;
+  async getOrCreateDefault(opts: { addonType: string, type: string, inputs: any, userId: any }) {
+    const { addonType, type, inputs, userId } = opts;

-   const addonDefine =  this.getDefineByType( type,addonType)
+    const addonDefine = this.getDefineByType(type, addonType);

-    const defaultConfig = await this.getDefault(userId,addonType);
+    const defaultConfig = await this.getDefault(userId, addonType);
    if (defaultConfig) {
      return defaultConfig;
    }
    const setting = {
-      ...inputs,
+      ...inputs
    };
    const res = await this.repository.save({
      userId,
@@ -224,7 +183,7 @@ export class AddonService extends BaseService<AddonEntity> {
      type: type,
      name: addonDefine.title,
      setting: JSON.stringify(setting),
-      isDefault: true,
+      isDefault: true
    });
    return this.buildAddonInstanceConfig(res);
  }
--- a/packages/libs/lib-server/src/user/addon/service/addon-sys-getter.ts
+++ b/packages/libs/lib-server/src/user/addon/service/addon-sys-getter.ts
@@ -1,17 +0,0 @@
-import { IAccessService } from '@certd/pipeline';
-import { AddonService } from './addon-service.js';
-
-export class AddonSysGetter implements IAccessService {
-  addonService: AddonService;
-  constructor(addonService: AddonService) {
-    this.addonService = addonService;
-  }
-
-  async getById<T = any>(id: any) {
-    return await this.addonService.getById(id, 0);
-  }
-
-  async getCommonById<T = any>(id: any) {
-    return await this.addonService.getById(id, 0);
-  }
-}
--- a/packages/libs/midway-flyway-js/CHANGELOG.md
+++ b/packages/libs/midway-flyway-js/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/midway-flyway-js
--- a/packages/libs/midway-flyway-js/package.json
+++ b/packages/libs/midway-flyway-js/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@certd/midway-flyway-js",
-  "version": "1.36.21",
+  "version": "1.37.1",
  "description": "midway with flyway, sql upgrade way ",
  "private": false,
  "type": "module",
@@ -25,9 +25,9 @@
  ],
  "license": "MIT",
  "dependencies": {
-    "@midwayjs/core": "~3.20.3",
-    "@midwayjs/logger": "~3.4.2",
-    "@midwayjs/typeorm": "~3.20.3",
+    "@midwayjs/core": "3.20.11",
+    "@midwayjs/logger": "3.4.2",
+    "@midwayjs/typeorm": "3.20.11",
    "better-sqlite3": "^11.1.2"
  },
  "devDependencies": {
@@ -46,5 +46,5 @@
    "typeorm": "^0.3.11",
    "typescript": "^5.4.2"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/plugins/plugin-cert/CHANGELOG.md
+++ b/packages/plugins/plugin-cert/CHANGELOG.md
@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+### Performance Improvements
+
+* cname主域名校验提示优化，显示不一致的两方便于排查问题 ([6ebb365](https://github.com/certd/certd/commit/6ebb3659f42155e4e8da600c493fb5227cd08137))
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+### Performance Improvements
+
+* 手动上传证书优化，增加到期前报错提醒 ([3d42bfd](https://github.com/certd/certd/commit/3d42bfd479eaacc4a49c401224815a6e2a0204b0))
+* 支持腾讯云验证码 ([03f317f](https://github.com/certd/certd/commit/03f317ffdb6595ce70e8a2302b05f390c52110c8))
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+### Bug Fixes
+
+* 修复旧版本升级上来报错eab授权的bug ([b76f2e2](https://github.com/certd/certd/commit/b76f2e2008a7fefac4c91179c45c56c7a7a84b71))
+
+### Performance Improvements
+
+* add preferred chain for google trust service ([#539](https://github.com/certd/certd/issues/539)) @ZeroClover ([e31d26a](https://github.com/certd/certd/commit/e31d26a8871c6088d9f8c0f580746ff2a810ae0c))
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 ### Bug Fixes
--- a/packages/plugins/plugin-cert/package.json
+++ b/packages/plugins/plugin-cert/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@certd/plugin-cert",
  "private": false,
-  "version": "1.36.21",
+  "version": "1.37.1",
  "type": "module",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -13,13 +13,14 @@
    "build3": "rollup -c",
    "build2": "vue-tsc --noEmit && vite build",
    "preview": "vite preview",
-    "pub": "npm publish"
+    "pub": "npm publish",
+    "compile": "tsc --skipLibCheck --watch"
  },
  "dependencies": {
-    "@certd/acme-client": "^1.36.21",
-    "@certd/basic": "^1.36.21",
-    "@certd/pipeline": "^1.36.21",
-    "@certd/plugin-lib": "^1.36.21",
+    "@certd/acme-client": "^1.37.1",
+    "@certd/basic": "^1.37.1",
+    "@certd/pipeline": "^1.37.1",
+    "@certd/plugin-lib": "^1.37.1",
    "@google-cloud/publicca": "^1.3.0",
    "dayjs": "^1.11.7",
    "jszip": "^3.10.1",
@@ -31,7 +32,6 @@
  "devDependencies": {
    "@types/chai": "^4.3.3",
    "@types/mocha": "^10.0.0",
-    "@types/psl": "^1.1.3",
    "@typescript-eslint/eslint-plugin": "^8.26.1",
    "@typescript-eslint/parser": "^8.26.1",
    "chai": "^4.3.6",
@@ -43,5 +43,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/plugins/plugin-cert/src/dns-provider/api.ts
+++ b/packages/plugins/plugin-cert/src/dns-provider/api.ts
@@ -1,5 +1,5 @@
 import { HttpClient, ILogger, utils } from "@certd/basic";
-import { IAccess, Registrable } from "@certd/pipeline";
+import { IAccess, IServiceGetter, Registrable } from "@certd/pipeline";

 export type DnsProviderDefine = Registrable & {
  accessType: string;
@@ -25,6 +25,7 @@ export type DnsProviderContext = {
  http: HttpClient;
  utils: typeof utils;
  domainParser: IDomainParser;
+  serviceGetter: IServiceGetter;
 };

 export interface IDnsProvider<T = any> {
--- a/packages/plugins/plugin-cert/src/dns-provider/index.ts
+++ b/packages/plugins/plugin-cert/src/dns-provider/index.ts
@@ -2,3 +2,4 @@ export * from "./api.js";
 export * from "./registry.js";
 export * from "./decorator.js";
 export * from "./base.js";
+export * from "./domain-parser.js";
--- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts
+++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts
@@ -6,6 +6,7 @@ import dayjs from "dayjs";

 export { CertReader };
 export type { CertInfo };
+
@IsTaskPlugin({
  name: "CertApplyUpload",
  icon: "ph:certificate",
@@ -62,6 +63,19 @@ export type { CertInfo };
  },
 })
 export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
+  @TaskInput({
+    title: "过期前提醒",
+    value: 10,
+    component: {
+      name: "a-input-number",
+      vModel: "value",
+    },
+    required: true,
+    order: 100,
+    helper: "到期前多少天提醒",
+  })
+  renewDays!: number;
+
  @TaskInput({
    title: "手动上传证书",
    component: {
@@ -97,6 +111,7 @@ export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
    this.userContext = this.ctx.userContext;
    this.lastStatus = this.ctx.lastStatus as Step;
  }
+
  async onInit(): Promise<void> {}

  async getCertFromStore() {
@@ -107,48 +122,54 @@ export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
    } catch (e) {
      this.logger.warn("读取cert失败：", e);
    }
-    if (certReader == null) {
-      certReader = new CertReader(this.uploadCert);
-    }
-    if (!certReader.expires || certReader.expires < new Date().getTime()) {
-      throw new Error("证书已过期，停止部署，请重新上传证书");
-    }
-
    return certReader;
  }

-  async execute(): Promise<string | void> {
-    let certReader = await this.getCertFromStore();
-    const crtMd5 = this.ctx.utils.hash.md5(certReader.cert.crt);
-
-    const leftDays = dayjs(certReader.expires).diff(dayjs(), "day");
-    this.logger.info(`证书过期时间${dayjs(certReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${leftDays}天`);
-
-    if (!this.ctx.inputChanged) {
-      this.logger.info("输入参数无变化");
-      const lastCrtMd5 = this.lastStatus?.status?.output?.certMd5;
-      this.logger.info("证书MD5", crtMd5);
-      this.logger.info("上次证书MD5", lastCrtMd5);
-      if (lastCrtMd5 === crtMd5) {
-        this.logger.info("证书无变化，跳过");
-        //输出证书MD5
-        this.certMd5 = crtMd5;
-        await this.output(certReader, false);
-        return "skip";
+  private checkExpires(certReader: CertReader) {
+    const renewDays = (this.renewDays ?? 10) * 24 * 60 * 60 * 1000;
+    if (certReader.expires) {
+      if (certReader.expires < new Date().getTime()) {
+        throw new Error("证书已过期，停止部署，请尽快上传新证书");
+      }
+      if (certReader.expires < new Date().getTime() + renewDays) {
+        throw new Error("证书即将已过期，停止部署，请尽快上传新证书");
+      }
+    }
+  }
+
+  async execute(): Promise<string | void> {
+    const oldCertReader = await this.getCertFromStore();
+    if (oldCertReader) {
+      const leftDays = dayjs(oldCertReader.expires).diff(dayjs(), "day");
+      this.logger.info(`证书过期时间${dayjs(oldCertReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${leftDays}天`);
+      this.checkExpires(oldCertReader);
+      if (!this.ctx.inputChanged) {
+        this.logger.info("输入参数无变化");
+        const lastCrtMd5 = this.lastStatus?.status?.output?.certMd5;
+        const newCrtMd5 = this.ctx.utils.hash.md5(this.uploadCert.crt);
+        this.logger.info("证书MD5", newCrtMd5);
+        this.logger.info("上次证书MD5", lastCrtMd5);
+        if (lastCrtMd5 === newCrtMd5) {
+          this.logger.info("证书无变化，跳过");
+          //输出证书MD5
+          this.certMd5 = newCrtMd5;
+          await this.output(oldCertReader, false);
+          return "skip";
+        }
+        this.logger.info("证书有变化，重新部署");
+      } else {
+        this.logger.info("输入参数有变化，重新部署");
      }
-      this.logger.info("证书有变化，重新部署");
-    } else {
-      this.logger.info("输入参数有变化，重新部署");
    }

-    certReader = new CertReader(this.uploadCert);
+    const newCertReader = new CertReader(this.uploadCert);
    this.clearLastStatus();
    //输出证书MD5
-    this.certMd5 = this.ctx.utils.hash.md5(certReader.cert.crt);
-    const newLeftDays = dayjs(certReader.expires).diff(dayjs(), "day");
-    this.logger.info(`新证书过期时间${dayjs(certReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${newLeftDays}天`);
-
-    await this.output(certReader, true);
+    this.certMd5 = this.ctx.utils.hash.md5(newCertReader.cert.crt);
+    const newLeftDays = dayjs(newCertReader.expires).diff(dayjs(), "day");
+    this.logger.info(`新证书过期时间${dayjs(newCertReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${newLeftDays}天`);
+    this.checkExpires(newCertReader);
+    await this.output(newCertReader, true);

    //必须output之后执行
    await this.emitCertApplySuccess();
--- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts
+++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts
@@ -524,6 +524,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
      http: this.ctx.http,
      utils,
      domainParser,
+      serviceGetter: this.ctx.serviceGetter,
    };
    return await createDnsProvider({
      dnsProviderType,
@@ -540,7 +541,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
      const mainDomain = await domainParser.parse(domain);
      const planSetting: DomainVerifyPlanInput = verifyPlanSetting[mainDomain];
      if (planSetting == null) {
-        throw new Error(`没有找到域名（${domain}）的校验计划`);
+        throw new Error(`没有找到域名（${domain}）的校验计划（如果您在流水线创建之后设置了子域名托管，需要重新编辑证书申请任务和重新校验cname记录的校验状态）`);
      }
      if (planSetting.type === "dns") {
        plan[domain] = await this.createDnsDomainVerifyPlan(planSetting, domain, mainDomain);
@@ -629,10 +630,20 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
    if (cnameRecord == null) {
      throw new Error(`请先配置${domain}的CNAME记录，并通过校验`);
    }
+    if (cnameRecord.status !== "valid") {
+      throw new Error(`CNAME记录${domain}的校验状态为${cnameRecord.status}，请等待校验通过`);
+    }
+
+    // 主域名异常
+    if (cnameRecord.mainDomain && mainDomain && cnameRecord.mainDomain !== mainDomain) {
+      throw new Error(`CNAME记录${domain}的域名与配置的主域名不一致（${cnameRecord.mainDomain}≠${mainDomain}），请确认是否在流水线创建之后修改了子域名托管，您需要重新校验CNAME记录的校验状态`);
+    }
+
    let dnsProvider = cnameRecord.commonDnsProvider;
    if (cnameRecord.cnameProvider.id > 0) {
      dnsProvider = await this.createDnsProvider(cnameRecord.cnameProvider.dnsProviderType, cnameRecord.cnameProvider.access);
    }
+
    return {
      type: "cname",
      domain,
--- a/packages/plugins/plugin-lib/CHANGELOG.md
+++ b/packages/plugins/plugin-lib/CHANGELOG.md
@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+### Performance Improvements
+
+* dns解析支持阿里esa ([9291fa6](https://github.com/certd/certd/commit/9291fa68aa7a88a05c2f888bf3048df36a8fbde3))
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/plugin-lib
--- a/packages/plugins/plugin-lib/package.json
+++ b/packages/plugins/plugin-lib/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@certd/plugin-lib",
  "private": false,
-  "version": "1.36.21",
+  "version": "1.37.1",
  "type": "module",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -13,7 +13,8 @@
    "build3": "rollup -c",
    "build2": "vue-tsc --noEmit && vite build",
    "preview": "vite preview",
-    "pub": "npm publish"
+    "pub": "npm publish",
+    "compile": "tsc --skipLibCheck --watch"
  },
  "dependencies": {
    "@alicloud/openapi-client": "^0.4.14",
@@ -21,8 +22,8 @@
    "@alicloud/pop-core": "^1.7.10",
    "@alicloud/tea-util": "^1.4.10",
    "@aws-sdk/client-s3": "^3.787.0",
-    "@certd/basic": "^1.36.21",
-    "@certd/pipeline": "^1.36.21",
+    "@certd/basic": "^1.37.1",
+    "@certd/pipeline": "^1.37.1",
    "@kubernetes/client-node": "0.21.0",
    "ali-oss": "^6.22.0",
    "basic-ftp": "^5.0.5",
@@ -41,7 +42,6 @@
  "devDependencies": {
    "@types/chai": "^4.3.3",
    "@types/mocha": "^10.0.0",
-    "@types/psl": "^1.1.3",
    "@typescript-eslint/eslint-plugin": "^8.26.1",
    "@typescript-eslint/parser": "^8.26.1",
    "chai": "^4.3.6",
@@ -53,5 +53,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "c725cee0445dbe1ebd1b6588373bde31697113da"
 }
--- a/packages/plugins/plugin-lib/src/aliyun/access/aliesa-access.ts
+++ b/packages/plugins/plugin-lib/src/aliyun/access/aliesa-access.ts
@@ -0,0 +1,45 @@
+import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
+
+@IsAccess({
+  name: "aliesa",
+  title: "阿里云ESA授权",
+  desc: "",
+  icon: "ant-design:aliyun-outlined",
+  order: 0,
+})
+export class AliesaAccess extends BaseAccess {
+  @AccessInput({
+    title: "阿里云授权",
+    component: {
+      name: "access-selector",
+      vModel: "modelValue",
+      type: "aliyun",
+    },
+    helper: "请选择阿里云授权",
+    required: true,
+  })
+  accessId = "";
+
+  @AccessInput({
+    title: "地区",
+    component: {
+      name: "a-select",
+      vModel: "value",
+      options: [
+        {
+          label: "杭州",
+          value: "cn-hangzhou",
+        },
+        {
+          label: "新加坡",
+          value: "ap-southeast-1",
+        },
+      ],
+    },
+    helper: "请选择ESA地区",
+    required: true,
+  })
+  region = "";
+}
+
+new AliesaAccess();
--- a/packages/plugins/plugin-lib/src/aliyun/access/index.ts
+++ b/packages/plugins/plugin-lib/src/aliyun/access/index.ts
@@ -1,2 +1,3 @@
 export * from "./aliyun-access.js";
 export * from "./alioss-access.js";
+export * from "./aliesa-access.js";
--- a/packages/plugins/plugin-lib/src/index.ts
+++ b/packages/plugins/plugin-lib/src/index.ts
@@ -7,3 +7,4 @@ export * from "./qiniu/index.js";
 export * from "./ctyun/index.js";
 export * from "./oss/index.js";
 export * from "./s3/index.js";
+export * from "./lib/index.js";
--- a/packages/plugins/plugin-lib/src/lib/index.ts
+++ b/packages/plugins/plugin-lib/src/lib/index.ts
@@ -0,0 +1 @@
+export * from "./ocr-api.js";
--- a/packages/plugins/plugin-lib/src/lib/ocr-api.ts
+++ b/packages/plugins/plugin-lib/src/lib/ocr-api.ts
@@ -0,0 +1,3 @@
+export interface IOcrService {
+  doOcrFromImage(opts: { image: string }): Promise<{ texts: string[] }>;
+}
--- a/packages/ui/Dockerfile
+++ b/packages/ui/Dockerfile
@@ -10,6 +10,7 @@ RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf
 RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker


+
 FROM node:22-alpine
 EXPOSE 7001
 EXPOSE 7002
--- a/packages/ui/certd-client/.env.remote
+++ b/packages/ui/certd-client/.env.remote
@@ -0,0 +1,2 @@
+#登录与权限开启
+VITE_APP_PM_ENABLED=false
--- a/packages/ui/certd-client/CHANGELOG.md
+++ b/packages/ui/certd-client/CHANGELOG.md
@@ -3,6 +3,45 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+### Bug Fixes
+
+* 修复版本比较bug ([109696e](https://github.com/certd/certd/commit/109696e965d68c50c8627ffd40203edd1d2daea5))
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+### Bug Fixes
+
+* 授权页面，id列位置不在第一列的bug ([3f1722d](https://github.com/certd/certd/commit/3f1722d54debcb4849dc14521a2da0d9b304b69f))
+
+### Performance Improvements
+
+* 动态加载验证码script ([dcc396a](https://github.com/certd/certd/commit/dcc396afb7a23aeb8af57c01014b09af5f033e61))
+* 验证码支持测试，登录验证码需要测试通过后才能开启 ([83e6476](https://github.com/certd/certd/commit/83e6476408090b741fabb1b542fb458d9a8b4134))
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+### Bug Fixes
+
+* 选择授权对话框编辑时，名称字段排在最后的bug ([31cfb09](https://github.com/certd/certd/commit/31cfb09468bda3272f5f63af65ff3e9272220b39))
+
+### Performance Improvements
+
+* 登录失败时清除验证码状态 ([1c15bea](https://github.com/certd/certd/commit/1c15beadc7fe8a7c6ec1903b7e722ca2f52e05b3))
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 ### Bug Fixes
--- a/packages/ui/certd-client/index.html
+++ b/packages/ui/certd-client/index.html
@@ -23,6 +23,7 @@

 </div>
 <script type="module" src="/src/main.ts"></script>
-<script src="https://static.geetest.com/v4/gt4.js"></script>
+<!--<script src="https://static.geetest.com/v4/gt4.js"></script>-->
+<!--<script src="https://turing.captcha.qcloud.com/TJCaptcha.js"></script>-->
 </body>
 </html>
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -1,11 +1,12 @@
 {
  "name": "@certd/ui-client",
-  "version": "1.36.21",
+  "version": "1.37.1",
  "private": true,
  "scripts": {
    "dev": "vite --open",
    "dev:pm": "vite --mode pm",
    "dev:force": "vite --force",
+    "remote": "vite --mode remote --open",
    "debug": "vite --mode debug --open",
    "debug:pm": "vite --mode debugpm",
    "debug:force": "vite --force --mode debug",
@@ -97,6 +98,7 @@
    "vue-cropperjs": "^5.0.0",
    "vue-echarts": "^7.0.3",
    "vue-i18n": "^9.10.2",
+    "vue-plugin-load-script": "2.1.1",
    "vue-router": "^4.3.0",
    "vuedraggable": "^4.1.0",
    "watermark-js-plus": "^1.5.8",
@@ -104,8 +106,8 @@
    "zod-defaults": "^0.1.3"
  },
  "devDependencies": {
-    "@certd/lib-iframe": "^1.36.21",
-    "@certd/pipeline": "^1.36.21",
+    "@certd/lib-iframe": "^1.37.1",
+    "@certd/pipeline": "^1.37.1",
    "@rollup/plugin-commonjs": "^25.0.7",
    "@rollup/plugin-node-resolve": "^15.2.3",
    "@types/chai": "^4.3.12",
--- a/packages/ui/certd-client/src/components/captcha/captcha-input.vue
+++ b/packages/ui/certd-client/src/components/captcha/captcha-input.vue
@@ -1,5 +1,5 @@
 <template>
-  <component :is="captchaComponent" v-if="settingStore.inited" ref="captchaRef" class="captcha_input" :captcha-get="getCaptcha" @change="onChange" />
+  <component :is="captchaComponent" v-if="settingStore.inited" ref="captchaRef" :model-value="modelValue" class="captcha_input" :captcha-get="getCaptcha" @change="onChange" />
 </template>
 <script setup lang="ts">
 import { ref, computed, defineAsyncComponent } from "vue";
@@ -7,6 +7,20 @@ import { useSettingStore } from "/@/store/settings";
 import { nanoid } from "nanoid";
 import { request } from "/@/api/service";

+const props = defineProps({
+  modelValue: {
+    type: Object,
+    default: () => ({}),
+  },
+  type: {
+    type: String,
+    default: "image",
+  },
+  addonId: {
+    type: Number,
+    default: 0,
+  },
+});
 const captchaRef = ref(null);
 const settingStore = useSettingStore();

@@ -17,7 +31,7 @@ const captchaAddonId = computed(() => {
  return settingStore.sysPublic.captchaAddonId ?? 0;
 });
 const captchaComponent = computed(() => {
-  let type = "image";
+  let type: any = props.type ?? "image";
  if (settingStore.sysPublic.captchaAddonId && settingStore.sysPublic.captchaType) {
    type = settingStore.sysPublic.captchaType;
  }
@@ -36,7 +50,7 @@ async function getCaptcha(): Promise<any> {
  });
 }

-function onChange(data) {
+function onChange(data: any) {
  emits("update:modelValue", data);
  emits("change", data);
 }
@@ -44,7 +58,11 @@ function onChange(data) {
 async function getCaptchaForm() {
  return await captchaRef.value.getCaptchaForm();
 }
+async function reset() {
+  await captchaRef.value.reset();
+}
 defineExpose({
  getCaptchaForm,
+  reset,
 });
 </script>
--- a/packages/ui/certd-client/src/components/captcha/captchas/geetest_captcha.vue
+++ b/packages/ui/certd-client/src/components/captcha/captchas/geetest_captcha.vue
@@ -2,28 +2,32 @@
  <div ref="captchaRef" class="geetest_captcha_wrapper"></div>
 </template>
 <script setup lang="ts">
-import { onMounted, defineProps, defineEmits, ref, onUnmounted } from "vue";
+import { onMounted, defineProps, defineEmits, ref, onUnmounted, Ref, watch } from "vue";
 import { useSettingStore } from "/@/store/settings";
 import { request } from "/src/api/service";
 import { notification } from "ant-design-vue";

+import { loadScript } from "vue-plugin-load-script";
+const loaded = ref(false);
+async function loadCaptchaScript() {
+  // 加载验证码js
+  await loadScript("https://static.geetest.com/v4/gt4.js");
+  loaded.value = true;
+}
+
 defineOptions({
  name: "GeetestCaptcha",
 });
 const emit = defineEmits(["update:modelValue", "change"]);
 const props = defineProps<{
+  modelValue: any;
  captchaGet: () => Promise<any>;
 }>();
 const captchaRef = ref(null);
-// const addonApi = createAddonApi();
-const settingStore = useSettingStore();

-const captchaInstanceRef = ref({});
+const captchaInstanceRef: Ref = ref({});
 async function init() {
-  // if (!initGeetest4) {
-  //   await import("https://static.geetest.com/v4/gt4.js");
-  // }
-
+  await loadCaptchaScript();
  const { captchaId } = await props.captchaGet();
  // @ts-ignore
  initGeetest4(
@@ -35,6 +39,13 @@ async function init() {
      captcha.appendTo(captchaRef.value); // 调用appendTo将验证码插入到页的某一个元素中，这个元素用户可以自定义
      captchaInstanceRef.value.instance = captcha;
      captchaInstanceRef.value.captchaId = captchaId;
+
+      captcha.onSuccess(function () {
+        const form = getCaptchaForm();
+        if (form) {
+          emitChange(form);
+        }
+      });
    }
  );
 }
@@ -58,29 +69,51 @@ function getCaptchaForm() {
  return result;
 }

-const valueRef = ref(null);
-const timeoutId = setInterval(() => {
-  const form = getCaptchaForm();
-  if (form && valueRef.value != form) {
-    console.log("form", form);
-    valueRef.value = form;
-    emitChange(form);
-  }
-}, 1000);
+// const valueRef = ref(null);
+// const timeoutId = setInterval(() => {
+//   const form = getCaptchaForm();
+//   if (form && valueRef.value != form) {
+//     console.log("form", form);
+//     valueRef.value = form;
+//     emitChange(form);
+//   }
+// }, 1000);

-onUnmounted(() => {
-  clearTimeout(timeoutId);
-});
+// onUnmounted(() => {
+//   clearTimeout(timeoutId);
+// });

 function emitChange(value: string) {
  emit("update:modelValue", value);
  emit("change", value);
 }
+function reset() {
+  captchaInstanceRef.value.instance.reset();
+}
+
+watch(
+  () => {
+    return props.modelValue;
+  },
+  value => {
+    if (value == null) {
+      reset();
+    }
+  }
+);

 defineExpose({
  getCaptchaForm,
+  reset,
 });

+watch(
+  () => [props.captchaGet],
+  async () => {
+    await init();
+  }
+);
+
 onMounted(async () => {
  await init();
 });
--- a/packages/ui/certd-client/src/components/captcha/captchas/image_captcha.vue
+++ b/packages/ui/certd-client/src/components/captcha/captchas/image_captcha.vue
@@ -11,10 +11,11 @@
  </div>
 </template>
 <script setup lang="ts">
-import { defineEmits, defineExpose, defineProps, ref } from "vue";
+import { defineEmits, defineExpose, defineProps, ref, watch } from "vue";
 import { nanoid } from "nanoid";

 const props = defineProps<{
+  modelValue: any;
  captchaGet?: () => Promise<any>;
 }>();
 defineOptions({
@@ -42,6 +43,7 @@ function getCaptchaForm() {
 defineExpose({
  resetImageCode,
  getCaptchaForm,
+  reset: resetImageCode,
 });

 resetImageCode();
@@ -52,7 +54,18 @@ function onChange(value: string) {
  emitChange(form);
 }

-function emitChange(value) {
+watch(
+  () => {
+    return props.modelValue;
+  },
+  value => {
+    if (value == null) {
+      resetImageCode();
+    }
+  }
+);
+
+function emitChange(value: any) {
  emit("update:modelValue", value);
  emit("change", value);
 }
--- a/packages/ui/certd-client/src/components/captcha/captchas/tencent_captcha.vue
+++ b/packages/ui/certd-client/src/components/captcha/captchas/tencent_captcha.vue
@@ -0,0 +1,226 @@
+<template>
+  <div ref="captchaRef" class="tencent_captcha_wrapper" :class="{ tencent_captcha_ok: modelValue }" @click="triggerCaptcha">
+    <div class="validation-box" :class="{ validated: modelValue != null }">
+      <div class="sweep-animation"></div>
+      <div class="box-content">
+        <div class="box-icon">✓</div>
+        <span v-if="modelValue == null" class="status-text">点击进行验证</span>
+        <span v-else class="status-text">验证成功</span>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { onMounted, defineProps, defineEmits, ref, onUnmounted, Ref, watch } from "vue";
+import { notification } from "ant-design-vue";
+
+import { loadScript } from "vue-plugin-load-script";
+const loaded = ref(false);
+async function loadCaptchaScript() {
+  // 加载验证码js
+  // var appid = "您的CaptchaAppId";
+  // loadScript("https://turing.captcha.qq.com/TJCaptcha.js?appid=" + appid);
+  await loadScript("https://turing.captcha.qcloud.com/TJCaptcha.js");
+  loaded.value = true;
+}
+loadCaptchaScript();
+
+defineOptions({
+  name: "TencentCaptcha",
+});
+const emit = defineEmits(["update:modelValue", "change"]);
+const props = defineProps<{
+  modelValue: any;
+  captchaGet: () => Promise<any>;
+}>();
+const captchaRef = ref(null);
+
+const captchaInstanceRef: Ref = ref({});
+
+// 定义回调函数
+function callback(res: { ret: number; ticket: string; randstr: string; errorCode?: number; errorMessage?: string }) {
+  // 第一个参数传入回调结果，结果如下：
+  // ret         Int       验证结果，0：验证成功。2：用户主动关闭验证码。
+  // ticket      String    验证成功的票据，当且仅当 ret = 0 时 ticket 有值。
+  // CaptchaAppId       String    验证码应用ID。
+  // bizState    Any       自定义透传参数。
+  // randstr     String    本次验证的随机串，后续票据校验时需传递该参数。
+  // verifyDuration     Int   验证码校验接口耗时（ms）。
+  // actionDuration     Int   操作校验成功耗时（用户动作+校验完成）(ms)。
+  // sid     String   链路sid。
+  console.log("callback:", res);
+  // res（用户主动关闭验证码）= {ret: 2, ticket: null}
+  // res（验证成功） = {ret: 0, ticket: "String", randstr: "String"}
+  // res（请求验证码发生错误，验证码自动返回trerror_前缀的容灾票据） = {ret: 0, ticket: "String", randstr: "String",  errorCode: Number, errorMessage: "String"}
+  // 此处代码仅为验证结果的展示示例，真实业务接入，建议基于ticket和errorCode情况做不同的业务处理
+  if (res.ret === 0) {
+    emitChange({
+      ticket: res.ticket,
+      randstr: res.randstr,
+    });
+  } else if (res.ret === 2) {
+    console.log("用户主动关闭验证码");
+  }
+}
+
+// 定义验证码js加载错误处理函数
+function loadErrorCallback(error: any) {
+  // var appid = "您的CaptchaAppId";
+  // // 生成容灾票据或自行做其它处理
+  // var ticket = "trerror_1001_" + appid + "_" + Math.floor(new Date().getTime() / 1000);
+  // callback({
+  //   ret: 0,
+  //   randstr: "@" + Math.random().toString(36).substr(2),
+  //   ticket: ticket,
+  //   errorCode: 1001,
+  //   errorMessage: "jsload_error",
+  // });
+  notification.error({
+    message: `验证码加载失败：${error?.message || error}`,
+  });
+}
+async function triggerCaptcha() {
+  if (!loaded.value) {
+    notification.error({
+      message: "验证码还未加载完成，请稍后再试",
+    });
+    return;
+  }
+
+  const { captchaAppId } = await props.captchaGet();
+
+  try {
+    // 生成一个验证码对象
+    // CaptchaAppId：登录验证码控制台，从【验证管理】页面进行查看。如果未创建过验证，请先新建验证。注意：不可使用客户端类型为小程序的CaptchaAppId，会导致数据统计错误。
+    //callback：定义的回调函数
+    // @ts-ignore
+    var captcha = new TencentCaptcha(captchaAppId + "", callback, {
+      userLanguage: "zh-cn",
+      // showFn: (ret: any) => {
+      //   const {
+      //     duration, // 验证码渲染完成的耗时(ms)
+      //     sid, // 链路sid
+      //   } = ret;
+      // },
+    });
+    // 调用方法，显示验证码
+    captcha.show();
+  } catch (error) {
+    // 加载异常，调用验证码js加载错误处理函数
+    loadErrorCallback(error);
+  }
+}
+
+function emitChange(value: any) {
+  emit("update:modelValue", value);
+  emit("change", value);
+}
+function reset() {
+  captchaInstanceRef.value.instance.reset();
+}
+
+watch(
+  () => {
+    return props.modelValue;
+  },
+  value => {
+    if (value == null) {
+      reset();
+    }
+  }
+);
+
+defineExpose({
+  reset,
+});
+</script>
+<style lang="less">
+.tencent_captcha_wrapper {
+  .validation-box {
+    width: 100%;
+    height: 40px;
+    margin: 0 auto 30px;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+    background-color: #f9f9f9;
+  }
+
+  .validation-box:hover {
+    border-color: #aaa;
+    background-color: #f0f0f0;
+  }
+
+  .validation-box.validated {
+    border-color: #4caf50;
+    background-color: #f1f8e9;
+  }
+
+  .box-content {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 2;
+    position: relative;
+  }
+
+  .box-icon {
+    font-size: 18px;
+    color: #bbb;
+    margin-right: 15px;
+    transition: all 0.3s ease;
+  }
+
+  .validation-box.validated .box-icon {
+    color: #4caf50;
+  }
+
+  .status-text {
+    font-size: 14px;
+    font-weight: 500;
+    color: #888;
+    transition: all 0.3s ease;
+  }
+
+  .validation-box.validated .status-text {
+    color: #4caf50;
+    font-weight: 600;
+  }
+
+  /* 划过动画效果 */
+  .sweep-animation {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(76, 175, 80, 0.2), transparent);
+    z-index: 1;
+    opacity: 0;
+    transition: opacity 0.3s;
+  }
+
+  .validation-box.validated .sweep-animation {
+    animation: sweep 0.8s ease forwards;
+    opacity: 1;
+  }
+
+  @keyframes sweep {
+    0% {
+      left: -100%;
+    }
+    50% {
+      left: 0;
+    }
+    100% {
+      left: 100%;
+    }
+  }
+}
+</style>
--- a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts
+++ b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts
@@ -45,6 +45,16 @@ export async function DoVerify(id: number) {
  });
 }

+export async function ResetStatus(id: number) {
+  return await request({
+    url: apiPrefix + "/resetStatus",
+    method: "post",
+    data: {
+      id,
+    },
+  });
+}
+
 export async function ParseDomain(fullDomain: string) {
  return await request({
    url: subDomainApiPrefix + "/parseDomain",
--- a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue
+++ b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue
@@ -16,6 +16,9 @@
        <a-tooltip v-if="cnameRecord.error" :title="cnameRecord.error">
          <fs-icon class="ml-5 color-red" icon="ion:warning-outline"></fs-icon>
        </a-tooltip>
+        <a-tooltip v-if="cnameRecord.status === 'valid'" title="重置校验状态，重新校验">
+          <fs-icon class="ml-2 color-yellow text-md pointer" icon="solar:undo-left-square-bold" @click="resetStatus"></fs-icon>
+        </a-tooltip>
      </td>
      <td class="center">
        <template v-if="cnameRecord.status !== 'valid'">
@@ -35,6 +38,7 @@ import { ref, watch } from "vue";
 import { dict } from "@fast-crud/fast-crud";
 import * as api from "./api.js";
 import CnameTip from "./cname-tip.vue";
+import { Modal } from "ant-design-vue";
 const statusDict = dict({
  data: [
    { label: "待设置CNAME", value: "cname", color: "warning" },
@@ -71,12 +75,15 @@ function onRecordChange() {
  });
 }

+async function loadRecord() {
+  cnameRecord.value = await GetByDomain(props.domain);
+}
 let refreshIntervalId: any = null;
 async function doRefresh() {
  if (!props.domain) {
    return;
  }
-  cnameRecord.value = await GetByDomain(props.domain);
+  await loadRecord();
  onRecordChange();

  if (cnameRecord.value.status === "validating") {
@@ -114,6 +121,17 @@ async function doVerify() {
  }
  await doRefresh();
 }
+
+async function resetStatus() {
+  Modal.confirm({
+    title: "重置状态",
+    content: "确定要重置校验状态吗？",
+    onOk: async () => {
+      await api.ResetStatus(cnameRecord.value.id);
+      await loadRecord();
+    },
+  });
+}
 </script>

 <style lang="less">
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -175,6 +175,7 @@ export default {
    suiteSetting: "Suite Settings",
    orderManager: "Order Management",
    userSuites: "User Suites",
+    netTest: "Network Test",
  },
  certificateRepo: {
    title: "Certificate Repository",
@@ -447,6 +448,7 @@ export default {
  description: "Description",
  createTime: "Creation Time",
  updateTime: "Update Time",
+  mainDomain: "Main Domain",
  edit: "Edit",
  groupName: "Group Name",
  enterGroupName: "Please enter group name",
@@ -723,11 +725,14 @@ export default {
      captchaEnabled: "Enable Login Captcha",
      captchaHelper: "Whether to enable captcha verification for login",
      captchaType: "Captcha Setting",
-
+      captchaTest: "Captcha Test",
+      // 保存后再点击测试，请务必测试通过了，再开启登录验证码
+      captchaTestHelper: "Save and click test, please make sure the test is passed before enabling login captcha",
      baseSetting: "Base Settings",
      registerSetting: "Register Settings",
      safeSetting: "Safe Settings",
      paymentSetting: "Payment Settings",
+      captchaSetting: "Captcha Setting",
    },
  },
  modal: {
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -181,6 +181,7 @@ export default {
    suiteSetting: "套餐设置",
    orderManager: "订单管理",
    userSuites: "用户套餐",
+    netTest: "网络测试",
  },
  certificateRepo: {
    title: "证书仓库",
@@ -453,6 +454,7 @@ export default {
  description: "说明",
  createTime: "创建时间",
  updateTime: "更新时间",
+  mainDomain: "主域名",
  edit: "编辑",
  groupName: "分组名称",
  enterGroupName: "请输入分组名称",
@@ -461,7 +463,7 @@ export default {
  batchDeleteConfirm: "确定要批量删除这{count}条记录吗",
  selectRecordFirst: "请先勾选记录",
  subdomainHosted: "托管的子域名",
-  subdomainHelpText: "如果您不理解什么是子域托管，请不要随意设置，可能导致证书无法申请，可以参考文档",
+  subdomainHelpText: "如果您不理解什么是子域托管，请不要随意设置（可能导致证书无法申请，以前设置过的cname记录也需要重新配置），可以参考文档",
  subdomainManagement: "子域管理",
  isDisabled: "是否禁用",
  enabled: "启用",
@@ -725,11 +727,13 @@ export default {
      captchaEnabled: "启用登录验证码",
      captchaHelper: "登录时是否启用验证码",
      captchaType: "验证码配置",
-
+      captchaTest: "测试验证码",
+      captchaTestHelper: "保存后再点击测试，请务必测试通过了，再开启登录验证码",
      baseSetting: "基本设置",
      registerSetting: "注册设置",
      safeSetting: "安全设置",
      paymentSetting: "支付设置",
+      captchaSetting: "验证码设置",
    },
  },
  modal: {
--- a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
+++ b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
@@ -14,7 +14,7 @@ import { usePreferences } from "/@/vben/preferences";
 import { LocalStorage } from "/@/utils/util.storage";

 import { FsEditorCode } from "@fast-crud/editor-code";
-import "@fast-crud/editor-code/dist/style.css"
+import "@fast-crud/editor-code/dist/style.css";

 class ColumnSizeSaver {
  save: (key: string, size: number) => void;
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -249,6 +249,17 @@ export const sysResources = [
          },
        ],
      },
+      {
+        title: "certd.sysResources.netTest",
+        name: "NetTest",
+        path: "/sys/nettest",
+        component: "/sys/nettest/index.vue",
+        meta: {
+          icon: "ion:build-outline",
+          auth: true,
+          keepAlive: true,
+        },
+      },
    ],
  },
 ];
--- a/packages/ui/certd-client/src/style/common.less
+++ b/packages/ui/certd-client/src/style/common.less
@@ -19,6 +19,10 @@ div#app {
  height: 100%;
 }

+pre.pre{
+   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+}
+
 h1,
 h2,
 h3,
--- a/packages/ui/certd-client/src/vben/popup-ui/modal/use-modal.ts
+++ b/packages/ui/certd-client/src/vben/popup-ui/modal/use-modal.ts
@@ -54,8 +54,8 @@ export function useVbenModal<TParentModalProps extends ModalProps = ModalProps>(
          );
      },
      {
-        inheritAttrs: false,
        name: "VbenParentModal",
+        inheritAttrs: false,
      }
    );
    return [Modal, extendedApi as ExtendedModalApi] as const;
@@ -104,8 +104,8 @@ export function useVbenModal<TParentModalProps extends ModalProps = ModalProps>(
        );
    },
    {
-      inheritAttrs: false,
      name: "VbenModal",
+      inheritAttrs: false,
    }
  );
  injectData.extendApi?.(extendedApi);
--- a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
@@ -91,6 +91,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          type: "number",
          column: {
            width: 50,
+            order: -999,
          },
          form: {
            show: false,
--- a/packages/ui/certd-client/src/views/certd/access/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/crud.tsx
@@ -66,6 +66,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          type: "number",
          column: {
            width: 100,
+            order: -999,
          },
          form: {
            show: false,
--- a/packages/ui/certd-client/src/views/certd/addon/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/addon/common.tsx
@@ -75,6 +75,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, a
      type: "number",
      column: {
        width: 100,
+        order: -999,
      },
      form: {
        show: false,
--- a/packages/ui/certd-client/src/views/certd/cert/domain/api.ts
+++ b/packages/ui/certd-client/src/views/certd/cert/domain/api.ts
@@ -57,4 +57,3 @@ export async function DeleteBatch(ids: any[]) {
    data: { ids },
  });
 }
-
--- a/packages/ui/certd-client/src/views/certd/cert/domain/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/cert/domain/crud.tsx
@@ -95,6 +95,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          type: "number",
          column: {
            width: 80,
+            order: -999,
          },
          form: {
            show: false,
--- a/packages/ui/certd-client/src/views/certd/cname/record/api.ts
+++ b/packages/ui/certd-client/src/views/certd/cname/record/api.ts
@@ -67,3 +67,13 @@ export async function DoVerify(id: number) {
    },
  });
 }
+
+export async function ResetStatus(id: number) {
+  return await request({
+    url: apiPrefix + "/resetStatus",
+    method: "post",
+    data: {
+      id,
+    },
+  });
+}
--- a/packages/ui/certd-client/src/views/certd/cname/record/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/cname/record/crud.tsx
@@ -5,7 +5,7 @@ import { useRouter } from "vue-router";
 import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { useUserStore } from "/@/store/user";
 import { useSettingStore } from "/@/store/settings";
-import { message } from "ant-design-vue";
+import { message, Modal } from "ant-design-vue";
 import CnameTip from "/@/components/plugins/cert/domains-verify-plan-editor/cname-tip.vue";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
  const router = useRouter();
@@ -79,6 +79,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          type: "number",
          column: {
            width: 80,
+            order: -999,
          },
          form: {
            show: false,
@@ -188,16 +189,32 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          },
          column: {
            width: 120,
-            align: "center",
+            align: "left",
            cellRender({ value, row }) {
+              async function resetStatus() {
+                Modal.confirm({
+                  title: "重置状态",
+                  content: "确定要重置校验状态吗？",
+                  onOk: async () => {
+                    await api.ResetStatus(row.id);
+                    await crudExpose.doRefresh();
+                  },
+                });
+              }
              return (
-                <div class={"flex flex-center"}>
+                <div class={"flex flex-left"}>
                  <fs-values-format modelValue={value} dict={dictRef}></fs-values-format>
                  {row.error && (
                    <a-tooltip title={row.error}>
                      <fs-icon class={"ml-5 color-red"} icon="ion:warning-outline"></fs-icon>
                    </a-tooltip>
                  )}
+
+                  {row.status === "valid" && (
+                    <a-tooltip title={"重置校验状态，重新校验"}>
+                      <fs-icon class={"ml-5 pointer "} icon="solar:undo-left-square-bold" onClick={resetStatus}></fs-icon>
+                    </a-tooltip>
+                  )}
                </div>
              );
            },
@@ -251,8 +268,15 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
            },
          },
        },
+        mainDomain: {
+          title: t("certd.mainDomain"),
+          type: "text",
+          form: {
+            show: false,
+          },
+        },
        createTime: {
-          title: t("certd.create_time"),
+          title: t("certd.createTime"),
          type: "datetime",
          form: {
            show: false,
@@ -264,7 +288,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          },
        },
        updateTime: {
-          title: t("certd.update_time"),
+          title: t("certd.updateTime"),
          type: "datetime",
          form: {
            show: false,
--- a/packages/ui/certd-client/src/views/certd/history/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/history/crud.tsx
@@ -93,6 +93,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          type: "number",
          column: {
            width: 100,
+            order: -999,
          },
          form: {
            show: false,
--- a/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
@@ -217,14 +217,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
            show: false,
          },
          column: {
-            sorter: true,
+            sorter: false,
            conditionalRender: false,
            cellRender({ row }) {
-              const {
-                applyTime,
-                effectiveTime,
-                expiresTime,
-              } = row || {};
+              const { applyTime, effectiveTime, expiresTime } = row || {};
              if (!expiresTime) {
                return "-";
              }
--- a/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
@@ -385,10 +385,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          column: {
            conditionalRender: false,
            cellRender({ row }) {
-              const {
-                certEffectiveTime: effectiveTime,
-                certExpiresTime: expiresTime,
-              } = row || {};
+              const { certEffectiveTime: effectiveTime, certExpiresTime: expiresTime } = row || {};
              if (!expiresTime) {
                return "-";
              }
--- a/packages/ui/certd-client/src/views/certd/notification/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/common.tsx
@@ -72,6 +72,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
      type: "number",
      column: {
        width: 100,
+        order: -999,
      },
      form: {
        show: false,
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -366,10 +366,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
          },
          column: {
            cellRender({ row }) {
-              const {
-                certEffectiveTime: effectiveTime,
-                certExpiresTime: expiresTime,
-              } = row?.lastVars || {};
+              const { certEffectiveTime: effectiveTime, certExpiresTime: expiresTime } = row?.lastVars || {};
              if (!expiresTime) {
                return "-";
              }
--- a/packages/ui/certd-client/src/views/framework/forgot-password/index.vue
+++ b/packages/ui/certd-client/src/views/framework/forgot-password/index.vue
@@ -21,10 +21,17 @@
            </a-input>
          </a-form-item>
          <a-form-item has-feedback name="captchaForEmail" label="验证码">
-            <CaptchaInput v-model:model-value="formState.captchaForEmail"></CaptchaInput>
+            <CaptchaInput ref="captchaForEmailRef" v-model:model-value="formState.captchaForEmail"></CaptchaInput>
          </a-form-item>
          <a-form-item has-feedback name="validateCode" label="邮件验证码">
-            <email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.input" :random-str="formState.randomStr" verification-type="forgotPassword" />
+            <email-code
+              v-model:value="formState.validateCode"
+              :captcha="formState.captchaForEmail"
+              :email="formState.input"
+              :random-str="formState.randomStr"
+              verification-type="forgotPassword"
+              @error="formState.captchaForEmail = null"
+            />
          </a-form-item>
        </a-tab-pane>
        <a-tab-pane key="mobile" tab="手机号找回">
@@ -36,10 +43,17 @@
            </a-input>
          </a-form-item>
          <a-form-item has-feedback name="captchaForSms" label="验证码">
-            <CaptchaInput v-model:model-value="formState.captchaForSms"></CaptchaInput>
+            <CaptchaInput ref="captchaForSmsRef" v-model:model-value="formState.captchaForSms"></CaptchaInput>
          </a-form-item>
          <a-form-item name="validateCode" label="手机验证码">
-            <sms-code v-model:value="formState.validateCode" :captcha="formState.captchaForSms" :mobile="formState.input" :phone-code="formState.phoneCode" verification-type="forgotPassword" />
+            <sms-code
+              v-model:value="formState.validateCode"
+              :captcha="formState.captchaForSms"
+              :mobile="formState.input"
+              :phone-code="formState.phoneCode"
+              verification-type="forgotPassword"
+              @error="formState.captchaForSms = null"
+            />
          </a-form-item>
        </a-tab-pane>
      </a-tabs>
--- a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue
+++ b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue
@@ -177,6 +177,8 @@ function isNewVersion(version: string, latestVersion: string) {
  for (let i = 0; i < current.length; i++) {
    if (parseInt(latest[i]) > parseInt(current[i])) {
      return true;
+    } else if (parseInt(latest[i]) < parseInt(current[i])) {
+      return false;
    }
  }
  return false;
@@ -191,7 +193,6 @@ async function loadLatestVersion() {

  const minVersion = settingsStore.productInfo?.app?.minVersion;
  if (minVersion) {
-    //
    if (isNewVersion(version.value, minVersion)) {
      notification.error({
        message: settingsStore.productInfo?.app?.minVersionTip ?? "版本过低，为了您的数据安全，请尽快升级",
--- a/packages/ui/certd-client/src/views/framework/login/index.vue
+++ b/packages/ui/certd-client/src/views/framework/login/index.vue
@@ -41,7 +41,7 @@
            </a-form-item>

            <a-form-item name="smsCode" :rules="rules.smsCode">
-              <sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" />
+              <sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" @error="formState.smsCaptcha = null" />
            </a-form-item>
          </template>
        </a-tab-pane>
@@ -188,6 +188,7 @@ export default defineComponent({
        }
      } finally {
        loading.value = false;
+        formState.captcha = null;
      }
    };

@@ -209,18 +210,6 @@ export default defineComponent({

    const captchaInputRef = ref();
    const captchaInputForSmsCode = ref();
-    async function doCaptchaValidate() {
-      if (!sysPublicSettings.captchaEnabled) {
-        return {};
-      }
-      const res = await captchaInputRef.value.getValidatedForm();
-      if (!res) {
-        return false;
-      }
-      return {
-        ...res,
-      };
-    }

    return {
      t,
--- a/packages/ui/certd-client/src/views/framework/login/sms-code.vue
+++ b/packages/ui/certd-client/src/views/framework/login/sms-code.vue
@@ -24,7 +24,7 @@ const props = defineProps<{
  captcha?: any;
  verificationType?: string;
 }>();
-const emit = defineEmits(["update:value", "change"]);
+const emit = defineEmits(["update:value", "change", "error"]);

 function onChange(value: string) {
  emit("update:value", value);
@@ -59,6 +59,9 @@ async function sendSmsCode() {
      captcha: props.captcha,
      verificationType: props.verificationType,
    });
+  } catch (e) {
+    emit("error", e);
+    throw e;
  } finally {
    loading.value = false;
  }
--- a/packages/ui/certd-client/src/views/framework/register/email-code.vue
+++ b/packages/ui/certd-client/src/views/framework/register/email-code.vue
@@ -23,7 +23,7 @@ const props = defineProps<{
  captcha?: any;
  verificationType?: string;
 }>();
-const emit = defineEmits(["update:value", "change"]);
+const emit = defineEmits(["update:value", "change", "error"]);

 function onChange(value: string) {
  emit("update:value", value);
@@ -54,6 +54,9 @@ async function sendSmsCode() {
      captcha: props.captcha,
      verificationType: props.verificationType,
    });
+  } catch (e) {
+    emit("error", e);
+    throw e;
  } finally {
    loading.value = false;
  }
--- a/packages/ui/certd-client/src/views/framework/register/index.vue
+++ b/packages/ui/certd-client/src/views/framework/register/index.vue
@@ -66,7 +66,7 @@
            </a-form-item>

            <a-form-item has-feedback name="validateCode" :rules="rules.validateCode" label="邮件验证码">
-              <email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.email" />
+              <email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.email" @error="formState.captchaForEmail = null" />
            </a-form-item>
          </template>
        </a-tab-pane>
@@ -182,16 +182,20 @@ export default defineComponent({
    };

    const handleFinish = async (values: any) => {
-      await userStore.register(
-        toRaw({
-          type: registerType.value,
-          password: formState.password,
-          username: formState.username,
-          email: formState.email,
-          captcha: formState.captcha,
-          validateCode: formState.validateCode,
-        }) as any
-      );
+      try {
+        await userStore.register(
+          toRaw({
+            type: registerType.value,
+            password: formState.password,
+            username: formState.username,
+            email: formState.email,
+            captcha: formState.captcha,
+            validateCode: formState.validateCode,
+          }) as any
+        );
+      } finally {
+        formState.captcha = null;
+      }
    };

    const handleFinishFailed = (errors: any) => {
--- a/packages/ui/certd-client/src/views/sys/nettest/DomainTestCard.vue
+++ b/packages/ui/certd-client/src/views/sys/nettest/DomainTestCard.vue
@@ -0,0 +1,288 @@
+<template>
+  <div class="domain-test-card">
+    <div class="card-header flex flex-wrap justify-start">
+      <div v-if="title">{{ title }}</div>
+      <a-form v-if="editing" layout="inline" :model="formData">
+        <a-form-item label="域名">
+          <a-input v-model:value="formData.domain" placeholder="请输入要测试的域名或IP" style="width: 240px" />
+        </a-form-item>
+        <a-form-item label="端口">
+          <a-input-number v-model:value="formData.port" placeholder="请输入端口" :min="1" :max="65535" style="width: 120px" />
+        </a-form-item>
+      </a-form>
+
+      <div v-else class="domain-info">
+        <span>域名: {{ formData.domain }}</span>
+        <span>端口: {{ formData.port }}</span>
+      </div>
+
+      <a-button :disabled="!formData.domain" size="small" type="primary" :loading="loading" @click="runAllTests"> 开始测试 </a-button>
+    </div>
+
+    <div class="card-content">
+      <div class="test-results">
+        <!-- 域名解析结果 -->
+        <test-case ref="domainResolveRef" title="域名解析" :test-method="() => createDomainResolveMethod()" :disabled="!getCurrentDomain()" />
+
+        <!-- Ping测试结果 -->
+        <test-case ref="pingTestRef" title="Ping测试" :test-method="() => createPingTestMethod()" :disabled="!getCurrentDomain()" />
+
+        <!-- Telnet测试结果 -->
+        <test-case ref="telnetTestRef" title="Telnet测试" :port="getCurrentPort()" :test-method="() => createTelnetTestMethod()" :disabled="!getCurrentDomain() || !getCurrentPort()" />
+      </div>
+
+      <div class="summary">
+        <a-alert :message="testSummary.title" :type="testSummary.status === 'success' ? 'success' : testSummary.status === 'failed' ? 'error' : 'warning'" show-icon :closable="false">
+          <template v-if="testSummary.text" #description>
+            <pre class="summary-text pre">{{ testSummary.text }}</pre>
+          </template>
+        </a-alert>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, onMounted, watch } from "vue";
+import { message } from "ant-design-vue";
+import { DomainResolve, PingTest, TelnetTest } from "./api";
+import TestCase from "./TestCase.vue";
+
+// 组件属性
+const props = defineProps<{
+  title?: string;
+  domain?: string;
+  port?: number;
+  autoStart?: boolean;
+}>();
+
+const editing = ref(!props.domain);
+
+// 测试组件的引用
+const domainResolveRef = ref();
+const pingTestRef = ref();
+const telnetTestRef = ref();
+
+// 表单数据
+const formData = reactive({
+  domain: props.domain || "",
+  port: props.port || 443,
+});
+
+// 加载状态
+const loading = ref(false);
+
+// 创建域名解析测试方法
+const createDomainResolveMethod = async () => {
+  const domain = getCurrentDomain();
+  return DomainResolve(domain);
+};
+
+// 创建Ping测试方法
+const createPingTestMethod = async () => {
+  const domain = getCurrentDomain();
+  return PingTest(domain);
+};
+
+// 创建Telnet测试方法
+const createTelnetTestMethod = async () => {
+  const domain = getCurrentDomain();
+  const port = getCurrentPort();
+
+  return TelnetTest(domain, port);
+};
+
+// 获取当前使用的域名
+const getCurrentDomain = () => {
+  return formData.domain;
+};
+
+// 获取当前使用的端口
+const getCurrentPort = () => {
+  return formData.port;
+};
+
+// 获取各测试用例的状态
+const getTestStatus = (testRef: any) => {
+  const result = testRef?.getResult();
+  if (!result) {
+    return null;
+  }
+
+  const isNetTestResult = typeof result === "object" && result !== null && "success" in result && "message" in result;
+
+  return {
+    success: isNetTestResult ? result.success : false,
+    message: isNetTestResult ? result.message : "测试失败",
+  };
+};
+
+// 生成测试总结
+const testSummary = computed(() => {
+  if (loading.value) {
+    return { status: "waiting", title: "测试中，请稍后..." };
+  }
+  // 通过computed获取各测试结果
+  const domainResolveResult = getTestStatus(domainResolveRef.value);
+  const pingTestResult = getTestStatus(pingTestRef.value);
+  const telnetTestResult = getTestStatus(telnetTestRef.value);
+
+  // 检查是否有测试结果
+  const testDone = domainResolveResult != null && pingTestResult != null && telnetTestResult != null;
+  if (!testDone) {
+    return { status: "waiting", title: '请点击"开始测试"按钮进行网络测试' };
+  }
+
+  // 详细分析不同的测试结果组合
+  // 1. 三个测试都失败
+  if (domainResolveResult?.success === false && pingTestResult?.success === false && telnetTestResult?.success === false) {
+    return {
+      status: "failed",
+      title: "所有测试均未通过",
+      text: `这表明应用容器内的网络可能完全不通。建议：\n1. 检查宿主机的网络连接状态\n2. 确认容器网络配置是否正确\n3. 检查防火墙设置是否阻止了网络访问`,
+    };
+  }
+
+  // 2. 域名解析成功，但Ping不通
+  if (domainResolveResult?.success === true && pingTestResult?.success === false) {
+    return {
+      status: "partial",
+      title: "域名解析成功，但Ping不通",
+      text: `可能原因：\n1. DNS被劫持，解析到了错误的IP地址\n2. 目标服务器禁止了Ping请求\n3. 目标服务器IP被墙\n4. 目标服务器网络不通或已下线`,
+    };
+  }
+
+  // 3. 域名解析和Ping都成功，但Telnet连接失败
+  if (domainResolveResult?.success === true && pingTestResult?.success === true && telnetTestResult?.success === false) {
+    return {
+      status: "partial",
+      title: "域名解析和Ping测试均通过，但Telnet连接失败",
+      text: `可能原因：\n1. 端口号输入错误，请确认目标服务使用的正确端口\n2. 目标服务器上该端口未开放或服务未启动\n3. 防火墙或安全组限制了该端口的访问\n4. 目标网站被墙`,
+    };
+  }
+
+  // 4. 域名解析失败，但其他测试可能成功或未执行
+  if (domainResolveResult?.success === false) {
+    return {
+      status: "partial",
+      title: "域名解析失败",
+      text: `可能原因：\n1. 域名输入错误或不存在\n2. DNS服务器配置问题\n3. 本地网络DNS解析故障\n4. 域名已过期或被注销`,
+    };
+  }
+
+  // 5. 所有测试都成功
+  if (domainResolveResult?.success === true && pingTestResult?.success === true && telnetTestResult?.success === true) {
+    return {
+      status: "success",
+      title: "所有测试均通过",
+      text: `域名${formData.domain}解析正常，能够正常Ping通，且端口${formData.port}可访问。`,
+    };
+  }
+
+  // 6. 其他部分成功的情况
+  return {
+    status: "partial",
+    title: "部分测试未通过",
+    text: `请结合具体测试结果进行分析：\n- 域名解析：${domainResolveResult ? (domainResolveResult.success ? "成功" : "失败") : "未执行"}\n- Ping测试：${pingTestResult ? (pingTestResult.success ? "成功" : "失败") : "未执行"}\n- Telnet测试：${telnetTestResult ? (telnetTestResult.success ? "成功" : "失败") : "未执行"}`,
+  };
+});
+
+// 运行全部测试
+async function runAllTests() {
+  const domain = getCurrentDomain();
+
+  // 检查是否有域名
+  if (!domain) {
+    message.error("请输入域名");
+    return;
+  }
+
+  loading.value = true;
+
+  // 通过组件引用调用测试方法
+  try {
+    await Promise.allSettled([domainResolveRef.value?.test(), pingTestRef.value?.test(), telnetTestRef.value?.test()]);
+  } catch (error) {
+    message.error("部分测试执行失败，请查看详细结果");
+  } finally {
+    loading.value = false;
+  }
+}
+
+onMounted(() => {
+  if (props.autoStart) {
+    runAllTests();
+  }
+});
+</script>
+
+<style lang="less">
+.domain-test-card {
+  border: 1px solid #e8e8e8;
+  border-radius: 4px;
+  overflow: hidden;
+  background-color: #fff;
+
+  .card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 12px 16px;
+    background-color: #fafafa;
+    border-bottom: 1px solid #e8e8e8;
+  }
+
+  .card-header h3 {
+    margin: 0;
+    font-size: 16px;
+    font-weight: 500;
+  }
+
+  .card-content {
+    padding: 16px;
+  }
+
+  .input-form {
+    margin-bottom: 12px;
+    padding: 12px;
+    background-color: #fafafa;
+    border-radius: 4px;
+  }
+
+  .domain-info {
+    padding: 5.5px 12px;
+    background-color: #f0f0f0;
+    border-radius: 4px;
+    display: flex;
+    gap: 16px;
+    font-size: 14px;
+    color: #666;
+  }
+
+  .test-buttons {
+    display: flex;
+    gap: 8px;
+    margin-bottom: 16px;
+  }
+
+  .test-results {
+    margin-top: 0px;
+  }
+
+  .summary {
+    margin-top: 16px;
+    padding: 12px;
+    background-color: #f8f9fa;
+    border-radius: 4px;
+    .summary-text {
+    }
+  }
+
+  /* 调整按钮大小 */
+  .ant-btn {
+    font-size: 12px;
+    padding: 2px 8px;
+    height: 24px;
+  }
+}
+</style>
--- a/packages/ui/certd-client/src/views/sys/nettest/ServerInfoCard.vue
+++ b/packages/ui/certd-client/src/views/sys/nettest/ServerInfoCard.vue
@@ -0,0 +1,140 @@
+<template>
+  <a-card title="服务端信息" class="server-info-card">
+    <template #extra>
+      <a-button size="small" :loading="loading" @click="refreshServerInfo">
+        <template #icon>
+          <a-icon type="sync" :spin="loading" />
+        </template>
+        刷新
+      </a-button>
+    </template>
+    <div v-if="loading" class="loading">
+      <a-spin size="small" />
+      <span style="margin-left: 8px">加载中...</span>
+    </div>
+    <div v-else-if="error" class="error">
+      <a-alert message="获取服务器信息失败" :description="error" type="error" show-icon />
+    </div>
+    <div v-else class="server-info-grid">
+      <!-- 本地IP -->
+      <div class="info-item">
+        <div class="info-label">本地IP:</div>
+        <div v-if="serverInfo.localIP && serverInfo.localIP.length > 0" class="info-value">
+          <a-tag v-for="ip in serverInfo.localIP" :key="ip" type="info" color="blue">{{ ip }}</a-tag>
+        </div>
+        <div v-else class="info-empty">暂无信息</div>
+      </div>
+
+      <!-- 外网IP -->
+      <div class="info-item">
+        <div class="info-label">外网IP:</div>
+        <div v-if="serverInfo.publicIP && serverInfo.publicIP.length > 0" class="info-value">
+          <a-tag v-for="ip in serverInfo.publicIP" :key="ip" type="info" color="green">{{ ip }}</a-tag>
+        </div>
+        <div v-else class="info-empty">暂无信息</div>
+      </div>
+
+      <!-- DNS服务器 -->
+      <div class="info-item">
+        <div class="info-label">DNS服务器:</div>
+        <div v-if="serverInfo.dnsServers && serverInfo.dnsServers.length > 0" class="info-value">
+          <a-tag v-for="dns in serverInfo.dnsServers" :key="dns" type="info" color="cyan">{{ dns }}</a-tag>
+        </div>
+        <div v-else class="info-empty">暂无信息</div>
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted } from "vue";
+import { message } from "ant-design-vue";
+import { GetServerInfo } from "./api";
+
+// 服务器信息类型
+interface ServerInfo {
+  localIP?: string[];
+  publicIP?: string[];
+  dnsServers?: string[];
+}
+
+const loading = ref(false);
+const error = ref<string | null>(null);
+const serverInfo = ref<ServerInfo>({});
+
+// 加载服务器信息
+const loadServerInfo = async () => {
+  loading.value = true;
+  error.value = null;
+  try {
+    serverInfo.value = await GetServerInfo();
+  } catch (e) {
+    error.value = e instanceof Error ? e.message : String(e);
+    message.error("获取服务器信息失败");
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 刷新服务器信息
+const refreshServerInfo = () => {
+  loadServerInfo();
+};
+
+// 组件挂载时加载数据
+onMounted(() => {
+  loadServerInfo();
+});
+</script>
+
+<style lang="less">
+.server-info-card {
+  margin-bottom: 16px;
+
+  .loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20px;
+    color: #666;
+  }
+
+  .error {
+    margin: 0;
+  }
+
+  .server-info-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+    gap: 16px;
+  }
+
+  .info-item {
+    background-color: #fafafa;
+    border-radius: 4px;
+    padding: 12px;
+
+    .info-label {
+      font-size: 14px;
+      font-weight: 500;
+      color: #666;
+      margin-bottom: 8px;
+    }
+
+    .info-value {
+      font-size: 14px;
+      color: #333;
+
+      .ant-list-item {
+        padding: 4px 0;
+      }
+    }
+
+    .info-empty {
+      font-size: 14px;
+      color: #999;
+      font-style: italic;
+    }
+  }
+}
+</style>
--- a/packages/ui/certd-client/src/views/sys/nettest/TestCase.vue
+++ b/packages/ui/certd-client/src/views/sys/nettest/TestCase.vue
@@ -0,0 +1,186 @@
+<template>
+  <div class="test-case" :class="{ loading }">
+    <div class="case-header">
+      <span class="flex items-center">
+        <fs-button size="small" type="text" icon="ion:play-circle" :loading="loading" :disabled="disabled" class="test-button" @click="runTest" />
+        <a-tag color="blue" class="case-title">
+          {{ title }}
+        </a-tag>
+        <span v-if="port" class="port-info">{{ port }}</span>
+      </span>
+      <span v-if="result && isNetTestResult" class="result-status flex-1" :style="{ color: isSuccess ? 'green' : 'red' }">
+        <span>
+          {{ isSuccess ? "✓" : "✗" }}
+        </span>
+        <span class="ml-2">
+          {{ result.message }}
+        </span>
+      </span>
+    </div>
+    <div v-if="result" class="result-content">
+      <div v-if="error" class="error-message">
+        <span style="color: red">{{ error }}</span>
+      </div>
+      <div v-else-if="isNetTestResult">
+        <div v-if="resultTestLog" class="test-log">
+          <pre>{{ resultTestLog }}</pre>
+        </div>
+      </div>
+      <div v-else-if="typeof result === 'object'" class="object-result">
+        <pre>{{ JSON.stringify(result, null, 2) }}</pre>
+      </div>
+      <div v-else class="text-result">
+        <pre>{{ result }}</pre>
+      </div>
+    </div>
+    <div v-else class="no-result">
+      <p>暂无结果</p>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed } from "vue";
+import { message } from "ant-design-vue";
+
+// 组件属性
+const props = defineProps<{
+  title: string;
+  port?: number | string;
+  testMethod: () => Promise<any>;
+  disabled?: boolean;
+}>();
+
+// 内部状态
+const loading = ref(false);
+const result = ref<any>(null);
+const error = ref<string | null>(null);
+
+// 运行测试
+const runTest = async () => {
+  loading.value = true;
+  error.value = null;
+  result.value = null;
+  try {
+    const testResult = await props.testMethod();
+    // 如果结果有 data 属性，则使用 data，否则使用整个结果
+    result.value = testResult.data || testResult;
+  } catch (err: any) {
+    result.value = null;
+    error.value = err.message || "测试失败";
+    message.error(`${props.title} 测试失败: ${error.value}`);
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 暴露方法给父组件
+defineExpose({
+  test: runTest,
+  getResult: () => result.value,
+});
+
+// 辅助计算属性，用于模板中显示结果
+const isNetTestResult = computed(() => {
+  return typeof result.value === "object" && result.value !== null && "success" in result.value && "message" in result.value && "testLog" in result.value;
+});
+
+const isSuccess = computed(() => {
+  return isNetTestResult.value && result.value.success;
+});
+
+const resultMessage = computed(() => {
+  return isNetTestResult.value ? result.value.message : "";
+});
+
+const resultTestLog = computed(() => {
+  return isNetTestResult.value ? result.value.testLog : "";
+});
+
+const resultError = computed(() => {
+  return isNetTestResult.value ? result.value.error : "";
+});
+</script>
+
+<style lang="less" scoped>
+.test-case {
+  padding: 12px 16px;
+  border-bottom: 1px solid #f0f0f0;
+  position: relative;
+
+  &:last-child {
+    border-bottom: none;
+  }
+
+  &.loading {
+    opacity: 0.7;
+  }
+}
+
+.case-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+
+  .result-status {
+    font-size: 14px;
+    color: #999;
+    margin-right: 10px;
+  }
+}
+
+.case-title {
+  font-weight: 500;
+  font-size: 14px;
+}
+
+.port-info {
+  font-size: 12px;
+  color: #999;
+  background-color: #f0f0f0;
+  padding: 2px 6px;
+  border-radius: 3px;
+  margin-right: 8px;
+}
+
+.test-button {
+  color: #1890ff;
+  font-size: 12px;
+  margin-right: 5px;
+}
+
+.result-content {
+  .error-message,
+  .object-result,
+  .text-result {
+    background-color: #f8f8f8;
+    padding: 8px 10px;
+    border-radius: 3px;
+    overflow-x: auto;
+  }
+
+  pre {
+    margin: 0;
+    font-size: 12px;
+    line-height: 1.4;
+    font-family: "Monaco", "Menlo", "Ubuntu Mono", monospace;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+  }
+
+  .test-log {
+    background-color: #f8f8f8;
+    padding: 8px 10px;
+    border-radius: 3px;
+    overflow-x: auto;
+  }
+}
+
+.no-result {
+  padding: 12px 0;
+  text-align: center;
+  color: #999;
+  font-size: 12px;
+}
+</style>
--- a/packages/ui/certd-client/src/views/sys/nettest/api.ts
+++ b/packages/ui/certd-client/src/views/sys/nettest/api.ts
@@ -0,0 +1,33 @@
+import { request } from "/@/api/service";
+
+export async function DomainResolve(domain: string) {
+  return await request({
+    url: "/sys/nettest/domainResolve",
+    method: "post",
+    data: { domain },
+  });
+}
+
+export async function PingTest(domain: string) {
+  return await request({
+    url: "/sys/nettest/ping",
+    method: "post",
+    data: { domain },
+  });
+}
+
+export async function TelnetTest(domain: string, port: number) {
+  return await request({
+    url: "/sys/nettest/telnet",
+    method: "post",
+    data: { domain, port },
+  });
+}
+
+// 获取服务器信息（包括本地IP、外网IP和DNS服务器）
+export async function GetServerInfo() {
+  return await request({
+    url: "/sys/nettest/serverInfo",
+    method: "post",
+  });
+}
--- a/packages/ui/certd-client/src/views/sys/nettest/index.vue
+++ b/packages/ui/certd-client/src/views/sys/nettest/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <fs-page class="page-sys-nettest">
+    <template #header>
+      <div class="title">
+        网络测试
+        <span class="sub">测试您的服务器容器网络连接是否正常</span>
+      </div>
+    </template>
+    <div class="nettest-container">
+      <!-- 服务端信息 -->
+      <server-info-card />
+
+      <!-- 测试区域 -->
+      <div class="test-areas flex-wrap md:flex-nowrap">
+        <!-- 百度域名测试 (用于对比) -->
+        <domain-test-card class="test-card" :domain="'baidu.com'" :port="443" :auto-start="true" />
+        <!-- 用户输入域名测试 -->
+        <domain-test-card class="test-card" :title="'自定义域名测试'" />
+      </div>
+    </div>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import DomainTestCard from "./DomainTestCard.vue";
+import ServerInfoCard from "./ServerInfoCard.vue";
+</script>
+
+<style lang="less">
+.page-sys-nettest {
+  .nettest-container {
+    padding: 16px;
+    background-color: #fff;
+  }
+
+  .test-areas {
+    display: flex;
+    gap: 16px;
+    margin-top: 16px;
+  }
+
+  .test-card {
+    min-width: 50%;
+  }
+}
+</style>
--- a/packages/ui/certd-client/src/views/sys/settings/api.ts
+++ b/packages/ui/certd-client/src/views/sys/settings/api.ts
@@ -79,6 +79,14 @@ export async function SysSettingsSave(data: SysSettings) {
  });
 }

+export async function TestCaptcha(form: any) {
+  return await request({
+    url: apiPrefix + "/captchaTest",
+    method: "post",
+    data: form,
+  });
+}
+
 export async function TestProxy() {
  return await request({
    url: apiPrefix + "/testProxy",
--- a/packages/ui/certd-client/src/views/sys/settings/index.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/index.vue
@@ -17,6 +17,9 @@
        <a-tab-pane key="safe" :tab="t('certd.sys.setting.safeSetting')">
          <SettingSafe v-if="activeKey === 'safe'" />
        </a-tab-pane>
+        <a-tab-pane key="captcha" :tab="t('certd.sys.setting.captchaSetting')">
+          <SettingCaptcha v-if="activeKey === 'captcha'" />
+        </a-tab-pane>
      </a-tabs>
    </div>
  </fs-page>
@@ -27,6 +30,8 @@ import SettingBase from "/@/views/sys/settings/tabs/base.vue";
 import SettingRegister from "/@/views/sys/settings/tabs/register.vue";
 import SettingPayment from "/@/views/sys/settings/tabs/payment.vue";
 import SettingSafe from "/@/views/sys/settings/tabs/safe.vue";
+import SettingCaptcha from "/@/views/sys/settings/tabs/captcha.vue";
+
 import { useRoute, useRouter } from "vue-router";
 import { ref } from "vue";
 import { useSettingStore } from "/@/store/settings";
@@ -58,7 +63,7 @@ function onChange(value: string) {
 <style lang="less">
 .page-sys-settings {
  .sys-settings-form {
-    width: 600px;
+    width: 800px;
    max-width: 100%;
    padding: 20px;
  }
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/base.vue
@@ -47,18 +47,6 @@
        <div class="helper" v-html="t('certd.commonCnameHelper')"></div>
      </a-form-item>

-      <a-form-item :label="t('certd.sys.setting.captchaEnabled')" :name="['public', 'captchaEnabled']">
-        <a-switch v-model:checked="formState.public.captchaEnabled" />
-        <div class="helper" v-html="t('certd.sys.setting.captchaHelper')"></div>
-      </a-form-item>
-      <a-form-item :label="t('certd.sys.setting.captchaType')" :name="['public', 'captchaAddonId']">
-        <addon-selector v-model:model-value="formState.public.captchaAddonId" addon-type="captcha" from="sys" @selected-change="onAddonChanged" />
-      </a-form-item>
-
-      <a-form-item :name="['public', 'captchaType']" class="hidden">
-        <a-input v-model:model-value="formState.public.captchaType"></a-input>
-      </a-form-item>
-
      <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
        <a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
      </a-form-item>
@@ -76,6 +64,7 @@ import { notification } from "ant-design-vue";
 import { util } from "/@/utils";
 import { useI18n } from "/src/locales";
 import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
+import CaptchaInput from "/@/components/captcha/captcha-input.vue";
 const { t } = useI18n();

 defineOptions({
@@ -106,6 +95,7 @@ const settingsStore = useSettingStore();
 const onFinish = async (form: any) => {
  try {
    saveLoading.value = true;
+
    await api.SysSettingsSave(form);
    await settingsStore.loadSysSettings();
    notification.success({
@@ -116,21 +106,6 @@ const onFinish = async (form: any) => {
  }
 };

-const onFinishFailed = (errorInfo: any) => {
-  // console.log("Failed:", errorInfo);
-};
-
-async function stopOtherUserTimer() {
-  await api.stopOtherUserTimer();
-  notification.success({
-    message: t("certd.stopSuccess"),
-  });
-}
-
-function onAddonChanged(target: any) {
-  formState.public.captchaType = target.type;
-}
-
 const testProxyLoading = ref(false);
 async function testProxy() {
  testProxyLoading.value = true;
--- a/packages/ui/certd-client/src/views/sys/settings/tabs/captcha.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/tabs/captcha.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="sys-settings-form sys-settings-base">
+    <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish">
+      <a-form-item :label="t('certd.sys.setting.captchaEnabled')" :name="['public', 'captchaEnabled']">
+        <a-switch v-model:checked="formState.public.captchaEnabled" />
+        <div class="helper" v-html="t('certd.sys.setting.captchaHelper')"></div>
+      </a-form-item>
+      <a-form-item :label="t('certd.sys.setting.captchaType')" :name="['public', 'captchaAddonId']">
+        <addon-selector v-model:model-value="formState.public.captchaAddonId" addon-type="captcha" from="sys" @selected-change="onAddonChanged" />
+      </a-form-item>
+      <a-form-item v-if="formState.public.captchaType === settingsStore.sysPublic.captchaType" :label="t('certd.sys.setting.captchaTest')">
+        <div class="flex">
+          <CaptchaInput v-model:model-value="captchaTestForm.captcha" class="w-50%"></CaptchaInput>
+          <a-button class="ml-2" type="primary" @click="doCaptchaValidate">后端验证</a-button>
+        </div>
+      </a-form-item>
+
+      <a-form-item :name="['public', 'captchaType']" class="hidden">
+        <a-input v-model:model-value="formState.public.captchaType"></a-input>
+      </a-form-item>
+
+      <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
+        <a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
+      </a-form-item>
+    </a-form>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { reactive, ref } from "vue";
+import { SysSettings } from "/@/views/sys/settings/api";
+import * as api from "/@/views/sys/settings/api";
+import { merge } from "lodash-es";
+import { useSettingStore } from "/@/store/settings";
+import { notification } from "ant-design-vue";
+import { util } from "/@/utils";
+import { useI18n } from "/src/locales";
+import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
+import CaptchaInput from "/@/components/captcha/captcha-input.vue";
+const { t } = useI18n();
+
+defineOptions({
+  name: "SettingCaptcha",
+});
+
+const captchaTestForm = reactive({
+  captcha: null,
+  pass: false,
+});
+
+async function doCaptchaValidate() {
+  if (!captchaTestForm.captcha) {
+    notification.error({
+      message: "请进行验证码验证",
+    });
+    return;
+  }
+  await api.TestCaptcha(captchaTestForm.captcha);
+  notification.success({
+    message: "校验通过",
+  });
+  captchaTestForm.pass = true;
+}
+
+const formState = reactive<Partial<SysSettings>>({
+  public: {
+    icpNo: "",
+    mpsNo: "",
+  },
+  private: {},
+});
+
+async function loadSysSettings() {
+  const data: any = await api.SysSettingsGet();
+  merge(formState, data);
+}
+
+const saveLoading = ref(false);
+loadSysSettings();
+const settingsStore = useSettingStore();
+const onFinish = async (form: any) => {
+  try {
+    saveLoading.value = true;
+
+    if (form.public.captchaEnabled && !captchaTestForm.pass) {
+      if (form.public.captchaType === settingsStore.sysPublic.captchaType) {
+        notification.error({
+          message: "您正在开启登录验证码，请先通过验证码测试，后端校验成功后才能保存",
+        });
+      } else {
+        notification.error({
+          message: "您正在开启登录验证码，请先关闭登录验证码开关，保存，然后会显示验证码，进行验证码测试，后端校验成功，之后再开启登录验证码，并保存",
+        });
+      }
+
+      return;
+    }
+
+    await api.SysSettingsSave(form);
+    await settingsStore.loadSysSettings();
+    notification.success({
+      message: t("certd.saveSuccess"),
+    });
+  } catch (e) {
+    console.error(e);
+    clearValidState();
+  } finally {
+    saveLoading.value = false;
+  }
+};
+
+function clearValidState() {
+  captchaTestForm.pass = false;
+  captchaTestForm.captcha = null;
+}
+
+function onAddonChanged(target: any) {
+  formState.public.captchaType = target.type;
+  clearValidState();
+}
+</script>
+<style lang="less">
+.sys-settings-base {
+}
+</style>
--- a/packages/ui/certd-client/src/views/sys/suite/product/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/suite/product/crud.tsx
@@ -55,15 +55,15 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          groups: {
            base: {
              header: t("certd.basicInfo"),
-              columns: ["title", "type", "disabled", "order", "supportBuy", "intro"]
+              columns: ["title", "type", "disabled", "order", "supportBuy", "intro"],
            },
            content: {
              header: t("certd.packageContent"),
-              columns: ["content.maxDomainCount", "content.maxPipelineCount", "content.maxDeployCount", "content.maxMonitorCount"]
+              columns: ["content.maxDomainCount", "content.maxPipelineCount", "content.maxDeployCount", "content.maxMonitorCount"],
            },
            price: {
              header: t("certd.price"),
-              columns: ["durationPrices"]
+              columns: ["durationPrices"],
            },
          },
        },
--- a/packages/ui/certd-client/src/views/sys/suite/trade/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/suite/trade/crud.tsx
@@ -41,7 +41,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
          //这里使用行选择插件，生成行选择crudOptions配置，最终会与crudOptions合并
          rowSelection: {
            enabled: true,
-            order: -2,
+            order: -99,
            before: true,
            // handle: (pluginProps,useCrudProps)=>CrudOptions,
            props: {
--- a/packages/ui/certd-client/vite.config.ts
+++ b/packages/ui/certd-client/vite.config.ts
@@ -84,6 +84,7 @@ export default ({ command, mode }) => {
      host: "0.0.0.0",
      port: 3008,
      fs: devServerFs,
+      allowedHosts: ["localhost", "127.0.0.1", "yfy.docmirror.cn"],
      proxy: {
        // with options
        "/api": {
--- a/packages/ui/certd-server/.env.dev-localplus.yaml
+++ b/packages/ui/certd-server/.env.dev-localplus.yaml
@@ -23,7 +23,6 @@ typeorm:
      database: './data/db-plus-dev-1.sqlite'

 # plus server: 'http://127.0.0.1:11007'
-
 account:
  server:
    baseUrl: 'http://localhost:1017/subject'
--- a/packages/ui/certd-server/CHANGELOG.md
+++ b/packages/ui/certd-server/CHANGELOG.md
@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.1](https://github.com/certd/certd/compare/v1.37.0...v1.37.1) (2025-09-29)
+
+### Bug Fixes
+
+* 修复某些情况下cname申请证书报错主域名不一致的bug ([2671781](https://github.com/certd/certd/commit/2671781e1bb0838981728d85eacf0e1a25a0fa48))
+
+### Performance Improvements
+
+* dns解析支持阿里esa ([9291fa6](https://github.com/certd/certd/commit/9291fa68aa7a88a05c2f888bf3048df36a8fbde3))
+
+# [1.37.0](https://github.com/certd/certd/compare/v1.36.25...v1.37.0) (2025-09-28)
+
+### Features
+
+* dist打包前检查 ([8f6e5bd](https://github.com/certd/certd/commit/8f6e5bd24b3b65fbfcba36c08f532a3abad2d606))
+
+## [1.36.25](https://github.com/certd/certd/compare/v1.36.24...v1.36.25) (2025-09-27)
+
+### Bug Fixes
+
+* 固定midwayjs版本，修复ui-server import 错误的bug ([eb4d125](https://github.com/certd/certd/commit/eb4d125eaf4a41e88c752d0c68993829589f8f27))
+
+## [1.36.24](https://github.com/certd/certd/compare/v1.36.23...v1.36.24) (2025-09-27)
+
+### Bug Fixes
+
+* 修复 ui-server 加载失败问题 ([c2ccdbe](https://github.com/certd/certd/commit/c2ccdbec9dd08bca4688eeb2f34d0105eec43ba1))
+
+### Performance Improvements
+
+* 重置管理员密码同时会关闭验证码，防止验证码失效之后无法登录 ([03899d4](https://github.com/certd/certd/commit/03899d4d9c76fc2077dacc53ab88e2c9ca41af7c))
+
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+### Performance Improvements
+
+* 开启子域名托管之后cname记录支持重置 ([54c8d62](https://github.com/certd/certd/commit/54c8d622437761d350db0f17e07f7517f1911211))
+* 验证码支持测试，登录验证码需要测试通过后才能开启 ([83e6476](https://github.com/certd/certd/commit/83e6476408090b741fabb1b542fb458d9a8b4134))
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+### Performance Improvements
+
+* 7001绑定::地址 ([7188997](https://github.com/certd/certd/commit/7188997dd1979f1c10fa29b30221015e0bd5fe9e))
+* 公共cname支持权限校验 ([9cc5f0f](https://github.com/certd/certd/commit/9cc5f0f889d4362ff36e7a1f0e448e02d32ecee7))
+* dns支持新网域名解析 ([cf3a78e](https://github.com/certd/certd/commit/cf3a78e1145ff0505c87fbc485d9e731b1aa88a8))
+* gcore flush plugin ssl_id改为必填项 ([4b90972](https://github.com/certd/certd/commit/4b909723411c57505aa13b07d8699fb9ac77c937))
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)

 **Note:** Version bump only for package @certd/ui-server
--- a/packages/ui/certd-server/app.js
+++ b/packages/ui/certd-server/app.js
@@ -5,9 +5,8 @@ const { Bootstrap } = require('@midwayjs/bootstrap');
 const DirectoryFileDetector = require('@midwayjs/core').DirectoryFileDetector;

 const baseDir = process.cwd();
-const pipelineDir = baseDir + './node_modules/@certd/pipeline/dist';
 const customFileDetector = new DirectoryFileDetector({
-  loadDir: [baseDir, pipelineDir],
+  loadDir: [baseDir],
 });

 module.exports = async () => {
--- a/packages/ui/certd-server/db/migration-mysql/v10032__cname_record.sql
+++ b/packages/ui/certd-server/db/migration-mysql/v10032__cname_record.sql
@@ -0,0 +1 @@
+ALTER TABLE cd_cname_record ADD COLUMN `main_domain` varchar(100);
--- a/packages/ui/certd-server/db/migration-pg/v10032__cname_record.sql
+++ b/packages/ui/certd-server/db/migration-pg/v10032__cname_record.sql
@@ -0,0 +1 @@
+ALTER TABLE cd_cname_record ADD COLUMN "main_domain" varchar(100);
--- a/packages/ui/certd-server/db/migration/v10032__cname_record.sql
+++ b/packages/ui/certd-server/db/migration/v10032__cname_record.sql
@@ -0,0 +1 @@
+ALTER TABLE cd_cname_record ADD COLUMN "main_domain" varchar(100);
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 :59
 :32
				`@@ -0,0 +1 @@`
				ALTER TABLE cd_cname_record ADD COLUMN `main_domain` varchar(100);
				`@@ -0,0 +1 @@`
				`ALTER TABLE cd_cname_record ADD COLUMN "main_domain" varchar(100);`