diff --git a/CHANGELOG.md b/CHANGELOG.md index 74f02825..83dfbcfb 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +### Performance Improvements + +* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735)) +* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb)) +* 优化部署到华为云CDN，支持先上传到ccm，再使用证书id部署，修复offline状态下导致部署报错的bug ([79df39a](https://github.com/certd/certd/commit/79df39acabab10ae7e1864dadcdc186bb007a3c5)) + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) ### Bug Fixes diff --git a/build.trigger b/build.trigger index 99f02a41..09cda20d 100644 --- a/build.trigger +++ b/build.trigger @@ -1 +1 @@ -23:49 +23:37 diff --git a/docs/guide/changelogs/CHANGELOG.md b/docs/guide/changelogs/CHANGELOG.md index 74f02825..83dfbcfb 100644 --- a/docs/guide/changelogs/CHANGELOG.md +++ b/docs/guide/changelogs/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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +### Performance Improvements + +* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735)) +* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb)) +* 优化部署到华为云CDN，支持先上传到ccm，再使用证书id部署，修复offline状态下导致部署报错的bug ([79df39a](https://github.com/certd/certd/commit/79df39acabab10ae7e1864dadcdc186bb007a3c5)) + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) ### Bug Fixes diff --git a/docs/guide/feature/safe/images/2fa.png b/docs/guide/feature/safe/images/2fa.png new file mode 100644 index 00000000..87618615 Binary files /dev/null and b/docs/guide/feature/safe/images/2fa.png differ diff --git a/docs/guide/feature/safe/index.md b/docs/guide/feature/safe/index.md index f06dc18a..b578c95d 100644 --- a/docs/guide/feature/safe/index.md +++ b/docs/guide/feature/safe/index.md @@ -22,9 +22,11 @@ Certd 存储了证书以及授权等敏感数据，所以需要严格保障安 * [站点隐藏设置说明](./hidden/) ![](./images/hidden.png) -## 4、登录二次验证 +## 4、登录双重验证 -待实现 +支持2FA双重认证 + +![](./images/2fa.png) ## 5、数据库自动备份【建议开启】 * [自动备份设置说明](../../use/backup/) diff --git a/lerna.json b/lerna.json index ed19d79d..b25a3c25 100644 --- a/lerna.json +++ b/lerna.json @@ -9,5 +9,5 @@ } }, "npmClient": "pnpm", - "version": "1.33.4" + "version": "1.33.5" } diff --git a/packages/core/acme-client/CHANGELOG.md b/packages/core/acme-client/CHANGELOG.md index 3198c4c1..b64cc3c9 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.33.5](https://github.com/publishlab/node-acme-client/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/acme-client + ## [1.33.4](https://github.com/publishlab/node-acme-client/compare/v1.33.3...v1.33.4) (2025-04-15) **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 7cb07ba4..7bcab8a9 100644 --- a/packages/core/acme-client/package.json +++ b/packages/core/acme-client/package.json @@ -3,7 +3,7 @@ "description": "Simple and unopinionated ACME client", "private": false, "author": "nmorsman", - "version": "1.33.4", + "version": "1.33.5", "type": "module", "module": "scr/index.js", "main": "src/index.js", @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.33.4", + "@certd/basic": "^1.33.5", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.7.2", @@ -67,5 +67,5 @@ "bugs": { "url": "https://github.com/publishlab/node-acme-client/issues" }, - "gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/core/basic/CHANGELOG.md b/packages/core/basic/CHANGELOG.md index 50d9101e..570a5cf7 100644 --- a/packages/core/basic/CHANGELOG.md +++ b/packages/core/basic/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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +### Performance Improvements + +* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb)) + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **Note:** Version bump only for package @certd/basic diff --git a/packages/core/basic/build.md b/packages/core/basic/build.md index 179d3280..c0b0ad71 100644 --- a/packages/core/basic/build.md +++ b/packages/core/basic/build.md @@ -1 +1 @@ -23:45 +23:32 diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index 4cdc3dd0..e8bb745a 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -1,7 +1,7 @@ { "name": "@certd/basic", "private": false, - "version": "1.33.4", + "version": "1.33.5", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -44,5 +44,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/core/pipeline/CHANGELOG.md b/packages/core/pipeline/CHANGELOG.md index 51a2827e..88668f1a 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/pipeline + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **Note:** Version bump only for package @certd/pipeline diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index ff25809e..aa3136a6 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -1,7 +1,7 @@ { "name": "@certd/pipeline", "private": false, - "version": "1.33.4", + "version": "1.33.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.33.4", - "@certd/plus-core": "^1.33.4", + "@certd/basic": "^1.33.5", + "@certd/plus-core": "^1.33.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": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/libs/lib-huawei/CHANGELOG.md b/packages/libs/lib-huawei/CHANGELOG.md index 4eb57b53..4c522d7a 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/lib-huawei + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **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 d2efde17..96b44579 100644 --- a/packages/libs/lib-huawei/package.json +++ b/packages/libs/lib-huawei/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-huawei", "private": false, - "version": "1.33.4", + "version": "1.33.5", "main": "./dist/bundle.js", "module": "./dist/bundle.js", "types": "./dist/d/index.d.ts", @@ -23,5 +23,5 @@ "prettier": "^2.8.8", "tslib": "^2.8.1" }, - "gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/libs/lib-iframe/CHANGELOG.md b/packages/libs/lib-iframe/CHANGELOG.md index 4863678c..2ece0a50 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/lib-iframe + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **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 866e06fb..f5023c17 100644 --- a/packages/libs/lib-iframe/package.json +++ b/packages/libs/lib-iframe/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-iframe", "private": false, - "version": "1.33.4", + "version": "1.33.5", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -30,5 +30,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/libs/lib-jdcloud/CHANGELOG.md b/packages/libs/lib-jdcloud/CHANGELOG.md index 83a301b1..667da009 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/jdcloud + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **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 e3b95073..9d3e31b4 100644 --- a/packages/libs/lib-jdcloud/package.json +++ b/packages/libs/lib-jdcloud/package.json @@ -1,6 +1,6 @@ { "name": "@certd/jdcloud", - "version": "1.33.4", + "version": "1.33.5", "description": "jdcloud openApi sdk", "main": "./dist/bundle.js", "module": "./dist/bundle.js", @@ -60,5 +60,5 @@ "fetch" ] }, - "gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/libs/lib-k8s/CHANGELOG.md b/packages/libs/lib-k8s/CHANGELOG.md index d6939b4a..0ccce9a5 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/lib-k8s + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **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 21b2c312..8218721d 100644 --- a/packages/libs/lib-k8s/package.json +++ b/packages/libs/lib-k8s/package.json @@ -1,7 +1,7 @@ { "name": "@certd/lib-k8s", "private": false, - "version": "1.33.4", + "version": "1.33.5", "type": "module", "main": "./dist/index.js", "module": "./dist/index.js", @@ -16,7 +16,7 @@ "preview": "vite preview" }, "dependencies": { - "@certd/basic": "^1.33.4", + "@certd/basic": "^1.33.5", "@kubernetes/client-node": "0.21.0" }, "devDependencies": { @@ -31,5 +31,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/libs/lib-server/CHANGELOG.md b/packages/libs/lib-server/CHANGELOG.md index b9fa0775..8515b7f9 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +### Performance Improvements + +* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735)) + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **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 53e7b402..573b2313 100644 --- a/packages/libs/lib-server/package.json +++ b/packages/libs/lib-server/package.json @@ -1,6 +1,6 @@ { "name": "@certd/lib-server", - "version": "1.33.4", + "version": "1.33.5", "description": "midway with flyway, sql upgrade way ", "private": false, "type": "module", @@ -27,10 +27,10 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.33.4", - "@certd/basic": "^1.33.4", - "@certd/pipeline": "^1.33.4", - "@certd/plus-core": "^1.33.4", + "@certd/acme-client": "^1.33.5", + "@certd/basic": "^1.33.5", + "@certd/pipeline": "^1.33.5", + "@certd/plus-core": "^1.33.5", "@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": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/libs/lib-server/src/basic/exception/auth-exception.ts b/packages/libs/lib-server/src/basic/exception/auth-exception.ts index 6523a0ee..299abdff 100644 --- a/packages/libs/lib-server/src/basic/exception/auth-exception.ts +++ b/packages/libs/lib-server/src/basic/exception/auth-exception.ts @@ -1,5 +1,6 @@ import { Constants } from '../constants.js'; import { BaseException } from './base-exception.js'; +import { TextException } from "./common-exception.js"; /** * 授权异常 */ @@ -10,9 +11,9 @@ export class AuthException extends BaseException { } -export class Need2FAException extends BaseException { - constructor(message?:string) { - super('Need2FAException', Constants.res.need2fa.code, message ? message : Constants.res.need2fa.message); +export class Need2FAException extends TextException { + constructor(message:string,data:any) { + super('Need2FAException', Constants.res.need2fa.code, message ? message : Constants.res.need2fa.message,data); } } diff --git a/packages/libs/lib-server/src/basic/exception/base-exception.ts b/packages/libs/lib-server/src/basic/exception/base-exception.ts index c74b4167..3ee44d78 100644 --- a/packages/libs/lib-server/src/basic/exception/base-exception.ts +++ b/packages/libs/lib-server/src/basic/exception/base-exception.ts @@ -3,9 +3,11 @@ */ export class BaseException extends Error { code: number; - constructor(name, code, message) { + data?:any + constructor(name, code, message,data?:any) { super(message); this.name = name; this.code = code; + this.data = data; } } diff --git a/packages/libs/lib-server/src/basic/exception/common-exception.ts b/packages/libs/lib-server/src/basic/exception/common-exception.ts index 1873d545..5e97743a 100644 --- a/packages/libs/lib-server/src/basic/exception/common-exception.ts +++ b/packages/libs/lib-server/src/basic/exception/common-exception.ts @@ -1,16 +1,23 @@ -import { Constants } from '../constants.js'; -import { BaseException } from './base-exception.js'; +import { Constants } from "../constants.js"; +import { BaseException } from "./base-exception.js"; + /** * 通用异常 */ export class CommonException extends BaseException { constructor(message) { - super('CommonException', Constants.res.error.code, message ? message : Constants.res.error.message); + super("CommonException", Constants.res.error.code, message ? message : Constants.res.error.message); } } export class CodeException extends BaseException { constructor(res: { code: number; message: string }) { - super('CodeException', res.code, res.message); + super("CodeException", res.code, res.message); + } +} + +export class TextException extends BaseException { + constructor(name, code,message, data?) { + super(name, code, message, data); } } diff --git a/packages/libs/lib-server/src/basic/result.ts b/packages/libs/lib-server/src/basic/result.ts index e5909a33..ca42e8d1 100644 --- a/packages/libs/lib-server/src/basic/result.ts +++ b/packages/libs/lib-server/src/basic/result.ts @@ -2,14 +2,15 @@ export class Result { code: number; msg: string; data: T; + constructor(code, msg, data?) { this.code = code; this.msg = msg; this.data = data; } - static error(code = 1, msg) { - return new Result(code, msg); + static error(code = 1, msg, data?: any) { + return new Result(code, msg, data); } static success(msg, data?) { diff --git a/packages/libs/midway-flyway-js/CHANGELOG.md b/packages/libs/midway-flyway-js/CHANGELOG.md index 0743a2e3..783e0747 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/midway-flyway-js + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **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 b5ad4809..3ebe7a10 100644 --- a/packages/libs/midway-flyway-js/package.json +++ b/packages/libs/midway-flyway-js/package.json @@ -1,6 +1,6 @@ { "name": "@certd/midway-flyway-js", - "version": "1.33.4", + "version": "1.33.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": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/plugins/plugin-cert/CHANGELOG.md b/packages/plugins/plugin-cert/CHANGELOG.md index 84831a31..51fbcff5 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/plugin-cert + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) **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 656002ce..6b4a2345 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-cert", "private": false, - "version": "1.33.4", + "version": "1.33.5", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -15,10 +15,10 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.33.4", - "@certd/basic": "^1.33.4", - "@certd/pipeline": "^1.33.4", - "@certd/plugin-lib": "^1.33.4", + "@certd/acme-client": "^1.33.5", + "@certd/basic": "^1.33.5", + "@certd/pipeline": "^1.33.5", + "@certd/plugin-lib": "^1.33.5", "@google-cloud/publicca": "^1.3.0", "dayjs": "^1.11.7", "jszip": "^3.10.1", @@ -41,5 +41,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/plugins/plugin-lib/CHANGELOG.md b/packages/plugins/plugin-lib/CHANGELOG.md index f1431f32..e2bf134c 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +**Note:** Version bump only for package @certd/plugin-lib + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) ### Performance Improvements diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index 5d8d79ab..731df87d 100644 --- a/packages/plugins/plugin-lib/package.json +++ b/packages/plugins/plugin-lib/package.json @@ -1,7 +1,7 @@ { "name": "@certd/plugin-lib", "private": false, - "version": "1.33.4", + "version": "1.33.5", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -16,8 +16,8 @@ }, "dependencies": { "@alicloud/pop-core": "^1.7.10", - "@certd/basic": "^1.33.4", - "@certd/pipeline": "^1.33.4", + "@certd/basic": "^1.33.5", + "@certd/pipeline": "^1.33.5", "@kubernetes/client-node": "0.21.0", "ali-oss": "^6.21.0", "basic-ftp": "^5.0.5", @@ -48,5 +48,5 @@ "tslib": "^2.8.1", "typescript": "^5.4.2" }, - "gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" + "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1" } diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md index 8b16e465..2d4a0e5d 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.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17) + +### Performance Improvements + +* 登录支持双重认证 ([48aef25](https://github.com/certd/certd/commit/48aef25b3f6499d674ca4e4ef16f4c62399fb735)) +* 多重认证登录 ([0f82cf4](https://github.com/certd/certd/commit/0f82cf409bc60706ab07e4ca4f272b9a1ca7eecb)) + ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15) ### Performance Improvements diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 1764aafb..f9f1904b 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -1,6 +1,6 @@ { "name": "@certd/ui-client", - "version": "1.33.4", + "version": "1.33.5", "private": true, "scripts": { "dev": "vite --open", @@ -101,8 +101,8 @@ "zod-defaults": "^0.1.3" }, "devDependencies": { - "@certd/lib-iframe": "^1.33.4", - "@certd/pipeline": "^1.33.4", + "@certd/lib-iframe": "^1.33.5", + "@certd/pipeline": "^1.33.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/api/service.ts b/packages/ui/certd-client/src/api/service.ts index 0378cce7..fd108aa0 100644 --- a/packages/ui/certd-client/src/api/service.ts +++ b/packages/ui/certd-client/src/api/service.ts @@ -3,6 +3,17 @@ import { get } from "lodash-es"; import { errorLog, errorCreate } from "./tools"; import { env } from "/src/utils/util.env"; import { useUserStore } from "/@/store/user"; + +export class CodeError extends Error { + code: number; + data?: any; + constructor(message: string, code: number, data?: any) { + super(message); + this.code = code; + this.data = data; + } +} + /** * @description 创建请求实例 */ @@ -56,12 +67,13 @@ function createService() { const errorMessage = dataAxios.msg || dataAxios.message || "未知错误"; // @ts-ignore if (response?.config?.onError) { - // @ts-ignore - response.config.onError(new Error(errorMessage)); + const err = new CodeError(errorMessage, dataAxios.code, dataAxios.data); + response.config.onError(err); + return; } //@ts-ignore const showErrorNotify = response?.config?.showErrorNotify; - errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify); + errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify, dataAxios); return dataAxios; } } diff --git a/packages/ui/certd-client/src/api/tools.ts b/packages/ui/certd-client/src/api/tools.ts index 08d80890..a7d949f7 100644 --- a/packages/ui/certd-client/src/api/tools.ts +++ b/packages/ui/certd-client/src/api/tools.ts @@ -4,6 +4,7 @@ * @param {String} defaultValue 默认值 */ import { uiContext } from "@fast-crud/fast-crud"; +import { CodeError } from "/@/api/service"; export function parse(jsonString = "{}", defaultValue = {}) { let result = defaultValue; @@ -68,8 +69,8 @@ export function errorLog(error: any, notify = true) { * @description 创建一个错误 * @param {String} msg 错误信息 */ -export function errorCreate(msg: string, notify = true) { - const err = new Error(msg); +export function errorCreate(msg: string, notify = true, data?: any) { + const err = new CodeError(msg, data.code, data.data); console.error("errorCreate", err); if (notify) { uiContext.get().notification.error({ message: err.message }); diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts index 2c487474..a9c992be 100644 --- a/packages/ui/certd-client/src/router/source/modules/certd.ts +++ b/packages/ui/certd-client/src/router/source/modules/certd.ts @@ -149,7 +149,7 @@ export const certdResources = [ path: "/certd/mine/security", component: "/certd/mine/security/index.vue", meta: { - icon: "ion:locked-outline", + icon: "fluent:shield-keyhole-16-regular", auth: true, isMenu: true, }, diff --git a/packages/ui/certd-client/src/store/user/api.user.ts b/packages/ui/certd-client/src/store/user/api.user.ts index 670f9118..12c92517 100644 --- a/packages/ui/certd-client/src/store/user/api.user.ts +++ b/packages/ui/certd-client/src/store/user/api.user.ts @@ -66,3 +66,11 @@ export async function mine(): Promise { method: "post", }); } + +export async function loginByTwoFactor(data: any) { + return await request({ + url: "/loginByTwoFactor", + method: "post", + data, + }); +} diff --git a/packages/ui/certd-client/src/store/user/index.ts b/packages/ui/certd-client/src/store/user/index.ts index 74632966..e6f354ed 100644 --- a/packages/ui/certd-client/src/store/user/index.ts +++ b/packages/ui/certd-client/src/store/user/index.ts @@ -51,7 +51,7 @@ export const useUserStore = defineStore({ setUserInfo(info: UserInfoRes) { this.userInfo = info; const userStore = vbenUserStore(); - userStore.setUserInfo(info); + userStore.setUserInfo(info as any); LocalStorage.set(USER_INFO_KEY, info); }, resetState() { @@ -71,23 +71,18 @@ export const useUserStore = defineStore({ * @description: login */ async login(loginType: string, params: LoginReq | SmsLoginReq): Promise { - try { - let loginRes: any = null; - if (loginType === "sms") { - loginRes = await UserApi.loginBySms(params as SmsLoginReq); - } else { - loginRes = await UserApi.login(params as LoginReq); - } - - const { token, expire } = loginRes; - // save token - this.setToken(token, expire); - // get user info - return await this.onLoginSuccess(loginRes); - } catch (error) { - console.error(error); - return null; + let loginRes: any = null; + if (loginType === "sms") { + loginRes = await UserApi.loginBySms(params as SmsLoginReq); + } else { + loginRes = await UserApi.login(params as LoginReq); } + return await this.onLoginSuccess(loginRes); + }, + + async loginByTwoFactor(form: any) { + const loginRes = await UserApi.loginByTwoFactor(form); + return await this.onLoginSuccess(loginRes); }, async getUserInfoAction(): Promise { const userInfo = await UserApi.mine(); @@ -100,9 +95,13 @@ export const useUserStore = defineStore({ }, async onLoginSuccess(loginData: any) { + const { token, expire } = loginData; + // save token + this.setToken(token, expire); + // get user info // await this.getUserInfoAction(); // const userInfo = await this.getUserInfoAction(); - mitter.emit("app.login", { token: loginData }); + mitter.emit("app.login", { ...loginData }); await router.replace("/"); }, diff --git a/packages/ui/certd-client/src/style/certd.less b/packages/ui/certd-client/src/style/certd.less index 3c2f19bc..51168636 100644 --- a/packages/ui/certd-client/src/style/certd.less +++ b/packages/ui/certd-client/src/style/certd.less @@ -105,4 +105,19 @@ span.fs-icon-svg{ svg{ vertical-align:0 !important; } +} + +.fs-button{ + span{ + &:first-child{ + margin-right: 5px; + } + &:last-child{ + margin-left: 5px; + } + } + .fs-icon,.fs-button-icon{ + margin: 0 !important; + + } } \ No newline at end of file diff --git a/packages/ui/certd-client/src/views/certd/mine/security/index.vue b/packages/ui/certd-client/src/views/certd/mine/security/index.vue index 2f44f14c..aab10450 100644 --- a/packages/ui/certd-client/src/views/certd/mine/security/index.vue +++ b/packages/ui/certd-client/src/views/certd/mine/security/index.vue @@ -5,11 +5,18 @@