diff --git a/CHANGELOG.md b/CHANGELOG.md index e2d2c544..638390d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +### Bug Fixes + +* 修复用户最大流水线数量校验的问题 ([919f70a](https://github.com/certd/certd/commit/919f70a5fd2842ca69f96f1659bb5a7ba3f73776)) +* 修复中文域名使用cname方式校验无法通过的问题 ([f7d5baa](https://github.com/certd/certd/commit/f7d5baa6d04cb83c572b06e62f885890cfa0143a)) +* 修复cv4pve sdk (proxmox插件连接失败时无法正常结束任务的bug) ([49f26b4](https://github.com/certd/certd/commit/49f26b4049a0549b0270395157e96e8f04a68bc4)) +* 修复flexcdn部署证书的顶级CA名称显示 ([6467edb](https://github.com/certd/certd/commit/6467edb84324d7c80a85212675dbacedc459df83)) +* 修复flexcdn证书commonNames错误的问题 ([ace363f](https://github.com/certd/certd/commit/ace363fa355436e769b27f71cc487d30d6441780)) + +### Performance Improvements + +* 分组选择支持清空选项 ([03e2e99](https://github.com/certd/certd/commit/03e2e9949837b34eb3ea56d14a9e8a5dabc96063)) +* 优化cname检查，当有冲突的cname记录时，给出提示 ([e639a8f](https://github.com/certd/certd/commit/e639a8f9f12640ffcca69f1a6a0324459924afbd)) +* 增加下载日志按钮 ([6ff509d](https://github.com/certd/certd/commit/6ff509d263c0182645b4692c10b5fedb192db964)) +* 站点监控支持批量导入域名和ip ([2d7729d](https://github.com/certd/certd/commit/2d7729dbe98f29088f5f317db2b52cc1ede223a6)) +* 支持设置用户有效期 ([6ac3bc5](https://github.com/certd/certd/commit/6ac3bc564f407dad2cd0b0b0744e887387aa5da3)) + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) ### Bug Fixes diff --git a/README.md b/README.md index 13eee2ba..3bec4e90 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,11 @@ https://afdian.com/a/greper 1. 可以调整开源协议以使其更严格或更宽松。 2. 可以用于商业用途。 +感谢以下贡献者做出的贡献。 + + + ## 九、 开源许可 * 本项目遵循 GNU Affero General Public License（AGPL）开源协议。 diff --git a/build.trigger b/build.trigger index 3a48ab5f..fbf1a7ab 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -23:57 +23:51 diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index e2d2c544..638390d4 100644 --- a/docs/guide/changelogs/CHANGELOG.md +++ b/docs/guide/changelogs/CHANGELOG.md @@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +### Bug Fixes + +* 修复用户最大流水线数量校验的问题 ([919f70a](https://github.com/certd/certd/commit/919f70a5fd2842ca69f96f1659bb5a7ba3f73776)) +* 修复中文域名使用cname方式校验无法通过的问题 ([f7d5baa](https://github.com/certd/certd/commit/f7d5baa6d04cb83c572b06e62f885890cfa0143a)) +* 修复cv4pve sdk (proxmox插件连接失败时无法正常结束任务的bug) ([49f26b4](https://github.com/certd/certd/commit/49f26b4049a0549b0270395157e96e8f04a68bc4)) +* 修复flexcdn部署证书的顶级CA名称显示 ([6467edb](https://github.com/certd/certd/commit/6467edb84324d7c80a85212675dbacedc459df83)) +* 修复flexcdn证书commonNames错误的问题 ([ace363f](https://github.com/certd/certd/commit/ace363fa355436e769b27f71cc487d30d6441780)) + +### Performance Improvements + +* 分组选择支持清空选项 ([03e2e99](https://github.com/certd/certd/commit/03e2e9949837b34eb3ea56d14a9e8a5dabc96063)) +* 优化cname检查，当有冲突的cname记录时，给出提示 ([e639a8f](https://github.com/certd/certd/commit/e639a8f9f12640ffcca69f1a6a0324459924afbd)) +* 增加下载日志按钮 ([6ff509d](https://github.com/certd/certd/commit/6ff509d263c0182645b4692c10b5fedb192db964)) +* 站点监控支持批量导入域名和ip ([2d7729d](https://github.com/certd/certd/commit/2d7729dbe98f29088f5f317db2b52cc1ede223a6)) +* 支持设置用户有效期 ([6ac3bc5](https://github.com/certd/certd/commit/6ac3bc564f407dad2cd0b0b0744e887387aa5da3)) + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) ### Bug Fixes diff --git a/lerna.json b/lerna.json index e03fe112..e2b3b79f 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.34.10" + "version": "1.34.11" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index 06fdf769..a686d483 100644 --- a/packages/core/acme-client/CHANGELOG.md +++ b/packages/core/acme-client/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.34.11](https://github.com/publishlab/node-acme-client/compare/v1.34.10...v1.34.11) (2025-06-05) + +### Bug Fixes + +* 修复中文域名使用cname方式校验无法通过的问题 ([f7d5baa](https://github.com/publishlab/node-acme-client/commit/f7d5baa6d04cb83c572b06e62f885890cfa0143a)) + +### Performance Improvements + +* 优化cname检查，当有冲突的cname记录时，给出提示 ([e639a8f](https://github.com/publishlab/node-acme-client/commit/e639a8f9f12640ffcca69f1a6a0324459924afbd)) + ## [1.34.10](https://github.com/publishlab/node-acme-client/compare/v1.34.9...v1.34.10) (2025-06-03) **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 6f95327f..0a354665 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.34.10", + "version": "1.34.11", "type": "module", "module": "scr/index.js", "main": "src/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.34.10", + "@certd/basic": "^1.34.11", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.7.2", @@ -27,7 +27,7 @@ "https-proxy-agent": "^7.0.5", "lodash-es": "^4.17.21", "node-forge": "^1.3.1", - "punycode": "^2.3.1" + "punycode.js": "^2.3.1" }, "devDependencies": { "@types/node": "^20.14.10", @@ -69,5 +69,5 @@ "bugs": { "url": "https://github.com/publishlab/node-acme-client/issues" }, - "gitHead": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/core/acme-client/types/index.d.ts b/packages/core/acme-client/types/index.d.ts index 6fa941da..4974baa5 100644 --- a/packages/core/acme-client/types/index.d.ts +++ b/packages/core/acme-client/types/index.d.ts @@ -203,6 +203,7 @@ export const agents: any; export function setLogger(fn: (message: any, ...args: any[]) => void): void; export function walkTxtRecord(record: any): Promise; +export function getAuthoritativeDnsResolver(record:string): Promise; export const CancelError: typeof CancelError; diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index c4eea476..bbae22b9 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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +**Note:** Version bump only for package @certd/basic + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) ### Performance Improvements diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index 6a639182..78c144b1 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -23:54 +23:48 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index b5c3902c..b1749fe4 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -1,7 +1,7 @@ { "name": "@certd/basic", "private": false, - "version": "1.34.10", + "version": "1.34.11", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -45,5 +45,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index 7a763ba1..128847a3 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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +**Note:** Version bump only for package @certd/pipeline + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) ### Performance Improvements diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 66a2e6e7..0717a046 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.34.10", + "version": "1.34.11", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -17,8 +17,8 @@ "pub": "npm publish" }, "dependencies": { - "@certd/basic": "^1.34.10", - "@certd/plus-core": "^1.34.10", + "@certd/basic": "^1.34.11", + "@certd/plus-core": "^1.34.11", "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": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index 373b66a9..c96ac0c9 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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) **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 0d46fbce..f7886214 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.34.10", + "version": "1.34.11", "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": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index b8a49399..823cf853 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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) **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 5c860870..ed6a5571 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.34.10", + "version": "1.34.11", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -31,5 +31,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md index 73e4885c..a51a6031 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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +**Note:** Version bump only for package @certd/jdcloud + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) **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 a0ecf74b..c95abe74 100644 --- a/packages/libs/lib-jdcloud/package.json +++ b/packages/libs/lib-jdcloud/package.json @@ -1,6 +1,6 @@ { "name": "@certd/jdcloud", - "version": "1.34.10", + "version": "1.34.11", "description": "jdcloud openApi sdk", "main": "./dist/bundle.js", "module": "./dist/bundle.js", @@ -61,5 +61,5 @@ "fetch" ] }, - "gitHead": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index b8a44ff3..20146c02 100644 --- a/packages/libs/lib-k8s/CHANGELOG.md +++ b/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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) **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 149346b4..e8d592c4 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.34.10", + "version": "1.34.11", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -17,7 +17,7 @@ "pub": "npm publish" }, "dependencies": { - "@certd/basic": "^1.34.10", + "@certd/basic": "^1.34.11", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { @@ -32,5 +32,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index 7b64c2a7..d54506bb 100644 --- a/packages/libs/lib-server/CHANGELOG.md +++ b/packages/libs/lib-server/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +### Performance Improvements + +* 支持设置用户有效期 ([6ac3bc5](https://github.com/certd/certd/commit/6ac3bc564f407dad2cd0b0b0744e887387aa5da3)) + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) **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 caf34bdb..799d48c6 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.34.10", + "version": "1.34.11", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -27,10 +27,10 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.34.10", - "@certd/basic": "^1.34.10", - "@certd/pipeline": "^1.34.10", - "@certd/plus-core": "^1.34.10", + "@certd/acme-client": "^1.34.11", + "@certd/basic": "^1.34.11", + "@certd/pipeline": "^1.34.11", + "@certd/plus-core": "^1.34.11", "@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": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/libs/lib-server/src/system/settings/service/models.ts b/packages/libs/lib-server/src/system/settings/service/models.ts index e16ff77b..851c37d9 100644 --- a/packages/libs/lib-server/src/system/settings/service/models.ts +++ b/packages/libs/lib-server/src/system/settings/service/models.ts @@ -16,6 +16,7 @@ export class SysPublicSettings extends BaseSettings { static __access__ = 'public'; registerEnabled = false; + userValidTimeEnabled?:boolean = false; passwordLoginEnabled = true; usernameRegisterEnabled = true; mobileRegisterEnabled = false; diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 7cc4e6b8..2a6bc9f0 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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) **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 ca7e8955..0eca1baa 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.34.10", + "version": "1.34.11", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -46,5 +46,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index 7cf7fd73..15bfd45d 100644 --- a/packages/plugins/plugin-cert/CHANGELOG.md +++ b/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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +### Bug Fixes + +* 修复中文域名使用cname方式校验无法通过的问题 ([f7d5baa](https://github.com/certd/certd/commit/f7d5baa6d04cb83c572b06e62f885890cfa0143a)) + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) **Note:** Version bump only for package @certd/plugin-cert diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 6a951c6c..1b334c8b 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.34.10", + "version": "1.34.11", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -16,16 +16,16 @@ "pub": "npm publish" }, "dependencies": { - "@certd/acme-client": "^1.34.10", - "@certd/basic": "^1.34.10", - "@certd/pipeline": "^1.34.10", - "@certd/plugin-lib": "^1.34.10", + "@certd/acme-client": "^1.34.11", + "@certd/basic": "^1.34.11", + "@certd/pipeline": "^1.34.11", + "@certd/plugin-lib": "^1.34.11", "@google-cloud/publicca": "^1.3.0", "dayjs": "^1.11.7", "jszip": "^3.10.1", "lodash-es": "^4.17.21", "psl": "^1.9.0", - "punycode": "^2.3.1", + "punycode.js": "^2.3.1", "rimraf": "^5.0.5" }, "devDependencies": { @@ -43,5 +43,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/plugins/plugin-cert/src/dns-provider/api.ts b/packages/plugins/plugin-cert/src/dns-provider/api.ts index f8fdc476..523159fe 100644 --- a/packages/plugins/plugin-cert/src/dns-provider/api.ts +++ b/packages/plugins/plugin-cert/src/dns-provider/api.ts @@ -29,9 +29,25 @@ export type DnsProviderContext = { export interface IDnsProvider { onInstance(): Promise; + + /** + * 中文转英文 + * @param domain + */ + punyCodeEncode(domain: string): string; + + /** + * 转中文域名 + * @param domain + */ + punyCodeDecode(domain: string): string; + createRecord(options: CreateRecordOptions): Promise; + removeRecord(options: RemoveRecordOptions): Promise; + setCtx(ctx: DnsProviderContext): void; + //中文域名是否需要punycode转码，如果返回True，则使用punycode来添加解析记录，否则使用中文域名添加解析记录 usePunyCode(): boolean; } diff --git a/packages/plugins/plugin-cert/src/dns-provider/base.ts b/packages/plugins/plugin-cert/src/dns-provider/base.ts index 25dfa5a8..543e67ea 100644 --- a/packages/plugins/plugin-cert/src/dns-provider/base.ts +++ b/packages/plugins/plugin-cert/src/dns-provider/base.ts @@ -1,7 +1,7 @@ import { CreateRecordOptions, DnsProviderContext, DnsProviderDefine, IDnsProvider, RemoveRecordOptions } from "./api.js"; import { dnsProviderRegistry } from "./registry.js"; import { HttpClient, ILogger } from "@certd/basic"; - +import punycode from "punycode.js"; export abstract class AbstractDnsProvider implements IDnsProvider { ctx!: DnsProviderContext; http!: HttpClient; @@ -13,6 +13,22 @@ export abstract class AbstractDnsProvider implements IDnsProvider { return false; } + /** + * 中文转英文 + * @param domain + */ + punyCodeEncode(domain: string) { + return punycode.toASCII(domain); + } + + /** + * 转中文域名 + * @param domain + */ + punyCodeDecode(domain: string) { + return punycode.toUnicode(domain); + } + setCtx(ctx: DnsProviderContext) { this.ctx = ctx; this.logger = ctx.logger; diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts index beb99697..d9774786 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts @@ -6,7 +6,7 @@ import { Challenge } from "@certd/acme-client/types/rfc8555"; import { IContext } from "@certd/pipeline"; import { ILogger, utils } from "@certd/basic"; import { IDnsProvider, IDomainParser } from "../../dns-provider/index.js"; -import punycode from "node:punycode"; +import punycode from "punycode.js"; import { IOssClient } from "@certd/plugin-lib"; export type CnameVerifyPlan = { type?: string; @@ -233,16 +233,18 @@ export class AcmeService { let dnsProvider = providers.dnsProvider; let fullRecord = `_acme-challenge.${fullDomain}`; + const origDomain = punycode.toUnicode(domain); + const origFullDomain = punycode.toUnicode(fullDomain); if (providers.domainsVerifyPlan) { //按照计划执行 - const domainVerifyPlan = providers.domainsVerifyPlan[domain]; + const domainVerifyPlan = providers.domainsVerifyPlan[origDomain]; if (domainVerifyPlan) { if (domainVerifyPlan.type === "dns") { dnsProvider = domainVerifyPlan.dnsProvider; } else if (domainVerifyPlan.type === "cname") { const cnameVerifyPlan = domainVerifyPlan.cnameVerifyPlan; if (cnameVerifyPlan) { - const cname = cnameVerifyPlan[fullDomain]; + const cname = cnameVerifyPlan[origFullDomain]; if (cname) { dnsProvider = cname.dnsProvider; domain = await this.options.domainParser.parse(cname.domain); 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 e2478bfa..bdffbb9d 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 @@ -5,6 +5,7 @@ import path from "path"; import { CertificateInfo, crypto } from "@certd/acme-client"; import { ILogger } from "@certd/basic"; import dayjs from "dayjs"; +import { uniq } from "lodash-es"; export type CertReaderHandleContext = { reader: CertReader; @@ -90,7 +91,8 @@ export class CertReader { const { detail } = this.getCrtDetail(); const domains = [detail.domains.commonName]; domains.push(...detail.domains.altNames); - return domains; + //去重 + return uniq(domains); } getAltNames() { diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md index 81032944..900764bd 100644 --- a/packages/plugins/plugin-lib/CHANGELOG.md +++ b/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.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +**Note:** Version bump only for package @certd/plugin-lib + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) ### Performance Improvements diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index 26989012..88264ea3 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.34.10", + "version": "1.34.11", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -20,8 +20,8 @@ "@alicloud/pop-core": "^1.7.10", "@alicloud/tea-util": "^1.4.10", "@aws-sdk/client-s3": "^3.787.0", - "@certd/basic": "^1.34.10", - "@certd/pipeline": "^1.34.10", + "@certd/basic": "^1.34.11", + "@certd/pipeline": "^1.34.11", "@kubernetes/client-node": "0.21.0", "ali-oss": "^6.22.0", "basic-ftp": "^5.0.5", @@ -52,5 +52,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "a4b6580247efabe948507c771a177d4f75670bc2" + "gitHead": "ab3a3156f24d7fc70f8a907c5f6fc754413a89d6" } diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index a15ab349..59127923 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/CHANGELOG.md @@ -3,6 +3,21 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.34.11](https://github.com/certd/certd/compare/v1.34.10...v1.34.11) (2025-06-05) + +### Bug Fixes + +* 修复中文域名使用cname方式校验无法通过的问题 ([f7d5baa](https://github.com/certd/certd/commit/f7d5baa6d04cb83c572b06e62f885890cfa0143a)) +* 修复flexcdn部署证书的顶级CA名称显示 ([6467edb](https://github.com/certd/certd/commit/6467edb84324d7c80a85212675dbacedc459df83)) + +### Performance Improvements + +* 分组选择支持清空选项 ([03e2e99](https://github.com/certd/certd/commit/03e2e9949837b34eb3ea56d14a9e8a5dabc96063)) +* 优化cname检查，当有冲突的cname记录时，给出提示 ([e639a8f](https://github.com/certd/certd/commit/e639a8f9f12640ffcca69f1a6a0324459924afbd)) +* 增加下载日志按钮 ([6ff509d](https://github.com/certd/certd/commit/6ff509d263c0182645b4692c10b5fedb192db964)) +* 站点监控支持批量导入域名和ip ([2d7729d](https://github.com/certd/certd/commit/2d7729dbe98f29088f5f317db2b52cc1ede223a6)) +* 支持设置用户有效期 ([6ac3bc5](https://github.com/certd/certd/commit/6ac3bc564f407dad2cd0b0b0744e887387aa5da3)) + ## [1.34.10](https://github.com/certd/certd/compare/v1.34.9...v1.34.10) (2025-06-03) ### Performance Improvements diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index aa12551b..9db439e4 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.34.10", + "version": "1.34.11", "private": true, "scripts": { "dev": "vite --open", @@ -9,7 +9,7 @@ "debug": "vite --mode debug --open", "debug:pm": "vite --mode debugpm", "debug:force": "vite --force --mode debug", - "build": "cross-env NODE_OPTIONS=--max-old-space-size=32768 vite build ", + "build": "cross-env NODE_OPTIONS=--max-old-space-size=40960 vite build ", "dev-build": "echo 1", "test:unit": "vitest", "serve": "vite preview", @@ -102,8 +102,8 @@ "zod-defaults": "^0.1.3" }, "devDependencies": { - "@certd/lib-iframe": "^1.34.10", - "@certd/pipeline": "^1.34.10", + "@certd/lib-iframe": "^1.34.11", + "@certd/pipeline": "^1.34.11", "@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/public/template-import.csv b/packages/ui/certd-client/public/site-import-template.csv similarity index 100% rename from packages/ui/certd-client/public/template-import.csv rename to packages/ui/certd-client/public/site-import-template.csv diff --git a/packages/ui/certd-client/src/components/index.ts b/packages/ui/certd-client/src/components/index.ts index 008752a2..7f08df50 100644 --- a/packages/ui/certd-client/src/components/index.ts +++ b/packages/ui/certd-client/src/components/index.ts @@ -15,6 +15,7 @@ import PemInput from "./pem-input.vue"; import { defineAsyncComponent } from "vue"; import NotificationSelector from "../views/certd/notification/notification-selector/index.vue"; import EmailSelector from "./email-selector/index.vue"; +import ValidTimeFormat from "./valid-time-format.vue"; export default { install(app: any) { app.component( @@ -27,6 +28,7 @@ export default { app.component("TextEditable", TextEditable); app.component("FileInput", FileInput); app.component("PemInput", PemInput); + app.component("ValidTimeFormat", ValidTimeFormat); // app.component("CodeEditor", CodeEditor); app.component("CronLight", CronLight); diff --git a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts index 9efd7833..01ffa5ec 100644 --- a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts +++ b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts @@ -8,6 +8,7 @@ export type CnameRecord = { status?: string; hostRecord?: string; recordValue?: string; + error?: string; }; export type DomainGroupItem = { diff --git a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue index 3f814dff..ebee7a67 100644 --- a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue +++ b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue @@ -13,6 +13,9 @@ + + + + diff --git a/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx b/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx index f851731f..25ff879d 100644 --- a/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx +++ b/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx @@ -1,7 +1,9 @@ import * as api from "./api"; -import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud"; +import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud"; import { useUserStore } from "/@/store/user"; import { Modal, notification } from "ant-design-vue"; +import dayjs from "dayjs"; +import { useSettingStore } from "/@/store/settings"; export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet { const pageRequest = async (query: UserPageQuery): Promise => { @@ -21,6 +23,10 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti const userStore = useUserStore(); + const settingStore = useSettingStore(); + const userValidTimeEnabled = compute(() => { + return settingStore.sysPublic.userValidTimeEnabled === true; + }); return { crudOptions: { request: { @@ -210,6 +216,43 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti width: 100, }, }, + validTime: { + title: "有效期", + type: "date", + form: { + show: userValidTimeEnabled, + }, + column: { + align: "center", + sorter: true, + width: 100, + show: userValidTimeEnabled, + cellRender({ value }) { + if (value == null || value === 0) { + return ""; + } + if (value < dayjs().valueOf()) { + return 已过期; + } + const date = dayjs(value).format("YYYY-MM-DD"); + return ( + + + + ); + }, + }, + valueBuilder({ value, row, key }) { + if (value != null) { + row[key] = dayjs(value); + } + }, + valueResolve({ value, row, key }) { + if (value != null) { + row[key] = value.valueOf(); + } + }, + }, remark: { title: "备注", type: "text", diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/register.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/register.vue index eb9ccec3..8f395eaa 100644 --- a/packages/ui/certd-client/src/views/sys/settings/tabs/register.vue +++ b/packages/ui/certd-client/src/views/sys/settings/tabs/register.vue @@ -11,6 +11,13 @@ + +
+ + +
+
有效期内用户可正常使用，失效后流水线将被停用
+