chore: oidc first

CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+### Performance Improvements
+
+* 优化dokploy 部署插件，配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
+* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 ### Bug Fixes

docs/guide/changelogs/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+### Performance Improvements
+
+* 优化dokploy 部署插件，配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
+* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
+
+## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
+
+### Bug Fixes
+
+* 商用证书上传保存失败的bug ([075b1dc](https://github.com/certd/certd/commit/075b1dc0eb8c39acc277277b1b334d66b6717ab2))
+
+### Performance Improvements
+
+* 优化阿里云clb 过期证书清理报错的问题 ([d465367](https://github.com/certd/certd/commit/d4653678b2e3643460f918992eeae4044d3a1cc7))
+
 ## [1.37.8](https://github.com/certd/certd/compare/v1.37.7...v1.37.8) (2025-11-17)
 
 ### Bug Fixes

docs/guide/open/index.md

@@ -19,9 +19,15 @@ header中传入x-certd-token即可调用开放接口
 4、然后将content和sign分别base64后用.号连接： x-certd-token = base64(content) +"."+base64(sign)   
 
 
-## 补充说明
+## 参数
-1.证书申请接口支持证书id和域名两种方式获取证书。
+支持证书id和域名两种方式获取证书。
-2.autoApply=true将在没有证书时自动触发申请，申请过程中会提示`正在申请中`，可轮循获取状态，直到证书申请成功。
+
+## 创建新的证书申请
+参数autoApply=true，将在没有证书时自动触发申请证书，检查逻辑如下：
+1. 如果证书仓库里面有，且没有过期，就直接返回证书
+2. 如果没有或者已过期，就会去找流水线，有就触发流水线执行
+3. 如果没有流水线，就创建一个流水线，触发运行（`注意：需要提前在域名管理中配置好域名校验方式，否则会申请失败`）
+4. 再次采用相同参数请求接口，如果在申请过程中，就会提示`正在申请中`，可轮循获取状态，直到证书申请成功。
 
 
 ## SDK

docs/guide/plugins/deploy.md

@@ -62,7 +62,7 @@
 | 14.| **威联通-部署证书到威联通** | 部署证书到qnap | 
 | 15.| **飞牛NAS-部署证书** |  | 
 | 16.| **Proxmox-上传证书到Proxmox** |  | 
-| 17.| **Dokploy-更新证书** | 自动更新Dokploy证书 | 
+| 17.| **Dokploy-部署server证书** | 自动更新Dokploy server证书 | 
 ## 5. 阿里云
 
 | 序号 | 名称 | 说明 |

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.37.9"
+  "version": "1.37.10"
 }

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/publishlab/node-acme-client/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.37.9](https://github.com/publishlab/node-acme-client/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **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.37.9",
+    "version": "1.37.10",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.37.9",
+        "@certd/basic": "^1.37.10",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -70,5 +70,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+    "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

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

@@ -31,9 +31,28 @@ export const directory = {
     sslcom:{
       staging: 'https://acme.ssl.com/sslcom-dv-rsa',
       production: 'https://acme.ssl.com/sslcom-dv-rsa',
+      ec: 'https://acme.ssl.com/sslcom-dv-ecc',
     }
 };
 
+export function getDirectoryUrl(opts) {
+  const {sslProvider, pkType} = opts
+  const list= directory[sslProvider]
+  if (!list) {
+    throw new Error(`sslProvider ${sslProvider} not found`)
+  }
+  let pkTypePrefix = pkType || 'rsa'
+  if (pkType) {
+   pkTypePrefix = pkType.toLowerCase().split("_")[0]
+  }
+
+  if (pkTypePrefix && list[pkTypePrefix]) {
+    return list[pkTypePrefix]
+  }
+
+  return list.production
+}
+
 /**
  * Crypto
  */

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

@@ -117,6 +117,8 @@ export const directory: {
     }
 };
 
+export function getDirectoryUrl(opts:{sslProvider:string, pkType: string}): string;
+
 /**
  * Crypto
  */

packages/core/basic/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/basic
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **Note:** Version bump only for package @certd/basic

packages/core/basic/build.md

@@ -1 +1 @@
-15:24
+23:49

packages/core/basic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.37.9",
+  "version": "1.37.10",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,6 +17,7 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
+    "async-lock": "^1.4.1",
     "axios": "^1.7.2",
     "dayjs": "^1.11.7",
     "http-proxy-agent": "^7.0.2",
@@ -46,5 +47,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

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

@@ -1,46 +1,16 @@
-import { logger, utils } from './index.js';
+// @ts-ignore
+import AsyncLock from "async-lock";
 
 export class Locker {
-  locked: Record<string, any> = {};
+  private asyncLocker: AsyncLock;
 
-  async execute(lockStr: string, callback: any) {
+  constructor() {
-    await this.lock(lockStr);
+    this.asyncLocker = new AsyncLock();
-    const timeoutId = setTimeout(() => {
-      logger.warn('Lock timeout,自动解锁', lockStr);
-      this.unlock(lockStr);
-    }, 20000);
-    try {
-      return await callback();
-    } finally {
-      clearTimeout(timeoutId);
-      this.unlock(lockStr);
-    }
   }
 
-  async lock(str: string) {
+  async execute(lockStr: string, callback: any, options?: { timeout?: number }) {
-    const isLocked = this.isLocked(str);
+    const timeout = options?.timeout ?? 20000;
-    if (isLocked) {
+    return this.asyncLocker.acquire(lockStr, callback, { timeout });
-      let count = 0;
-      while (true) {
-        await utils.sleep(100);
-        if (!this.isLocked(str)) {
-          break;
-        }
-        count++;
-        if (count > 20) {
-          throw new Error('Lock timeout');
-        }
-      }
-    }
-    this.locked[str] = true;
-  }
-
-  unlock(str: string) {
-    delete this.locked[str];
-  }
-
-  isLocked(str: string) {
-    return this.locked[str] ?? false;
   }
 }
 

packages/core/basic/test.mjs

@@ -0,0 +1,14 @@
+import { random } from "lodash-es";
+import { locker } from "./dist/utils/util.lock.js";
+
+async function testLocker() {
+  for (let i = 0; i < 10; i++) {
+    await locker.execute("test", async () => {
+      console.log("test", i);
+      await new Promise(resolve => setTimeout(resolve, Math.random() * 1000));
+      throw new Error("test error");
+    });
+  }
+}
+
+await testLocker();

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.37.9",
+  "version": "1.37.10",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,8 +18,8 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/basic": "^1.37.9",
+    "@certd/basic": "^1.37.10",
-    "@certd/plus-core": "^1.37.9",
+    "@certd/plus-core": "^1.37.10",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
     "reflect-metadata": "^0.1.13"
@@ -45,5 +45,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

packages/libs/lib-huawei/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/lib-huawei
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **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.37.9",
+  "version": "1.37.10",
   "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": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

packages/libs/lib-iframe/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/lib-iframe
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **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.37.9",
+  "version": "1.37.10",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -31,5 +31,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

packages/libs/lib-jdcloud/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/jdcloud
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **Note:** Version bump only for package @certd/jdcloud

packages/libs/lib-jdcloud/package.json

@@ -1,13 +1,11 @@
 {
   "name": "@certd/jdcloud",
-  "version": "1.37.9",
+  "version": "1.37.10",
   "description": "jdcloud openApi sdk",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
   "scripts": {
-    "test": "cross-env NODE_CONFIG_DIR=./test/config  mocha --recursive --require babel-register",
-    "dev": "babel src --out-dir babel -w",
     "build": "rollup -c ",
     "dev-build": "npm run build",
     "pub": "npm publish"
@@ -15,7 +13,6 @@
   "author": "",
   "license": "Apache",
   "dependencies": {
-    "babel-register": "^6.26.0",
     "buffer": "^5.0.8",
     "create-hash": "^1.1.3",
     "create-hmac": "^1.1.6",
@@ -30,8 +27,6 @@
     "@rollup/plugin-typescript": "^11.0.0",
     "@typescript-eslint/eslint-plugin": "^8.26.1",
     "@typescript-eslint/parser": "^8.26.1",
-    "babel-cli": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
     "chai": "^4.1.2",
     "config": "^1.30.0",
     "cross-env": "^5.1.4",
@@ -61,5 +56,5 @@
       "fetch"
     ]
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **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.37.9",
+  "version": "1.37.10",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,7 +17,7 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/basic": "^1.37.9",
+    "@certd/basic": "^1.37.10",
     "@kubernetes/client-node": "0.21.0"
   },
   "devDependencies": {
@@ -32,5 +32,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

packages/libs/lib-server/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/lib-server
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **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.37.9",
+  "version": "1.37.10",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -28,11 +28,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.37.9",
+    "@certd/acme-client": "^1.37.10",
-    "@certd/basic": "^1.37.9",
+    "@certd/basic": "^1.37.10",
-    "@certd/pipeline": "^1.37.9",
+    "@certd/pipeline": "^1.37.10",
-    "@certd/plugin-lib": "^1.37.9",
+    "@certd/plugin-lib": "^1.37.10",
-    "@certd/plus-core": "^1.37.9",
+    "@certd/plus-core": "^1.37.10",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",
@@ -64,5 +64,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

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

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **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.37.9",
+  "version": "1.37.10",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -46,5 +46,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+### Performance Improvements
+
+* 优化dokploy 部署插件，配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **Note:** Version bump only for package @certd/plugin-cert

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.37.9",
+  "version": "1.37.10",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,10 +17,10 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.37.9",
+    "@certd/acme-client": "^1.37.10",
-    "@certd/basic": "^1.37.9",
+    "@certd/basic": "^1.37.10",
-    "@certd/pipeline": "^1.37.9",
+    "@certd/pipeline": "^1.37.10",
-    "@certd/plugin-lib": "^1.37.9",
+    "@certd/plugin-lib": "^1.37.10",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

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

@@ -128,7 +128,7 @@ export class AcmeService {
       await this.saveAccountConfig(email, conf);
       this.logger.info(`创建新的Accountkey:${email}`);
     }
-    const directoryUrl = acme.directory[this.sslProvider].production;
+    const directoryUrl = acme.getDirectoryUrl({ sslProvider: this.sslProvider, pkType: this.options.privateKeyType });
     if (this.options.useMappingProxy) {
       urlMapping.enabled = true;
     } else {

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

@@ -36,6 +36,7 @@ export class CertReader {
   detail: CertificateInfo;
   //毫秒时间戳
   effective: number;
+  //毫秒时间戳
   expires: number;
   constructor(certInfo: CertInfo) {
     this.cert = certInfo;

packages/plugins/plugin-lib/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+**Note:** Version bump only for package @certd/plugin-lib
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 **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.37.9",
+  "version": "1.37.10",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -22,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.37.9",
+    "@certd/basic": "^1.37.10",
-    "@certd/pipeline": "^1.37.9",
+    "@certd/pipeline": "^1.37.10",
     "@kubernetes/client-node": "0.21.0",
     "ali-oss": "^6.22.0",
     "basic-ftp": "^5.0.5",
@@ -35,7 +35,7 @@
     "rimraf": "^5.0.5",
     "socks": "^2.8.3",
     "socks-proxy-agent": "^8.0.4",
-    "ssh2": "^1.15.0",
+    "ssh2": "1.17.0",
     "strip-ansi": "^7.1.0",
     "tencentcloud-sdk-nodejs": "^4.0.1005"
   },
@@ -53,5 +53,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ac70821fea8fb283709870a3eb08f1cd92c94aeb"
+  "gitHead": "eb41a3655fe91af94f1c42a51aaa9122edfcf40e"
 }

packages/ui/Dockerfile

@@ -19,6 +19,8 @@ RUN apk add --no-cache openjdk8
 WORKDIR /app/
 COPY --from=builder /workspace/certd-server/ /app/
 
+COPY ./patch/ssh2/*.js /app/node_modules/.pnpm/node_modules/ssh2/lib/protocol/
+
 ENV LEGO_VERSION=4.22.2
 ENV LEGO_DOWNLOAD_DIR=/app/tools/lego
 RUN mkdir -p $LEGO_DOWNLOAD_DIR

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+### Performance Improvements
+
+* 站点证书监控备注输入框改成textarea ([70b603d](https://github.com/certd/certd/commit/70b603d601c34f39148c2ab70c655c51babf563d))
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 ### Bug Fixes

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.37.9",
+  "version": "1.37.10",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -106,8 +106,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.37.9",
+    "@certd/lib-iframe": "^1.37.10",
-    "@certd/pipeline": "^1.37.9",
+    "@certd/pipeline": "^1.37.10",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/views/certd/addon/api.ts

@@ -1,7 +1,8 @@
 import { request } from "/src/api/service";
 import { RequestHandleReq } from "/@/components/plugins/lib";
+import { AddonTypeDefines } from "./types";
 
-export function createAddonApi(opts: { from: any; addonType: string }) {
+export function createAddonApi(opts: { from: any; addonType: string } = { from: "user", addonType: "" }) {
   let apiPrefix = "/addon";
   if (opts.from === "sys") {
     apiPrefix = "/sys/addon";
@@ -128,15 +129,6 @@ export function createAddonApi(opts: { from: any; addonType: string }) {
   };
 }
 
-export const AddonTypeDefines = {
-  captcha: {
-    name: "captcha",
-    title: "验证码",
-    showDefault: false,
-    showTest: false,
-  },
-};
-
 export function getAddonTypeDefine(addonType: string) {
   return AddonTypeDefines[addonType];
 }

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

@@ -20,7 +20,7 @@ import { addonProvide } from "/@/views/certd/addon/common";
 export default defineComponent({
   name: "AddonManager",
   setup() {
-    const api = createAddonApi();
+    const api = createAddonApi({ from: "user", addonType: "" });
     addonProvide(api);
     const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
 

packages/ui/certd-client/src/views/certd/addon/types.ts

@@ -0,0 +1,15 @@
+export interface AddonTypeDefine {
+  name: string;
+  title: string;
+  showDefault: boolean;
+  showTest: boolean;
+}
+
+export const AddonTypeDefines: Record<string, AddonTypeDefine> = {
+  captcha: {
+    name: "captcha",
+    title: "验证码",
+    showDefault: false,
+    showTest: false,
+  },
+};

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

@@ -555,7 +555,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           search: {
             show: false,
           },
-          type: "text",
+          type: "textarea",
           column: {
             width: 200,
             sorter: true,

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.10](https://github.com/certd/certd/compare/v1.37.9...v1.37.10) (2025-11-19)
+
+### Performance Improvements
+
+* 优化dokploy 部署插件，配置选择serverId ([c9709f2](https://github.com/certd/certd/commit/c9709f26981c1cc9f71c14babb204329fcae0db5))
+
 ## [1.37.9](https://github.com/certd/certd/compare/v1.37.8...v1.37.9) (2025-11-19)
 
 ### Performance Improvements

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.37.9",
+  "version": "1.37.10",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -45,20 +45,20 @@
     "@aws-sdk/client-cloudfront": "^3.699.0",
     "@aws-sdk/client-iam": "^3.699.0",
     "@aws-sdk/client-s3": "^3.705.0",
-    "@certd/acme-client": "^1.37.9",
+    "@certd/acme-client": "^1.37.10",
-    "@certd/basic": "^1.37.9",
+    "@certd/basic": "^1.37.10",
-    "@certd/commercial-core": "^1.37.9",
+    "@certd/commercial-core": "^1.37.10",
     "@certd/cv4pve-api-javascript": "^8.4.2",
-    "@certd/jdcloud": "^1.37.9",
+    "@certd/jdcloud": "^1.37.10",
-    "@certd/lib-huawei": "^1.37.9",
+    "@certd/lib-huawei": "^1.37.10",
-    "@certd/lib-k8s": "^1.37.9",
+    "@certd/lib-k8s": "^1.37.10",
-    "@certd/lib-server": "^1.37.9",
+    "@certd/lib-server": "^1.37.10",
-    "@certd/midway-flyway-js": "^1.37.9",
+    "@certd/midway-flyway-js": "^1.37.10",
-    "@certd/pipeline": "^1.37.9",
+    "@certd/pipeline": "^1.37.10",
-    "@certd/plugin-cert": "^1.37.9",
+    "@certd/plugin-cert": "^1.37.10",
-    "@certd/plugin-lib": "^1.37.9",
+    "@certd/plugin-lib": "^1.37.10",
-    "@certd/plugin-plus": "^1.37.9",
+    "@certd/plugin-plus": "^1.37.10",
-    "@certd/plus-core": "^1.37.9",
+    "@certd/plus-core": "^1.37.10",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",
     "@koa/cors": "^5.0.0",
@@ -106,6 +106,7 @@
     "nanoid": "^5.0.7",
     "node-forge": "^1.3.1",
     "nodemailer": "^6.9.16",
+    "openid-client": "^6.8.1",
     "otplib": "^12.0.1",
     "pg": "^8.12.0",
     "psl": "^1.9.0",

packages/ui/certd-server/src/controller/basic/oidc/oidc-controller.ts

@@ -0,0 +1,30 @@
+import { BaseController, Constants } from "@certd/lib-server";
+import { ALL, Body, Controller, Get, Post, Provide, Query } from "@midwayjs/core";
+
+/**
+ */
+@Provide()
+@Controller('/api/connect')
+export class LoginController extends BaseController {
+
+
+  @Get('/login', { summary: Constants.per.guest })
+  public async login(@Query(ALL) body: any) {
+    //构造登录url
+    return this.ok(1);
+  }
+  @Get('/callback', { summary: Constants.per.guest })
+  public async callback(@Query(ALL) body: any) {
+    //处理登录回调
+    return this.ok(1);
+  }
+
+  @Post('/bind', { summary: Constants.per.guest })
+  public async bind(@Body(ALL) body: any) {
+    const autoRegister = body.autoRegister || false;
+    const bindInfo = body.bind || {};
+    //处理登录回调
+    return this.ok(1);
+  }
+  
+}

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

@@ -50,6 +50,14 @@ export class DokployAccess extends BaseAccess {
     return "ok"
   }
 
+  async getServerList(){
+    const req = {
+      url :"/api/server.all",
+      method: "get",
+    }
+    return await this.doRequest(req);
+  }
+
   async getCertList(){
     const req = {
       url :"/api/certificates.all",
@@ -96,7 +104,7 @@ export class DokployAccess extends BaseAccess {
       headers,
       baseURL: this.endpoint,
       ...req,
-      logRes: true,
+      logRes: false,
     });
   }
 

packages/ui/certd-server/src/plugins/plugin-dokploy/plugins/plugin-refresh-cert.ts

@@ -1,13 +1,13 @@
 import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
-import {CertApplyPluginNames, CertInfo} from "@certd/plugin-cert";
+import {CertApplyPluginNames, CertInfo, CertReader} from "@certd/plugin-cert";
 import {createCertDomainGetterInputDefine, createRemoteSelectInputDefine} from "@certd/plugin-lib";
 import {DokployAccess} from "../access.js";
 
 @IsTaskPlugin({
   //命名规范，插件类型+功能（就是目录plugin-demo中的demo），大写字母开头，驼峰命名
   name: "DokployRefreshCert",
-  title: "Dokploy-更新证书",
+  title: "Dokploy-部署server证书",
-  desc: "自动更新Dokploy证书",
+  desc: "自动更新Dokploy server证书",
   icon: "svg:icon-lucky",
   //插件分组
   group: pluginGroups.panel.key,
@@ -52,12 +52,12 @@ export class DokployRefreshCert extends AbstractTaskPlugin {
     createRemoteSelectInputDefine({
       title: "证书名称",
       helper: "要更新的证书名称，如果这里没有，请先给手动绑定一次证书",
-      action: DokployRefreshCert.prototype.onGetCertList.name,
+      action: DokployRefreshCert.prototype.onGetServerList.name,
       pager: false,
       search: false
     })
   )
-  certList!: string[];
+  serverList!: string[];
 
   //插件实例化时执行的方法
   async onInstance() {
@@ -67,46 +67,61 @@ export class DokployRefreshCert extends AbstractTaskPlugin {
   async execute(): Promise<void> {
     const access = await this.getAccess<DokployAccess>(this.accessId);
 
+    if (!this.serverList || this.serverList.length === 0) {
+      throw new Error("请先选择要部署证书的server");
+    }
+
     // await access.createCert({cert:this.cert})
 
-    const certList = await access.getCertList();
+    const oldCertList = await access.getCertList();
 
 
-    for (const certId of this.certList) {
+    const certReader = new CertReader(this.cert);
-      this.logger.info(`----------- 开始更新证书：${certId}`);
+    for (const serverId of this.serverList) {
-      const [serverId,name] = certId.split("#");
+      this.logger.info(`----------- 开始部署server证书：${serverId}`);
-      const founds = certList.filter((item: any) => item.name === name);
+      if(!serverId){
-      if (founds){
+        this.logger.error(`----------- serverId不能为空，跳过更新`);
-        for (const found of founds) {
+        continue;
-          await access.removeCert({id:found.certificateId})
-        }
       }
-
       await access.createCert({
-        name,
+        name: certReader.buildCertName(),
         cert: this.cert,
         serverId: serverId,
       });
-      this.logger.info(`----------- 更新证书${certId}成功`);
+      this.logger.info(`----------- 部署server${serverId}证书成功`);
+    }
+
+    this.logger.info(`----------- 等待10秒后开始清理过期证书`);
+    await this.ctx.utils.sleep(10000);
+    //清理过期证书
+    for (const certItem of oldCertList) {
+      
+      const certDetail = CertReader.readCertDetail(certItem.certificateData);
+      if (certDetail.expires.getTime() < new Date().getTime()){
+          this.logger.info(`----------- 证书${certItem.certificateId}已过期`);
+          await access.removeCert({id:certItem.certificateId});
+          this.logger.info(`----------- 清理过期证书${certItem.certificateId}成功`);  
+      }else{
+        this.logger.info(`----------- 证书${certItem.certificateId}还未过期`);  
+      }
     }
 
     this.logger.info("部署完成");
   }
 
-  async onGetCertList(data: PageSearch = {}) {
+  async onGetServerList(data: PageSearch = {}) {
     const access = await this.getAccess<DokployAccess>(this.accessId);
 
-    const res = await access.getCertList()
+    const res = await access.getServerList()
     const list = res
     if (!list || list.length === 0) {
-      throw new Error("没有找到证书，你可以直接手动输入id，如果id不存在将自动创建");
+      throw new Error("没有找到Server，你可以直接手动输入serverId");
     }
 
     const options = list.map((item: any) => {
       return {
         label: `${item.name}<${item.serverId}>`,
-        value: `${item.serverId}#${item.name}`,
+        value: `${item.serverId}`,
-        domain: item.name
       };
     });
     return options;

packages/ui/certd-server/src/plugins/plugin-oauth/api.ts

@@ -0,0 +1,24 @@
+export interface OauthProvider {
+  buildLoginUrl: (params: { redirectUri: string }) => string;
+  handleCallback: (params: { code: string; redirectUri: string }) => Promise<{
+    accessToken: string;
+    refreshToken: string;
+    expiresIn: number;
+    idToken: string;
+    scope: string;
+    tokenType: string;
+  }>;
+  bind: (params: {
+    accessToken: string;
+    refreshToken: string;
+    expiresIn: number;
+    idToken: string;
+    scope: string;
+    tokenType: string;
+    bindInfo: any;
+  }) => Promise<{
+    success: boolean;
+    message: string;
+  }>;
+  
+}

trigger/build.trigger

@@ -1 +1 @@
-01:18
+23:54

trigger/release.trigger

@@ -1 +1 @@
-01:28
+23:57