diff --git a/CHANGELOG.md b/CHANGELOG.md index ba2ebfe6..c3a459b8 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.34.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +### Bug Fixes + +* 修复Farcdn证书有效期错误的问题 ([1fe4c36](https://github.com/certd/certd/commit/1fe4c367f7128de9ba5e3395ae06bc81e63a7d5a)) + +### Performance Improvements + +* 不止证书自动化，插件解锁无限可能 ([a9b302e](https://github.com/certd/certd/commit/a9b302e38d3328d75df8b2da3d8b914851e55e9c)) +* 邮箱支持保存和选择 ([f7b0b44](https://github.com/certd/certd/commit/f7b0b44ef6044bec36510a6f0b06d8dca5bfce49)) +* 支持github 新版本检查并发布通知 ([356703c](https://github.com/certd/certd/commit/356703c83ea18c6efb8931402e181280d7b7e696)) + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) ### Bug Fixes diff --git a/build.trigger b/build.trigger index 0b159a82..4d404726 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -23:14 +00:57 diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index ba2ebfe6..c3a459b8 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.34.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +### Bug Fixes + +* 修复Farcdn证书有效期错误的问题 ([1fe4c36](https://github.com/certd/certd/commit/1fe4c367f7128de9ba5e3395ae06bc81e63a7d5a)) + +### Performance Improvements + +* 不止证书自动化，插件解锁无限可能 ([a9b302e](https://github.com/certd/certd/commit/a9b302e38d3328d75df8b2da3d8b914851e55e9c)) +* 邮箱支持保存和选择 ([f7b0b44](https://github.com/certd/certd/commit/f7b0b44ef6044bec36510a6f0b06d8dca5bfce49)) +* 支持github 新版本检查并发布通知 ([356703c](https://github.com/certd/certd/commit/356703c83ea18c6efb8931402e181280d7b7e696)) + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) ### Bug Fixes diff --git a/lerna.json b/lerna.json index c6d8c7b0..2d4d5690 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.34.8" + "version": "1.34.9" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index 2413894a..e3dc47a6 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.9](https://github.com/publishlab/node-acme-client/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/acme-client + ## [1.34.8](https://github.com/publishlab/node-acme-client/compare/v1.34.7...v1.34.8) (2025-05-28) **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 32e5be1b..87236f87 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.8", + "version": "1.34.9", "type": "module", "module": "scr/index.js", "main": "src/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.34.8", + "@certd/basic": "^1.34.9", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.7.2", @@ -69,5 +69,5 @@ "bugs": { "url": "https://github.com/publishlab/node-acme-client/issues" }, - "gitHead": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index 3fa4760d..1782478b 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/basic + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) **Note:** Version bump only for package @certd/basic diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index 19f41712..01ed2ee3 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -23:11 +00:54 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index 509f3d00..f04be623 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.8", + "version": "1.34.9", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -45,5 +45,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index dc349156..f90b62da 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/pipeline + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) ### Performance Improvements diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index e779c868..1c7ce89d 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.8", + "version": "1.34.9", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -17,8 +17,8 @@ "pub": "npm publish" }, "dependencies": { - "@certd/basic": "^1.34.8", - "@certd/plus-core": "^1.34.8", + "@certd/basic": "^1.34.9", + "@certd/plus-core": "^1.34.9", "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": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/core/pipeline/src/core/run-history.ts b/packages/core/pipeline/src/core/run-history.ts index fdb26a0c..040f37ab 100644 --- a/packages/core/pipeline/src/core/run-history.ts +++ b/packages/core/pipeline/src/core/run-history.ts @@ -203,6 +203,7 @@ export class RunnableCollection { if (runnable?.status) { runnable.status.status = ResultType.none; runnable.status.result = ResultType.none; + runnable.status.output = {}; runnable.status.inputHash = ""; // @ts-ignore runnable.input = {}; diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index 6a1c85db..722e2970 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) **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 4c837c31..f1cf5f9d 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.8", + "version": "1.34.9", "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": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index ab402909..49996218 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) **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 9d24ba4b..212e230e 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.8", + "version": "1.34.9", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -31,5 +31,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md index d8b0418a..45b4a232 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/jdcloud + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) **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 ab1f7980..d6a276a1 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.8", + "version": "1.34.9", "description": "jdcloud openApi sdk", "main": "./dist/bundle.js", "module": "./dist/bundle.js", @@ -61,5 +61,5 @@ "fetch" ] }, - "gitHead": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index 4ee00211..5bf38078 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) **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 79c3003d..076be525 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.8", + "version": "1.34.9", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -17,7 +17,7 @@ "pub": "npm publish" }, "dependencies": { - "@certd/basic": "^1.34.8", + "@certd/basic": "^1.34.9", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { @@ -32,5 +32,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index 0da1ff17..d720bbdb 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +### Performance Improvements + +* 邮箱支持保存和选择 ([f7b0b44](https://github.com/certd/certd/commit/f7b0b44ef6044bec36510a6f0b06d8dca5bfce49)) + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) **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 d8067a38..9934c350 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.8", + "version": "1.34.9", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -27,10 +27,10 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.34.8", - "@certd/basic": "^1.34.8", - "@certd/pipeline": "^1.34.8", - "@certd/plus-core": "^1.34.8", + "@certd/acme-client": "^1.34.9", + "@certd/basic": "^1.34.9", + "@certd/pipeline": "^1.34.9", + "@certd/plus-core": "^1.34.9", "@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": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts b/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts index be22bd25..35498e09 100644 --- a/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts +++ b/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts @@ -3,11 +3,12 @@ import { InjectEntityModel } from '@midwayjs/typeorm'; import { Repository } from 'typeorm'; import { SysSettingsEntity } from '../entity/sys-settings.js'; import { BaseSettings, SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js'; -import * as _ from 'lodash-es'; + import { BaseService } from '../../../basic/index.js'; import { cache, logger, setGlobalProxy } from '@certd/basic'; import * as dns from 'node:dns'; - +import {mergeUtils} from "@certd/basic"; +const {merge} = mergeUtils; /** * 设置 */ @@ -75,7 +76,7 @@ export class SysSettingsService extends BaseService { } let newSetting: T = new type(); const savedSettings = await this.getSettingByKey(key); - newSetting = _.merge(newSetting, savedSettings); + newSetting = merge(newSetting, savedSettings); await this.saveSetting(newSetting); cache.set(cacheKey, newSetting); return newSetting; diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index d5155b69..362719c8 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) **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 53550d7f..6d2d3308 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.8", + "version": "1.34.9", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -46,5 +46,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index ed2c0cbb..7b0e5703 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +### Performance Improvements + +* 邮箱支持保存和选择 ([f7b0b44](https://github.com/certd/certd/commit/f7b0b44ef6044bec36510a6f0b06d8dca5bfce49)) + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) ### Bug Fixes diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 29ac49c3..e4230905 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.8", + "version": "1.34.9", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -16,10 +16,10 @@ "pub": "npm publish" }, "dependencies": { - "@certd/acme-client": "^1.34.8", - "@certd/basic": "^1.34.8", - "@certd/pipeline": "^1.34.8", - "@certd/plugin-lib": "^1.34.8", + "@certd/acme-client": "^1.34.9", + "@certd/basic": "^1.34.9", + "@certd/pipeline": "^1.34.9", + "@certd/plugin-lib": "^1.34.9", "@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": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } 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 6692b6ad..226e38b5 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -8,7 +8,7 @@ export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin { @TaskInput({ title: "邮箱", component: { - name: "a-input", + name: "email-selector", vModel: "value", }, rules: [{ type: "email", message: "请输入正确的邮箱" }], diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md index c71c0a45..7e10f89c 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.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +**Note:** Version bump only for package @certd/plugin-lib + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) ### Bug Fixes diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index 167f76e4..ead07b62 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.8", + "version": "1.34.9", "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.8", - "@certd/pipeline": "^1.34.8", + "@certd/basic": "^1.34.9", + "@certd/pipeline": "^1.34.9", "@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": "d876ea671137e7a4d99a23bb8a5baed06f119dfb" + "gitHead": "85f9ef35f650d6ed1125f9d5eecee08cabc7fe8a" } diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index a5bfcd3e..9150bf3f 100644 --- a/packages/ui/certd-client/CHANGELOG.md +++ b/packages/ui/certd-client/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.34.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +### Performance Improvements + +* 邮箱支持保存和选择 ([f7b0b44](https://github.com/certd/certd/commit/f7b0b44ef6044bec36510a6f0b06d8dca5bfce49)) +* 支持github 新版本检查并发布通知 ([356703c](https://github.com/certd/certd/commit/356703c83ea18c6efb8931402e181280d7b7e696)) + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) ### Bug Fixes diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 457899de..6e17a061 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.8", + "version": "1.34.9", "private": true, "scripts": { "dev": "vite --open", @@ -102,8 +102,8 @@ "zod-defaults": "^0.1.3" }, "devDependencies": { - "@certd/lib-iframe": "^1.34.8", - "@certd/pipeline": "^1.34.8", + "@certd/lib-iframe": "^1.34.9", + "@certd/pipeline": "^1.34.9", "@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/email-selector/api.ts b/packages/ui/certd-client/src/components/email-selector/api.ts new file mode 100644 index 00000000..efed705f --- /dev/null +++ b/packages/ui/certd-client/src/components/email-selector/api.ts @@ -0,0 +1,29 @@ +import { request } from "/src/api/service"; + +export async function EmailList() { + return await request({ + url: "/mine/email/list", + method: "post", + data: {}, + }); +} + +export async function EmailDelete(email: string) { + return await request({ + url: "/mine/email/delete", + method: "post", + data: { + email: email, + }, + }); +} + +export async function EmailAdd(email: string) { + return await request({ + url: "/mine/email/add", + method: "post", + data: { + email: email, + }, + }); +} diff --git a/packages/ui/certd-client/src/components/email-selector/index.vue b/packages/ui/certd-client/src/components/email-selector/index.vue new file mode 100644 index 00000000..3dfa3468 --- /dev/null +++ b/packages/ui/certd-client/src/components/email-selector/index.vue @@ -0,0 +1,89 @@ + + + diff --git a/packages/ui/certd-client/src/components/index.ts b/packages/ui/certd-client/src/components/index.ts index ca01c51e..008752a2 100644 --- a/packages/ui/certd-client/src/components/index.ts +++ b/packages/ui/certd-client/src/components/index.ts @@ -14,12 +14,14 @@ import FileInput from "./file-input.vue"; 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"; export default { install(app: any) { app.component( "CodeEditor", defineAsyncComponent(() => import("./code-editor/index.vue")) ); + app.component("EmailSelector", EmailSelector); app.component("NotificationSelector", NotificationSelector); app.component("PiContainer", PiContainer); app.component("TextEditable", TextEditable); 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 292b49d4..200e38ac 100644 --- a/packages/ui/certd-client/src/components/vip-button/api.ts +++ b/packages/ui/certd-client/src/components/vip-button/api.ts @@ -4,7 +4,7 @@ export async function doActive(form: any) { return await request({ url: "/sys/plus/active", method: "post", - data: form + data: form, }); } @@ -12,6 +12,6 @@ export async function getVipTrial() { return await request({ url: "/sys/plus/getVipTrial", method: "post", - data: {} + data: {}, }); } diff --git a/packages/ui/certd-server/CHANGELOG.md b/packages/ui/certd-server/CHANGELOG.md index f735e903..fcae0db3 100644 --- a/packages/ui/certd-server/CHANGELOG.md +++ b/packages/ui/certd-server/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.34.9](https://github.com/certd/certd/compare/v1.34.8...v1.34.9) (2025-05-30) + +### Bug Fixes + +* 修复Farcdn证书有效期错误的问题 ([1fe4c36](https://github.com/certd/certd/commit/1fe4c367f7128de9ba5e3395ae06bc81e63a7d5a)) + +### Performance Improvements + +* 不止证书自动化，插件解锁无限可能 ([a9b302e](https://github.com/certd/certd/commit/a9b302e38d3328d75df8b2da3d8b914851e55e9c)) +* 邮箱支持保存和选择 ([f7b0b44](https://github.com/certd/certd/commit/f7b0b44ef6044bec36510a6f0b06d8dca5bfce49)) +* 支持github 新版本检查并发布通知 ([356703c](https://github.com/certd/certd/commit/356703c83ea18c6efb8931402e181280d7b7e696)) + ## [1.34.8](https://github.com/certd/certd/compare/v1.34.7...v1.34.8) (2025-05-28) ### Bug Fixes diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index e90b34c3..f5dbd8ba 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.34.8", + "version": "1.34.9", "description": "fast-server base midway", "private": true, "type": "module", @@ -41,19 +41,19 @@ "@aws-sdk/client-acm": "^3.699.0", "@aws-sdk/client-cloudfront": "^3.699.0", "@aws-sdk/client-s3": "^3.705.0", - "@certd/acme-client": "^1.34.8", - "@certd/basic": "^1.34.8", - "@certd/commercial-core": "^1.34.8", - "@certd/jdcloud": "^1.34.8", - "@certd/lib-huawei": "^1.34.8", - "@certd/lib-k8s": "^1.34.8", - "@certd/lib-server": "^1.34.8", - "@certd/midway-flyway-js": "^1.34.8", - "@certd/pipeline": "^1.34.8", - "@certd/plugin-cert": "^1.34.8", - "@certd/plugin-lib": "^1.34.8", - "@certd/plugin-plus": "^1.34.8", - "@certd/plus-core": "^1.34.8", + "@certd/acme-client": "^1.34.9", + "@certd/basic": "^1.34.9", + "@certd/commercial-core": "^1.34.9", + "@certd/jdcloud": "^1.34.9", + "@certd/lib-huawei": "^1.34.9", + "@certd/lib-k8s": "^1.34.9", + "@certd/lib-server": "^1.34.9", + "@certd/midway-flyway-js": "^1.34.9", + "@certd/pipeline": "^1.34.9", + "@certd/plugin-cert": "^1.34.9", + "@certd/plugin-lib": "^1.34.9", + "@certd/plugin-plus": "^1.34.9", + "@certd/plus-core": "^1.34.9", "@corsinvest/cv4pve-api-javascript": "^8.3.0", "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120", "@huaweicloud/huaweicloud-sdk-core": "^3.1.120", diff --git a/packages/ui/certd-server/src/controller/user/mine/email-controller.ts b/packages/ui/certd-server/src/controller/user/mine/email-controller.ts index 856ba00e..e5daf16b 100644 --- a/packages/ui/certd-server/src/controller/user/mine/email-controller.ts +++ b/packages/ui/certd-server/src/controller/user/mine/email-controller.ts @@ -17,4 +17,25 @@ export class EmailController extends BaseController { await this.emailService.test(userId, receiver); return this.ok({}); } + + @Post('/list', { summary: Constants.per.authOnly }) + public async list() { + const userId = super.getUserId(); + const res = await this.emailService.list(userId); + return this.ok(res); + } + + @Post('/add', { summary: Constants.per.authOnly }) + public async add(@Body('email') email) { + const userId = super.getUserId(); + await this.emailService.add(userId, email); + return this.ok({}); + } + + @Post('/delete', { summary: Constants.per.authOnly }) + public async delete(@Body('email') email) { + const userId = super.getUserId(); + await this.emailService.delete(userId, email); + return this.ok({}); + } } diff --git a/packages/ui/certd-server/src/modules/basic/service/email-service.ts b/packages/ui/certd-server/src/modules/basic/service/email-service.ts index 1a5af9bd..25b19644 100644 --- a/packages/ui/certd-server/src/modules/basic/service/email-service.ts +++ b/packages/ui/certd-server/src/modules/basic/service/email-service.ts @@ -10,6 +10,7 @@ import { SendMailOptions } from 'nodemailer'; import { UserSettingsService } from '../../mine/service/user-settings-service.js'; import { PlusService, SysSettingsService, SysSiteInfo } from '@certd/lib-server'; import { getEmailSettings } from '../../sys/settings/fix.js'; +import { UserEmailSetting } from "../../mine/service/models.js"; export type EmailConfig = { host: string; @@ -108,4 +109,24 @@ export class EmailService implements IEmailService { content: '测试邮件,from certd', }); } + + async list(userId: any) { + const userEmailSetting = await this.settingsService.getSetting(userId,UserEmailSetting) + return userEmailSetting.list; + } + + async delete(userId: any, email: string) { + const userEmailSetting = await this.settingsService.getSetting(userId,UserEmailSetting) + userEmailSetting.list = userEmailSetting.list.filter(item=>item !== email); + await this.settingsService.saveSetting(userId,userEmailSetting) + } + async add(userId: any, email: string) { + const userEmailSetting = await this.settingsService.getSetting(userId,UserEmailSetting) + //如果已存在 + if(userEmailSetting.list.includes(email)){ + return + } + userEmailSetting.list.unshift(email) + await this.settingsService.saveSetting(userId,userEmailSetting) + } } diff --git a/packages/ui/certd-server/src/modules/mine/service/models.ts b/packages/ui/certd-server/src/modules/mine/service/models.ts index 0d589aab..90ea441d 100644 --- a/packages/ui/certd-server/src/modules/mine/service/models.ts +++ b/packages/ui/certd-server/src/modules/mine/service/models.ts @@ -26,3 +26,10 @@ export class UserSiteMonitorSetting extends BaseSettings { notificationId?:number= 0; } + +export class UserEmailSetting extends BaseSettings { + static __title__ = "用户邮箱设置"; + static __key__ = "user.email"; + + list:string[] = []; +} diff --git a/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts b/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts index 852a8780..b036a9e9 100644 --- a/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts +++ b/packages/ui/certd-server/src/modules/mine/service/user-settings-service.ts @@ -3,8 +3,8 @@ import { InjectEntityModel } from "@midwayjs/typeorm"; import { Repository } from "typeorm"; import { BaseService, BaseSettings } from "@certd/lib-server"; import { UserSettingsEntity } from "../entity/user-settings.js"; -import { merge } from "lodash-es"; - +import { mergeUtils } from "@certd/basic"; +const {merge} = mergeUtils /** * 授权 */ diff --git a/packages/ui/certd-server/src/plugins/plugin-farcdn/access.ts b/packages/ui/certd-server/src/plugins/plugin-farcdn/access.ts index f3cde7ba..99465aab 100644 --- a/packages/ui/certd-server/src/plugins/plugin-farcdn/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-farcdn/access.ts @@ -153,8 +153,8 @@ export class FarcdnAccess extends BaseAccess { serverName: oldCert.serverName || certReader.getMainDomain(), commonNames: [certReader.getMainDomain()], dnsNames: certReader.getAltNames(), - timeBeginAt: detail.notBefore, - timeEndAt: detail.notAfter, + timeBeginAt: detail.notBefore.getTime(), + timeEndAt: detail.notAfter.getTime(), name: oldCert.name|| certReader.buildCertName(), description:oldCert.description||"" } diff --git a/packages/ui/certd-server/src/plugins/plugin-farcdn/plugins/plugin-refresh-cert.ts b/packages/ui/certd-server/src/plugins/plugin-farcdn/plugins/plugin-refresh-cert.ts index 6b248cd2..21cbc34b 100644 --- a/packages/ui/certd-server/src/plugins/plugin-farcdn/plugins/plugin-refresh-cert.ts +++ b/packages/ui/certd-server/src/plugins/plugin-farcdn/plugins/plugin-refresh-cert.ts @@ -1,8 +1,7 @@ -import { IsTaskPlugin, PageReq, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; +import { AbstractTaskPlugin, IsTaskPlugin, PageReq, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline"; import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert"; import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib"; import { FarcdnAccess } from "../access.js"; -import { AbstractPlusTaskPlugin } from "@certd/plugin-plus"; @IsTaskPlugin({ //命名规范，插件类型+功能（就是目录plugin-demo中的demo），大写字母开头，驼峰命名 @@ -12,7 +11,7 @@ import { AbstractPlusTaskPlugin } from "@certd/plugin-plus"; icon: "svg:icon-lucky", //插件分组 group: pluginGroups.cdn.key, - needPlus: true, + needPlus: false, default: { //默认值配置照抄即可 strategy: { @@ -21,7 +20,7 @@ import { AbstractPlusTaskPlugin } from "@certd/plugin-plus"; } }) //类名规范，跟上面插件名称（name）一致 -export class FarcdnRefreshCert extends AbstractPlusTaskPlugin { +export class FarcdnRefreshCert extends AbstractTaskPlugin { //证书选择，此项必须要有 @TaskInput({ title: "域名证书", diff --git a/packages/ui/certd-server/src/plugins/plugin-github/plugins/plugin-check-release.ts b/packages/ui/certd-server/src/plugins/plugin-github/plugins/plugin-check-release.ts index ce560708..1b85300b 100644 --- a/packages/ui/certd-server/src/plugins/plugin-github/plugins/plugin-check-release.ts +++ b/packages/ui/certd-server/src/plugins/plugin-github/plugins/plugin-check-release.ts @@ -61,21 +61,23 @@ export class GithubCheckRelease extends AbstractTaskPlugin { } //插件执行方法 - async execute(): Promise { + async execute(): Promise { const access = await this.getAccess(this.accessId); - const res = await access.getRelease({repoName:this.repoName}) - + if(res == null){ + throw new Error(`获取${this.repoName}最新版本失败`) + } const lastVersion = this.ctx.lastStatus?.status?.output?.lastVersion; if(res.tag_name == null || res.tag_name ==lastVersion){ this.logger.info(`暂无更新，${res.tag_name}`); - return + return "skip" } //有更新 - this.logger.info(`有更新,${lastVersion}->${res.tag_name}`) + this.logger.info(`有更新,${lastVersion??"0"}->${res.tag_name}`) this.lastVersion = res.tag_name; + const body = res.body.replaceAll("* ","- ") //发送通知 for (const notificationId of this.notificationIds) { await this.ctx.notificationService.send({ @@ -85,7 +87,7 @@ export class GithubCheckRelease extends AbstractTaskPlugin { logger: this.logger, body: { title: `${this.repoName} 新版本 ${this.lastVersion} 发布`, - content: `${res.body}`, + content: `${body}\n\n > [Certd](https://certd.docmirror.cn)，不止证书自动化，插件解锁无限可能！\n\n`, url: `https://github.com/${this.repoName}/releases/tag/${this.lastVersion}`, } }) diff --git a/packages/ui/certd-server/src/plugins/plugin-notification/email/index.ts b/packages/ui/certd-server/src/plugins/plugin-notification/email/index.ts index ddba2491..91e4946a 100644 --- a/packages/ui/certd-server/src/plugins/plugin-notification/email/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-notification/email/index.ts @@ -9,10 +9,10 @@ export class EmailNotification extends BaseNotification { @NotificationInput({ title: '收件人邮箱', component: { - name: 'a-select', + name: 'email-selector', vModel: 'value', mode: 'tags', - open: false, + // open: false, }, required: true, helper: '可以填写多个，填写一个按回车键再填写下一个\n需要先[配置邮件服务器](#/sys/settings/email)', diff --git a/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts b/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts index c4b92ac7..2d7d45dc 100644 --- a/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts @@ -55,14 +55,14 @@ export class QywxNotification extends BaseNotification { * } * } */ - + const color = body.errorMessage?'red':'green'; await this.http.request({ url: this.webhook, method: 'POST', data: { - msgtype: 'text', - text: { - content: `${body.title}\n${body.content}\n查看详情: ${body.url}`, + msgtype: 'markdown', + markdown: { + content: `${body.title}\n\n\n${body.content}\n\n[查看详情](${body.url})`, mentioned_list: this.mentionedList, mentioned_mobile_list: this.mentionedMobileList, },