diff --git a/CHANGELOG.md b/CHANGELOG.md index 15800464..fba06cb5 100644 --- a/CHANGELOG.md +++ b/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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +### Bug Fixes + +* 修复邮箱设置无效的bug ([aaa3224](https://github.com/certd/certd/commit/aaa322464d0f65e924d1850995540d396ee24d25)) + +**Note:** Version bump only for package root + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) * 🔱: [client] sync upgrade with 2 commits [trident-sync] ([aa3207f](https://github.com/certd/certd/commit/aa3207fca5f15f7c3da789989d99c8ae7d1c4551)) diff --git a/README.md b/README.md index de6feb80..cac54702 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,11 @@ https://docs.docker.com/compose/install/linux/ ### 2. 下载docker-compose.yaml文件 ```bash -mdkir certd +mkdir certd cd certd -wget https://github.com/certd/certd/blob/v2/docker/run/docker-compose.yaml +wget https://raw.githubusercontent.com/certd/certd/v2/docker/run/docker-compose.yaml +# 或者使用gitee地址 +wget https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml # 根据需要修改里面的配置 # 1.修改镜像版本号 @@ -69,9 +71,11 @@ https://github.com/certd/certd/releases ### 3. 运行 ```bash # 如果docker compose是插件化安装 +export CERTD_VERSION=1.2.0 docker compose up -d #如果docker compose是独立安装 +export CERTD_VERSION=1.2.0 docker-compose up -d ``` diff --git a/lerna.json b/lerna.json index 82fc9f3a..e6a21ca7 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.2.0" + "version": "1.2.1" } diff --git a/package.json b/package.json index 20088b20..164e250b 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "scripts": { "start": "lerna bootstrap --hoist", "i-all": "lerna link && lerna exec npm install ", - "publish": "npm run proxy && npm run prepublishOnly1 && lerna publish 1.2.0 --conventional-commits && npm run afterpublishOnly && npm run deploy1", + "publish": "npm run proxy && npm run prepublishOnly1 && lerna publish --conventional-commits && npm run afterpublishOnly && npm run deploy1", "afterpublishOnly": "", "proxy": "npm config set proxy=http://127.0.0.1:10809", "prepublishOnly1": "npm run before-build && lerna run build ", diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index 0f7e6560..a8693882 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.2.1](https://github.com/publishlab/node-acme-client/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/acme-client + +**Note:** Version bump only for package @certd/acme-client + # [1.2.0](https://github.com/publishlab/node-acme-client/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/acme-client diff --git a/packages/core/acme-client/build.md b/packages/core/acme-client/build.md index 5536de38..dacdddaf 100644 --- a/packages/core/acme-client/build.md +++ b/packages/core/acme-client/build.md @@ -1 +1 @@ -12:37 +23:41 diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index f2c40be9..30bdcd06 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.2.0", + "version": "1.2.1", "main": "src/index.js", "types": "types", "license": "MIT", diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index bf81a3a9..70a8cf8b 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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/pipeline + +**Note:** Version bump only for package @certd/pipeline + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index c8d1dd77..9c319167 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.2.0", + "version": "1.2.1", "main": "./src/index.ts", "module": "./src/index.ts", "types": "./src/index.ts", @@ -23,7 +23,7 @@ "qs": "^6.11.2" }, "devDependencies": { - "@certd/acme-client": "^1.2.0", + "@certd/acme-client": "^1.2.1", "@rollup/plugin-commonjs": "^23.0.4", "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.0.1", diff --git a/packages/plugins/plugin-aliyun/CHANGELOG.md b/packages/plugins/plugin-aliyun/CHANGELOG.md index 2f15df49..1679a0f6 100644 --- a/packages/plugins/plugin-aliyun/CHANGELOG.md +++ b/packages/plugins/plugin-aliyun/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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/plugin-aliyun + +**Note:** Version bump only for package @certd/plugin-aliyun + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/plugin-aliyun diff --git a/packages/plugins/plugin-aliyun/package.json b/packages/plugins/plugin-aliyun/package.json index a00a23e6..45790c00 100644 --- a/packages/plugins/plugin-aliyun/package.json +++ b/packages/plugins/plugin-aliyun/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-aliyun", "private": false, - "version": "1.2.0", + "version": "1.2.1", "main": "./src/index.ts", "module": "./src/index.ts", "types": "./src/index.ts", @@ -23,10 +23,10 @@ "node-forge": "^0.10.0" }, "devDependencies": { - "@certd/acme-client": "^1.2.0", - "@certd/pipeline": "^1.2.0", - "@certd/plugin-cert": "^1.2.0", - "@certd/plugin-util": "^1.2.0", + "@certd/acme-client": "^1.2.1", + "@certd/pipeline": "^1.2.1", + "@certd/plugin-cert": "^1.2.1", + "@certd/plugin-util": "^1.2.1", "@midwayjs/core": "^3.0.0", "@midwayjs/decorator": "^3.0.0", "@rollup/plugin-commonjs": "^23.0.4", diff --git a/packages/plugins/plugin-aliyun/src/dns-provider/aliyun-dns-provider.ts b/packages/plugins/plugin-aliyun/src/dns-provider/aliyun-dns-provider.ts index 9400a75e..f8731680 100644 --- a/packages/plugins/plugin-aliyun/src/dns-provider/aliyun-dns-provider.ts +++ b/packages/plugins/plugin-aliyun/src/dns-provider/aliyun-dns-provider.ts @@ -29,6 +29,7 @@ export class AliyunDnsProvider implements IDnsProvider { async getDomainList() { const params = { RegionId: "cn-hangzhou", + PageSize: 100, }; const requestOption = { @@ -42,14 +43,16 @@ export class AliyunDnsProvider implements IDnsProvider { async matchDomain(dnsRecord: string) { const list = await this.getDomainList(); let domain = null; + const domainList = []; for (const item of list) { + domainList.push(item.DomainName); if (_.endsWith(dnsRecord, item.DomainName)) { domain = item.DomainName; break; } } if (!domain) { - throw new Error("can not find Domain ," + dnsRecord); + throw new Error(`can not find Domain :${dnsRecord} ,list: ${JSON.stringify(domainList)}`); } return domain; } diff --git a/packages/plugins/plugin-all/CHANGELOG.md b/packages/plugins/plugin-all/CHANGELOG.md index 2381969e..6a0d539f 100644 --- a/packages/plugins/plugin-all/CHANGELOG.md +++ b/packages/plugins/plugin-all/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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/plugin-all + +**Note:** Version bump only for package @certd/plugin-all + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/plugin-all diff --git a/packages/plugins/plugin-all/package.json b/packages/plugins/plugin-all/package.json index 2c77c666..fae3cf09 100644 --- a/packages/plugins/plugin-all/package.json +++ b/packages/plugins/plugin-all/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-all", "private": false, - "version": "1.2.0", + "version": "1.2.1", "main": "./src/index.ts", "module": "./src/index.ts", "types": "./src/index.ts", @@ -17,12 +17,12 @@ "preview": "vite preview" }, "devDependencies": { - "@certd/pipeline": "^1.2.0", - "@certd/plugin-aliyun": "^1.2.0", - "@certd/plugin-cert": "^1.2.0", - "@certd/plugin-host": "^1.2.0", - "@certd/plugin-huawei": "^1.2.0", - "@certd/plugin-tencent": "^1.2.0", + "@certd/pipeline": "^1.2.1", + "@certd/plugin-aliyun": "^1.2.1", + "@certd/plugin-cert": "^1.2.1", + "@certd/plugin-host": "^1.2.1", + "@certd/plugin-huawei": "^1.2.1", + "@certd/plugin-tencent": "^1.2.1", "@rollup/plugin-commonjs": "^23.0.4", "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.0.1", diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index 14252265..ab80c7cb 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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/plugin-cert + +**Note:** Version bump only for package @certd/plugin-cert + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) **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 0c094e8d..6faf5450 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.2.0", + "version": "1.2.1", "main": "./src/index.ts", "module": "./src/index.ts", "types": "./src/index.ts", @@ -17,8 +17,8 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.2.0", - "@certd/pipeline": "^1.2.0", + "@certd/acme-client": "^1.2.1", + "@certd/pipeline": "^1.2.1", "jszip": "^3.10.1", "node-forge": "^0.10.0" }, diff --git a/packages/plugins/plugin-host/CHANGELOG.md b/packages/plugins/plugin-host/CHANGELOG.md index 84b29c6c..80972535 100644 --- a/packages/plugins/plugin-host/CHANGELOG.md +++ b/packages/plugins/plugin-host/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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/plugin-host + +**Note:** Version bump only for package @certd/plugin-host + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/plugin-host diff --git a/packages/plugins/plugin-host/package.json b/packages/plugins/plugin-host/package.json index 8f22a5c7..0e2ce21c 100644 --- a/packages/plugins/plugin-host/package.json +++ b/packages/plugins/plugin-host/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-host", "private": false, - "version": "1.2.0", + "version": "1.2.1", "main": "./src/index.ts", "module": "./src/index.ts", "types": "./src/index.ts", @@ -17,8 +17,8 @@ "preview": "vite preview" }, "dependencies": { - "@certd/pipeline": "^1.2.0", - "@certd/plugin-cert": "^1.2.0", + "@certd/pipeline": "^1.2.1", + "@certd/plugin-cert": "^1.2.1", "ssh2": "^0.8.9" }, "devDependencies": { diff --git a/packages/plugins/plugin-huawei/CHANGELOG.md b/packages/plugins/plugin-huawei/CHANGELOG.md index 3d0eedb6..7f0c48ca 100644 --- a/packages/plugins/plugin-huawei/CHANGELOG.md +++ b/packages/plugins/plugin-huawei/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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/plugin-huawei + +**Note:** Version bump only for package @certd/plugin-huawei + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/plugin-huawei diff --git a/packages/plugins/plugin-huawei/package.json b/packages/plugins/plugin-huawei/package.json index 48b105d2..8030b170 100644 --- a/packages/plugins/plugin-huawei/package.json +++ b/packages/plugins/plugin-huawei/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-huawei", "private": false, - "version": "1.2.0", + "version": "1.2.1", "main": "./src/index.ts", "module": "./src/index.ts", "types": "./src/index.ts", @@ -17,10 +17,10 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.2.0", - "@certd/pipeline": "^1.2.0", - "@certd/plugin-cert": "^1.2.0", - "@certd/plugin-util": "^1.2.0", + "@certd/acme-client": "^1.2.1", + "@certd/pipeline": "^1.2.1", + "@certd/plugin-cert": "^1.2.1", + "@certd/plugin-util": "^1.2.1", "axios": "^0.27.2", "dayjs": "^1.11.6", "lodash": "^4.17.21", diff --git a/packages/plugins/plugin-tencent/CHANGELOG.md b/packages/plugins/plugin-tencent/CHANGELOG.md index 43b855c8..89be4edb 100644 --- a/packages/plugins/plugin-tencent/CHANGELOG.md +++ b/packages/plugins/plugin-tencent/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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/plugin-tencent + +**Note:** Version bump only for package @certd/plugin-tencent + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/plugin-tencent diff --git a/packages/plugins/plugin-tencent/package.json b/packages/plugins/plugin-tencent/package.json index fe4fb1d3..1ac4056a 100644 --- a/packages/plugins/plugin-tencent/package.json +++ b/packages/plugins/plugin-tencent/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-tencent", "private": false, - "version": "1.2.0", + "version": "1.2.1", "main": "./src/index.ts", "module": "./src/index.ts", "types": "./src/index.ts", @@ -17,9 +17,9 @@ "preview": "vite preview" }, "dependencies": { - "@certd/pipeline": "^1.2.0", - "@certd/plugin-cert": "^1.2.0", - "@certd/plugin-util": "^1.2.0", + "@certd/pipeline": "^1.2.1", + "@certd/plugin-cert": "^1.2.1", + "@certd/plugin-util": "^1.2.1", "tencentcloud-sdk-nodejs": "^4.0.44" }, "devDependencies": { diff --git a/packages/plugins/plugin-util/CHANGELOG.md b/packages/plugins/plugin-util/CHANGELOG.md index 0bf4ef01..b344726e 100644 --- a/packages/plugins/plugin-util/CHANGELOG.md +++ b/packages/plugins/plugin-util/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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/plugin-util + +**Note:** Version bump only for package @certd/plugin-util + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/plugin-util diff --git a/packages/plugins/plugin-util/package.json b/packages/plugins/plugin-util/package.json index 9b88c020..b3c8458d 100644 --- a/packages/plugins/plugin-util/package.json +++ b/packages/plugins/plugin-util/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-util", "private": false, - "version": "1.2.0", + "version": "1.2.1", "main": "./src/index.ts", "module": "./src/index.ts", "types": "./src/index.ts", @@ -21,7 +21,7 @@ "shelljs": "^0.8.5" }, "devDependencies": { - "@certd/pipeline": "^1.2.0", + "@certd/pipeline": "^1.2.1", "@rollup/plugin-commonjs": "^23.0.4", "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.0.1", diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index bc61a023..219d6612 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.2.1](https://github.com/certd/certd/compare/v1.2.0...v1.2.1) (2023-12-12) + +**Note:** Version bump only for package @certd/ui-client + +**Note:** Version bump only for package @certd/ui-client + # [1.2.0](https://github.com/certd/certd/compare/v1.1.6...v1.2.0) (2023-10-27) * 🔱: [client] sync upgrade with 2 commits [trident-sync] ([aa3207f](https://github.com/certd/certd/commit/aa3207fca5f15f7c3da789989d99c8ae7d1c4551)) diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 02df4e38..d3fba522 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.2.0", + "version": "1.2.1", "private": true, "scripts": { "dev": "vite", @@ -61,7 +61,7 @@ "vuedraggable": "^2.24.3" }, "devDependencies": { - "@certd/pipeline": "^1.2.0", + "@certd/pipeline": "^1.2.1", "@rollup/plugin-commonjs": "^25.0.3", "@rollup/plugin-node-resolve": "^15.1.0", "@types/chai": "^4.3.5", diff --git a/packages/ui/certd-server/CHANGELOG.md b/packages/ui/certd-server/CHANGELOG.md index 3f3ec068..38ada35a 100644 --- a/packages/ui/certd-server/CHANGELOG.md +++ b/packages/ui/certd-server/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.2.1](https://github.com/fast-crud/fast-server-js/compare/v1.2.0...v1.2.1) (2023-12-12) + +### Bug Fixes + +* 修复邮箱设置无效的bug ([aaa3224](https://github.com/fast-crud/fast-server-js/commit/aaa322464d0f65e924d1850995540d396ee24d25)) + +**Note:** Version bump only for package @certd/ui-server + # [1.2.0](https://github.com/fast-crud/fast-server-js/compare/v1.1.6...v1.2.0) (2023-10-27) **Note:** Version bump only for package @certd/ui-server diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 72478230..2163fd4c 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.2.0", + "version": "1.2.1", "description": "fast-server base midway", "private": true, "scripts": { @@ -21,15 +21,15 @@ "mig": "typeorm migration:create -n name" }, "dependencies": { - "@certd/acme-client": "^1.2.0", - "@certd/pipeline": "^1.2.0", - "@certd/plugin-aliyun": "^1.2.0", - "@certd/plugin-all": "^1.2.0", - "@certd/plugin-cert": "^1.2.0", - "@certd/plugin-host": "^1.2.0", - "@certd/plugin-huawei": "^1.2.0", - "@certd/plugin-tencent": "^1.2.0", - "@certd/plugin-util": "^1.2.0", + "@certd/acme-client": "^1.2.1", + "@certd/pipeline": "^1.2.1", + "@certd/plugin-aliyun": "^1.2.1", + "@certd/plugin-all": "^1.2.1", + "@certd/plugin-cert": "^1.2.1", + "@certd/plugin-host": "^1.2.1", + "@certd/plugin-huawei": "^1.2.1", + "@certd/plugin-tencent": "^1.2.1", + "@certd/plugin-util": "^1.2.1", "@koa/cors": "^3.4.3", "@midwayjs/bootstrap": "^3.9.1", "@midwayjs/cache": "^3.9.0", diff --git a/packages/ui/certd-server/src/modules/system/service/settings-service.ts b/packages/ui/certd-server/src/modules/system/service/settings-service.ts index b90c3a42..f2b76ffb 100644 --- a/packages/ui/certd-server/src/modules/system/service/settings-service.ts +++ b/packages/ui/certd-server/src/modules/system/service/settings-service.ts @@ -54,6 +54,7 @@ export class SettingsService extends BaseService { const entity = await this.repository.findOne({ where: { key: bean.key, + userId: bean.userId, }, }); if (entity) {