diff --git a/.npmrc b/.npmrc index 6c2b9be4..beae5694 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,2 @@ -link-workspace-packages=true +link-workspace-packages=deep prefer-workspace-packages=true diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c27ae53..5d06df8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,23 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +### Bug Fixes + +* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1)) +* 修复角色无法删除的bug ([66629a5](https://github.com/certd/certd/commit/66629a591aecc2d8364ea415c7afc3f9d0406562)) +* 修复Cname情况下,无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224)) + +### Performance Improvements + +* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36)) +* 系统设置中的代理设置优化为可全局生效,环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf)) +* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d)) +* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044)) +* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572)) +* 专业版试用,无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232)) + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) ### Bug Fixes diff --git a/README.md b/README.md index 16e7835b..951739bf 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ docker compose up -d * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。 * 我们所说的续期,其实就是按照全套流程重新申请一份新证书,然后重新部署上去。 * 免费证书过期时间90天,以后可能还会缩短,所以自动化部署必不可少 -* 设置每天自动运行,当证书过期前20天,会自动重新申请证书并部署 +* 设置每天自动运行,当证书过期前35天,会自动重新申请证书并部署 ## 七、不同平台的设置说明 diff --git a/build.trigger b/build.trigger index 77d7baab..1765b646 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -21:55 +22:02 diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index 2c27ae53..5d06df8e 100644 --- a/docs/guide/changelogs/CHANGELOG.md +++ b/docs/guide/changelogs/CHANGELOG.md @@ -3,6 +3,23 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +### Bug Fixes + +* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1)) +* 修复角色无法删除的bug ([66629a5](https://github.com/certd/certd/commit/66629a591aecc2d8364ea415c7afc3f9d0406562)) +* 修复Cname情况下,无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224)) + +### Performance Improvements + +* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36)) +* 系统设置中的代理设置优化为可全局生效,环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf)) +* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d)) +* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044)) +* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572)) +* 专业版试用,无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232)) + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) ### Bug Fixes diff --git a/docs/guide/index.md b/docs/guide/index.md index c1bcce58..f99e0a33 100644 --- a/docs/guide/index.md +++ b/docs/guide/index.md @@ -26,7 +26,7 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工 * 实际上没有办法不改变证书文件本身情况下直接续期或者续签。 * 我们所说的续期,其实就是按照全套流程重新申请一份新证书,然后重新部署上去。 * 免费证书过期时间90天,以后可能还会缩短,所以自动化部署必不可少 -* 设置每天自动运行,当证书过期前20天,会自动重新申请证书并部署 +* 设置每天自动运行,当证书过期前35天,会自动重新申请证书并部署 ## 三、证书颁发机构对比 * Let's Encrypt:申请最简单。 diff --git a/lerna.json b/lerna.json index 1c2afe56..9cd2c16c 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.27.4" + "version": "1.27.5" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index 5dba2125..0d2c4a09 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.27.5](https://github.com/publishlab/node-acme-client/compare/v1.27.4...v1.27.5) (2024-11-18) + +**Note:** Version bump only for package @certd/acme-client + ## [1.27.4](https://github.com/publishlab/node-acme-client/compare/v1.27.3...v1.27.4) (2024-11-14) **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 b7b17aff..8bd2a5fd 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.27.4", + "version": "1.27.5", "type": "module", "module": "scr/index.js", "main": "src/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.27.4", + "@certd/basic": "^1.27.5", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.7.2", @@ -65,5 +65,5 @@ "bugs": { "url": "https://github.com/publishlab/node-acme-client/issues" }, - "gitHead": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/core/basic/.npmrc b/packages/core/basic/.npmrc index 6c2b9be4..beae5694 100644 --- a/packages/core/basic/.npmrc +++ b/packages/core/basic/.npmrc @@ -1,2 +1,2 @@ -link-workspace-packages=true +link-workspace-packages=deep prefer-workspace-packages=true diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index 8b563851..8dd4a51f 100644 --- a/packages/core/basic/CHANGELOG.md +++ b/packages/core/basic/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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +### Performance Improvements + +* 系统设置中的代理设置优化为可全局生效,环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf)) +* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d)) +* 优化腾讯云 cloudflare 重复解析记录时的返回值 ([90d1b68](https://github.com/certd/certd/commit/90d1b68bd6cf232fbe085234efe07d29b7690044)) + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) **Note:** Version bump only for package @certd/basic diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index ebfeee18..338fc018 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -21:51 +21:57 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index 120dbf3f..d655dfc5 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -1,7 +1,7 @@ { "name": "@certd/basic", "private": false, - "version": "1.27.4", + "version": "1.27.5", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -43,5 +43,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/core/basic/src/utils/util.request.ts b/packages/core/basic/src/utils/util.request.ts index 73867523..dd1cbe49 100644 --- a/packages/core/basic/src/utils/util.request.ts +++ b/packages/core/basic/src/utils/util.request.ts @@ -178,7 +178,10 @@ export function createAxiosService({ logger }: { logger: Logger }) { ); logger.error('返回数据:', JSON.stringify(error.response?.data)); if (error.response?.data) { - error.message = error.response.data.message || error.response.data.msg || error.response.data.error || error.response.data; + const message = error.response.data.message || error.response.data.msg || error.response.data.error; + if (typeof message === 'string') { + error.message = message; + } } if (error instanceof AggregateError) { logger.error('AggregateError', error); diff --git a/packages/core/pipeline/.npmrc b/packages/core/pipeline/.npmrc index 6c2b9be4..beae5694 100644 --- a/packages/core/pipeline/.npmrc +++ b/packages/core/pipeline/.npmrc @@ -1,2 +1,2 @@ -link-workspace-packages=true +link-workspace-packages=deep prefer-workspace-packages=true diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index b7d7d8d4..1ea34ae4 100644 --- a/packages/core/pipeline/CHANGELOG.md +++ b/packages/core/pipeline/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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +### Performance Improvements + +* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d)) + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 9788e867..c1166fca 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.27.4", + "version": "1.27.5", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -16,8 +16,8 @@ "test": "mocha --loader=ts-node/esm" }, "dependencies": { - "@certd/basic": "^1.27.4", - "@certd/plus-core": "^1.27.4", + "@certd/basic": "^1.27.5", + "@certd/plus-core": "^1.27.5", "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": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/core/pipeline/src/access/registry.ts b/packages/core/pipeline/src/access/registry.ts index 4dea4643..10e7a366 100644 --- a/packages/core/pipeline/src/access/registry.ts +++ b/packages/core/pipeline/src/access/registry.ts @@ -1,4 +1,4 @@ -import { Registry } from "../registry/index.js"; +import { createRegistry } from "../registry/index.js"; // @ts-ignore -export const accessRegistry = new Registry("access"); +export const accessRegistry = createRegistry("access"); diff --git a/packages/core/pipeline/src/plugin/registry.ts b/packages/core/pipeline/src/plugin/registry.ts index 684cd4ca..1411053b 100644 --- a/packages/core/pipeline/src/plugin/registry.ts +++ b/packages/core/pipeline/src/plugin/registry.ts @@ -1,4 +1,4 @@ -import { OnRegisterContext, Registry } from "../registry/index.js"; +import { createRegistry, OnRegisterContext } from "../registry/index.js"; import { AbstractTaskPlugin } from "./api.js"; import { pluginGroups } from "./group.js"; @@ -13,4 +13,4 @@ const onRegister = ({ key, value }: OnRegisterContext) => { } } }; -export const pluginRegistry = new Registry("plugin", onRegister); +export const pluginRegistry = createRegistry("plugin", onRegister); diff --git a/packages/core/pipeline/src/registry/registry.ts b/packages/core/pipeline/src/registry/registry.ts index cf49899a..2be4d839 100644 --- a/packages/core/pipeline/src/registry/registry.ts +++ b/packages/core/pipeline/src/registry/registry.ts @@ -88,3 +88,21 @@ export class Registry { return item.define; } } + +export function createRegistry(type: string, onRegister?: OnRegister) { + const pipelineregistrycacheKey = "PIPELINE_REGISTRY_CACHE"; + // @ts-ignore + let cached: any = global[pipelineregistrycacheKey]; + if (!cached) { + cached = {}; + // @ts-ignore + global[pipelineregistrycacheKey] = cached; + } + + if (cached[type]) { + return cached[type]; + } + const newRegistry = new Registry(type, onRegister); + cached[type] = newRegistry; + return newRegistry; +} diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index b7120137..838158c2 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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) **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 f80b750f..3e321ef2 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.27.4", + "version": "1.27.5", "main": "./dist/bundle.js", "module": "./dist/bundle.js", "types": "./dist/d/index.d.ts", @@ -21,5 +21,5 @@ "prettier": "^2.8.8", "tslib": "^2.8.1" }, - "gitHead": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index 9f7d16cf..0b6d4123 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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) **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 c4ac119a..3d6c958f 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.27.4", + "version": "1.27.5", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -30,5 +30,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index f36589f6..8e1aeb87 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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) **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 aa54eeb8..25c1bb5d 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.27.4", + "version": "1.27.5", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -16,7 +16,7 @@ "preview": "vite preview" }, "dependencies": { - "@certd/basic": "^1.27.4", + "@certd/basic": "^1.27.5", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { @@ -31,5 +31,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index 43866b37..e5b7c69d 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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +### Performance Improvements + +* 专业版试用,无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232)) + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) ### Performance Improvements diff --git a/packages/libs/lib-server/package.json b/packages/libs/lib-server/package.json index 1322b873..017f0e8a 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.27.4", + "version": "1.27.5", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -27,10 +27,10 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.27.4", - "@certd/basic": "^1.27.4", - "@certd/pipeline": "^1.27.4", - "@certd/plus-core": "^1.27.4", + "@certd/acme-client": "^1.27.5", + "@certd/basic": "^1.27.5", + "@certd/pipeline": "^1.27.5", + "@certd/plus-core": "^1.27.5", "@midwayjs/cache": "~3.14.0", "@midwayjs/core": "~3.17.1", "@midwayjs/i18n": "~3.17.3", @@ -61,5 +61,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/libs/lib-server/src/system/basic/service/plus-service.ts b/packages/libs/lib-server/src/system/basic/service/plus-service.ts index 37b29b04..32e5ba2d 100644 --- a/packages/libs/lib-server/src/system/basic/service/plus-service.ts +++ b/packages/libs/lib-server/src/system/basic/service/plus-service.ts @@ -108,6 +108,23 @@ export class PlusService { return res.accessToken; } + async getVipTrial() { + const plusRequestService = await this.getPlusRequestService(); + await this.register(); + const res = await plusRequestService.request({ + url: '/activation/subject/vip/trialGet', + method: 'POST', + }); + if (res.license) { + await this.updateLicense(res.license); + return { + duration: res.duration, + }; + } else { + throw new Error('您已经领取过VIP试用了'); + } + } + async requestWithToken(config: HttpRequestConfig) { const plusRequestService = await this.getPlusRequestService(); const token = await this.getAccessToken(); diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 4b4edd90..2f2e80ea 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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) **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 271f8735..fe40967f 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.27.4", + "version": "1.27.5", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -46,5 +46,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/plugins/plugin-cert/.npmrc b/packages/plugins/plugin-cert/.npmrc index 6c2b9be4..beae5694 100644 --- a/packages/plugins/plugin-cert/.npmrc +++ b/packages/plugins/plugin-cert/.npmrc @@ -1,2 +1,2 @@ -link-workspace-packages=true +link-workspace-packages=deep prefer-workspace-packages=true diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index 23683172..da8f7802 100644 --- a/packages/plugins/plugin-cert/CHANGELOG.md +++ b/packages/plugins/plugin-cert/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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +### Bug Fixes + +* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1)) + +### Performance Improvements + +* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d)) +* 支持namesilo ([80159ec](https://github.com/certd/certd/commit/80159ecca895103d0495f3217311199e66056572)) +* 专业版试用,无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232)) + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) ### Bug Fixes diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 0015082f..5a5d8157 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.27.4", + "version": "1.27.5", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -15,9 +15,9 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.27.4", - "@certd/basic": "^1.27.4", - "@certd/pipeline": "^1.27.4", + "@certd/acme-client": "^1.27.5", + "@certd/basic": "^1.27.5", + "@certd/pipeline": "^1.27.5", "@google-cloud/publicca": "^1.3.0", "dayjs": "^1.11.7", "jszip": "^3.10.1", @@ -40,5 +40,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "339554bdbf61c4784614747734a420e744e13bfb" + "gitHead": "3e0d4a0bede5f7353b9b7ff74d9883b59c05510c" } diff --git a/packages/plugins/plugin-cert/src/dns-provider/registry.ts b/packages/plugins/plugin-cert/src/dns-provider/registry.ts index c5c9c1ea..f11064d8 100644 --- a/packages/plugins/plugin-cert/src/dns-provider/registry.ts +++ b/packages/plugins/plugin-cert/src/dns-provider/registry.ts @@ -1,3 +1,3 @@ -import { Registry } from "@certd/pipeline"; +import { createRegistry } from "@certd/pipeline"; -export const dnsProviderRegistry = new Registry("dnsProvider"); +export const dnsProviderRegistry = createRegistry("dnsProvider"); diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts index 85ae9f8a..e396d4db 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -73,7 +73,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { }) renewDays!: number; - @TaskInput({ title: "成功后邮件通知", value: true, @@ -141,7 +140,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { } this._result.pipelinePrivateVars.cert = cert; - if (cert.pfx == null || cert.der == null || cert.jks == null) { + if (isNew) { try { const converter = new CertConverter({ logger: this.logger }); const res = await converter.convert({ @@ -152,21 +151,18 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { const pfxBuffer = fs.readFileSync(res.pfxPath); cert.pfx = pfxBuffer.toString("base64"); fs.unlinkSync(res.pfxPath); - isNew = true; } if (cert.der == null && res.derPath) { const derBuffer = fs.readFileSync(res.derPath); cert.der = derBuffer.toString("base64"); fs.unlinkSync(res.derPath); - isNew = true; } if (cert.jks == null && res.jksPath) { const jksBuffer = fs.readFileSync(res.jksPath); cert.jks = jksBuffer.toString("base64"); fs.unlinkSync(res.jksPath); - isNew = true; } this.logger.info("转换证书格式成功"); @@ -292,7 +288,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { } /** - * 检查是否过期,默认提前20天 + * 检查是否过期,默认提前35天 * @param expires * @param maxDays * @returns {boolean} diff --git a/packages/ui/certd-client/.npmrc b/packages/ui/certd-client/.npmrc index 6c2b9be4..beae5694 100644 --- a/packages/ui/certd-client/.npmrc +++ b/packages/ui/certd-client/.npmrc @@ -1,2 +1,2 @@ -link-workspace-packages=true +link-workspace-packages=deep prefer-workspace-packages=true diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index 4f3dbedd..06021510 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/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.27.5](https://github.com/certd/certd/compare/v1.27.4...v1.27.5) (2024-11-18) + +### Bug Fixes + +* 修复1Panel面板本身证书更新导致判定执行失败的问题 ([2689e6d](https://github.com/certd/certd/commit/2689e6d6c03aba21da90d5d45232c6ba08696be1)) +* 修复Cname情况下,无法使用DNS类型的bug ([26dad39](https://github.com/certd/certd/commit/26dad399d5768b3205da099ddc11809aef7d6224)) + +### Performance Improvements + +* 日志查看自动滚动到底部 ([4a2f7eb](https://github.com/certd/certd/commit/4a2f7ebf87b7c027cebff7cb763f8f35f6d2aa36)) +* 系统设置中的代理设置优化为可全局生效,环境变量中的https_proxy设置将无效 ([381a37f](https://github.com/certd/certd/commit/381a37fbaa6b61c887eda743897ae00afb825bdf)) +* 新手导航在非编辑模式下不显示 ([18bfcc2](https://github.com/certd/certd/commit/18bfcc24ad0bde57bb04db8a4209861ec6b8ff1d)) +* 专业版试用,无需绑定账号 ([c7c4318](https://github.com/certd/certd/commit/c7c4318c11b65a76089787aa58939832d338a232)) + ## [1.27.4](https://github.com/certd/certd/compare/v1.27.3...v1.27.4) (2024-11-14) ### Performance Improvements diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 2d957a1c..bce989f0 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.27.4", + "version": "1.27.5", "private": true, "scripts": { "dev": "vite --open", @@ -65,8 +65,8 @@ "vuedraggable": "^4.1.0" }, "devDependencies": { - "@certd/lib-iframe": "^1.27.4", - "@certd/pipeline": "^1.27.4", + "@certd/lib-iframe": "^1.27.5", + "@certd/pipeline": "^1.27.5", "@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/cron-editor/index.vue b/packages/ui/certd-client/src/components/cron-editor/index.vue index aa6e2693..9b502a61 100644 --- a/packages/ui/certd-client/src/components/cron-editor/index.vue +++ b/packages/ui/certd-client/src/components/cron-editor/index.vue @@ -40,6 +40,7 @@ if (props.modelValue == null) { } const emit = defineEmits<{ "update:modelValue": any; + change: any; }>(); const errorMessage = ref(null); diff --git a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/index.vue b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/index.vue index 08e8f40f..acdb82a7 100644 --- a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/index.vue +++ b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/index.vue @@ -33,7 +33,7 @@ DNS类型: ([ title: "设置定时执行", descriptions: [ "流水线测试成功,接下来配置定时触发,以后每天定时执行就不用管了", - "推荐配置每天运行一次,在到期前20天才会重新申请新证书并部署,没到期前会自动跳过,不会重复申请。" + "推荐配置每天运行一次,在到期前35天才会重新申请新证书并部署,没到期前会自动跳过,不会重复申请。" ] }, { diff --git a/packages/ui/certd-client/src/components/vip-button/api.ts b/packages/ui/certd-client/src/components/vip-button/api.ts index 19379fa0..292b49d4 100644 --- a/packages/ui/certd-client/src/components/vip-button/api.ts +++ b/packages/ui/certd-client/src/components/vip-button/api.ts @@ -7,3 +7,11 @@ export async function doActive(form: any) { data: form }); } + +export async function getVipTrial() { + return await request({ + url: "/sys/plus/getVipTrial", + method: "post", + data: {} + }); +} 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 7e57c4ca..aa8ef823 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -12,13 +12,14 @@