diff --git a/CHANGELOG.md b/CHANGELOG.md index 65f758f5..7543c229 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +### Bug Fixes + +* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd)) + +### Performance Improvements + +* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c)) +* 支持letencrypt测试环境，支持IP证书？ ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec)) +* server 增加 "@peculiar/x509" 依赖 ([acdf091](https://github.com/certd/certd/commit/acdf0912d452029f158279fb78155086e4fbac17)) + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) ### Bug Fixes diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index 65f758f5..7543c229 100644 --- a/docs/guide/changelogs/CHANGELOG.md +++ b/docs/guide/changelogs/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +### Bug Fixes + +* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd)) + +### Performance Improvements + +* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c)) +* 支持letencrypt测试环境，支持IP证书？ ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec)) +* server 增加 "@peculiar/x509" 依赖 ([acdf091](https://github.com/certd/certd/commit/acdf0912d452029f158279fb78155086e4fbac17)) + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) ### Bug Fixes diff --git a/lerna.json b/lerna.json index 166e3107..0509bf4e 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.37.5" + "version": "1.37.6" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index a2fa9700..2b98e29d 100644 --- a/packages/core/acme-client/CHANGELOG.md +++ b/packages/core/acme-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.6](https://github.com/publishlab/node-acme-client/compare/v1.37.5...v1.37.6) (2025-11-10) + +### Performance Improvements + +* 支持letencrypt测试环境，支持IP证书？ ([1462cdd](https://github.com/publishlab/node-acme-client/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec)) + ## [1.37.5](https://github.com/publishlab/node-acme-client/compare/v1.37.4...v1.37.5) (2025-11-08) **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 4bf4ef94..f4a789e6 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.37.5", + "version": "1.37.6", "type": "module", "module": "scr/index.js", "main": "src/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.37.5", + "@certd/basic": "^1.37.6", "@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": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/core/acme-client/src/index.js b/packages/core/acme-client/src/index.js index a40d9544..561c5195 100644 --- a/packages/core/acme-client/src/index.js +++ b/packages/core/acme-client/src/index.js @@ -21,6 +21,9 @@ export const directory = { staging: 'https://acme-staging-v02.api.letsencrypt.org/directory', production: 'https://acme-v02.api.letsencrypt.org/directory', }, + letsencrypt_staging: { + production: 'https://acme-staging-v02.api.letsencrypt.org/directory', + }, zerossl: { staging: 'https://acme.zerossl.com/v2/DV90', production: 'https://acme.zerossl.com/v2/DV90', diff --git a/packages/core/acme-client/types/index.d.ts b/packages/core/acme-client/types/index.d.ts index 5c81057a..fd33fb42 100644 --- a/packages/core/acme-client/types/index.d.ts +++ b/packages/core/acme-client/types/index.d.ts @@ -108,6 +108,9 @@ export const directory: { staging: string, production: string }, + letsencrypt_staging: { + production: string + }, zerossl: { staging: string, production: string diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index 85882ce1..5a75b8f8 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/basic + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **Note:** Version bump only for package @certd/basic diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index 1f1779e5..16e79880 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -05:00 +00:42 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index f528bc96..9e3cf7e4 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -1,7 +1,7 @@ { "name": "@certd/basic", "private": false, - "version": "1.37.5", + "version": "1.37.6", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -46,5 +46,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index bdcc39a2..42c1d47a 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/pipeline + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 43790715..f56d872b 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.37.5", + "version": "1.37.6", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -18,8 +18,8 @@ "compile": "tsc --skipLibCheck --watch" }, "dependencies": { - "@certd/basic": "^1.37.5", - "@certd/plus-core": "^1.37.5", + "@certd/basic": "^1.37.6", + "@certd/plus-core": "^1.37.6", "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": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index 040d49ce..90ffdb77 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **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 851c9694..d8c68be6 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.37.5", + "version": "1.37.6", "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": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index f2a15221..062e872e 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **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 329a48f4..0104842a 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.37.5", + "version": "1.37.6", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -31,5 +31,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md index 1db15192..f07d2f0c 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/jdcloud + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **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 c63096fb..ab6bc99c 100644 --- a/packages/libs/lib-jdcloud/package.json +++ b/packages/libs/lib-jdcloud/package.json @@ -1,6 +1,6 @@ { "name": "@certd/jdcloud", - "version": "1.37.5", + "version": "1.37.6", "description": "jdcloud openApi sdk", "main": "./dist/bundle.js", "module": "./dist/bundle.js", @@ -61,5 +61,5 @@ "fetch" ] }, - "gitHead": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index 3894ffbc..7772d712 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **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 4f76b766..f28e428c 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.37.5", + "version": "1.37.6", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -17,7 +17,7 @@ "pub": "npm publish" }, "dependencies": { - "@certd/basic": "^1.37.5", + "@certd/basic": "^1.37.6", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { @@ -32,5 +32,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index f035d5f8..4d50fade 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/lib-server + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) ### Performance Improvements diff --git a/packages/libs/lib-server/package.json b/packages/libs/lib-server/package.json index 3420d124..445e6966 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.37.5", + "version": "1.37.6", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -28,11 +28,11 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.37.5", - "@certd/basic": "^1.37.5", - "@certd/pipeline": "^1.37.5", - "@certd/plugin-lib": "^1.37.5", - "@certd/plus-core": "^1.37.5", + "@certd/acme-client": "^1.37.6", + "@certd/basic": "^1.37.6", + "@certd/pipeline": "^1.37.6", + "@certd/plugin-lib": "^1.37.6", + "@certd/plus-core": "^1.37.6", "@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": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 616ea4dd..3841fe1b 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **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 f72575e1..1a578857 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.37.5", + "version": "1.37.6", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -46,5 +46,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index e694672f..164bb436 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +### Performance Improvements + +* 支持letencrypt测试环境，支持IP证书？ ([1462cdd](https://github.com/certd/certd/commit/1462cddd1eb347b7ff238286b5c977b29a0591ec)) + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **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 01f0262d..8ba0c099 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.37.5", + "version": "1.37.6", "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.5", - "@certd/basic": "^1.37.5", - "@certd/pipeline": "^1.37.5", - "@certd/plugin-lib": "^1.37.5", + "@certd/acme-client": "^1.37.6", + "@certd/basic": "^1.37.6", + "@certd/pipeline": "^1.37.6", + "@certd/plugin-lib": "^1.37.6", "@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": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } 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 74ba8173..74322522 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts @@ -50,7 +50,7 @@ export type CertInfo = { one?: string; p7b?: string; }; -export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom"; +export type SSLProvider = "letsencrypt" | "google" | "zerossl" | "sslcom" | "letsencrypt_staging"; export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521"; type AcmeServiceOptions = { userContext: IContext; @@ -111,7 +111,7 @@ export class AcmeService { await this.userContext.setObj(this.buildAccountKey(email), conf); } - async getAcmeClient(email: string, isTest = false): Promise { + async getAcmeClient(email: string): Promise { const mappings = {}; if (this.sslProvider === "letsencrypt") { mappings["acme-v02.api.letsencrypt.org"] = this.options.reverseProxy || "le.px.certd.handfree.work"; @@ -128,12 +128,7 @@ export class AcmeService { await this.saveAccountConfig(email, conf); this.logger.info(`创建新的Accountkey:${email}`); } - let directoryUrl = ""; - if (isTest) { - directoryUrl = acme.directory[this.sslProvider].staging; - } else { - directoryUrl = acme.directory[this.sslProvider].production; - } + const directoryUrl = acme.directory[this.sslProvider].production; if (this.options.useMappingProxy) { urlMapping.enabled = true; } else { @@ -327,13 +322,12 @@ export class AcmeService { domainsVerifyPlan?: DomainsVerifyPlan; httpUploader?: any; csrInfo: any; - isTest?: boolean; privateKeyType?: string; profile?: string; preferredChain?: string; }): Promise { - const { email, isTest, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options; - const client: acme.Client = await this.getAcmeClient(email, isTest); + const { email, csrInfo, dnsProvider, domainsVerifyPlan, profile, preferredChain } = options; + const client: acme.Client = await this.getAcmeClient(email); let domains = options.domains; const encodingDomains = []; diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts index 8811ccd3..53263187 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts @@ -137,6 +137,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { { value: "google", label: "Google（免费）", icon: "flat-color-icons:google" }, { value: "zerossl", label: "ZeroSSL（免费）", icon: "emojione:digit-zero" }, { value: "sslcom", label: "SSL.com（仅主域名和www免费）", icon: "la:expeditedssl" }, + { value: "letsencrypt_staging", label: "Let's Encrypt测试环境（IP证书）", icon: "simple-icons:letsencrypt" }, ], }, helper: "Let's Encrypt：申请最简单\nGoogle：大厂光环，兼容性好，仅首次需要翻墙获取EAB授权\nZeroSSL：需要EAB授权，无需翻墙\nSSL.com：仅主域名和www免费,必须设置CAA记录", @@ -412,7 +413,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { async onInit() { let eab: EabAccess = null; - if (this.sslProvider && this.sslProvider !== "letsencrypt") { + if (this.sslProvider && !this.sslProvider.startsWith("letsencrypt")) { if (this.sslProvider === "google" && this.googleAccessId) { this.logger.info("当前正在使用 google服务账号授权获取EAB"); const googleAccess = await this.getAccess(this.googleAccessId); @@ -495,7 +496,6 @@ export class CertApplyPlugin extends CertApplyBasePlugin { dnsProvider, domainsVerifyPlan, csrInfo, - isTest: false, privateKeyType: this.privateKeyType, profile: this.certProfile, preferredChain: this.preferredChain, diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md index 5eeb52e8..7885b4f1 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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +**Note:** Version bump only for package @certd/plugin-lib + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) **Note:** Version bump only for package @certd/plugin-lib diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index 2a39cd0d..7a3b6fbf 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.37.5", + "version": "1.37.6", "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.5", - "@certd/pipeline": "^1.37.5", + "@certd/basic": "^1.37.6", + "@certd/pipeline": "^1.37.6", "@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": "9d5daf00152188369bf29e8be5795dbf04737f18" + "gitHead": "9fcdeca6920fc7d465e2443dab4f246d279f108b" } diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index 0d7c0814..aba069b9 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-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.37.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +### Bug Fixes + +* 修复创建流水线报id不能为空的bug ([aac569a](https://github.com/certd/certd/commit/aac569a9259ede43399e0ed5d668e936b984d6dd)) + +### Performance Improvements + +* 增加vip时间同步按钮 ([32e4e91](https://github.com/certd/certd/commit/32e4e91ab81008dda422fb53fd6f4d1711c5d80c)) + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) ### Bug Fixes diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 89ef6088..4bfd95df 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.37.5", + "version": "1.37.6", "private": true, "scripts": { "dev": "vite --open", @@ -106,8 +106,8 @@ "zod-defaults": "^0.1.3" }, "devDependencies": { - "@certd/lib-iframe": "^1.37.5", - "@certd/pipeline": "^1.37.5", + "@certd/lib-iframe": "^1.37.6", + "@certd/pipeline": "^1.37.6", "@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/components/vip-button/index.vue b/packages/ui/certd-client/src/components/vip-button/index.vue index 547ce5f8..246020e3 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -340,6 +340,13 @@ function openUpgrade() { function showManualActivation() { manualActiveFlag.value = true; } + + function goBindAccount() { + modalRef?.destroy(); + router.push({ + path: "/sys/account", + }); + } const modalRef = modal.success({ title, maskClosable: true, @@ -367,6 +374,9 @@ function openUpgrade() {
{t("vip.current")} {vipLabel} {t("vip.activated_expire_time")} {settingStore.expiresText} + + {t("vip.learn_more")} +
); } @@ -439,6 +449,10 @@ function openUpgrade() {
{t("vip.site_id")}： + + + {t("vip.not_effective")} +
{plusInfo} diff --git a/packages/ui/certd-client/src/locales/langs/en-US/vip.ts b/packages/ui/certd-client/src/locales/langs/en-US/vip.ts index 06d2eccd..39ebd640 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/vip.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/vip.ts @@ -98,4 +98,6 @@ export default { already_comm: "Already Business Edition, can't change to Professional Edition", already_perpetual_plus: "You already have a perpetual Professional Edition, can't upgrade", confirm: "Confirm", + not_effective: "Not effective?", + learn_more: "More privileges", }; diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts index d65b99e0..a7b12c3f 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts @@ -97,4 +97,6 @@ export default { already_comm: "已经是商业版了，不能降级为专业版", already_perpetual_plus: "您已经是永久专业版了，无法继续升级", confirm: "确认", + not_effective: "没有生效?", + learn_more: "更多特权(加VIP群等)", }; diff --git a/packages/ui/certd-client/src/views/certd/pipeline/api.ts b/packages/ui/certd-client/src/views/certd/pipeline/api.ts index c501aaff..1d2d7f66 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/api.ts +++ b/packages/ui/certd-client/src/views/certd/pipeline/api.ts @@ -62,7 +62,7 @@ export async function GetDetail(id: any) { }); } -export async function Save(pipelineEntity: any) { +export async function Save(pipelineEntity: any): Promise<{ id: number; version: number }> { return await request({ url: apiPrefix + "/save", method: "post", 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 3b3d4b0f..66764cfd 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 @@ -367,7 +367,7 @@ export function useCertPipelineCreator() { pipeline = setRunnableIds(pipeline); const groupId = form.groupId; - const id = await api.Save({ + const { id } = await api.Save({ title: pipeline.title, content: JSON.stringify(pipeline), keepHistoryCount: 30, diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts index 409a9768..af1c975d 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts @@ -16,7 +16,7 @@ export type RunHistory = { export type PipelineOptions = { doTrigger(options: { pipelineId: number; stepId?: string }): Promise; - doSave(pipelineConfig: Pipeline): Promise; + doSave(pipelineConfig: Pipeline): Promise<{ id: number; version: number }>; getPipelineDetail(query: { pipelineId: number }): Promise; getHistoryList(query: { pipelineId: number }): Promise; getHistoryDetail(query: { historyId: number }): Promise; diff --git a/packages/ui/certd-server/CHANGELOG.md b/packages/ui/certd-server/CHANGELOG.md index e34f6e53..2691ea25 100644 --- a/packages/ui/certd-server/CHANGELOG.md +++ b/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.6](https://github.com/certd/certd/compare/v1.37.5...v1.37.6) (2025-11-10) + +### Performance Improvements + +* server 增加 "@peculiar/x509" 依赖 ([acdf091](https://github.com/certd/certd/commit/acdf0912d452029f158279fb78155086e4fbac17)) + ## [1.37.5](https://github.com/certd/certd/compare/v1.37.4...v1.37.5) (2025-11-08) ### Bug Fixes diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 9b31f36f..f0f32f52 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -1,6 +1,6 @@ { "name": "@certd/ui-server", - "version": "1.37.5", + "version": "1.37.6", "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.5", - "@certd/basic": "^1.37.5", - "@certd/commercial-core": "^1.37.5", + "@certd/acme-client": "^1.37.6", + "@certd/basic": "^1.37.6", + "@certd/commercial-core": "^1.37.6", "@certd/cv4pve-api-javascript": "^8.4.2", - "@certd/jdcloud": "^1.37.5", - "@certd/lib-huawei": "^1.37.5", - "@certd/lib-k8s": "^1.37.5", - "@certd/lib-server": "^1.37.5", - "@certd/midway-flyway-js": "^1.37.5", - "@certd/pipeline": "^1.37.5", - "@certd/plugin-cert": "^1.37.5", - "@certd/plugin-lib": "^1.37.5", - "@certd/plugin-plus": "^1.37.5", - "@certd/plus-core": "^1.37.5", + "@certd/jdcloud": "^1.37.6", + "@certd/lib-huawei": "^1.37.6", + "@certd/lib-k8s": "^1.37.6", + "@certd/lib-server": "^1.37.6", + "@certd/midway-flyway-js": "^1.37.6", + "@certd/pipeline": "^1.37.6", + "@certd/plugin-cert": "^1.37.6", + "@certd/plugin-lib": "^1.37.6", + "@certd/plugin-plus": "^1.37.6", + "@certd/plus-core": "^1.37.6", "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120", "@huaweicloud/huaweicloud-sdk-core": "^3.1.120", "@koa/cors": "^5.0.0", @@ -73,6 +73,7 @@ "@midwayjs/typeorm": "3.20.11", "@midwayjs/upload": "3.20.13", "@midwayjs/validate": "3.20.13", + "@peculiar/x509": "^1.11.0", "@volcengine/openapi": "^1.28.1", "ali-oss": "^6.21.0", "axios": "^1.7.2", diff --git a/trigger/build.trigger b/trigger/build.trigger index 9958cb8c..98f9e3b6 100644 --- a/trigger/build.trigger +++ b/trigger/build.trigger @@ -1 +1 @@ -05:07 +00:49 diff --git a/trigger/release.trigger b/trigger/release.trigger index 021746b2..aabd250a 100644 --- a/trigger/release.trigger +++ b/trigger/release.trigger @@ -1 +1 @@ -01:52 +05:19