diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e02139a1..317406481 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +### Bug Fixes + +* 更新我爱云CDN域名地址,和部分目录结构 [@tyjsjxh](https://github.com/tyjsjxh) ([#514](https://github.com/certd/certd/issues/514)) ([78e7a81](https://github.com/certd/certd/commit/78e7a81638c2ee779f0ab6c3ba7e5c6f6e064151)) +* 修复cron选择组件星期显示错误的bug ([eb75e52](https://github.com/certd/certd/commit/eb75e52278f94a72643f7317e6740fb42666c68a)) +* 修复proxmox某些情况下执行卡住的bug ([ebd6917](https://github.com/certd/certd/commit/ebd6917a1d40ae4d94555c32b7e3c093d0599b94)) + +### Performance Improvements + +* 部署到k8s支持自动创建secret ([c09c962](https://github.com/certd/certd/commit/c09c962cb676ca261610aa9f3e5105c9dae43f43)) +* 短信验证码支持腾讯云 ([9108459](https://github.com/certd/certd/commit/9108459ae42bcd95a59acba164a64e82e5f2cfe6)) +* 商业版支持自定义插件的参数配置 ([17f23f3](https://github.com/certd/certd/commit/17f23f37516af925d5049291d67d41e4271f81f8)) +* 腾讯云插件支持国际版 ([58e82d5](https://github.com/certd/certd/commit/58e82d5dbd4ebf089ef239578ef9b68454d17b30)) +* 腾讯云EO插件支持自动获取zoneid和域名列表 ([70fcdc9](https://github.com/certd/certd/commit/70fcdc9ebbfb7c883c0c8a2138f61a0776a9491b)) +* 支持部署到阿里云云原生API网关、AI网关 ([2ca20be](https://github.com/certd/certd/commit/2ca20be197720201fceabcce9d927f4dbc1cc872)) +* 支持部署到华为云obs ([9feb9d0](https://github.com/certd/certd/commit/9feb9d04b3c56ec95c06fcf4fd071eb0e88ffc6f)) +* 支持部署到dokploy ([7dbdeae](https://github.com/certd/certd/commit/7dbdeaebe0bfee7521a863fe5e6b4a712aec5876)) +* 支持删除宝塔证书夹中的过期证书 ([3575113](https://github.com/certd/certd/commit/3575113655be751d19f88c64491e98a89042d6a2)) +* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165)) +* lecdnv2支持api token ([e448934](https://github.com/certd/certd/commit/e4489343fee7754be07bcfc3323969dc3a30e90c)) +* openapi返回证书时挑选匹配范围最小的那一个;增加format参数,增加返回值p7b格式,增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5)) +* ssh 配置sudo免密提示 ([e1e7011](https://github.com/certd/certd/commit/e1e7011853ad0c5bd7b09c3690861d5aa34b2db4)) + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ### Bug Fixes diff --git a/build.trigger b/build.trigger index f5ed3ee83..bacbe4702 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -23:58 +00:43 diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index 6e02139a1..317406481 100644 --- a/docs/guide/changelogs/CHANGELOG.md +++ b/docs/guide/changelogs/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +### Bug Fixes + +* 更新我爱云CDN域名地址,和部分目录结构 [@tyjsjxh](https://github.com/tyjsjxh) ([#514](https://github.com/certd/certd/issues/514)) ([78e7a81](https://github.com/certd/certd/commit/78e7a81638c2ee779f0ab6c3ba7e5c6f6e064151)) +* 修复cron选择组件星期显示错误的bug ([eb75e52](https://github.com/certd/certd/commit/eb75e52278f94a72643f7317e6740fb42666c68a)) +* 修复proxmox某些情况下执行卡住的bug ([ebd6917](https://github.com/certd/certd/commit/ebd6917a1d40ae4d94555c32b7e3c093d0599b94)) + +### Performance Improvements + +* 部署到k8s支持自动创建secret ([c09c962](https://github.com/certd/certd/commit/c09c962cb676ca261610aa9f3e5105c9dae43f43)) +* 短信验证码支持腾讯云 ([9108459](https://github.com/certd/certd/commit/9108459ae42bcd95a59acba164a64e82e5f2cfe6)) +* 商业版支持自定义插件的参数配置 ([17f23f3](https://github.com/certd/certd/commit/17f23f37516af925d5049291d67d41e4271f81f8)) +* 腾讯云插件支持国际版 ([58e82d5](https://github.com/certd/certd/commit/58e82d5dbd4ebf089ef239578ef9b68454d17b30)) +* 腾讯云EO插件支持自动获取zoneid和域名列表 ([70fcdc9](https://github.com/certd/certd/commit/70fcdc9ebbfb7c883c0c8a2138f61a0776a9491b)) +* 支持部署到阿里云云原生API网关、AI网关 ([2ca20be](https://github.com/certd/certd/commit/2ca20be197720201fceabcce9d927f4dbc1cc872)) +* 支持部署到华为云obs ([9feb9d0](https://github.com/certd/certd/commit/9feb9d04b3c56ec95c06fcf4fd071eb0e88ffc6f)) +* 支持部署到dokploy ([7dbdeae](https://github.com/certd/certd/commit/7dbdeaebe0bfee7521a863fe5e6b4a712aec5876)) +* 支持删除宝塔证书夹中的过期证书 ([3575113](https://github.com/certd/certd/commit/3575113655be751d19f88c64491e98a89042d6a2)) +* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165)) +* lecdnv2支持api token ([e448934](https://github.com/certd/certd/commit/e4489343fee7754be07bcfc3323969dc3a30e90c)) +* openapi返回证书时挑选匹配范围最小的那一个;增加format参数,增加返回值p7b格式,增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5)) +* ssh 配置sudo免密提示 ([e1e7011](https://github.com/certd/certd/commit/e1e7011853ad0c5bd7b09c3690861d5aa34b2db4)) + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ### Bug Fixes diff --git a/lerna.json b/lerna.json index bbbdafd7b..26a7f3583 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.36.17" + "version": "1.36.18" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index 5a3217de1..329ae74ae 100644 --- a/packages/core/acme-client/CHANGELOG.md +++ b/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.36.18](https://github.com/publishlab/node-acme-client/compare/v1.36.17...v1.36.18) (2025-08-28) + +**Note:** Version bump only for package @certd/acme-client + ## [1.36.17](https://github.com/publishlab/node-acme-client/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/acme-client diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index e83971a56..d77cfec87 100644 --- a/packages/core/acme-client/package.json +++ b/packages/core/acme-client/package.json @@ -3,7 +3,7 @@ "description": "Simple and unopinionated ACME client", "private": false, "author": "nmorsman", - "version": "1.36.17", + "version": "1.36.18", "type": "module", "module": "scr/index.js", "main": "src/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.36.17", + "@certd/basic": "^1.36.18", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.7.2", @@ -69,5 +69,5 @@ "bugs": { "url": "https://github.com/publishlab/node-acme-client/issues" }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index 12a89bdbe..d8c3f8a14 100644 --- a/packages/core/basic/CHANGELOG.md +++ b/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +**Note:** Version bump only for package @certd/basic + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/basic diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index 7a6a87811..4316bd657 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -23:53 +00:39 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index 0fe465a68..def44d2fe 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -1,7 +1,7 @@ { "name": "@certd/basic", "private": false, - "version": "1.36.17", + "version": "1.36.18", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -45,5 +45,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index fba2e62ad..d954ea085 100644 --- a/packages/core/pipeline/CHANGELOG.md +++ b/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +**Note:** Version bump only for package @certd/pipeline + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 9944b6a36..0dcf7704e 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.36.17", + "version": "1.36.18", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -17,8 +17,8 @@ "pub": "npm publish" }, "dependencies": { - "@certd/basic": "^1.36.17", - "@certd/plus-core": "^1.36.17", + "@certd/basic": "^1.36.18", + "@certd/plus-core": "^1.36.18", "dayjs": "^1.11.7", "lodash-es": "^4.17.21", "reflect-metadata": "^0.1.13" @@ -44,5 +44,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index 5688a5362..5e582f6bd 100644 --- a/packages/libs/lib-huawei/CHANGELOG.md +++ b/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/lib-huawei diff --git a/packages/libs/lib-huawei/package.json b/packages/libs/lib-huawei/package.json index 3683308e8..bb3a33df8 100644 --- a/packages/libs/lib-huawei/package.json +++ b/packages/libs/lib-huawei/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-huawei", "private": false, - "version": "1.36.17", + "version": "1.36.18", "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": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index c9c107c62..f2a0a6938 100644 --- a/packages/libs/lib-iframe/CHANGELOG.md +++ b/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/lib-iframe diff --git a/packages/libs/lib-iframe/package.json b/packages/libs/lib-iframe/package.json index b81af813a..8466cce21 100644 --- a/packages/libs/lib-iframe/package.json +++ b/packages/libs/lib-iframe/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-iframe", "private": false, - "version": "1.36.17", + "version": "1.36.18", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -31,5 +31,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md index e4cc75378..ffaf02e09 100644 --- a/packages/libs/lib-jdcloud/CHANGELOG.md +++ b/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +**Note:** Version bump only for package @certd/jdcloud + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/jdcloud diff --git a/packages/libs/lib-jdcloud/package.json b/packages/libs/lib-jdcloud/package.json index 60233cc37..df4e817ef 100644 --- a/packages/libs/lib-jdcloud/package.json +++ b/packages/libs/lib-jdcloud/package.json @@ -1,6 +1,6 @@ { "name": "@certd/jdcloud", - "version": "1.36.17", + "version": "1.36.18", "description": "jdcloud openApi sdk", "main": "./dist/bundle.js", "module": "./dist/bundle.js", @@ -61,5 +61,5 @@ "fetch" ] }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index 5a0149f94..f7570468a 100644 --- a/packages/libs/lib-k8s/CHANGELOG.md +++ b/packages/libs/lib-k8s/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +### Performance Improvements + +* 部署到k8s支持自动创建secret ([c09c962](https://github.com/certd/certd/commit/c09c962cb676ca261610aa9f3e5105c9dae43f43)) + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/lib-k8s diff --git a/packages/libs/lib-k8s/package.json b/packages/libs/lib-k8s/package.json index 7df9c6f32..2ae6f74a0 100644 --- a/packages/libs/lib-k8s/package.json +++ b/packages/libs/lib-k8s/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-k8s", "private": false, - "version": "1.36.17", + "version": "1.36.18", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -17,7 +17,7 @@ "pub": "npm publish" }, "dependencies": { - "@certd/basic": "^1.36.17", + "@certd/basic": "^1.36.18", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { @@ -32,5 +32,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/libs/lib-k8s/src/lib/k8s.client.ts b/packages/libs/lib-k8s/src/lib/k8s.client.ts index 2032dae00..0e2fac476 100644 --- a/packages/libs/lib-k8s/src/lib/k8s.client.ts +++ b/packages/libs/lib-k8s/src/lib/k8s.client.ts @@ -90,7 +90,7 @@ export class K8sClient { async createSecret(opts: { namespace: string; body: V1Secret }) { const namespace = opts.namespace || "default"; const created = await this.client.createNamespacedSecret(namespace, opts.body); - this.logger.info("new secrets:", opts.body); + this.logger.info("new secrets:", opts.body.metadata); return created.body; } @@ -103,17 +103,33 @@ export class K8sClient { // return await this.client.replaceNamespacedSecret(secretName, namespace, opts.body); // } - async patchSecret(opts: { namespace: string; secretName: string; body: V1Secret }) { + async patchSecret(opts: { namespace: string; secretName: string; body: V1Secret; createOnNotFound?: boolean }) { const namespace = opts.namespace || "default"; const secretName = opts.secretName; if (secretName == null) { throw new Error("secretName 不能为空"); } this.logger.info("patch secret:", secretName, namespace); - const oldSecret = await this.client.readNamespacedSecret(secretName, namespace); + let oldSecret: any = null; + try { + oldSecret = await this.client.readNamespacedSecret(secretName, namespace); + } catch (e) { + //@ts-ignore + if (e.response?.body?.code === 404) { + this.logger.warn(`secret ${secretName} 不存在`); + if (opts.createOnNotFound) { + //没有找到,则创建 + const res = await this.createSecret({ namespace, body: opts.body }); + this.logger.info(`secret ${secretName} 已创建`); + return res; + } + } + throw e; + } + const newSecret = _.merge(oldSecret.body, opts.body); const res = await this.client.replaceNamespacedSecret(secretName, namespace, newSecret); - this.logger.info("secret updated"); + this.logger.info(`secret ${secretName} 已更新`); return res.body; } diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index 5a38b23dd..213e6268e 100644 --- a/packages/libs/lib-server/CHANGELOG.md +++ b/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +**Note:** Version bump only for package @certd/lib-server + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/lib-server diff --git a/packages/libs/lib-server/package.json b/packages/libs/lib-server/package.json index 83ca13a24..329dfa97d 100644 --- a/packages/libs/lib-server/package.json +++ b/packages/libs/lib-server/package.json @@ -1,6 +1,6 @@ { "name": "@certd/lib-server", - "version": "1.36.17", + "version": "1.36.18", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -27,10 +27,10 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.36.17", - "@certd/basic": "^1.36.17", - "@certd/pipeline": "^1.36.17", - "@certd/plus-core": "^1.36.17", + "@certd/acme-client": "^1.36.18", + "@certd/basic": "^1.36.18", + "@certd/pipeline": "^1.36.18", + "@certd/plus-core": "^1.36.18", "@midwayjs/cache": "~3.14.0", "@midwayjs/core": "~3.20.3", "@midwayjs/i18n": "~3.20.3", @@ -61,5 +61,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 341d1f19c..771525204 100644 --- a/packages/libs/midway-flyway-js/CHANGELOG.md +++ b/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/midway-flyway-js diff --git a/packages/libs/midway-flyway-js/package.json b/packages/libs/midway-flyway-js/package.json index 21ea147ae..ab01b2a23 100644 --- a/packages/libs/midway-flyway-js/package.json +++ b/packages/libs/midway-flyway-js/package.json @@ -1,6 +1,6 @@ { "name": "@certd/midway-flyway-js", - "version": "1.36.17", + "version": "1.36.18", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -46,5 +46,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index c68b54780..3e8521a58 100644 --- a/packages/plugins/plugin-cert/CHANGELOG.md +++ b/packages/plugins/plugin-cert/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.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +### Performance Improvements + +* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165)) +* openapi返回证书时挑选匹配范围最小的那一个;增加format参数,增加返回值p7b格式,增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5)) + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ### Performance Improvements diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 81cae2d3f..c6d56d933 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-cert", "private": false, - "version": "1.36.17", + "version": "1.36.18", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -16,10 +16,10 @@ "pub": "npm publish" }, "dependencies": { - "@certd/acme-client": "^1.36.17", - "@certd/basic": "^1.36.17", - "@certd/pipeline": "^1.36.17", - "@certd/plugin-lib": "^1.36.17", + "@certd/acme-client": "^1.36.18", + "@certd/basic": "^1.36.18", + "@certd/pipeline": "^1.36.18", + "@certd/plugin-lib": "^1.36.18", "@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": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts index 318aa0c48..df31264f1 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts @@ -21,6 +21,15 @@ export type CertReaderHandleContext = { }; export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise; export type HandleOpts = { logger: ILogger; handle: CertReaderHandle }; + +const formats = { + pem: ["crt", "key", "ic"], + one: ["one"], + pfx: ["pfx"], + der: ["der"], + jks: ["jks"], + p7b: ["p7b", "key"], +}; export class CertReader { cert: CertInfo; @@ -74,8 +83,17 @@ export class CertReader { return arr[0] + endStr; } - toCertInfo(): CertInfo { - return this.cert; + toCertInfo(format?: string): CertInfo { + if (!format) { + return this.cert; + } + + const formatArr = formats[format]; + const res: any = {}; + formatArr.forEach((key: string) => { + res[key] = this.cert[key]; + }); + return res; } getCrtDetail(crt: string = this.cert.crt) { diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md index 82b40351a..d2c403c37 100644 --- a/packages/plugins/plugin-lib/CHANGELOG.md +++ b/packages/plugins/plugin-lib/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +### Performance Improvements + +* 腾讯云插件支持国际版 ([58e82d5](https://github.com/certd/certd/commit/58e82d5dbd4ebf089ef239578ef9b68454d17b30)) +* 支持部署到阿里云云原生API网关、AI网关 ([2ca20be](https://github.com/certd/certd/commit/2ca20be197720201fceabcce9d927f4dbc1cc872)) +* ssh 配置sudo免密提示 ([e1e7011](https://github.com/certd/certd/commit/e1e7011853ad0c5bd7b09c3690861d5aa34b2db4)) + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) ### Performance Improvements diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index e02c69283..7d96007cf 100644 --- a/packages/plugins/plugin-lib/package.json +++ b/packages/plugins/plugin-lib/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-lib", "private": false, - "version": "1.36.17", + "version": "1.36.18", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -21,8 +21,8 @@ "@alicloud/pop-core": "^1.7.10", "@alicloud/tea-util": "^1.4.10", "@aws-sdk/client-s3": "^3.787.0", - "@certd/basic": "^1.36.17", - "@certd/pipeline": "^1.36.17", + "@certd/basic": "^1.36.18", + "@certd/pipeline": "^1.36.18", "@kubernetes/client-node": "0.21.0", "ali-oss": "^6.22.0", "basic-ftp": "^5.0.5", @@ -53,5 +53,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "831c325c6383ba0a6f2dfa7496451ec714784e93" + "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f" } diff --git a/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts b/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts index f7c493b9a..5ced97a3a 100644 --- a/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts +++ b/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts @@ -7,9 +7,9 @@ export type AliyunClientV2Req = { // 接口 HTTP 方法 method?: "GET" | "POST"; authType?: "AK"; - style?: "RPC"; + style?: "RPC" | "ROA"; // 接口 PATH - pathname?: `/`; + pathname?: string; data?: any; }; @@ -63,10 +63,10 @@ export class AliyunClientV2 { protocol: "HTTPS", // 接口 HTTP 方法 method: req.method ?? "POST", - authType: "AK", - style: "RPC", + authType: req.authType ?? "AK", + style: req.style ?? "RPC", // 接口 PATH - pathname: `/`, + pathname: req.pathname ?? `/`, // 接口请求体内容格式 reqBodyType: "json", // 接口响应体内容格式 diff --git a/packages/plugins/plugin-lib/src/aliyun/lib/ssl-client.ts b/packages/plugins/plugin-lib/src/aliyun/lib/ssl-client.ts index 112b858c6..df57e7ab5 100644 --- a/packages/plugins/plugin-lib/src/aliyun/lib/ssl-client.ts +++ b/packages/plugins/plugin-lib/src/aliyun/lib/ssl-client.ts @@ -9,7 +9,8 @@ export type AliyunCertInfo = { export type AliyunSslClientOpts = { access: AliyunAccess; logger: ILogger; - endpoint: string; + endpoint?: string; + region?: string; }; export type AliyunSslGetResourceListReq = { @@ -48,10 +49,19 @@ export class AliyunSslClient { async getClient() { const access = this.opts.access; const client = new AliyunClient({ logger: this.opts.logger }); + + let endpoint = this.opts.endpoint || "cas.aliyuncs.com"; + if (this.opts.endpoint == null && this.opts.region) { + if (this.opts.region === "cn-hangzhou") { + endpoint = "cas.aliyuncs.com"; + } else { + endpoint = `cas.${this.opts.region}.aliyuncs.com`; + } + } await client.init({ accessKeyId: access.accessKeyId, accessKeySecret: access.accessKeySecret, - endpoint: `https://${this.opts.endpoint || "cas.aliyuncs.com"}`, + endpoint: `https://${endpoint}`, apiVersion: "2020-04-07", }); return client; diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index d4a11f67c..c91dfd093 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/CHANGELOG.md @@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28) + +### Bug Fixes + +* 修复cron选择组件星期显示错误的bug ([eb75e52](https://github.com/certd/certd/commit/eb75e52278f94a72643f7317e6740fb42666c68a)) + +### Performance Improvements + +* 短信验证码支持腾讯云 ([9108459](https://github.com/certd/certd/commit/9108459ae42bcd95a59acba164a64e82e5f2cfe6)) +* 商业版支持自定义插件的参数配置 ([17f23f3](https://github.com/certd/certd/commit/17f23f37516af925d5049291d67d41e4271f81f8)) +* 支持p7b证书格式 ([d9f4a57](https://github.com/certd/certd/commit/d9f4a5793d68a017a5d80ad5385cbda603c4e165)) +* openapi返回证书时挑选匹配范围最小的那一个;增加format参数,增加返回值p7b格式,增加detail返回 ([2085bcc](https://github.com/certd/certd/commit/2085bcceb61c3723c9bdfec4c4cc0917631ff5e5)) + ## [1.36.17](https://github.com/certd/certd/compare/v1.36.16...v1.36.17) (2025-08-17) **Note:** Version bump only for package @certd/ui-client diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 3d5127f02..156fb9e60 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -1,6 +1,6 @@ { "name": "@certd/ui-client", - "version": "1.36.17", + "version": "1.36.18", "private": true, "scripts": { "dev": "vite --open", @@ -30,6 +30,7 @@ "@ant-design/icons-vue": "^7.0.1", "@aws-sdk/client-s3": "^3.535.0", "@aws-sdk/s3-request-presigner": "^3.535.0", + "@certd/vue-js-cron-light": "^4.0.14", "@ctrl/tinycolor": "^4.1.0", "@fast-crud/fast-crud": "^1.25.13", "@fast-crud/fast-extends": "^1.25.13", @@ -43,7 +44,6 @@ "@tailwindcss/typography": "^0.5.16", "@tanstack/vue-store": "^0.7.0", "@vee-validate/zod": "^4.15.0", - "@certd/vue-js-cron-light": "^4.0.14", "@vue/shared": "^3.5.13", "@vueuse/core": "^10.11.0", "ant-design-vue": "^4.2.6", @@ -103,8 +103,8 @@ "zod-defaults": "^0.1.3" }, "devDependencies": { - "@certd/lib-iframe": "^1.36.17", - "@certd/pipeline": "^1.36.17", + "@certd/lib-iframe": "^1.36.18", + "@certd/pipeline": "^1.36.18", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-node-resolve": "^15.2.3", "@types/chai": "^4.3.12", diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts index 4e734a54e..af8aac992 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts @@ -564,7 +564,7 @@ export default { ipv6Priority: "IPv6 Priority", dualStackNetworkHelper: "If IPv6 priority is selected, enable IPv6 in docker-compose.yaml", enableCommonCnameService: "Enable Public CNAME Service", - commonCnameHelper: "Allow use of public CNAME service. If disabled and no custom CNAME service is set, CNAME proxy certificate application will not work.", + commonCnameHelper: "Allow use of public CNAME service. If disabled and no custom CNAME service is set, CNAME proxy certificate application will not work.", enableCommonSelfServicePasswordRetrieval: "Enable self-service password recovery", saveButton: "Save", stopSuccess: "Stopped successfully", @@ -587,6 +587,7 @@ export default { commFeature: "Commercial feature", smsProvider: "SMS provider", aliyunSms: "Aliyun SMS", + tencentSms: "Tencent SMS", yfySms: "YFY SMS", smsTest: "SMS test", testMobilePlaceholder: "Enter test mobile number", diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts index ec9612202..ed5b72070 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts @@ -570,7 +570,7 @@ export default { ipv6Priority: "IPV6优先", dualStackNetworkHelper: "如果选择IPv6优先,需要在docker-compose.yaml中启用ipv6", enableCommonCnameService: "启用公共CNAME服务", - commonCnameHelper: "是否可以使用公共CNAME服务,如果禁用,且没有设置自定义CNAME服务,则无法使用CNAME代理方式申请证书", + commonCnameHelper: "是否可以使用公共CNAME服务,如果禁用,且没有设置自定义CNAME服务,则无法使用CNAME代理方式申请证书", enableCommonSelfServicePasswordRetrieval: "启用自助找回密码", saveButton: "保存", stopSuccess: "停止成功", @@ -593,6 +593,7 @@ export default { commFeature: "商业版功能", smsProvider: "短信提供商", aliyunSms: "阿里云短信", + tencentSms: "腾讯云短信", yfySms: "易发云短信", smsTest: "短信测试", testMobilePlaceholder: "输入测试手机号", diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts index 22937dd45..b634f254f 100644 --- a/packages/ui/certd-client/src/router/source/modules/sys.ts +++ b/packages/ui/certd-client/src/router/source/modules/sys.ts @@ -133,7 +133,7 @@ export const sysResources = [ title: "certd.sysResources.sysPluginConfig", name: "SysPluginConfig", path: "/sys/plugin/config", - component: "/sys/plugin/config.vue", + component: "/sys/plugin/config-common.vue", meta: { show: () => { const settingStore = useSettingStore(); diff --git a/packages/ui/certd-client/src/store/plugin/index.ts b/packages/ui/certd-client/src/store/plugin/index.ts index 7f600f08d..6ecb356e1 100644 --- a/packages/ui/certd-client/src/store/plugin/index.ts +++ b/packages/ui/certd-client/src/store/plugin/index.ts @@ -1,9 +1,11 @@ import { defineStore } from "pinia"; import * as api from "./api.plugin"; -import { DynamicType, FormItemProps } from "@fast-crud/fast-crud"; +import { DynamicType, FormItemProps, useMerge } from "@fast-crud/fast-crud"; import { i18n } from "/src/locales/i18n"; +import { cloneDeep } from "lodash-es"; interface PluginState { group?: PluginGroups; + originGroup?: PluginGroups; } export type PluginGroup = { @@ -32,14 +34,17 @@ export class PluginGroups { groups!: { [key: string]: PluginGroup }; map!: { [key: string]: PluginDefine }; t: any; - constructor(groups: { [key: string]: PluginGroup }) { + mergeSetting?: boolean; + constructor(groups: { [key: string]: PluginGroup }, opts?: { mergeSetting?: boolean }) { this.groups = groups; this.t = i18n.global.t; + this.mergeSetting = opts?.mergeSetting ?? false; this.initGroup(groups); this.initMap(); } private initGroup(groups: { [p: string]: PluginGroup }) { + const { merge } = useMerge(); const all: PluginGroup = { key: "all", title: this.t("certd.all"), @@ -48,6 +53,14 @@ export class PluginGroups { icon: "material-symbols:border-all-rounded", }; for (const key in groups) { + if (this.mergeSetting) { + for (const plugin of groups[key].plugins) { + if (plugin.sysSetting) { + merge(plugin.input, plugin.sysSetting.metadata?.input || {}); + } + } + } + all.plugins.push(...groups[key].plugins); } this.groups = { @@ -132,11 +145,15 @@ export const usePluginStore = defineStore({ id: "app.plugin", state: (): PluginState => ({ group: null, + originGroup: null, }), actions: { async reload() { const groups = await api.GetGroups({}); - this.group = new PluginGroups(groups); + this.group = new PluginGroups(groups, { mergeSetting: true }); + this.originGroup = new PluginGroups(cloneDeep(groups)); + console.log("group", this.group); + console.log("originGroup", this.originGroup); }, async init() { if (!this.group) { @@ -150,6 +167,7 @@ export const usePluginStore = defineStore({ }, async clear() { this.group = null; + this.originGroup = null }, async getList(): Promise { await this.init(); @@ -159,6 +177,10 @@ export const usePluginStore = defineStore({ await this.init(); return this.group.get(name); }, + async getPluginDefineFromOrigin(name: string): Promise { + await this.init(); + return this.originGroup.get(name); + }, async getPluginConfig(query: any) { return await api.GetPluginConfig(query); }, diff --git a/packages/ui/certd-client/src/style/common.less b/packages/ui/certd-client/src/style/common.less index 8f5c3b543..70336dd0f 100644 --- a/packages/ui/certd-client/src/style/common.less +++ b/packages/ui/certd-client/src/style/common.less @@ -304,3 +304,11 @@ h6 { padding: 10px; color: #6e6e6e; } + +.ant-modal-body{ + .fs-form-body{ + max-height: 66vh; + overflow-y: auto; + } + +} \ No newline at end of file diff --git a/packages/ui/certd-client/src/views/certd/access/common.tsx b/packages/ui/certd-client/src/views/certd/access/common.tsx index 55ce6fe8d..65d30afe6 100644 --- a/packages/ui/certd-client/src/views/certd/access/common.tsx +++ b/packages/ui/certd-client/src/views/certd/access/common.tsx @@ -84,6 +84,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) { component: { color: "auto", }, + order: -1, }, form: { component: { diff --git a/packages/ui/certd-client/src/views/certd/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/crud.tsx index 0e8aea819..c0490c426 100644 --- a/packages/ui/certd-client/src/views/certd/access/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/access/crud.tsx @@ -82,6 +82,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat }, column: { width: 300, + order: -11, }, }, from: { diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx index 74c891951..dd6ff4d57 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx @@ -138,6 +138,7 @@ export function useCertPipelineCreator() { form: { doSubmit, wrapper: { + wrapClassName: "cert_pipeline_create_form", width: 1350, saveRemind: false, title: t("certd.pipelineForm.createTitle"), diff --git a/packages/ui/certd-client/src/views/certd/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/index.vue index b337fda45..164a1a793 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/index.vue @@ -115,4 +115,13 @@ function batchRerun() { padding-left: 10px; } } + +.cert_pipeline_create_form { + .ant-collapse { + margin: 10px; + } + .ant-collapse-header { + text-align: right; + } +} diff --git a/packages/ui/certd-client/src/views/framework/login/index.vue b/packages/ui/certd-client/src/views/framework/login/index.vue index 1f6a0a713..604aa0d30 100644 --- a/packages/ui/certd-client/src/views/framework/login/index.vue +++ b/packages/ui/certd-client/src/views/framework/login/index.vue @@ -43,7 +43,7 @@ -