Merge branch 'v2-dev' into v2-dev-buy

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.4](https://github.com/publishlab/node-acme-client/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.37.3](https://github.com/publishlab/node-acme-client/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+### Bug Fixes
+
+* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/publishlab/node-acme-client/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
+
+## [1.37.2](https://github.com/publishlab/node-acme-client/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+### Bug Fixes
+
+* aliyunoss 选择证书接入点选择新加坡无法上传的bug ([e00733a](https://github.com/publishlab/node-acme-client/commit/e00733a34644c23ffe926486b15dc96bf2fa4b57))
+
+## [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

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.36.22",
+    "version": "1.37.4",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.36.22",
+        "@certd/basic": "^1.37.4",
         "@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": "c98f43b98459d107910c95d23fda785b0edc4702"
+    "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

packages/core/acme-client/src/api.js

@@ -28,7 +28,6 @@ class AcmeApi {
                 }
             }
         }
-        console.log(locationUrl, mapping);
         return locationUrl;
     }
 

packages/core/acme-client/src/auto.js

@@ -2,7 +2,6 @@
  * ACME auto helper
  */
 import { readCsrDomains } from "./crypto/index.js";
-import { log } from "./logger.js";
 import { wait } from "./wait.js";
 import { CancelError } from "./error.js";
 
@@ -45,6 +44,9 @@ export default async (client, userOpts) => {
         accountPayload.externalAccountBinding = opts.externalAccountBinding;
     }
 
+    const log = (...args)=>{
+        return client.logger.info(...args);
+    }
     /**
      * Register account
      */
@@ -255,7 +257,7 @@ export default async (client, userOpts) => {
                 await wait(waitDnsDiffuseTime * 1000)
             }
 
-            log("开始向提供商请求挑战验证");
+            log("开始向提供商请求检查验证");
             await runPromisePa(completeChallengeTasks, 1000);
         } catch (e) {
             log(`证书申请失败${e.message}`);

packages/core/acme-client/src/axios.js

@@ -3,9 +3,9 @@
  */
 import axios from 'axios';
 import { parseRetryAfterHeader } from './util.js';
-import { log } from './logger.js';
 const { AxiosError } = axios;
 import {getGlobalAgents, HttpError} from '@certd/basic'
+import { log } from './logger.js';
 /**
  * Defaults
  */

packages/core/acme-client/src/client.js

@@ -5,7 +5,6 @@
  */
 import { createHash } from 'crypto';
 import  { getPemBodyAsB64u } from './crypto/index.js';
-import { log } from './logger.js';
 import HttpClient from './http.js';
 import AcmeApi from './api.js';
 import verify from './verify.js';
@@ -104,8 +103,13 @@ class AcmeClient {
             max: this.opts.backoffMax,
         };
 
-        this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping);
+        this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping, opts.logger);
         this.api = new AcmeApi(this.http, this.opts.accountUrl);
+        this.logger = opts.logger;
+    }
+
+    log(...args) {
+        this.logger.info(...args);
     }
 
     /**
@@ -177,7 +181,7 @@ class AcmeClient {
             this.getAccountUrl();
 
             /* Account URL exists */
-            log('Account URL exists, returning updateAccount()');
+            this.log('Account URL exists, returning updateAccount()');
             return this.updateAccount(data);
         }
         catch (e) {
@@ -185,7 +189,7 @@ class AcmeClient {
 
             /* HTTP 200: Account exists */
             if (resp.status === 200) {
-                log('Account already exists (HTTP 200), returning updateAccount()');
+                this.log('Account already exists (HTTP 200), returning updateAccount()');
                 return this.updateAccount(data);
             }
 
@@ -214,7 +218,7 @@ class AcmeClient {
             this.api.getAccountUrl();
         }
         catch (e) {
-            log('No account URL found, returning createAccount()');
+            this.log('No account URL found, returning createAccount()');
             return this.createAccount(data);
         }
 
@@ -502,7 +506,7 @@ class AcmeClient {
             await verify[challenge.type](authz, challenge, keyAuthorization);
         };
 
-        log('Waiting for ACME challenge verification（等待ACME挑战验证）');
+        this.log('Waiting for ACME challenge verification（等待ACME检查验证）');
         return util.retry(verifyFn, this.backoffOpts);
     }
 
@@ -570,7 +574,7 @@ class AcmeClient {
             const resp = await this.api.apiRequest(item.url, null, [200]);
 
             /* Verify status */
-            log(`[${d}] Item has status（挑战状态）: ${resp.data.status}`);
+            this.log(`[${d}] Item has status（检查状态）: ${resp.data.status}`);
 
             if (invalidStates.includes(resp.data.status)) {
                 abort();
@@ -586,7 +590,7 @@ class AcmeClient {
             throw new Error(`[${d}] Unexpected item status: ${resp.data.status}`);
         };
 
-        log(`[${d}] Waiting for valid status （等待valid状态）: ${item.url}`, this.backoffOpts);
+        this.log(`[${d}] Waiting for valid status （等待valid状态）: ${item.url}`, this.backoffOpts);
         return util.retry(verifyFn, this.backoffOpts);
     }
 

packages/core/acme-client/src/http.js

@@ -19,7 +19,7 @@ import { getJwk } from './crypto/index.js';
  */
 
 class HttpClient {
-    constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {}) {
+    constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {},logger) {
         this.directoryUrl = directoryUrl;
         this.accountKey = accountKey;
         this.externalAccountBinding = externalAccountBinding;
@@ -31,6 +31,7 @@ class HttpClient {
         this.directoryMaxAge = 86400;
         this.directoryTimestamp = 0;
         this.urlMapping = urlMapping;
+        this.log = logger? logger.info.bind(logger) : log;
     }
 
     /**
@@ -48,7 +49,7 @@ class HttpClient {
             for (const key in this.urlMapping.mappings) {
                 if (url.includes(key)) {
                     const newUrl = url.replace(key, this.urlMapping.mappings[key]);
-                    log(`use reverse proxy: ${newUrl}`);
+                    this.log(`use reverse proxy: ${newUrl}`);
                     url = newUrl;
                 }
             }
@@ -65,10 +66,10 @@ class HttpClient {
         opts.headers['Content-Type'] = 'application/jose+json';
 
         /* Request */
-        log(`HTTP request: ${method} ${url}`);
+        this.log(`HTTP request: ${method} ${url}`);
         const resp = await axios.request(opts);
 
-        log(`RESP ${resp.status} ${method} ${url}`);
+        this.log(`RESP ${resp.status} ${method} ${url}`);
         return resp;
     }
 
@@ -85,7 +86,7 @@ class HttpClient {
         const age = (now - this.directoryTimestamp);
 
         if (!this.directoryCache || (age > this.directoryMaxAge)) {
-            log(`Refreshing ACME directory, age: ${age}`);
+            this.log(`Refreshing ACME directory, age: ${age}`);
             const resp = await this.request(this.directoryUrl, 'get');
 
             if (resp.status >= 400) {
@@ -187,7 +188,7 @@ class HttpClient {
 
         /* Nonce */
         if (nonce) {
-            log(`Using nonce: ${nonce}`);
+            this.log(`Using nonce: ${nonce}`);
             header.nonce = nonce;
         }
 
@@ -314,7 +315,7 @@ class HttpClient {
             nonce = resp.headers['replay-nonce'] || null;
             attempts += 1;
 
-            log(`Caught invalid nonce error, retrying (${attempts}/${this.maxBadNonceRetries}) signed request to: ${url}`);
+            this.log(`Caught invalid nonce error, retrying (${attempts}/${this.maxBadNonceRetries}) signed request to: ${url}`);
             return this.signedRequest(url, payload, { kid, nonce, includeExternalAccountBinding }, attempts);
         }
 

packages/core/acme-client/types/index.d.ts

@@ -49,6 +49,7 @@ export interface ClientOptions {
     backoffMax?: number;
     urlMapping?: UrlMapping;
     signal?: AbortSignal;
+    logger?:any
 }
 
 export interface ClientExternalAccountBindingOptions {

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+### Performance Improvements
+
+* 支持网络测试 ([2bef608](https://github.com/certd/certd/commit/2bef608e07ceb56d52007f290667e0afef401b22))
+
+## [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

packages/core/basic/build.md

@@ -1 +1 @@
-01:46
+01:28

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.36.22",
+  "version": "1.37.4",
   "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": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

packages/core/basic/src/index.ts

@@ -1,2 +1 @@
-export * from './utils/index.js';
-export * from './utils/util.id.js';
+export * from "./utils/index.js";

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";
@@ -35,6 +37,9 @@ import { mitter } from "./util.mitter.js";
 
 import * as request from "./util.request.js";
 export * from "./util.cache.js";
+
+export * from "./util.id.js";
+
 export const utils = {
   sleep,
   http,
@@ -43,7 +48,6 @@ export const utils = {
   hash: hashUtils,
   promises,
   file: fileUtils,
-  _,
   mergeUtils,
   cache,
   nanoid,

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);
       }

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [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

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.36.22",
+  "version": "1.37.4",
   "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.22",
-    "@certd/plus-core": "^1.36.22",
+    "@certd/basic": "^1.37.4",
+    "@certd/plus-core": "^1.37.4",
     "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": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

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) {

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 = {

packages/libs/lib-huawei/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.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
+## [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

packages/libs/lib-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-huawei",
   "private": false,
-  "version": "1.36.22",
+  "version": "1.37.4",
   "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": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

packages/libs/lib-iframe/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.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
+## [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

packages/libs/lib-iframe/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-iframe",
   "private": false,
-  "version": "1.36.22",
+  "version": "1.37.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

packages/libs/lib-jdcloud/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.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+**Note:** Version bump only for package @certd/jdcloud
+
+## [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

packages/libs/lib-jdcloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.36.22",
+  "version": "1.37.4",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
@@ -61,5 +61,5 @@
       "fetch"
     ]
   },
-  "gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

packages/libs/lib-k8s/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.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [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

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.36.22",
+  "version": "1.37.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,7 +17,7 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/basic": "^1.36.22",
+    "@certd/basic": "^1.37.4",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -32,5 +32,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+**Note:** Version bump only for package @certd/lib-server
+
+## [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

packages/libs/lib-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.36.22",
+  "version": "1.37.4",
   "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,19 +28,20 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.36.22",
-    "@certd/basic": "^1.36.22",
-    "@certd/pipeline": "^1.36.22",
-    "@certd/plugin-lib": "^1.36.22",
-    "@certd/plus-core": "^1.36.22",
-    "@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.4",
+    "@certd/basic": "^1.37.4",
+    "@certd/pipeline": "^1.37.4",
+    "@certd/plugin-lib": "^1.37.4",
+    "@certd/plus-core": "^1.37.4",
+    "@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",
@@ -62,5 +64,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

packages/libs/lib-server/src/basic/base-controller.ts

@@ -47,4 +47,12 @@ export abstract class BaseController {
     }
     return user;
   }
+
+  isAdmin() {
+    const roleIds: number[] = this.ctx?.user?.roles;
+    if (roleIds?.includes(1)) {
+      return true;
+    }
+  }
+
 }

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'

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

@@ -3,7 +3,7 @@ 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';
-
+import fs from 'fs';
 @Provide("plusService")
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class PlusService {
@@ -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,
       },
     });
   }

packages/libs/lib-server/src/system/settings/service/models.ts

@@ -37,6 +37,15 @@ export class SysPublicSettings extends BaseSettings {
   //验证码类型
   captchaType?: string;
   captchaAddonId?:number;
+
+
+
+  //流水线是否启用有效期
+  pipelineValidTimeEnabled?: boolean = false;
+
+  //证书域名添加到监控
+  certDomainAddToMonitorEnabled?: boolean = false;
+
 }
 
 export class SysPrivateSettings extends BaseSettings {
@@ -51,6 +60,8 @@ export class SysPrivateSettings extends BaseSettings {
   dnsResultOrder? = '';
   commonCnameEnabled?: boolean = true;
 
+  httpRequestTimeout?: number = 30;
+
   sms?: {
     type?: string;
     config?: any;
@@ -214,3 +225,4 @@ export class SysSafeSetting extends BaseSettings {
   };
 }
 
+

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;

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'

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);
-  }
-}

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);
   }

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);
-  }
-}

packages/libs/midway-flyway-js/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.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [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

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

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.36.22",
+  "version": "1.37.4",
   "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": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+### Bug Fixes
+
+* 修复lego模式下 私钥加密类型错误的bug ([f7cf7c1](https://github.com/certd/certd/commit/f7cf7c198d7f77b222099770f81accc637bc6619))
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+### Bug Fixes
+
+* 修复并发情况下证书申请日志混乱的bug ([bb2714f](https://github.com/certd/certd/commit/bb2714ff241f9db4a71d805b23a1b0f9f2f6413a))
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+### Performance Improvements
+
+* 证书监控支持设置证书即将过期天数 ([cd35568](https://github.com/certd/certd/commit/cd35568e042e6ab928685efad51cdbed823d2d4f))
+* 支持新网代理方式 ([f612509](https://github.com/certd/certd/commit/f612509cac87b859e81a7a52fe94b2eaccad22f9))
+
+## [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

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.36.22",
+  "version": "1.37.4",
   "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.22",
-    "@certd/basic": "^1.36.22",
-    "@certd/pipeline": "^1.36.22",
-    "@certd/plugin-lib": "^1.36.22",
+    "@certd/acme-client": "^1.37.4",
+    "@certd/basic": "^1.37.4",
+    "@certd/pipeline": "^1.37.4",
+    "@certd/plugin-lib": "^1.37.4",
     "@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": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

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";

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

@@ -82,9 +82,9 @@ export class AcmeService {
     this.sslProvider = options.sslProvider || "letsencrypt";
     this.eab = options.eab;
     this.skipLocalVerify = options.skipLocalVerify ?? false;
-    acme.setLogger((message: any, ...args: any[]) => {
-      this.logger.info(message, ...args);
-    });
+    // acme.setLogger((message: any, ...args: any[]) => {
+    //   this.logger.info(message, ...args);
+    // });
   }
 
   async getAccountConfig(email: string, urlMapping: UrlMapping): Promise<any> {
@@ -155,6 +155,7 @@ export class AcmeService {
       backoffMax: 10000,
       urlMapping,
       signal: this.options.signal,
+      logger: this.logger,
     });
 
     if (conf.accountUrl == null) {

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();

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

@@ -117,11 +117,11 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       ],
     },
     required: true,
-    helper: `1. <b>DNS直接验证</b>：域名dns解析是在阿里云/腾讯云/华为云/CF/NameSilo/西数/火山/dns.la/京东云/51dns的，选它
-2.  <b>CNAME代理验证</b>：支持任何注册商的域名，第一次需要手动添加[CNAME记录](#/certd/cname/record)（建议将DNS服务器修改为阿里云/腾讯云的，然后使用DNS直接验证）
+    helper: `1. <b>DNS直接验证</b>：当域名dns解析已被本系统支持时（即下方DNS解析服务商选项中可选），推荐选择此方式
+2.  <b>CNAME代理验证</b>：支持任何注册商的域名，第一次需要手动添加[CNAME记录](#/certd/cname/record)（如果经常申请失败，建议将DNS服务器修改为阿里云/腾讯云的，然后使用DNS直接验证）
 3.  <b>HTTP文件验证</b>：不支持泛域名，需要配置网站文件上传
 4.  <b>多DNS提供商</b>：每个域名可以选择独立的DNS提供商
-5.  <b>自动匹配</b>：需要在[域名管理](#/certd/cert/domain)中事先配置好校验方式
+5.  <b>自动匹配</b>：此处无需选择校验方式，需要在[域名管理](#/certd/cert/domain)中提前配置好校验方式
 `,
   })
   challengeType!: string;
@@ -133,9 +133,9 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       name: "icon-select",
       vModel: "value",
       options: [
-        { value: "letsencrypt", label: "Let's Encrypt", icon: "simple-icons:letsencrypt" },
-        { value: "google", label: "Google", icon: "flat-color-icons:google" },
-        { value: "zerossl", label: "ZeroSSL", icon: "emojione:digit-zero" },
+        { value: "letsencrypt", label: "Let's Encrypt（免费，新手推荐）", icon: "simple-icons:letsencrypt" },
+        { value: "google", label: "Google（免费）", icon: "flat-color-icons:google" },
+        { value: "zerossl", label: "ZeroSSL（免费）", icon: "emojione:digit-zero" },
         { value: "sslcom", label: "SSL.com（仅主域名和www免费）", icon: "la:expeditedssl" },
       ],
     },
@@ -541,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);
@@ -630,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,

packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts

@@ -158,7 +158,7 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin {
     if (this.eab) {
       eabArgs = ` --eab --kid "${this.eab.kid}" --hmac "${this.eab.hmacKey}"`;
     }
-    const keyType = `-k ${this.privateKeyType}`;
+    const keyType = `-k ${this.privateKeyType?.replaceAll("_", "")}`;
 
     const saveDir = `./data/.lego/pipeline_${this.pipeline.id}/`;
     const savePathArgs = `--path "${saveDir}"`;

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+### Performance Improvements
+
+* ssh 增加禁止-i参数提示 ([3a8931f](https://github.com/certd/certd/commit/3a8931feeffd7157163ff7d46b693e5e1a434b9c))
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
+## [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

packages/plugins/plugin-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-lib",
   "private": false,
-  "version": "1.36.22",
+  "version": "1.37.4",
   "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.22",
-    "@certd/pipeline": "^1.36.22",
+    "@certd/basic": "^1.37.4",
+    "@certd/pipeline": "^1.37.4",
     "@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": "c98f43b98459d107910c95d23fda785b0edc4702"
+  "gitHead": "dbce75146439dac484597ce6494b935fd7ce75f7"
 }

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();

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";

packages/plugins/plugin-lib/src/index.ts

@@ -7,4 +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";
+export * from "./lib/index.js";

packages/plugins/plugin-lib/src/ssh/ssh.ts

@@ -188,6 +188,11 @@ export class AsyncSsh2Client {
     //   script += "\r\nexit\r\n";
     //   //保证windows下正常退出
     // }
+
+    if (script.includes(" -i ")) {
+      this.logger.warn("不支持交互式命令，请不要使用-i参数");
+    }
+
     return safePromise((resolve, reject) => {
       this.logger.info(`执行命令：[${this.connConf.host}][exec]: \n` + script);
       // pty 伪终端，window下的输出会带上conhost.exe之类的多余的字符串，影响返回结果判断

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

packages/ui/certd-client/.env.remote

@@ -0,0 +1,2 @@
+#登录与权限开启
+VITE_APP_PM_ENABLED=false

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,58 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.4](https://github.com/certd/certd/compare/v1.37.3...v1.37.4) (2025-10-28)
+
+### Bug Fixes
+
+* 修复站点证书监控复制按钮无效的bug ([efa26a0](https://github.com/certd/certd/commit/efa26a067f06402f30befc016d9934cadcd5a563))
+
+## [1.37.3](https://github.com/certd/certd/compare/v1.37.2...v1.37.3) (2025-10-24)
+
+### Performance Improvements
+
+*  注册页面增加手机注册tab页签 ([6b2f1fc](https://github.com/certd/certd/commit/6b2f1fcd3e058061b814c3331cda8ce1b2d80d73))
+* 流水线创建时支持添加到证书监控 ([59ba408](https://github.com/certd/certd/commit/59ba4080706548828ef1c0a9cd893c1c9a7d591f))
+* 流水线支持有效期设置 ([911e69e](https://github.com/certd/certd/commit/911e69e3bc0cdd48b62953b5d0981d640fc1f8ac))
+* 站点证书监控增加导出和分组功能 ([2ed12c4](https://github.com/certd/certd/commit/2ed12c429eb58274a4f9dd0ed3b66e160d283ded))
+* 证书监控增加批量删除 ([e578c52](https://github.com/certd/certd/commit/e578c52fdf2f838038062aa4209b655fbae461fb))
+
+## [1.37.2](https://github.com/certd/certd/compare/v1.37.1...v1.37.2) (2025-10-14)
+
+### Performance Improvements
+
+* 证书监控支持设置证书即将过期天数 ([cd35568](https://github.com/certd/certd/commit/cd35568e042e6ab928685efad51cdbed823d2d4f))
+* 支持网络测试 ([2bef608](https://github.com/certd/certd/commit/2bef608e07ceb56d52007f290667e0afef401b22))
+
+## [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

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>

packages/ui/certd-client/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.36.22",
+  "version": "1.37.4",
   "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",
@@ -32,11 +33,11 @@
     "@aws-sdk/s3-request-presigner": "^3.535.0",
     "@certd/vue-js-cron-light": "^4.0.14",
     "@ctrl/tinycolor": "^4.1.0",
-    "@fast-crud/editor-code": "^1.26.6",
-    "@fast-crud/fast-crud": "^1.26.6",
-    "@fast-crud/fast-extends": "^1.26.6",
-    "@fast-crud/ui-antdv4": "^1.26.6",
-    "@fast-crud/ui-interface": "^1.26.6",
+    "@fast-crud/editor-code": "^1.27.4",
+    "@fast-crud/fast-crud": "^1.27.4",
+    "@fast-crud/fast-extends": "^1.27.4",
+    "@fast-crud/ui-antdv4": "^1.27.4",
+    "@fast-crud/ui-interface": "^1.27.4",
     "@iconify/tailwind": "^1.2.0",
     "@iconify/vue": "^4.1.1",
     "@manypkg/get-packages": "^2.2.2",
@@ -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.22",
-    "@certd/pipeline": "^1.36.22",
+    "@certd/lib-iframe": "^1.37.4",
+    "@certd/pipeline": "^1.37.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/components/captcha/captcha-input.vue

@@ -12,6 +12,14 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  type: {
+    type: String,
+    default: "image",
+  },
+  addonId: {
+    type: Number,
+    default: 0,
+  },
 });
 const captchaRef = ref(null);
 const settingStore = useSettingStore();
@@ -23,7 +31,7 @@ const captchaAddonId = computed(() => {
   return settingStore.sysPublic.captchaAddonId ?? 0;
 });
 const captchaComponent = computed(() => {
-  let type: any = "image";
+  let type: any = props.type ?? "image";
   if (settingStore.sysPublic.captchaAddonId && settingStore.sysPublic.captchaType) {
     type = settingStore.sysPublic.captchaType;
   }
@@ -48,10 +56,10 @@ function onChange(data: any) {
 }
 
 async function getCaptchaForm() {
-  return await captchaRef.value.getCaptchaForm();
+  return await captchaRef.value?.getCaptchaForm();
 }
 async function reset() {
-  await captchaRef.value.reset();
+  await captchaRef.value?.reset();
 }
 defineExpose({
   getCaptchaForm,

packages/ui/certd-client/src/components/captcha/captchas/geetest_captcha.vue

@@ -7,6 +7,14 @@ 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",
 });
@@ -16,15 +24,10 @@ const props = defineProps<{
   captchaGet: () => Promise<any>;
 }>();
 const captchaRef = ref(null);
-// const addonApi = createAddonApi();
-const settingStore = useSettingStore();
 
 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(

packages/ui/certd-client/src/components/captcha/captchas/tencent_captcha.vue

@@ -0,0 +1,233 @@
+<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.errorCode && res.errorCode > 0) {
+    notification.error({
+      message: `验证码验证失败：${res.errorMessage || res.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>

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",

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">

packages/ui/certd-client/src/locales/langs/en-US/certd.ts

@@ -57,6 +57,7 @@ export default {
   suiteBuy: "Suite Purchase",
   myTrade: "My Orders",
   paymentReturn: "Payment Return",
+  hasExpired: "Expired",
   user: {
     greeting: "Hello",
     profile: "Account Info",
@@ -136,10 +137,16 @@ export default {
     triggerType: "Trigger Type",
     pipelineId: "Pipeline Id",
   },
+
+  pi: {
+    validTime: "Piepline Valid Time",
+    validTimeHelper: "Not filled in means permanent validity",
+  },
   types: {
-    certApply: "Certificate Application",
-    certUpload: "Certificate Upload",
+    certApply: "Cert Apply",
+    certUpload: "Cert Upload",
     custom: "Custom",
+    template: "Template",
   },
   myPipelines: "My Pipelines",
   selectedCount: "Selected {count} items",
@@ -175,6 +182,7 @@ export default {
     suiteSetting: "Suite Settings",
     orderManager: "Order Management",
     userSuites: "User Suites",
+    netTest: "Network Test",
   },
   certificateRepo: {
     title: "Certificate Repository",
@@ -223,9 +231,13 @@ export default {
     notificationWhen: "Notification Timing",
     notificationHelper: "Get real-time alerts when the task fails",
     groupIdTitle: "Pipeline Group",
+
+    addToMonitorEnabled: "Add to Cert Monitor",
+    addToMonitorDomains: "Add to Monitor Domains",
   },
   notificationDefault: "Use Default Notification",
   monitor: {
+    remark: "Remark",
     title: "Site Certificate Monitoring",
     description: "Check website certificates' expiration at 0:00 daily; reminders sent 10 days before expiration (using default notification channel);",
     settingLink: "Site Monitoring Settings",
@@ -247,6 +259,7 @@ export default {
     certDomains: "Certificate Domains",
     certProvider: "Issuer",
     certStatus: "Certificate Status",
+    error: "Error",
     status: {
       ok: "Valid",
       expired: "Expired",
@@ -280,6 +293,8 @@ export default {
       cronTrigger: "Scheduled trigger for monitoring",
       dnsServer: "DNS Server",
       dnsServerHelper: "Use a custom domain name resolution server, such as: 1.1.1.1 , support multiple",
+      certValidDays: "Certificate Valid Days",
+      certValidDaysHelper: "Number of days before expiration to send a notification",
     },
   },
   checkStatus: {
@@ -289,7 +304,7 @@ export default {
   },
   domainList: {
     title: "Domain List",
-    helper: "Format: domain:port:name, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com",
+    helper: "Format: domain:port:name:remark, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu:remarkText\nwww.taobao.com::Taobao\nwww.google.com",
     required: "Please enter domains to import",
     placeholder: "www.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com\n",
   },
@@ -447,6 +462,7 @@ export default {
   description: "Description",
   createTime: "Creation Time",
   updateTime: "Update Time",
+  mainDomain: "Main Domain",
   edit: "Edit",
   groupName: "Group Name",
   enterGroupName: "Please enter group name",
@@ -715,19 +731,32 @@ export default {
   addonName: "Name",
   addonNameHelper: "Fill freely, helps to distinguish when multiple same type exist",
   addonTypeSelect: "Select type",
+  dates: {
+    years: "{count} years",
+    months: "{count} months",
+  },
   sys: {
     setting: {
+      baseSetting: "Base Settings",
+      registerSetting: "Register Settings",
+      safeSetting: "Safe Settings",
+      paymentSetting: "Payment Settings",
+      captchaSetting: "Captcha Setting",
+      pipelineSetting: "Pipeline Settings",
       showRunStrategy: "Show RunStrategy",
       showRunStrategyHelper: "Allow modify the run strategy of the task",
 
       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",
+      pipelineValidTimeEnabled: "Enable Pipeline Valid Time",
+      pipelineValidTimeEnabledHelper: "Whether to enable the valid time of the pipeline",
+      certDomainAddToMonitorEnabled: "Add Domain to Certificate Monitor",
+      certDomainAddToMonitorEnabledHelper: "Whether to add the domain to the certificate monitor",
     },
   },
   modal: {

packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts

@@ -62,6 +62,7 @@ export default {
   suiteBuy: "套餐购买",
   myTrade: "我的订单",
   paymentReturn: "支付返回",
+  hasExpired: "已过期",
 
   user: {
     greeting: "您好",
@@ -142,10 +143,15 @@ export default {
     triggerType: "触发类型",
     pipelineId: "流水线Id",
   },
+  pi: {
+    validTime: "流水线有效期",
+    validTimeHelper: "不填则为永久有效",
+  },
   types: {
     certApply: "证书申请",
     certUpload: "证书上传",
     custom: "自定义",
+    template: "模版",
   },
   myPipelines: "我的流水线",
   selectedCount: "已选择 {count} 项",
@@ -181,6 +187,7 @@ export default {
     suiteSetting: "套餐设置",
     orderManager: "订单管理",
     userSuites: "用户套餐",
+    netTest: "网络测试",
   },
   certificateRepo: {
     title: "证书仓库",
@@ -228,9 +235,12 @@ export default {
     notificationWhen: "通知时机",
     notificationHelper: "任务执行失败实时提醒",
     groupIdTitle: "流水线分组",
+    addToMonitorEnabled: "添加到证书监控",
+    addToMonitorDomains: "添加到监控域名",
   },
   notificationDefault: "使用默认通知",
   monitor: {
+    remark: "备注",
     title: "站点证书监控",
     description: "每天0点，检查网站证书的过期时间，到期前10天时将发出提醒（使用默认通知渠道）;",
     settingLink: "站点监控设置",
@@ -252,6 +262,7 @@ export default {
     certDomains: "证书域名",
     certProvider: "颁发机构",
     certStatus: "证书状态",
+    error: "错误信息",
     status: {
       ok: "正常",
       expired: "过期",
@@ -285,6 +296,8 @@ export default {
       cronTrigger: "定时触发监控",
       dnsServer: "DNS服务器",
       dnsServerHelper: "使用自定义的域名解析服务器，如：1.1.1.1 , 支持多个",
+      certValidDays: "证书到期前天数",
+      certValidDaysHelper: "证书到期前多少天发送通知",
     },
   },
   checkStatus: {
@@ -294,9 +307,9 @@ export default {
   },
   domainList: {
     title: "域名列表",
-    helper: "格式【域名:端口:名称】，一行一个，其中端口、名称可以省略\n比如：\nwww.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com",
+    helper: "格式【域名:端口:名称:备注】，一行一个，其中端口、名称、备注可以省略\n比如：\nwww.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com",
     required: "请输入要导入的域名",
-    placeholder: "www.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com\n",
+    placeholder: "www.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com\n",
   },
   accountInfo: "账号信息",
   securitySettings: "认证安全设置",
@@ -453,6 +466,7 @@ export default {
   description: "说明",
   createTime: "创建时间",
   updateTime: "更新时间",
+  mainDomain: "主域名",
   edit: "编辑",
   groupName: "分组名称",
   enterGroupName: "请输入分组名称",
@@ -461,7 +475,7 @@ export default {
   batchDeleteConfirm: "确定要批量删除这{count}条记录吗",
   selectRecordFirst: "请先勾选记录",
   subdomainHosted: "托管的子域名",
-  subdomainHelpText: "如果您不理解什么是子域托管，请不要随意设置，可能导致证书无法申请，可以参考文档",
+  subdomainHelpText: "如果您不理解什么是子域托管，请不要随意设置（可能导致证书无法申请，以前设置过的cname记录也需要重新配置），可以参考文档",
   subdomainManagement: "子域管理",
   isDisabled: "是否禁用",
   enabled: "启用",
@@ -717,19 +731,32 @@ export default {
     copyPipelineConfig: "复制该流水线配置作为模板来源",
     pipeline: "流水线",
   },
+  dates: {
+    years: "{count}年",
+    months: "{count}月",
+  },
   sys: {
     setting: {
+      baseSetting: "基本设置",
+      registerSetting: "注册设置",
+      safeSetting: "安全设置",
+      paymentSetting: "支付设置",
+      captchaSetting: "验证码设置",
+      pipelineSetting: "流水线设置",
+
       showRunStrategy: "显示运行策略选择",
       showRunStrategyHelper: "任务设置中是否允许选择运行策略",
 
       captchaEnabled: "启用登录验证码",
       captchaHelper: "登录时是否启用验证码",
       captchaType: "验证码配置",
+      captchaTest: "测试验证码",
+      captchaTestHelper: "保存后再点击测试，请务必测试通过了，再开启登录验证码",
 
-      baseSetting: "基本设置",
-      registerSetting: "注册设置",
-      safeSetting: "安全设置",
-      paymentSetting: "支付设置",
+      pipelineValidTimeEnabled: "启用流水线有效期",
+      pipelineValidTimeEnabledHelper: "是否启用流水线有效期",
+      certDomainAddToMonitorEnabled: "证书域名添加到证书监控",
+      certDomainAddToMonitorEnabledHelper: "创建证书流水线时是否可以选择将域名添加到证书监控",
     },
   },
   modal: {

packages/ui/certd-client/src/plugin/fast-crud/index.tsx

@@ -1,6 +1,6 @@
 import { request } from "/src/api/service";
 // import "/src/mock";
-import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, utils } from "@fast-crud/fast-crud";
+import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, utils, forEachTableColumns } from "@fast-crud/fast-crud";
 import "@fast-crud/fast-crud/dist/style.css";
 import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader, FsExtendsInput } from "@fast-crud/fast-extends";
 import "@fast-crud/fast-extends/dist/style.css";
@@ -14,25 +14,27 @@ 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;
-  constructor() {
-    this.save = debounce((key: string, size: number) => {
+  type: string;
+  save: (key: string, value: any) => void;
+  constructor(type: string = "columnSize") {
+    this.type = type;
+    this.save = debounce((key: string, value: any) => {
       const saveKey = this.getKey();
       let data = LocalStorage.get(saveKey);
       if (!data) {
         data = {};
       }
-      data[key] = size;
+      data[key] = value;
       LocalStorage.set(saveKey, data);
     });
   }
   getKey() {
     const loc = window.location;
     const currentUrl = `${loc.pathname}${loc.search}${loc.hash}`;
-    return `columnSize-${currentUrl}`;
+    return `${this.type}-${currentUrl}`;
   }
   get(key: string) {
     const saveKey = this.getKey();
@@ -45,6 +47,7 @@ class ColumnSizeSaver {
   }
 }
 const columnSizeSaver = new ColumnSizeSaver();
+const tableSortSaver = new ColumnSizeSaver("tableSorter");
 
 function install(app: App, options: any = {}) {
   app.use(UiAntdv);
@@ -63,6 +66,8 @@ function install(app: App, options: any = {}) {
     commonOptions(props: UseCrudProps): CrudOptions {
       utils.logger.debug("commonOptions:", props);
       const crudBinding = props.crudExpose?.crudBinding;
+      const crudExpose = props.crudExpose;
+
       const { isMobile } = usePreferences();
       const opts: CrudOptions = {
         settings: {
@@ -74,6 +79,20 @@ function install(app: App, options: any = {}) {
               },
             },
           },
+          onUseCrud(bindings: any) {
+            const oldSorter = tableSortSaver.get("sorter");
+            if (oldSorter) {
+              const { prop, order } = oldSorter;
+              forEachTableColumns(bindings.table.columns, (column: any) => {
+                if (column.key === prop) {
+                  column.sortOrder = order;
+                } else {
+                  column.sortOrder = false;
+                }
+              });
+              bindings.table.sort = oldSorter;
+            }
+          },
         },
         table: {
           scroll: {
@@ -104,6 +123,30 @@ function install(app: App, options: any = {}) {
               return "-";
             },
           },
+          onSortChange: (sortChange: any) => {
+            const { isServerSort, prop, asc, order } = sortChange;
+            const oldSort = crudBinding.value.table.sort;
+            const newSorter = isServerSort ? { prop, order, asc } : null;
+
+            forEachTableColumns(crudBinding.value.table.columns, (column: any) => {
+              if (column.key === prop) {
+                column.sortOrder = order;
+              } else {
+                column.sortOrder = false;
+              }
+            });
+
+            crudBinding.value.table.sort = newSorter;
+            if (newSorter) {
+              tableSortSaver.save("sorter", newSorter);
+            } else {
+              tableSortSaver.clear();
+            }
+
+            if (isServerSort || oldSort != null) {
+              crudExpose.doRefresh();
+            }
+          },
         },
         toolbar: {
           export: {
@@ -189,6 +232,10 @@ function install(app: App, options: any = {}) {
           },
           wrapperCol: {
             span: null,
+            buttons: {
+              copy: { show: false },
+              paste: { show: false },
+            },
           },
           wrapper: {
             saveRemind: true,

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,
+        },
+      },
     ],
   },
 ];

packages/ui/certd-client/src/store/settings/api.basic.ts

@@ -50,6 +50,12 @@ export type SysPublicSetting = {
   captchaEnabled?: boolean;
   captchaType?: number;
   captchaAddonId?: number;
+
+  //流水线是否启用有效期
+  pipelineValidTimeEnabled?: boolean;
+
+  //证书域名添加到监控
+  certDomainAddToMonitorEnabled?: boolean;
 };
 export type SuiteSetting = {
   enabled?: boolean;
@@ -63,6 +69,9 @@ export type SysPrivateSetting = {
     type?: string;
     config?: any;
   };
+
+  //http请求超时时间
+  httpRequestTimeout?: number;
 };
 export type SysInstallInfo = {
   siteId: string;

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,

packages/ui/certd-client/src/style/scroll.less

@@ -1,23 +1,23 @@
 ::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
+  width: 12px !important;
+  height: 12px !important;
 }
 
 ::-webkit-scrollbar-track {
-  width: 8px;
+  width: 12px !important;
   background: rgba(#101f1c, 0.1);
-  -webkit-border-radius: 2em;
-  -moz-border-radius: 2em;
-  border-radius: 2em;
+  -webkit-border-radius: 4em;
+  -moz-border-radius: 4em;
+  border-radius: 4em;
 }
 
 ::-webkit-scrollbar-thumb {
   // background-color: rgba(#101F1C, 0.5);
   background-clip: padding-box;
   min-height: 28px;
-  -webkit-border-radius: 2em;
-  -moz-border-radius: 2em;
-  border-radius: 2em;
+  -webkit-border-radius: 4em;
+  -moz-border-radius: 4em;
+  border-radius: 4em;
   background-color: #b3b3b3;
   box-shadow: 0px 1px 1px #eee inset;
 }

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);

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,

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,

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,

packages/ui/certd-client/src/views/certd/basic/group/api.ts

@@ -0,0 +1,64 @@
+import { dict } from "@fast-crud/fast-crud";
+import { request } from "/src/api/service";
+
+export function createApi() {
+  const apiPrefix = "/basic/group";
+  return {
+    async GetList(query: any) {
+      return await request({
+        url: apiPrefix + "/page",
+        method: "post",
+        data: query,
+      });
+    },
+
+    async AddObj(obj: any) {
+      return await request({
+        url: apiPrefix + "/add",
+        method: "post",
+        data: obj,
+      });
+    },
+
+    async UpdateObj(obj: any) {
+      return await request({
+        url: apiPrefix + "/update",
+        method: "post",
+        data: obj,
+      });
+    },
+
+    async DelObj(id: number) {
+      return await request({
+        url: apiPrefix + "/delete",
+        method: "post",
+        params: { id },
+      });
+    },
+
+    async GetObj(id: number) {
+      return await request({
+        url: apiPrefix + "/info",
+        method: "post",
+        params: { id },
+      });
+    },
+    async ListAll(type: string) {
+      return await request({
+        url: apiPrefix + "/all",
+        method: "post",
+        params: { type },
+      });
+    },
+  };
+}
+
+export const pipelineGroupApi = createApi();
+
+export function createGroupDictRef(type: string) {
+  return dict({
+    url: "/basic/group/all?type=" + type,
+    value: "id",
+    label: "name",
+  });
+}

packages/ui/certd-client/src/views/certd/basic/group/crud.tsx

@@ -0,0 +1,142 @@
+import { useI18n } from "/src/locales";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { pipelineGroupApi } from "./api";
+import { ref } from "vue";
+
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+  const { t } = useI18n();
+  const api = pipelineGroupApi;
+  const typeRef = ref(context.type);
+
+  const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    return await api.GetList(query);
+  };
+  const editRequest = async (req: EditReq) => {
+    const { form, row } = req;
+    form.id = row.id;
+    const res = await api.UpdateObj(form);
+    return res;
+  };
+  const delRequest = async (req: DelReq) => {
+    const { row } = req;
+    return await api.DelObj(row.id);
+  };
+
+  const addRequest = async (req: AddReq) => {
+    const { form } = req;
+    form.type = typeRef.value;
+    const res = await api.AddObj(form);
+    return res;
+  };
+
+  return {
+    crudOptions: {
+      settings: {
+        plugins: {
+          mobile: {
+            props: {
+              rowHandle: {
+                width: 160,
+              },
+            },
+          },
+        },
+      },
+      request: {
+        pageRequest,
+        addRequest,
+        editRequest,
+        delRequest,
+      },
+      search: {
+        initialForm: {
+          type: typeRef.value,
+        },
+      },
+      form: {
+        labelCol: {
+          //固定label宽度
+          span: null,
+          style: {
+            width: "100px",
+          },
+        },
+        col: {
+          span: 22,
+        },
+        wrapper: {
+          width: 600,
+        },
+      },
+      rowHandle: {
+        width: 200,
+        group: {
+          editable: {
+            edit: {
+              text: t("certd.edit"),
+              order: -1,
+              type: "primary",
+              click({ row, index }) {
+                crudExpose.openEdit({
+                  index,
+                  row,
+                });
+              },
+            },
+          },
+        },
+      },
+      table: {
+        editable: {
+          enabled: true,
+          mode: "cell",
+          exclusive: true,
+          //排他式激活效果，将其他行的编辑状态触发保存
+          exclusiveEffect: "save", //自动保存其他行编辑状态，cancel = 自动关闭其他行编辑状态
+          async updateCell(opts) {
+            const { row, key, value } = opts;
+            //如果是添加，需要返回{[rowKey]:xxx},比如:{id:2}
+            return await api.UpdateObj({ id: row.id, [key]: value });
+          },
+        },
+      },
+      columns: {
+        id: {
+          title: "ID",
+          key: "id",
+          type: "number",
+          search: {
+            show: true,
+          },
+          column: {
+            width: 100,
+            editable: {
+              disabled: true,
+            },
+          },
+          form: {
+            show: false,
+          },
+        },
+        name: {
+          title: t("certd.groupName"),
+          search: {
+            show: true,
+          },
+          type: "text",
+          form: {
+            rules: [
+              {
+                required: true,
+                message: t("certd.enterGroupName"),
+              },
+            ],
+          },
+          column: {
+            width: 400,
+          },
+        },
+      },
+    },
+  };
+}

packages/ui/certd-client/src/views/certd/basic/group/group-selector.vue

@@ -0,0 +1,58 @@
+<template>
+  <div class="pi-group-selector flex full-w">
+    <div class="flex-1">
+      <fs-dict-select :value="modelValue" :dict="groupDictRef" :allow-clear="true" @update:value="doUpdate"></fs-dict-select>
+    </div>
+
+    <fs-table-select
+      class="flex-0"
+      :create-crud-options="createCrudOptions"
+      :crud-options-override="{
+        search: { show: false, initialForm: { type: props.type } },
+        table: {
+          scroll: {
+            x: 540,
+          },
+        },
+      }"
+      :model-value="modelValue"
+      :dict="groupDictRef"
+      :show-current="false"
+      :show-select="false"
+      :dialog="{ width: 960 }"
+      :destroy-on-close="false"
+      height="400px"
+      @update:model-value="doUpdate"
+      @dialog-closed="doRefresh"
+    >
+      <template #default="scope">
+        <fs-button class="ml-5" type="primary" icon="ant-design:edit-outlined" @click="scope.open({ context: { type: props.type } })"></fs-button>
+      </template>
+    </fs-table-select>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { createGroupDictRef } from "./api";
+import createCrudOptions from "./crud";
+import { dict, FsDictSelect } from "@fast-crud/fast-crud";
+
+const props = defineProps<{
+  modelValue?: number;
+  type: string;
+}>();
+
+defineOptions({
+  name: "GroupSelector",
+});
+const groupDictRef = createGroupDictRef(props.type);
+const emit = defineEmits(["refresh", "update:modelValue", "change"]);
+function doRefresh() {
+  emit("refresh");
+  groupDictRef.reloadDict();
+}
+
+function doUpdate(value: any) {
+  emit("update:modelValue", value);
+}
+</script>

packages/ui/certd-client/src/views/certd/basic/group/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <fs-page>
+    <template #header>
+      <div class="title">
+        分组管理
+        <span class="sub">流水线分组</span>
+      </div>
+    </template>
+    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+  </fs-page>
+</template>
+
+<script lang="ts">
+import { defineComponent, onActivated, onMounted } from "vue";
+import { useFs } from "@fast-crud/fast-crud";
+import createCrudOptions from "./crud";
+
+export default defineComponent({
+  name: "BasicGroupManager",
+  setup() {
+    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+
+    // 页面打开后获取列表数据
+    onMounted(() => {
+      crudExpose.doRefresh();
+    });
+    onActivated(() => {
+      crudExpose.doRefresh();
+    });
+
+    return {
+      crudBinding,
+      crudRef,
+    };
+  },
+});
+</script>

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

@@ -57,4 +57,3 @@ export async function DeleteBatch(ids: any[]) {
     data: { ids },
   });
 }
-

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,

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,
+    },
+  });
+}

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,6 +268,13 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        mainDomain: {
+          title: t("certd.mainDomain"),
+          type: "text",
+          form: {
+            show: false,
+          },
+        },
         createTime: {
           title: t("certd.createTime"),
           type: "datetime",

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,

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 "-";
               }

packages/ui/certd-client/src/views/certd/monitor/site/api.ts

@@ -35,6 +35,14 @@ export const siteInfoApi = {
     });
   },
 
+  async BatchDelObj(ids: number[]) {
+    return await request({
+      url: apiPrefix + "/batchDelete",
+      method: "post",
+      data: { ids },
+    });
+  },
+
   async GetObj(id: number) {
     return await request({
       url: apiPrefix + "/info",

packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx

@@ -1,15 +1,18 @@
 // @ts-ignore
 import { useI18n } from "/src/locales";
-import { AddReq, ColumnCompositionProps, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { AddReq, ColumnCompositionProps, ColumnProps, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DataFormatterContext, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { siteInfoApi } from "./api";
+import * as settingApi from "./setting/api";
 import dayjs from "dayjs";
-import { Modal, notification } from "ant-design-vue";
+import { message, Modal, notification } from "ant-design-vue";
 import { useSettingStore } from "/@/store/settings";
 import { mySuiteApi } from "/@/views/certd/suite/mine/api";
 import { mitter } from "/@/utils/util.mitt";
 import { useSiteIpMonitor } from "./ip/use";
 import { useSiteImport } from "/@/views/certd/monitor/site/use";
-
+import { ref } from "vue";
+import GroupSelector from "../../basic/group/group-selector.vue";
+import { createGroupDictRef } from "../../basic/group/api";
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
   const api = siteInfoApi;
@@ -30,6 +33,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
 
   const addRequest = async (req: AddReq) => {
     const { form } = req;
+    delete form.id;
     const res = await api.AddObj(form);
     return res;
   };
@@ -47,6 +51,35 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   const { openSiteIpMonitorDialog } = useSiteIpMonitor();
   const { openSiteImportDialog } = useSiteImport();
 
+  const certValidDaysRef = ref(10);
+
+  async function loadSetting() {
+    const setting = await settingApi.SiteMonitorSettingsGet();
+    certValidDaysRef.value = setting?.certValidDays || 10;
+  }
+  loadSetting();
+
+  const selectedRowKeys = ref([]);
+
+  const handleBatchDelete = () => {
+    if (selectedRowKeys.value?.length > 0) {
+      Modal.confirm({
+        title: "确认",
+        content: `确定要批量删除这${selectedRowKeys.value.length}条记录吗`,
+        async onOk() {
+          await api.BatchDelObj(selectedRowKeys.value);
+          message.info("删除成功");
+          crudExpose.doRefresh();
+          selectedRowKeys.value = [];
+        },
+      });
+    } else {
+      message.error("请先勾选记录");
+    }
+  };
+
+  context.handleBatchDelete = handleBatchDelete;
+
   function checkAll() {
     Modal.confirm({
       title: t("certd.monitor.confirmTitle"), // "确认"
@@ -60,6 +93,16 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
     });
   }
+
+  const GroupTypeSite = "site";
+  const groupDictRef = createGroupDictRef(GroupTypeSite);
+
+  function getDefaultGroupId() {
+    const searchFrom = crudExpose.getSearchValidatedFormData();
+    if (searchFrom.groupId) {
+      return searchFrom.groupId;
+    }
+  }
   return {
     id: "siteMonitorCrud",
     crudOptions: {
@@ -69,6 +112,68 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         editRequest,
         delRequest,
       },
+      tabs: {
+        name: "groupId",
+        show: true,
+      },
+      toolbar: {
+        buttons: {
+          export: {
+            show: true,
+          },
+        },
+        export: {
+          dataFrom: "search",
+          columnFilter: (col: ColumnProps) => {
+            //列过滤器，返回true则导出该列
+            //例如： 只导出show=true的列
+            return col.show === true;
+          },
+          dataFormatter: (opts: DataFormatterContext) => {
+            //例如 格式化日期
+            const { row, originalRow, col, exportCol } = opts;
+            const key = col.key;
+            const element = originalRow[key];
+            if (key.includes("Time") && element) {
+              row[key] = dayjs(element).format("YYYY-MM-DD HH:mm:ss");
+            }
+
+            if (col.width) {
+              exportCol.width = col.width / 10;
+            }
+
+            if (col.key === "certInfo" && originalRow?.certProvider) {
+              row[key] = originalRow?.certProvider + " " + originalRow?.certDomains;
+            }
+
+            //参数说明
+            // DataFormatterContext = {row: any,originalRow: any, key: string, col: ColumnProps, exportCol:ExportColumn}
+            // row = 当前行数据
+            // originalRow = 当前行原始数据
+            // key = 当前列的key
+            // col = 当前列的配置
+            // exportCol = 当前列的导出配置
+          },
+        },
+      },
+      pagination: {
+        pageSizeOptions: ["10", "20", "50", "100", "200"],
+      },
+      settings: {
+        plugins: {
+          //这里使用行选择插件，生成行选择crudOptions配置，最终会与crudOptions合并
+          rowSelection: {
+            enabled: true,
+            props: {
+              multiple: true,
+              crossPage: false,
+              selectedRowKeys: () => {
+                return selectedRowKeys;
+              },
+            },
+          },
+        },
+      },
       form: {
         labelCol: {
           //固定label宽度
@@ -112,7 +217,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
                 }
               }
 
-              await crudExpose.openAdd({});
+              const defaultGroupId = getDefaultGroupId();
+              await crudExpose.openAdd({
+                row: { groupId: defaultGroupId },
+              });
             },
           },
           //导入按钮
@@ -121,7 +229,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             text: t("certd.monitor.bulkImport"),
             type: "primary",
             async click() {
+              const defaultGroupId = getDefaultGroupId();
               openSiteImportDialog({
+                defaultGroupId,
                 afterSubmit() {
                   crudExpose.doRefresh();
                 },
@@ -173,10 +283,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
       },
-      tabs: {
-        name: "disabled",
-        show: true,
-      },
+      // tabs: {
+      //   name: "disabled",
+      //   show: true,
+      // },
       columns: {
         id: {
           title: "ID",
@@ -357,6 +467,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           column: {
             sorter: true,
             width: 155,
+            show: false,
           },
         },
         certExpiresTime: {
@@ -385,10 +496,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           column: {
             conditionalRender: false,
             cellRender({ row }) {
-              const {
-                certEffectiveTime: effectiveTime,
-                certExpiresTime: expiresTime,
-              } = row || {};
+              const certValidDays = certValidDaysRef.value;
+              const { certEffectiveTime: effectiveTime, certExpiresTime: expiresTime } = row || {};
               if (!expiresTime) {
                 return "-";
               }
@@ -400,13 +509,53 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               const effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
               // 距离失效时间剩余天数
               const leftDays = dayjs(expiresTime).diff(dayjs(), "day");
-              const color = leftDays < 20 ? "red" : "#389e0d";
+              const color = leftDays < certValidDays ? "red" : "#389e0d";
               const percent = (leftDays / effectiveDays) * 100;
               // console.log('cellRender', 'effectiveDays', effectiveDays, 'expiresTime', expiresTime, 'applyTime', applyTime, 'percent', percent, row)
               return <a-progress title={expireDate + t("certd.monitor.expired")} percent={percent} strokeColor={color} format={(percent: number) => `${leftDays}${t("certd.monitor.days")}`} />;
             },
           },
         },
+        groupId: {
+          title: t("certd.fields.group"),
+          type: "dict-select",
+          search: {
+            show: true,
+          },
+          dict: groupDictRef,
+          form: {
+            component: {
+              name: GroupSelector,
+              vModel: "modelValue",
+              type: GroupTypeSite,
+              onRefresh() {
+                groupDictRef.reloadDict();
+              },
+            },
+          },
+          column: {
+            width: 130,
+            align: "center",
+            component: {
+              color: "auto",
+            },
+            sorter: true,
+          },
+        },
+        remark: {
+          title: t("certd.monitor.remark"),
+          search: {
+            show: false,
+          },
+          type: "text",
+          column: {
+            width: 200,
+            sorter: true,
+            cellRender({ value }) {
+              return <a-tooltip title={value}>{value}</a-tooltip>;
+            },
+          },
+        },
         lastCheckTime: {
           title: t("certd.monitor.lastCheckTime"),
           search: {
@@ -574,6 +723,21 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             show: false,
           },
         },
+        error: {
+          title: t("certd.monitor.error"),
+          search: {
+            show: false,
+          },
+          type: "text",
+          form: { show: false },
+          column: {
+            width: 200,
+            sorter: true,
+            cellRender({ value }) {
+              return <a-tooltip title={value}>{value}</a-tooltip>;
+            },
+          },
+        },
       },
     },
   };

packages/ui/certd-client/src/views/certd/monitor/site/index.vue

@@ -15,23 +15,28 @@
         </div>
       </div>
     </template>
-    <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+    <fs-crud ref="crudRef" v-bind="crudBinding">
+      <template #pagination-left>
+        <a-tooltip title="批量删除">
+          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
+        </a-tooltip>
+      </template>
+    </fs-crud>
   </fs-page>
 </template>
 
 <script lang="ts" setup>
-import { onActivated, onMounted } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
+import { onActivated, onMounted } from "vue";
 import createCrudOptions from "./crud";
-import { siteInfoApi } from "./api";
-import { Modal, notification } from "ant-design-vue";
 import { useI18n } from "/src/locales";
-
 const { t } = useI18n();
 defineOptions({
   name: "SiteCertMonitor",
 });
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: {} });
+const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
+
+const handleBatchDelete = context.handleBatchDelete;
 
 // 页面打开后获取列表数据
 onMounted(() => {

packages/ui/certd-client/src/views/certd/monitor/site/setting/api.ts

@@ -6,6 +6,7 @@ export type UserSiteMonitorSetting = {
   retryTimes?: number;
   cron?: string;
   dnsServer?: string[];
+  certValidDays?: number;
 };
 
 export async function SiteMonitorSettingsGet() {

packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue

@@ -17,6 +17,12 @@
           </div>
           <div class="helper">{{ t("certd.monitor.setting.monitorRetryTimes") }}</div>
         </a-form-item>
+        <a-form-item :label="t('certd.monitor.setting.certValidDays')" :name="['certValidDays']">
+          <div class="flex">
+            <a-input-number v-model:value="formState.certValidDays" />
+          </div>
+          <div class="helper">{{ t("certd.monitor.setting.certValidDaysHelper") }}</div>
+        </a-form-item>
         <a-form-item :label="t('certd.monitor.setting.dnsServer')" :name="['dnsServer']">
           <div class="flex">
             <a-select v-model:value="formState.dnsServer" mode="tags" :open="false" />

packages/ui/certd-client/src/views/certd/monitor/site/use.tsx

@@ -1,13 +1,13 @@
 import { useFormWrapper } from "@fast-crud/fast-crud";
 import { siteInfoApi } from "./api";
 import { useI18n } from "/src/locales";
-
+import GroupSelector from "../../basic/group/group-selector.vue";
 export function useSiteImport() {
   const { t } = useI18n();
   const { openCrudFormDialog } = useFormWrapper();
 
-  async function openSiteImportDialog(opts: { afterSubmit: any }) {
-    const { afterSubmit } = opts;
+  async function openSiteImportDialog(opts: { afterSubmit: any; defaultGroupId?: number }) {
+    const { afterSubmit, defaultGroupId } = opts;
     await openCrudFormDialog<any>({
       crudOptions: {
         columns: {
@@ -26,6 +26,21 @@ export function useSiteImport() {
               },
             },
           },
+          groupId: {
+            type: "select",
+            title: t("certd.fields.group"),
+            form: {
+              value: defaultGroupId,
+              component: {
+                name: GroupSelector,
+                vModel: "modelValue",
+                type: "site",
+              },
+              col: {
+                span: 24,
+              },
+            },
+          },
         },
 
         form: {

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,

packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx

@@ -6,12 +6,13 @@ import { useRouter } from "vue-router";
 import { compute, CreateCrudOptionsRet, dict, useFormWrapper } from "@fast-crud/fast-crud";
 import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
 import { useReference } from "/@/use/use-refrence";
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import * as api from "../api";
 import { PluginGroup, usePluginStore } from "/@/store/plugin";
 import { createNotificationApi } from "/@/views/certd/notification/api";
 import GroupSelector from "../group/group-selector.vue";
 import { useI18n } from "/src/locales";
+import { useSettingStore } from "/@/store/settings";
 
 export function fillPipelineByDefaultForm(pipeline: any, form: any) {
   const triggers = [];
@@ -78,6 +79,7 @@ export function useCertPipelineCreator() {
   const { openCrudFormDialog } = useFormWrapper();
 
   const pluginStore = usePluginStore();
+  const settingStore = useSettingStore();
   const router = useRouter();
 
   function createCrudOptions(certPlugins: any[], getFormData: any, doSubmit: any): CreateCrudOptionsRet {
@@ -251,7 +253,48 @@ export function useCertPipelineCreator() {
                 name: GroupSelector,
                 vModel: "modelValue",
               },
-              order: 9999,
+              order: 888,
+            },
+          },
+          addToMonitorEnabled: {
+            title: t("certd.pipelineForm.addToMonitorEnabled"),
+            type: "switch",
+            form: {
+              show: computed(() => {
+                return settingStore.isPlus && settingStore.sysPublic?.certDomainAddToMonitorEnabled;
+              }),
+              value: false,
+              component: {
+                name: "a-switch",
+                vModel: "checked",
+              },
+              col: {
+                span: 24,
+              },
+              order: 999,
+              valueChange({ value, form }) {
+                if (value) {
+                  form.addToMonitorDomains = form.domains.join("\n").replaceAll("*", "www");
+                }
+              },
+            },
+          },
+          addToMonitorDomains: {
+            title: t("certd.pipelineForm.addToMonitorDomains"),
+            type: "text",
+            form: {
+              show: compute(({ form }) => {
+                return form.addToMonitorEnabled;
+              }),
+              component: {
+                name: "a-textarea",
+                vModel: "value",
+              },
+              col: {
+                span: 24,
+              },
+              helper: t("certd.domainList.helper"),
+              order: 999,
             },
           },
         },
@@ -330,6 +373,8 @@ export function useCertPipelineCreator() {
         keepHistoryCount: 30,
         type: "cert",
         groupId,
+        addToMonitorEnabled: form.addToMonitorEnabled,
+        addToMonitorDomains: form.addToMonitorDomains,
       });
       if (form.email) {
         try {

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 "-";
               }
@@ -469,7 +466,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
           },
           column: {
             sorter: true,
-            width: 80,
+            width: 100,
             align: "center",
             component: {
               name: "fs-dict-switch",
@@ -516,7 +513,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
               { value: "cert", label: t("certd.types.certApply") },
               { value: "cert_upload", label: t("certd.types.certUpload") },
               { value: "custom", label: t("certd.types.custom") },
-              { value: "template", label: "模版" },
+              { value: "template", label: t("certd.types.template") },
             ],
           }),
           form: {
@@ -525,7 +522,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
           },
           column: {
             sorter: true,
-            width: 90,
+            width: 110,
             align: "center",
             show: true,
             component: {
@@ -558,16 +555,53 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
             sorter: true,
           },
         },
-        createTime: {
-          title: t("certd.fields.createTime"),
-          type: "datetime",
+        validTime: {
+          title: t("certd.pi.validTime"),
+          type: "date",
           form: {
-            show: false,
+            show: computed(() => {
+              return settingStore.isPlus && settingStore.sysPublic.pipelineValidTimeEnabled && userStore.isAdmin;
+            }),
+            helper: t("certd.pi.validTimeHelper"),
+            valueResolve({ form, key, value }) {
+              if (value) {
+                form[key] = value.valueOf();
+              }
+            },
+            valueBuilder({ form, key, value }) {
+              if (value) {
+                form[key] = dayjs(value);
+              }
+            },
+            component: {
+              presets: [
+                { label: t("certd.dates.months", { count: 3 }), value: dayjs().add(3, "month") },
+                { label: t("certd.dates.months", { count: 6 }), value: dayjs().add(6, "month") },
+                { label: t("certd.dates.years", { count: 1 }), value: dayjs().add(1, "year") },
+                { label: t("certd.dates.years", { count: 2 }), value: dayjs().add(2, "year") },
+                { label: t("certd.dates.years", { count: 3 }), value: dayjs().add(3, "year") },
+                { label: t("certd.dates.years", { count: 4 }), value: dayjs().add(4, "year") },
+                { label: t("certd.dates.years", { count: 5 }), value: dayjs().add(5, "year") },
+                { label: t("certd.dates.years", { count: 6 }), value: dayjs().add(6, "year") },
+              ],
+            },
           },
           column: {
+            show: computed(() => {
+              return settingStore.isPlus && settingStore.sysPublic.pipelineValidTimeEnabled;
+            }),
             sorter: true,
             width: 155,
             align: "center",
+            cellRender({ value }) {
+              if (!value || value <= 0) {
+                return "-";
+              }
+              if (value < Date.now()) {
+                return t("certd.hasExpired");
+              }
+              return dayjs(value).format("YYYY-MM-DD");
+            },
           },
         },
         updateTime: {

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

@@ -37,6 +37,7 @@ const pipelineOptions: PipelineOptions = {
         type: detail.pipeline.type,
         from: detail.pipeline.from,
       },
+      validTime: detail.pipeline.validTime,
     } as PipelineDetail;
   },
 

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

@@ -26,7 +26,6 @@
 import { onActivated, onMounted, ref } from "vue";
 import { dict, useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import PiCertdForm from "./certd-form/index.vue";
 import ChangeGroup from "./components/change-group.vue";
 import ChangeTrigger from "./components/change-trigger.vue";
 import { Modal, notification } from "ant-design-vue";

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

@@ -28,6 +28,13 @@
               未设置触发源，不会自动执行
             </span>
           </a-tag>
+          <a-tag v-if="pipelineEntity.validTime > 0 && settingStore.sysPublic.pipelineValidTimeEnabled && settingStore.isPlus" :color="pipelineEntity.validTime > Date.now() ? 'green' : 'red'">
+            <span class="flex">
+              <fs-icon icon="ion:time-outline"></fs-icon>
+              <span v-if="pipelineEntity.validTime > Date.now()"> 有效期：<FsTimeHumanize :model-value="pipelineEntity.validTime" :options="{ units: ['d'] }" format="YYYY-MM-DD"></FsTimeHumanize> </span>
+              <span v-else> 已过期 </span>
+            </span>
+          </a-tag>
         </div>
         <div class="basis-40 flex justify-end mr-10">
           <template v-if="editMode">
@@ -343,7 +350,7 @@ export default defineComponent({
     const { t } = useI18n();
     const currentPipeline: Ref<any> = ref({});
     const pipeline: Ref<any> = ref({});
-
+    const pipelineEntity: Ref<any> = ref({});
     const histories: Ref<RunHistory[]> = ref([]);
 
     const currentHistory: Ref<any> = ref({});
@@ -490,6 +497,7 @@ export default defineComponent({
           return;
         }
         const detail: PipelineDetail = await props.options.getPipelineDetail({ pipelineId: value });
+        pipelineEntity.value = detail;
         currentPipeline.value = merge(
           {
             title: "新管道流程",
@@ -808,7 +816,7 @@ export default defineComponent({
               return nodes;
             },
           });
-          throw new Error(errorMessage);
+          throw new Error(errorMessages?.join(","));
         }
       }
 
@@ -822,10 +830,6 @@ export default defineComponent({
         saveLoading.value = true;
         try {
           if (props.options.doSave) {
-            if (pipeline.value.version == null) {
-              pipeline.value.version = 0;
-            }
-            pipeline.value.version++;
             currentPipeline.value = pipeline.value;
 
             //移除空阶段
@@ -970,6 +974,7 @@ export default defineComponent({
       nextTriggerTimes,
       viewCert,
       downloadCert,
+      pipelineEntity,
     };
   },
 });

packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts

@@ -3,6 +3,7 @@ import { PluginGroups } from "/@/store/plugin";
 
 export type PipelineDetail = {
   pipeline: Pipeline;
+  validTime?: number;
 };
 
 export type RunHistory = {

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 ?? "版本过低，为了您的数据安全，请尽快升级",

packages/ui/certd-client/src/views/framework/login/index.vue

@@ -95,11 +95,14 @@ import SmsCode from "/@/views/framework/login/sms-code.vue";
 import { useI18n } from "/@/locales";
 import { LanguageToggle } from "/@/vben/layouts";
 import CaptchaInput from "/@/components/captcha/captcha-input.vue";
+import { useRoute } from "vue-router";
 export default defineComponent({
   name: "LoginPage",
   components: { LanguageToggle, SmsCode, CaptchaInput },
   setup() {
     const { t } = useI18n();
+    const route = useRoute();
+    const urlLoginType = route.query.loginType as string | undefined;
     const verifyCodeInputRef = ref();
     const loading = ref(false);
     const userStore = useUserStore();
@@ -110,7 +113,7 @@ export default defineComponent({
       phoneCode: "86",
       mobile: "",
       password: "",
-      loginType: "password", //password
+      loginType: urlLoginType || "password", //password
       smsCode: "",
       captcha: null,
       smsCaptcha: null,

packages/ui/certd-client/src/views/framework/register/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main">
     <a-form ref="formRef" class="user-layout-register" name="custom-validation" :model="formState" :rules="rules" v-bind="layout" :label-col="{ span: 6 }" @finish="handleFinish" @finish-failed="handleFinishFailed">
-      <a-tabs v-model:active-key="registerType">
+      <a-tabs v-model:active-key="registerType" @change="handleTabChange">
         <a-tab-pane key="username" tab="用户名注册" :disabled="!settingsStore.sysPublic.usernameRegisterEnabled">
           <template v-if="registerType === 'username'">
             <a-form-item required has-feedback name="username" label="用户名" :rules="rules.username">
@@ -61,7 +61,7 @@
               </a-input-password>
             </a-form-item>
 
-            <a-form-item has-feedback name="imgCode" label="验证码" :rules="rules.imgCode">
+            <a-form-item has-feedback name="captchaForEmail" label="验证码" :rules="rules.captchaForEmail">
               <CaptchaInput v-model:model-value="formState.captchaForEmail"></CaptchaInput>
             </a-form-item>
 
@@ -70,6 +70,8 @@
             </a-form-item>
           </template>
         </a-tab-pane>
+
+        <a-tab-pane v-if="settingsStore.sysPublic.smsLoginEnabled" key="mobile" tab="手机号注册"> </a-tab-pane>
       </a-tabs>
 
       <a-form-item>
@@ -90,6 +92,7 @@ import EmailCode from "./email-code.vue";
 import { useSettingStore } from "/@/store/settings";
 import { notification } from "ant-design-vue";
 import CaptchaInput from "/@/components/captcha/captcha-input.vue";
+import { useRouter } from "vue-router";
 export default defineComponent({
   name: "RegisterPage",
   components: { CaptchaInput, EmailCode },
@@ -115,6 +118,7 @@ export default defineComponent({
       password: "",
       confirmPassword: "",
       captcha: null,
+      captchaForEmail: null,
     });
 
     const rules = {
@@ -171,6 +175,18 @@ export default defineComponent({
           message: "请输入邮件验证码",
         },
       ],
+      captcha: [
+        {
+          required: true,
+          message: "请通过验证码",
+        },
+      ],
+      captchaForEmail: [
+        {
+          required: true,
+          message: "请通过验证码",
+        },
+      ],
     };
     const layout = {
       labelCol: {
@@ -189,7 +205,7 @@ export default defineComponent({
             password: formState.password,
             username: formState.username,
             email: formState.email,
-            captcha: formState.captcha,
+            captcha: registerType.value === "email" ? formState.captchaForEmail : formState.captcha,
             validateCode: formState.validateCode,
           }) as any
         );
@@ -206,6 +222,13 @@ export default defineComponent({
       formRef.value.resetFields();
     };
 
+    const router = useRouter();
+    const handleTabChange = (key: string) => {
+      if (key === "mobile") {
+        router.push({ path: "/login", query: { loginType: "sms" } });
+      }
+    };
+
     return {
       formState,
       formRef,
@@ -216,6 +239,7 @@ export default defineComponent({
       resetForm,
       registerType,
       settingsStore,
+      handleTabChange,
     };
   },
 });

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>