diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4afd94..84d310a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +### Bug Fixes + +* 修复二次认证登录进入错误账号的bug ([e3930e0](https://github.com/certd/certd/commit/e3930e07172dd7903cb0f6ff26e0e3e828ba3e77)) + +### Features + +* 从yaml文件注册插件 ([deb3893](https://github.com/certd/certd/commit/deb38938204b29543f36d3266249958faaaa6b66)) + +### Performance Improvements + +* 优化cdnfly插件,支持自动匹配域名部署 ([afd59e9](https://github.com/certd/certd/commit/afd59e9933b2650f41c5d47684c171b93b962065)) + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) ### Bug Fixes diff --git a/build.trigger b/build.trigger index e8e2d5aa..c28ffb7c 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -01:58 +17:28 diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index 6d4afd94..84d310a0 100644 --- a/docs/guide/changelogs/CHANGELOG.md +++ b/docs/guide/changelogs/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +### Bug Fixes + +* 修复二次认证登录进入错误账号的bug ([e3930e0](https://github.com/certd/certd/commit/e3930e07172dd7903cb0f6ff26e0e3e828ba3e77)) + +### Features + +* 从yaml文件注册插件 ([deb3893](https://github.com/certd/certd/commit/deb38938204b29543f36d3266249958faaaa6b66)) + +### Performance Improvements + +* 优化cdnfly插件,支持自动匹配域名部署 ([afd59e9](https://github.com/certd/certd/commit/afd59e9933b2650f41c5d47684c171b93b962065)) + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) ### Bug Fixes diff --git a/lerna.json b/lerna.json index 252aa5a2..4712a77a 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.33.8" + "version": "1.34.0" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index ec932cac..673d88ce 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.34.0](https://github.com/publishlab/node-acme-client/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/acme-client + ## [1.33.8](https://github.com/publishlab/node-acme-client/compare/v1.33.7...v1.33.8) (2025-04-26) ### Bug Fixes diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index 151317c1..549fc098 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.33.8", + "version": "1.34.0", "type": "module", "module": "scr/index.js", "main": "src/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.33.8", + "@certd/basic": "^1.34.0", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.7.2", @@ -68,5 +68,5 @@ "bugs": { "url": "https://github.com/publishlab/node-acme-client/issues" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index 652677b9..0d51d9e7 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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/basic + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) **Note:** Version bump only for package @certd/basic diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index a0251e1d..954a7f2e 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -01:54 +17:24 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index ec0a09e4..9699cd41 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -1,7 +1,7 @@ { "name": "@certd/basic", "private": false, - "version": "1.33.8", + "version": "1.34.0", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -44,5 +44,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index 623603d5..62d3ed9c 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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/pipeline + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index f826effd..78fd428e 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.33.8", + "version": "1.34.0", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -16,8 +16,8 @@ "test": "mocha --loader=ts-node/esm" }, "dependencies": { - "@certd/basic": "^1.33.8", - "@certd/plus-core": "^1.33.8", + "@certd/basic": "^1.34.0", + "@certd/plus-core": "^1.34.0", "dayjs": "^1.11.7", "lodash-es": "^4.17.21", "reflect-metadata": "^0.1.13" @@ -43,5 +43,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index 8e4d3425..ac923664 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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) **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 00281a64..5d627325 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.33.8", + "version": "1.34.0", "main": "./dist/bundle.js", "module": "./dist/bundle.js", "types": "./dist/d/index.d.ts", @@ -23,5 +23,5 @@ "prettier": "^2.8.8", "tslib": "^2.8.1" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index 3b97e6b0..659ff23a 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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) **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 74bf4b90..b0f04b06 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.33.8", + "version": "1.34.0", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -30,5 +30,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md index ac338a42..e359c57d 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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/jdcloud + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) **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 671d73ea..0a3703a3 100644 --- a/packages/libs/lib-jdcloud/package.json +++ b/packages/libs/lib-jdcloud/package.json @@ -1,6 +1,6 @@ { "name": "@certd/jdcloud", - "version": "1.33.8", + "version": "1.34.0", "description": "jdcloud openApi sdk", "main": "./dist/bundle.js", "module": "./dist/bundle.js", @@ -60,5 +60,5 @@ "fetch" ] }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index 2283f1bf..ff737079 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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) **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 ca8c4165..2519806f 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.33.8", + "version": "1.34.0", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -16,7 +16,7 @@ "preview": "vite preview" }, "dependencies": { - "@certd/basic": "^1.33.8", + "@certd/basic": "^1.34.0", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { @@ -31,5 +31,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index 6c25cd61..d63a23b5 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.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/lib-server + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) **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 3936c668..edc7819b 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.33.8", + "version": "1.34.0", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -27,10 +27,10 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.33.8", - "@certd/basic": "^1.33.8", - "@certd/pipeline": "^1.33.8", - "@certd/plus-core": "^1.33.8", + "@certd/acme-client": "^1.34.0", + "@certd/basic": "^1.34.0", + "@certd/pipeline": "^1.34.0", + "@certd/plus-core": "^1.34.0", "@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": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 753fb24b..d8fc3ef8 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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) **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 7c52e725..f116eb7c 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.33.8", + "version": "1.34.0", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -46,5 +46,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index 372ad8b8..07077679 100644 --- a/packages/plugins/plugin-cert/CHANGELOG.md +++ b/packages/plugins/plugin-cert/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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +**Note:** Version bump only for package @certd/plugin-cert + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) ### Bug Fixes diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 6ead162e..7797124f 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.33.8", + "version": "1.34.0", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -15,10 +15,10 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.33.8", - "@certd/basic": "^1.33.8", - "@certd/pipeline": "^1.33.8", - "@certd/plugin-lib": "^1.33.8", + "@certd/acme-client": "^1.34.0", + "@certd/basic": "^1.34.0", + "@certd/pipeline": "^1.34.0", + "@certd/plugin-lib": "^1.34.0", "@google-cloud/publicca": "^1.3.0", "dayjs": "^1.11.7", "jszip": "^3.10.1", @@ -42,5 +42,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } diff --git a/packages/plugins/plugin-cert/src/dns-provider/base.ts b/packages/plugins/plugin-cert/src/dns-provider/base.ts index e262c605..bdcf42b3 100644 --- a/packages/plugins/plugin-cert/src/dns-provider/base.ts +++ b/packages/plugins/plugin-cert/src/dns-provider/base.ts @@ -32,7 +32,7 @@ export abstract class AbstractDnsProvider implements IDnsProvider { export async function createDnsProvider(opts: { dnsProviderType: string; context: DnsProviderContext }): Promise { const { dnsProviderType, context } = opts; const dnsProviderPlugin = dnsProviderRegistry.get(dnsProviderType); - const DnsProviderClass = dnsProviderPlugin.target; + const DnsProviderClass = await dnsProviderPlugin.target(); const dnsProviderDefine = dnsProviderPlugin.define as DnsProviderDefine; if (dnsProviderDefine.deprecated) { context.logger.warn(dnsProviderDefine.deprecated); diff --git a/packages/plugins/plugin-cert/src/dns-provider/decorator.ts b/packages/plugins/plugin-cert/src/dns-provider/decorator.ts index c2c89a91..34e17048 100644 --- a/packages/plugins/plugin-cert/src/dns-provider/decorator.ts +++ b/packages/plugins/plugin-cert/src/dns-provider/decorator.ts @@ -24,7 +24,9 @@ export function IsDnsProvider(define: DnsProviderDefine): ClassDecorator { target.define = define; dnsProviderRegistry.register(define.name, { define, - target, + target: async () => { + return target; + }, }); }; } diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md index 72d4cc1b..7c456576 100644 --- a/packages/plugins/plugin-lib/CHANGELOG.md +++ b/packages/plugins/plugin-lib/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.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +### Performance Improvements + +* 优化cdnfly插件,支持自动匹配域名部署 ([afd59e9](https://github.com/certd/certd/commit/afd59e9933b2650f41c5d47684c171b93b962065)) + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) ### Bug Fixes diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index 8bf941a5..3392cb48 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.33.8", + "version": "1.34.0", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -17,8 +17,8 @@ "dependencies": { "@alicloud/pop-core": "^1.7.10", "@aws-sdk/client-s3": "^3.787.0", - "@certd/basic": "^1.33.8", - "@certd/pipeline": "^1.33.8", + "@certd/basic": "^1.34.0", + "@certd/pipeline": "^1.34.0", "@kubernetes/client-node": "0.21.0", "ali-oss": "^6.22.0", "basic-ftp": "^5.0.5", @@ -49,5 +49,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "9b420ad33ff4c36fc99d643c18be9ec7e29f220d" + "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310" } 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 eb9ee0c4..5d05a3d6 100644 --- a/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts +++ b/packages/plugins/plugin-lib/src/aliyun/access/aliyun-access.ts @@ -5,6 +5,7 @@ import { IsAccess, AccessInput, BaseAccess } from "@certd/pipeline"; title: "阿里云授权", desc: "", icon: "ant-design:aliyun-outlined", + order: 0, }) export class AliyunAccess extends BaseAccess { @AccessInput({ diff --git a/packages/plugins/plugin-lib/src/common/index.ts b/packages/plugins/plugin-lib/src/common/index.ts index 64592c40..c790299c 100644 --- a/packages/plugins/plugin-lib/src/common/index.ts +++ b/packages/plugins/plugin-lib/src/common/index.ts @@ -65,7 +65,7 @@ export function createRemoteSelectInputDefine(opts?: { watches: [certDomainsInputKey, accessIdInputKey, ...watches], }, rules: opts?.rules, - required: true, + required: opts.required ?? true, mergeScript: ` return { component:{ diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index f6ce1a68..d8447d5c 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.34.0](https://github.com/certd/certd/compare/v1.33.8...v1.34.0) (2025-04-28) + +### Bug Fixes + +* 修复二次认证登录进入错误账号的bug ([e3930e0](https://github.com/certd/certd/commit/e3930e07172dd7903cb0f6ff26e0e3e828ba3e77)) + ## [1.33.8](https://github.com/certd/certd/compare/v1.33.7...v1.33.8) (2025-04-26) ### Bug Fixes diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 4c6fc4f3..7b0c9770 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.33.8", + "version": "1.34.0", "private": true, "scripts": { "dev": "vite --open", @@ -101,8 +101,8 @@ "zod-defaults": "^0.1.3" }, "devDependencies": { - "@certd/lib-iframe": "^1.33.8", - "@certd/pipeline": "^1.33.8", + "@certd/lib-iframe": "^1.34.0", + "@certd/pipeline": "^1.34.0", "@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 731aba3c..4b90018c 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -27,7 +27,7 @@ const props = withDefaults( mode?: "comm" | "button" | "nav" | "icon"; }>(), { - mode: "button" + mode: "button", } ); type Text = { @@ -40,57 +40,57 @@ const text = computed(() => { isComm: { comm: { name: `${vipLabel}已开通`, - title: "到期时间:" + expireTime.value + title: "到期时间:" + expireTime.value, }, button: { name: `${vipLabel}已开通`, - title: "到期时间:" + expireTime.value + title: "到期时间:" + expireTime.value, }, icon: { name: "", - title: `${vipLabel}已开通` + title: `${vipLabel}已开通`, }, nav: { name: `${vipLabel}`, - title: "到期时间:" + expireTime.value - } + title: "到期时间:" + expireTime.value, + }, }, isPlus: { comm: { name: "商业版功能", - title: "升级商业版,获取商业授权" + title: "升级商业版,获取商业授权", }, button: { name: `${vipLabel}已开通`, - title: "到期时间:" + expireTime.value + title: "到期时间:" + expireTime.value, }, icon: { name: "", - title: `${vipLabel}已开通` + title: `${vipLabel}已开通`, }, nav: { name: `${vipLabel}`, - title: "到期时间:" + expireTime.value - } + title: "到期时间:" + expireTime.value, + }, }, free: { comm: { name: "商业版功能", - title: "升级商业版,获取商业授权" + title: "升级商业版,获取商业授权", }, button: { name: "专业版功能", - title: "升级专业版,享受更多VIP特权" + title: "升级专业版,享受更多VIP特权", }, icon: { name: "", - title: "专业版功能" + title: "专业版功能", }, nav: { name: "基础版", - title: "升级专业版,享受更多VIP特权" - } - } + title: "升级专业版,享受更多VIP特权", + }, + }, }; if (settingStore.isComm) { return map.isComm[props.mode]; @@ -119,7 +119,7 @@ const expiredDays = computed(() => { const formState = reactive({ code: "", - inviteCode: "" + inviteCode: "", }); const router = useRouter(); @@ -143,10 +143,10 @@ async function doActive() { content: "绑定账号后,可以避免License丢失,强烈建议绑定", onOk() { router.push("/sys/account"); - } + }, }); } - } + }, }); } } @@ -183,7 +183,7 @@ function openTrialModal() {
点击确认,即可获取7天专业版试用
); - } + }, }); } @@ -208,7 +208,7 @@ function openStarModal() { ); - } + }, }); } @@ -226,13 +226,14 @@ function openUpgrade() { title = "续期专业版/升级商业版"; } + const productInfo = settingStore.productInfo; const vipTypeDefine = { free: { title: "基础版", desc: "社区免费版", type: "free", icon: "lucide:package-open", - privilege: ["证书申请无限制", "域名数量无限制", "证书流水线数量无限制", "常用的主机、云平台、cdn等部署插件", "邮件、webhook通知方式"] + privilege: ["证书申请无限制", "域名数量无限制", "证书流水线数量无限制", "常用的主机、云平台、cdn等部署插件", "邮件、webhook通知方式"], }, plus: { title: "专业版", @@ -243,10 +244,12 @@ function openUpgrade() { title: "点击获取7天试用", click: () => { openStarModal(); - } + }, }, icon: "stash:thumb-up", - price: 29.9, + price: productInfo.plus.price, + price3: `¥${productInfo.plus.price3}/3年`, + tooltip: productInfo.plus.tooltip, get() { return ( @@ -255,7 +258,7 @@ function openUpgrade() { ); - } + }, }, comm: { title: "商业版", @@ -263,11 +266,13 @@ function openUpgrade() { type: "comm", icon: "vaadin:handshake", privilege: ["拥有专业版所有特权", "允许商用,可修改logo、标题", "数据统计", "插件管理", "多用户无限制", "支持用户支付"], - price: 399, + price: productInfo.comm.price, + price3: `¥${productInfo.comm.price3}/3年`, + tooltip: productInfo.comm.tooltip, get() { - return 请联系作者获取; - } - } + return 请联系作者获取试用; + }, + }, }; const modalRef = modal.confirm({ @@ -321,9 +326,12 @@ function openUpgrade() {