diff --git a/AGENTS.md b/AGENTS.md index 43cc830b9..cd4f1545c 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -177,6 +177,7 @@ Certd 是一个支持私有化部署的 SSL/TLS 证书自动化管理平台。 - 优先沿用现有模块、插件、服务模式，再考虑新增抽象。 - `packages/ui/certd-server/data/`、`logs/`、生成的 metadata/dist 等通常视为运行时或构建产物，除非任务明确要求处理它们。 - 注意本地数据和配置里可能包含凭据、证书材料等敏感信息。 +- 使用 `/basic/file/upload` 上传文件后，接口返回的是临时缓存 key。业务保存表单或设置时，后端必须调用 `FileService.saveFile(userId, key, "public" | "private")` 转成永久文件 key 后再入库/入设置；不要直接保存 `tmpfile_key_...`，否则后续回显或下载会失效。 - 本仓库代码注释优先使用中文，尤其是解释业务规则、兼容逻辑、协议细节和隐藏风险时；除非文件已有明确英文注释风格或引用外部英文术语，否则不要新增英文说明性注释。 - 代码可读性优先于短写法。遇到包含业务分支的复杂三元表达式、内联对象、链式调用或条件组合时，优先拆成命名清晰的中间变量、独立分支或小函数，让读代码的人能一眼看出业务意图；不要为了少写几行把逻辑压成难读的一坨。 @@ -232,4 +233,3 @@ Get-ChildItem packages\ui\certd-client\src\views\certd - 优先对改动包运行聚焦的测试；后端可按包运行单元测试，前端优先使用 Prettier/ESLint 做改动文件验证。只有跨包影响明显时再考虑全 monorepo 构建。 - 不要主动运行 `pnpm install` 安装依赖：用户会事先准备好 `node_modules`。如果 `pnpm install` 或 `test:unit` 因缺少依赖、TTY 或网络问题失败，立即停止尝试，告知用户解决环境问题。 - diff --git a/CHANGELOG.md b/CHANGELOG.md index 586865785..bf8d65ff0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +### Bug Fixes + +* **pipeline-service:** 修复流水线运行时超过套餐部署次数仍然能够正常运行的bug ([5e59651](https://github.com/certd/certd/commit/5e59651d45bc91919629e35995ff1b3cff6b87ea)) + +### Performance Improvements + +* 商业版套餐只支持设置为可叠加 ([5e72f75](https://github.com/certd/certd/commit/5e72f75395fb632a30e80c07d35d8ba40ef631fa)) +* 新增阿里云直播证书部署插件 ([8edb6f8](https://github.com/certd/certd/commit/8edb6f8727bd148f106801bef25567880fd35e9e)) + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) ### Bug Fixes diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index 586865785..bf8d65ff0 100644 --- a/docs/guide/changelogs/CHANGELOG.md +++ b/docs/guide/changelogs/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +### Bug Fixes + +* **pipeline-service:** 修复流水线运行时超过套餐部署次数仍然能够正常运行的bug ([5e59651](https://github.com/certd/certd/commit/5e59651d45bc91919629e35995ff1b3cff6b87ea)) + +### Performance Improvements + +* 商业版套餐只支持设置为可叠加 ([5e72f75](https://github.com/certd/certd/commit/5e72f75395fb632a30e80c07d35d8ba40ef631fa)) +* 新增阿里云直播证书部署插件 ([8edb6f8](https://github.com/certd/certd/commit/8edb6f8727bd148f106801bef25567880fd35e9e)) + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) ### Bug Fixes diff --git a/docs/guide/plugins/deploy.md b/docs/guide/plugins/deploy.md index 18708ebf4..dbc327539 100644 --- a/docs/guide/plugins/deploy.md +++ b/docs/guide/plugins/deploy.md @@ -1,5 +1,5 @@ # 任务插件 -共 `131` 款任务插件 +共 `132` 款任务插件 ## 1. 证书申请 | 序号 | 名称 | 说明 | @@ -93,13 +93,14 @@ | 9.| **阿里云-部署至ESA** | 部署证书到阿里云ESA(边缘安全加速)，自动删除过期证书 | | 10.| **阿里云-部署至阿里云FC(3.0)** | 部署证书到阿里云函数计算（FC3.0） | | 11.| **阿里云-部署至GA** | 部署证书到阿里云GA(全球加速)，支持更新默认证书和扩展证书 | -| 12.| **阿里云-部署至NLB（网络负载均衡）** | NLB,网络负载均衡,更新监听器的默认证书 | -| 13.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名，不是上传到阿里云oss | -| 14.| **阿里云-部署至CLB(传统负载均衡)** | 部署证书到阿里云CLB(传统负载均衡) | -| 15.| **阿里云-部署至VOD** | 部署证书到阿里云视频点播（vod） | -| 16.| **阿里云-部署至阿里云WAF(云产品接入)** | 部署证书到阿里云WAF(云产品接入)，CNAME方式接入的请选择另外一个waf插件 | -| 17.| **阿里云-部署至阿里云WAF(cname接入)** | 部署证书到阿里云WAF(cname接入)，云资源的请选择另外一个waf插件 | -| 18.| **阿里云-上传证书到CAS** | 上传证书到阿里云证书管理服务（CAS），如果不想在阿里云上同一份证书上传多次，可以把此任务作为前置任务，其他阿里云任务证书那一项选择此任务的输出 | +| 12.| **阿里云-部署至直播（Live）** | 部署证书到阿里云视频直播（Live）域名 | +| 13.| **阿里云-部署至NLB（网络负载均衡）** | NLB,网络负载均衡,更新监听器的默认证书 | +| 14.| **阿里云-部署证书至OSS** | 部署域名证书至阿里云OSS自定义域名，不是上传到阿里云oss | +| 15.| **阿里云-部署至CLB(传统负载均衡)** | 部署证书到阿里云CLB(传统负载均衡) | +| 16.| **阿里云-部署至VOD** | 部署证书到阿里云视频点播（vod） | +| 17.| **阿里云-部署至阿里云WAF(云产品接入)** | 部署证书到阿里云WAF(云产品接入)，CNAME方式接入的请选择另外一个waf插件 | +| 18.| **阿里云-部署至阿里云WAF(cname接入)** | 部署证书到阿里云WAF(cname接入)，云资源的请选择另外一个waf插件 | +| 19.| **阿里云-上传证书到CAS** | 上传证书到阿里云证书管理服务（CAS），如果不想在阿里云上同一份证书上传多次，可以把此任务作为前置任务，其他阿里云任务证书那一项选择此任务的输出 | ## 6. 华为云 | 序号 | 名称 | 说明 | diff --git a/lerna.json b/lerna.json index c372042d0..d881b283f 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.40.3" + "version": "1.40.4" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index 70091ff37..2a4d09a71 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.40.4](https://github.com/publishlab/node-acme-client/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/acme-client + ## [1.40.3](https://github.com/publishlab/node-acme-client/compare/v1.40.2...v1.40.3) (2026-05-21) **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 74d5ba2b9..1930cf113 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.40.3", + "version": "1.40.4", "type": "module", "module": "./dist/index.js", "main": "./dist/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.40.3", + "@certd/basic": "^1.40.4", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.9.0", @@ -76,5 +76,5 @@ "bugs": { "url": "https://github.com/publishlab/node-acme-client/issues" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index a3a49b555..67e2a63a2 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/basic + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **Note:** Version bump only for package @certd/basic diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index efee0407a..98f058dcf 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -22:57 +00:18 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index e135c7d44..0ee8cd334 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -1,7 +1,7 @@ { "name": "@certd/basic", "private": false, - "version": "1.40.3", + "version": "1.40.4", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -52,5 +52,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index 26cdf25b9..2e85c0278 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/pipeline + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 2752b8788..3a01b1697 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.40.3", + "version": "1.40.4", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -19,8 +19,8 @@ "compile": "tsc --skipLibCheck --watch" }, "dependencies": { - "@certd/basic": "^1.40.3", - "@certd/plus-core": "^1.40.3", + "@certd/basic": "^1.40.4", + "@certd/plus-core": "^1.40.4", "dayjs": "^1.11.7", "lodash-es": "^4.17.21", "reflect-metadata": "^0.1.13" @@ -49,5 +49,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index 16a4cb775..67037069c 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **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 cb069666a..e4cb12791 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.40.3", + "version": "1.40.4", "main": "./dist/bundle.js", "module": "./dist/bundle.js", "types": "./dist/d/index.d.ts", @@ -27,5 +27,5 @@ "prettier": "^2.8.8", "tslib": "^2.8.1" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index eec62c04d..ecd307d2a 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **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 5f86bf35b..a7d0907b5 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.40.3", + "version": "1.40.4", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -34,5 +34,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md index f7b5aa6bd..0c7357676 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/jdcloud + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **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 02ae7edce..9e3c10aea 100644 --- a/packages/libs/lib-jdcloud/package.json +++ b/packages/libs/lib-jdcloud/package.json @@ -1,6 +1,6 @@ { "name": "@certd/jdcloud", - "version": "1.40.3", + "version": "1.40.4", "description": "jdcloud openApi sdk", "main": "./dist/bundle.js", "module": "./dist/bundle.js", @@ -59,5 +59,5 @@ "fetch" ] }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index 573dd4c5e..a7f4a77a8 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **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 b9a2fccfa..ab304f493 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.40.3", + "version": "1.40.4", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -19,7 +19,7 @@ "compile": "tsc --skipLibCheck --watch" }, "dependencies": { - "@certd/basic": "^1.40.3", + "@certd/basic": "^1.40.4", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { @@ -36,5 +36,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index f0e51690a..455a6eecb 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +### Performance Improvements + +* 商业版套餐只支持设置为可叠加 ([5e72f75](https://github.com/certd/certd/commit/5e72f75395fb632a30e80c07d35d8ba40ef631fa)) + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **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 ffa97ed86..f032db4f5 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.40.3", + "version": "1.40.4", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -29,11 +29,11 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.40.3", - "@certd/basic": "^1.40.3", - "@certd/pipeline": "^1.40.3", - "@certd/plugin-lib": "^1.40.3", - "@certd/plus-core": "^1.40.3", + "@certd/acme-client": "^1.40.4", + "@certd/basic": "^1.40.4", + "@certd/pipeline": "^1.40.4", + "@certd/plugin-lib": "^1.40.4", + "@certd/plus-core": "^1.40.4", "@midwayjs/cache": "3.14.0", "@midwayjs/core": "3.20.11", "@midwayjs/i18n": "3.20.13", @@ -69,5 +69,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/libs/lib-server/src/basic/constants.ts b/packages/libs/lib-server/src/basic/constants.ts index 407683b8c..73de33205 100644 --- a/packages/libs/lib-server/src/basic/constants.ts +++ b/packages/libs/lib-server/src/basic/constants.ts @@ -8,6 +8,8 @@ export const Constants = { guest: '_guest_', //无需登录 anonymous: '_guest_', + //无需登录，有 token 时解析当前用户 + guestOptionalAuth: '_guestOptionalAuth_', //仅需要登录 authOnly: '_authOnly_', //仅需要登录 diff --git a/packages/libs/lib-server/src/system/basic/service/file-service.test.ts b/packages/libs/lib-server/src/system/basic/service/file-service.test.ts new file mode 100644 index 000000000..b5dfca3aa --- /dev/null +++ b/packages/libs/lib-server/src/system/basic/service/file-service.test.ts @@ -0,0 +1,43 @@ +/// +/// + +import assert from "node:assert/strict"; +import fs from "node:fs"; +import os from "node:os"; +import path from "node:path"; +import { FileService } from "./file-service.js"; + +function createUploadFile(key: string) { + const uploadRootDir = "./data/upload"; + const filePath = path.join(uploadRootDir, key); + fs.mkdirSync(path.dirname(filePath), { recursive: true }); + fs.writeFileSync(filePath, "test"); + return filePath; +} + +describe("FileService.getFile", () => { + let cwd: string; + let oldCwd: string; + + beforeEach(() => { + oldCwd = process.cwd(); + cwd = fs.mkdtempSync(path.join(os.tmpdir(), "certd-file-service-")); + process.chdir(cwd); + }); + + afterEach(() => { + process.chdir(oldCwd); + fs.rmSync(cwd, { recursive: true, force: true }); + }); + + it("allows admin to read another user's private file", () => { + const service = new FileService(); + const userIdMd5 = Buffer.from(Buffer.from("2").toString("base64")).toString("hex"); + const key = `/private/${userIdMd5}/2026_05_25/qr.png`; + const expectedPath = createUploadFile(key); + + const filePath = service.getFile(key, 1, true); + + assert.equal(filePath, expectedPath); + }); +}); diff --git a/packages/libs/lib-server/src/system/basic/service/file-service.ts b/packages/libs/lib-server/src/system/basic/service/file-service.ts index deb1a3012..4dc782f8e 100644 --- a/packages/libs/lib-server/src/system/basic/service/file-service.ts +++ b/packages/libs/lib-server/src/system/basic/service/file-service.ts @@ -56,7 +56,7 @@ export class FileService { return key; } - getFile(key: string, userId?: number) { + getFile(key: string, userId?: number, allowAnyPrivateUser = false) { if (!key) { throw new ParamException('参数错误'); } @@ -70,7 +70,7 @@ export class FileService { const keyArr = key.split('/'); const permission = keyArr[1]; const userIdMd5 = keyArr[2]; - if (permission !== 'public') { + if (permission !== 'public' && !allowAnyPrivateUser) { //非公开文件需要验证用户 const userIdStr = Buffer.from(Buffer.from(userIdMd5, 'hex').toString('base64')).toString(); const userIdInt: number = parseInt(userIdStr, 10); diff --git a/packages/libs/lib-server/src/system/settings/service/models.ts b/packages/libs/lib-server/src/system/settings/service/models.ts index d81e897ff..58ecf6434 100644 --- a/packages/libs/lib-server/src/system/settings/service/models.ts +++ b/packages/libs/lib-server/src/system/settings/service/models.ts @@ -245,6 +245,8 @@ export class SysSuiteSetting extends BaseSettings { enabled: boolean = false; + allowSuiteStack: boolean = false; + registerGift?: { productId: number; duration: number; diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 9b8b42308..c8776dd37 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **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 ec5f2ffe8..83bd5adcd 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.40.3", + "version": "1.40.4", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -49,5 +49,5 @@ "typeorm": "^0.3.11", "typescript": "^5.4.2" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index 8d048ed31..d8322b989 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +**Note:** Version bump only for package @certd/plugin-cert + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **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 efebd1e5c..f101438c9 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.40.3", + "version": "1.40.4", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -18,10 +18,10 @@ "compile": "tsc --skipLibCheck --watch" }, "dependencies": { - "@certd/acme-client": "^1.40.3", - "@certd/basic": "^1.40.3", - "@certd/pipeline": "^1.40.3", - "@certd/plugin-lib": "^1.40.3", + "@certd/acme-client": "^1.40.4", + "@certd/basic": "^1.40.4", + "@certd/pipeline": "^1.40.4", + "@certd/plugin-lib": "^1.40.4", "psl": "^1.9.0", "punycode.js": "^2.3.1" }, @@ -41,5 +41,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md index 2b6feaeb4..311bb9f85 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +### Performance Improvements + +* 新增阿里云直播证书部署插件 ([8edb6f8](https://github.com/certd/certd/commit/8edb6f8727bd148f106801bef25567880fd35e9e)) + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) **Note:** Version bump only for package @certd/plugin-lib diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index b3255cef6..cf5d95122 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.40.3", + "version": "1.40.4", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -23,10 +23,10 @@ "@alicloud/pop-core": "^1.7.10", "@alicloud/tea-util": "^1.4.11", "@aws-sdk/client-s3": "^3.964.0", - "@certd/acme-client": "^1.40.3", - "@certd/basic": "^1.40.3", - "@certd/pipeline": "^1.40.3", - "@certd/plus-core": "^1.40.3", + "@certd/acme-client": "^1.40.4", + "@certd/basic": "^1.40.4", + "@certd/pipeline": "^1.40.4", + "@certd/plus-core": "^1.40.4", "@kubernetes/client-node": "0.21.0", "ali-oss": "^6.22.0", "basic-ftp": "^5.0.5", @@ -61,5 +61,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "01c91ba294f88bd07fddf9358c4301bbb4027916" + "gitHead": "4a09cf289d3f360c830f1a203fa11baa6af20f1c" } diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index b6b7fe07c..d0b242570 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.40.4](https://github.com/certd/certd/compare/v1.40.3...v1.40.4) (2026-05-24) + +### Performance Improvements + +* 商业版套餐只支持设置为可叠加 ([5e72f75](https://github.com/certd/certd/commit/5e72f75395fb632a30e80c07d35d8ba40ef631fa)) + ## [1.40.3](https://github.com/certd/certd/compare/v1.40.2...v1.40.3) (2026-05-21) ### Bug Fixes diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 4286cfd88..68e2ef1c1 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.40.3", + "version": "1.40.4", "private": true, "scripts": { "dev": "vite --open", @@ -106,8 +106,8 @@ "zod-defaults": "^0.1.3" }, "devDependencies": { - "@certd/lib-iframe": "^1.40.3", - "@certd/pipeline": "^1.40.3", + "@certd/lib-iframe": "^1.40.4", + "@certd/pipeline": "^1.40.4", "@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/views/certd/cert/dns-persist/index.vue b/packages/ui/certd-client/src/views/certd/cert/dns-persist/index.vue index 2b4d93e63..a877357cb 100644 --- a/packages/ui/certd-client/src/views/certd/cert/dns-persist/index.vue +++ b/packages/ui/certd-client/src/views/certd/cert/dns-persist/index.vue @@ -1,9 +1,9 @@ diff --git a/packages/ui/certd-client/src/views/certd/wallet/api.ts b/packages/ui/certd-client/src/views/certd/wallet/api.ts index 149348d4b..8c5a594ea 100644 --- a/packages/ui/certd-client/src/views/certd/wallet/api.ts +++ b/packages/ui/certd-client/src/views/certd/wallet/api.ts @@ -8,6 +8,10 @@ export async function GetWithdrawSetting() { return await request({ url: "/wallet/withdraw/setting/get", method: "post" }); } +export async function GetWalletSetting() { + return await request({ url: "/wallet/settings/get", method: "post" }); +} + export async function SaveWithdrawSetting(data: any) { return await request({ url: "/wallet/withdraw/setting/save", method: "post", data }); } diff --git a/packages/ui/certd-client/src/views/certd/wallet/crud-withdraw.tsx b/packages/ui/certd-client/src/views/certd/wallet/crud-withdraw.tsx index ae90e3328..e5266b1cf 100644 --- a/packages/ui/certd-client/src/views/certd/wallet/crud-withdraw.tsx +++ b/packages/ui/certd-client/src/views/certd/wallet/crud-withdraw.tsx @@ -47,22 +47,6 @@ export default function (): CreateCrudOptionsRet { }), column: { width: 110 }, }, - realName: { title: "真实姓名", type: "text", column: { width: 120 } }, - account: { title: "收款账号", type: "text", column: { width: 180 } }, - bankName: { title: "开户银行", type: "text", column: { width: 160 } }, - qrCode: { - title: "收款二维码", - type: "text", - column: { - width: 120, - cellRender({ value }) { - if (!value) { - return "-"; - } - return ; - }, - }, - }, auditRemark: { title: "审核备注", type: "text", column: { minWidth: 180 } }, }, }, diff --git a/packages/ui/certd-client/src/views/certd/wallet/index.vue b/packages/ui/certd-client/src/views/certd/wallet/index.vue index 03dfb90a0..0ccf2e3d2 100644 --- a/packages/ui/certd-client/src/views/certd/wallet/index.vue +++ b/packages/ui/certd-client/src/views/certd/wallet/index.vue @@ -6,17 +6,11 @@
-
{{ item.title }}
-
{{ item.value }}
-
-
- -
-
提现操作
-
- 提现设置 - - 申请提现 +
+
{{ item.title }}
+
{{ item.value }}
+
+ 申请提现
@@ -33,9 +27,9 @@ + + diff --git a/packages/ui/certd-client/src/views/sys/suite/invite/setting.vue b/packages/ui/certd-client/src/views/sys/suite/invite/setting.vue index b3a47b436..510d619bf 100644 --- a/packages/ui/certd-client/src/views/sys/suite/invite/setting.vue +++ b/packages/ui/certd-client/src/views/sys/suite/invite/setting.vue @@ -8,16 +8,26 @@ - - - - + + + + + + + 保存设置 @@ -26,20 +36,55 @@ @@ -71,5 +131,8 @@ onMounted(loadSettings); .settings-form { max-width: 860px; } + .agreement-editor { + min-height: 420px; + } } diff --git a/packages/ui/certd-client/src/views/sys/suite/product/price-input.vue b/packages/ui/certd-client/src/views/sys/suite/product/price-input.vue index 2706e4a7b..8c6faf3cd 100644 --- a/packages/ui/certd-client/src/views/sys/suite/product/price-input.vue +++ b/packages/ui/certd-client/src/views/sys/suite/product/price-input.vue @@ -1,6 +1,6 @@ @@ -55,6 +55,12 @@ const onPriceChange = (price: number) => {