github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2-dev' into v2-dev

pull/409/head
xiaojunnuo 2025-04-18 10:17:48 +08:00
parent 45cdfbfae8 3fb5c38571
commit 7daad5477a
52 changed files with 333 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
### Bug Fixes ### Bug Fixes

2
build.trigger
View File

@ -1 +1 @@
23:49 23:37

8
docs/guide/changelogs/CHANGELOG.md
View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
### Bug Fixes ### Bug Fixes

BIN
docs/guide/feature/safe/images/2fa.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 70 KiB

6
docs/guide/feature/safe/index.md
View File

@ -22,9 +22,11 @@ Certd 存储了证书以及授权等敏感数据，所以需要严格保障安
* [站点隐藏设置说明](./hidden/) * [站点隐藏设置说明](./hidden/)
![](./images/hidden.png) ![](./images/hidden.png)
## 4、登录二次验证 ## 4、登录双重验证
待实现 支持2FA双重认证
![](./images/2fa.png)
## 5、数据库自动备份【建议开启】 ## 5、数据库自动备份【建议开启】
* [自动备份设置说明](../../use/backup/) * [自动备份设置说明](../../use/backup/)

2
lerna.json
View File

@ -9,5 +9,5 @@
} }
}, },
"npmClient": "pnpm", "npmClient": "pnpm",
"version": "1.33.4" "version": "1.33.5"
} }

4
packages/core/acme-client/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/acme-client

6
packages/core/acme-client/package.json
View File

@ -3,7 +3,7 @@
"description": "Simple and unopinionated ACME client", "description": "Simple and unopinionated ACME client",
"private": false, "private": false,
"author": "nmorsman", "author": "nmorsman",
"version": "1.33.4", "version": "1.33.5",
"type": "module", "type": "module",
"module": "scr/index.js", "module": "scr/index.js",
"main": "src/index.js", "main": "src/index.js",
@ -18,7 +18,7 @@
"types" "types"
], ],
"dependencies": { "dependencies": {
"@certd/basic": "^1.33.4", "@certd/basic": "^1.33.5",
"@peculiar/x509": "^1.11.0", "@peculiar/x509": "^1.11.0",
"asn1js": "^3.0.5", "asn1js": "^3.0.5",
"axios": "^1.7.2", "axios": "^1.7.2",
@ -67,5 +67,5 @@
"bugs": { "bugs": {
"url": "https://github.com/publishlab/node-acme-client/issues" "url": "https://github.com/publishlab/node-acme-client/issues"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

6
packages/core/basic/CHANGELOG.md
View File

@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/basic

2
packages/core/basic/build.md
View File

@ -1 +1 @@
23:45 23:32

4
packages/core/basic/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@certd/basic", "name": "@certd/basic",
"private": false, "private": false,
"version": "1.33.4", "version": "1.33.5",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"module": "./dist/index.js", "module": "./dist/index.js",
@ -44,5 +44,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

4
packages/core/pipeline/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/pipeline

8
packages/core/pipeline/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@certd/pipeline", "name": "@certd/pipeline",
"private": false, "private": false,
"version": "1.33.4", "version": "1.33.5",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"module": "./dist/index.js", "module": "./dist/index.js",
@ -16,8 +16,8 @@
"test": "mocha --loader=ts-node/esm" "test": "mocha --loader=ts-node/esm"
}, },
"dependencies": { "dependencies": {
"@certd/basic": "^1.33.4", "@certd/basic": "^1.33.5",
"@certd/plus-core": "^1.33.4", "@certd/plus-core": "^1.33.5",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"
@ -43,5 +43,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

4
packages/libs/lib-huawei/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/lib-huawei

4
packages/libs/lib-huawei/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@certd/lib-huawei", "name": "@certd/lib-huawei",
"private": false, "private": false,
"version": "1.33.4", "version": "1.33.5",
"main": "./dist/bundle.js", "main": "./dist/bundle.js",
"module": "./dist/bundle.js", "module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts", "types": "./dist/d/index.d.ts",
@ -23,5 +23,5 @@
"prettier": "^2.8.8", "prettier": "^2.8.8",
"tslib": "^2.8.1" "tslib": "^2.8.1"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

4
packages/libs/lib-iframe/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/lib-iframe

4
packages/libs/lib-iframe/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@certd/lib-iframe", "name": "@certd/lib-iframe",
"private": false, "private": false,
"version": "1.33.4", "version": "1.33.5",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"module": "./dist/index.js", "module": "./dist/index.js",
@ -30,5 +30,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

4
packages/libs/lib-jdcloud/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/jdcloud

4
packages/libs/lib-jdcloud/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@certd/jdcloud", "name": "@certd/jdcloud",
"version": "1.33.4", "version": "1.33.5",
"description": "jdcloud openApi sdk", "description": "jdcloud openApi sdk",
"main": "./dist/bundle.js", "main": "./dist/bundle.js",
"module": "./dist/bundle.js", "module": "./dist/bundle.js",
@ -60,5 +60,5 @@
"fetch" "fetch"
] ]
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

4
packages/libs/lib-k8s/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/lib-k8s

6
packages/libs/lib-k8s/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@certd/lib-k8s", "name": "@certd/lib-k8s",
"private": false, "private": false,
"version": "1.33.4", "version": "1.33.5",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"module": "./dist/index.js", "module": "./dist/index.js",
@ -16,7 +16,7 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@certd/basic": "^1.33.4", "@certd/basic": "^1.33.5",
"@kubernetes/client-node": "0.21.0" "@kubernetes/client-node": "0.21.0"
}, },
"devDependencies": { "devDependencies": {
@ -31,5 +31,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

6
packages/libs/lib-server/CHANGELOG.md
View File

@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/lib-server

12
packages/libs/lib-server/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@certd/lib-server", "name": "@certd/lib-server",
"version": "1.33.4", "version": "1.33.5",
"description": "midway with flyway, sql upgrade way ", "description": "midway with flyway, sql upgrade way ",
"private": false, "private": false,
"type": "module", "type": "module",
@ -27,10 +27,10 @@
], ],
"license": "AGPL", "license": "AGPL",
"dependencies": { "dependencies": {
"@certd/acme-client": "^1.33.4", "@certd/acme-client": "^1.33.5",
"@certd/basic": "^1.33.4", "@certd/basic": "^1.33.5",
"@certd/pipeline": "^1.33.4", "@certd/pipeline": "^1.33.5",
"@certd/plus-core": "^1.33.4", "@certd/plus-core": "^1.33.5",
"@midwayjs/cache": "~3.14.0", "@midwayjs/cache": "~3.14.0",
"@midwayjs/core": "~3.20.3", "@midwayjs/core": "~3.20.3",
"@midwayjs/i18n": "~3.20.3", "@midwayjs/i18n": "~3.20.3",
@ -61,5 +61,5 @@
"typeorm": "^0.3.11", "typeorm": "^0.3.11",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

7
packages/libs/lib-server/src/basic/exception/auth-exception.ts
View File

@ -1,5 +1,6 @@
import { Constants } from '../constants.js'; import { Constants } from '../constants.js';
import { BaseException } from './base-exception.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 { export class Need2FAException extends TextException {
constructor(message?:string) { constructor(message:string,data:any) {
super('Need2FAException', Constants.res.need2fa.code, message ? message : Constants.res.need2fa.message); super('Need2FAException', Constants.res.need2fa.code, message ? message : Constants.res.need2fa.message,data);
} }
} }

4
packages/libs/lib-server/src/basic/exception/base-exception.ts
View File

@ -3,9 +3,11 @@
*/ */
export class BaseException extends Error { export class BaseException extends Error {
code: number; code: number;
constructor(name, code, message) { data?:any
constructor(name, code, message,data?:any) {
super(message); super(message);
this.name = name; this.name = name;
this.code = code; this.code = code;
this.data = data;
} }
} }

15
packages/libs/lib-server/src/basic/exception/common-exception.ts
View File

@ -1,16 +1,23 @@
import { Constants } from '../constants.js'; import { Constants } from "../constants.js";
import { BaseException } from './base-exception.js'; import { BaseException } from "./base-exception.js";
/** /**
* 通用异常 * 通用异常
*/ */
export class CommonException extends BaseException { export class CommonException extends BaseException {
constructor(message) { 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 { export class CodeException extends BaseException {
constructor(res: { code: number; message: string }) { 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);
} }
} }

5
packages/libs/lib-server/src/basic/result.ts
View File

@ -2,14 +2,15 @@ export class Result<T> {
code: number; code: number;
msg: string; msg: string;
data: T; data: T;
constructor(code, msg, data?) { constructor(code, msg, data?) {
this.code = code; this.code = code;
this.msg = msg; this.msg = msg;
this.data = data; this.data = data;
} }
static error(code = 1, msg) { static error(code = 1, msg, data?: any) {
return new Result(code, msg); return new Result(code, msg, data);
} }
static success(msg, data?) { static success(msg, data?) {

4
packages/libs/midway-flyway-js/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/midway-flyway-js

4
packages/libs/midway-flyway-js/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@certd/midway-flyway-js", "name": "@certd/midway-flyway-js",
"version": "1.33.4", "version": "1.33.5",
"description": "midway with flyway, sql upgrade way ", "description": "midway with flyway, sql upgrade way ",
"private": false, "private": false,
"type": "module", "type": "module",
@ -46,5 +46,5 @@
"typeorm": "^0.3.11", "typeorm": "^0.3.11",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

4
packages/plugins/plugin-cert/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [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 **Note:** Version bump only for package @certd/plugin-cert

12
packages/plugins/plugin-cert/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@certd/plugin-cert", "name": "@certd/plugin-cert",
"private": false, "private": false,
"version": "1.33.4", "version": "1.33.5",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
@ -15,10 +15,10 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@certd/acme-client": "^1.33.4", "@certd/acme-client": "^1.33.5",
"@certd/basic": "^1.33.4", "@certd/basic": "^1.33.5",
"@certd/pipeline": "^1.33.4", "@certd/pipeline": "^1.33.5",
"@certd/plugin-lib": "^1.33.4", "@certd/plugin-lib": "^1.33.5",
"@google-cloud/publicca": "^1.3.0", "@google-cloud/publicca": "^1.3.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"jszip": "^3.10.1", "jszip": "^3.10.1",
@ -41,5 +41,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

4
packages/plugins/plugin-lib/CHANGELOG.md
View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
### Performance Improvements ### Performance Improvements

8
packages/plugins/plugin-lib/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@certd/plugin-lib", "name": "@certd/plugin-lib",
"private": false, "private": false,
"version": "1.33.4", "version": "1.33.5",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
@ -16,8 +16,8 @@
}, },
"dependencies": { "dependencies": {
"@alicloud/pop-core": "^1.7.10", "@alicloud/pop-core": "^1.7.10",
"@certd/basic": "^1.33.4", "@certd/basic": "^1.33.5",
"@certd/pipeline": "^1.33.4", "@certd/pipeline": "^1.33.5",
"@kubernetes/client-node": "0.21.0", "@kubernetes/client-node": "0.21.0",
"ali-oss": "^6.21.0", "ali-oss": "^6.21.0",
"basic-ftp": "^5.0.5", "basic-ftp": "^5.0.5",
@ -48,5 +48,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "5b3fb7387df65ed67811623ef9a2c5adadc8bf4f" "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
} }

7
packages/ui/certd-client/CHANGELOG.md
View File

@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
### Performance Improvements ### Performance Improvements

6
packages/ui/certd-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@certd/ui-client", "name": "@certd/ui-client",
"version": "1.33.4", "version": "1.33.5",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite --open", "dev": "vite --open",
@ -101,8 +101,8 @@
"zod-defaults": "^0.1.3" "zod-defaults": "^0.1.3"
}, },
"devDependencies": { "devDependencies": {
"@certd/lib-iframe": "^1.33.4", "@certd/lib-iframe": "^1.33.5",
"@certd/pipeline": "^1.33.4", "@certd/pipeline": "^1.33.5",
"@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-node-resolve": "^15.2.3",
"@types/chai": "^4.3.12", "@types/chai": "^4.3.12",

18
packages/ui/certd-client/src/api/service.ts
View File

@ -3,6 +3,17 @@ import { get } from "lodash-es";
import { errorLog, errorCreate } from "./tools"; import { errorLog, errorCreate } from "./tools";
import { env } from "/src/utils/util.env"; import { env } from "/src/utils/util.env";
import { useUserStore } from "/@/store/user"; 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 创建请求实例 * @description 创建请求实例
*/ */
@ -56,12 +67,13 @@ function createService() {
const errorMessage = dataAxios.msg || dataAxios.message || "未知错误"; const errorMessage = dataAxios.msg || dataAxios.message || "未知错误";
// @ts-ignore // @ts-ignore
if (response?.config?.onError) { if (response?.config?.onError) {
// @ts-ignore const err = new CodeError(errorMessage, dataAxios.code, dataAxios.data);
response.config.onError(new Error(errorMessage)); response.config.onError(err);
return;
} }
//@ts-ignore //@ts-ignore
const showErrorNotify = response?.config?.showErrorNotify; const showErrorNotify = response?.config?.showErrorNotify;
errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify); errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify, dataAxios);
return dataAxios; return dataAxios;
} }
} }

5
packages/ui/certd-client/src/api/tools.ts
View File

@ -4,6 +4,7 @@
* @param {String} defaultValue 默认值 * @param {String} defaultValue 默认值
*/ */
import { uiContext } from "@fast-crud/fast-crud"; import { uiContext } from "@fast-crud/fast-crud";
import { CodeError } from "/@/api/service";
export function parse(jsonString = "{}", defaultValue = {}) { export function parse(jsonString = "{}", defaultValue = {}) {
let result = defaultValue; let result = defaultValue;
@ -68,8 +69,8 @@ export function errorLog(error: any, notify = true) {
* @description 创建一个错误 * @description 创建一个错误
* @param {String} msg 错误信息 * @param {String} msg 错误信息
*/ */
export function errorCreate(msg: string, notify = true) { export function errorCreate(msg: string, notify = true, data?: any) {
const err = new Error(msg); const err = new CodeError(msg, data.code, data.data);
console.error("errorCreate", err); console.error("errorCreate", err);
if (notify) { if (notify) {
uiContext.get().notification.error({ message: err.message }); uiContext.get().notification.error({ message: err.message });

2
packages/ui/certd-client/src/router/source/modules/certd.ts
View File

@ -149,7 +149,7 @@ export const certdResources = [
path: "/certd/mine/security", path: "/certd/mine/security",
component: "/certd/mine/security/index.vue", component: "/certd/mine/security/index.vue",
meta: { meta: {
icon: "ion:locked-outline", icon: "fluent:shield-keyhole-16-regular",
auth: true, auth: true,
isMenu: true, isMenu: true,
}, },

8
packages/ui/certd-client/src/store/user/api.user.ts
View File

@ -66,3 +66,11 @@ export async function mine(): Promise<UserInfoRes> {
method: "post", method: "post",
}); });
} }
export async function loginByTwoFactor(data: any) {
return await request({
url: "/loginByTwoFactor",
method: "post",
data,
});
}

35
packages/ui/certd-client/src/store/user/index.ts
View File

@ -51,7 +51,7 @@ export const useUserStore = defineStore({
setUserInfo(info: UserInfoRes) { setUserInfo(info: UserInfoRes) {
this.userInfo = info; this.userInfo = info;
const userStore = vbenUserStore(); const userStore = vbenUserStore();
userStore.setUserInfo(info); userStore.setUserInfo(info as any);
LocalStorage.set(USER_INFO_KEY, info); LocalStorage.set(USER_INFO_KEY, info);
}, },
resetState() { resetState() {
@ -71,23 +71,18 @@ export const useUserStore = defineStore({
* @description: login * @description: login
*/ */
async login(loginType: string, params: LoginReq | SmsLoginReq): Promise<any> { async login(loginType: string, params: LoginReq | SmsLoginReq): Promise<any> {
try { let loginRes: any = null;
let loginRes: any = null; if (loginType === "sms") {
if (loginType === "sms") { loginRes = await UserApi.loginBySms(params as SmsLoginReq);
loginRes = await UserApi.loginBySms(params as SmsLoginReq); } else {
} else { loginRes = await UserApi.login(params as LoginReq);
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;
} }
return await this.onLoginSuccess(loginRes);
},
async loginByTwoFactor(form: any) {
const loginRes = await UserApi.loginByTwoFactor(form);
return await this.onLoginSuccess(loginRes);
}, },
async getUserInfoAction(): Promise<UserInfoRes> { async getUserInfoAction(): Promise<UserInfoRes> {
const userInfo = await UserApi.mine(); const userInfo = await UserApi.mine();
@ -100,9 +95,13 @@ export const useUserStore = defineStore({
}, },
async onLoginSuccess(loginData: any) { async onLoginSuccess(loginData: any) {
const { token, expire } = loginData;
// save token
this.setToken(token, expire);
// get user info
// await this.getUserInfoAction(); // await this.getUserInfoAction();
// const userInfo = await this.getUserInfoAction(); // const userInfo = await this.getUserInfoAction();
mitter.emit("app.login", { token: loginData }); mitter.emit("app.login", { ...loginData });
await router.replace("/"); await router.replace("/");
}, },

15
packages/ui/certd-client/src/style/certd.less
View File

@ -105,4 +105,19 @@ span.fs-icon-svg{
svg{ svg{
vertical-align:0 !important; 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;
}
} }

44
packages/ui/certd-client/src/views/certd/mine/security/index.vue
View File

@ -5,11 +5,18 @@
</template> </template>
<div class="user-settings-form settings-form"> <div class="user-settings-form settings-form">
<a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off"> <a-form :model="formState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off">
<a-form-item label="OTP多重验证登录" :name="['authenticator', 'enabled']"> <a-form-item label="2FA多重验证登录" :name="['authenticator', 'enabled']">
<div class="flex mt-5"> <div class="flex mt-5">
<a-switch v-model:checked="formState.authenticator.enabled" :disabled="!settingsStore.isPlus" @change="onAuthenticatorEnabledChanged" /> <a-switch v-model:checked="formState.authenticator.enabled" :disabled="!settingsStore.isPlus" @change="onAuthenticatorEnabledChanged" />
<a-button v-if="formState.authenticator.enabled && formState.authenticator.verified" :disabled="authenticatorOpenRef" size="small" class="ml-5" type="primary" @click="authenticatorForm.open = true"> <a-button
v-if="formState.authenticator.enabled && formState.authenticator.verified"
:disabled="authenticatorOpenRef || !settingsStore.isPlus"
size="small"
class="ml-5"
type="primary"
@click="authenticatorForm.open = true"
>
重新绑定 重新绑定
</a-button> </a-button>
@ -19,8 +26,30 @@
<div class="helper">是否开启多重验证登录</div> <div class="helper">是否开启多重验证登录</div>
</a-form-item> </a-form-item>
<a-form-item v-if="authenticatorOpenRef" label="绑定设备" class="authenticator-config"> <a-form-item v-if="authenticatorOpenRef" label="绑定设备" class="authenticator-config">
<h3 class="font-bold m-5">1. 安装任意一款 Authenticator APP</h3> <h3 class="font-bold m-5">1. 安装任意一款支持Authenticator的验证APP，比如：</h3>
<div class="ml-20">比如：Microsoft Authenticator / Google Authenticator / Authy / Synology Secure SignIn 等</div> <div class="ml-20">
<ul>
<li>
<a-tooltip title="如果报没有找到谷歌服务的错误，您可以安装KK谷歌助手">
<a href="https://appgallery.huawei.com/app/C100262999" target="_blank"> Microsoft Authenticator</a>
</a-tooltip>
</li>
<li>
<a href="https://sj.qq.com/appdetail/com.tencent.authenticator" target="_blank">腾讯身份验证器</a>
</li>
<li>
<a href="https://www.synology.cn/zh-cn/dsm/feature/authentication" target="_blank">群晖身份验证器</a>
</li>
<li>
<a-tooltip title="如果报没有找到谷歌服务的错误，您可以安装KK谷歌助手">
<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Google Authenticator</a>
</a-tooltip>
</li>
<li>
<a href="https://play.google.com/store/apps/details?id=com.authy.authy" target="_blank">Authy</a>
</li>
</ul>
</div>
<h3 class="font-bold m-10">2. 扫描二维码添加账号</h3> <h3 class="font-bold m-10">2. 扫描二维码添加账号</h3>
<div v-if="authenticatorForm.qrcodeSrc" class="qrcode"> <div v-if="authenticatorForm.qrcodeSrc" class="qrcode">
<div class="ml-20"> <div class="ml-20">
@ -53,7 +82,12 @@ defineOptions({
name: "UserSecurity", name: "UserSecurity",
}); });
const formState = reactive<Partial<UserTwoFactorSetting>>({}); const formState = reactive<Partial<UserTwoFactorSetting>>({
authenticator: {
enabled: false,
verified: false,
},
});
const authenticatorForm = reactive({ const authenticatorForm = reactive({
qrcodeSrc: "", qrcodeSrc: "",

31
packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue
View File

@ -4,10 +4,14 @@
<a-tab-pane v-for="item of detail.nodes" :key="item.node.id"> <a-tab-pane v-for="item of detail.nodes" :key="item.node.id">
<template #tab> <template #tab>
<div class="tab-title flex-between" :title="item.node.title"> <div class="tab-title flex-between" :title="item.node.title">
<span class="tab-title-text flex items-center md:w-40"> <span class="tab-title-text flex items-center md:w-48">
<pi-status-show class="mr-1" :status="item.node.status?.result" type="icon"></pi-status-show> <pi-status-show class="mr-1" :status="item.node.status?.result" type="icon"></pi-status-show>
<!-- <fs-icon icon="ion:chevron-forward-circle" class="text-md mr-1"></fs-icon>--> <!-- <fs-icon icon="ion:chevron-forward-circle" class="text-md mr-1"></fs-icon>-->
{{ item.node.title }} <span class="flex-1 ellipsis">{{ item.node.title }}</span>
<a-tooltip title="强制重新执行此步骤">
<fs-icon class="pointer color-blue ml-1" style="font-size: 16px" title="强制重新执行此步骤" icon="icon-park-outline:replay-music" @click="triggerRun(item.node.id)"></fs-icon>
</a-tooltip>
</span> </span>
</div> </div>
</template> </template>
@ -31,13 +35,14 @@ export default {
name: "PiTaskView", name: "PiTaskView",
components: { PiStatusShow }, components: { PiStatusShow },
props: {}, props: {},
emits: ["run"],
setup(props: any, ctx: any) { setup(props: any, ctx: any) {
const taskModal = ref({ const taskModal = ref({
open: false, open: false,
onOk() { onOk() {
taskViewClose(); taskViewClose();
}, },
cancelText: "关闭" cancelText: "关闭",
}); });
const { isMobile } = usePreferences(); const { isMobile } = usePreferences();
const tabPosition = computed(() => { const tabPosition = computed(() => {
@ -65,7 +70,7 @@ export default {
node: step, node: step,
type: "步骤", type: "步骤",
tab: 2, tab: 2,
logs: [] logs: [],
}); });
} }
for (let node of nodes) { for (let node of nodes) {
@ -82,7 +87,7 @@ export default {
list.push({ list.push({
time, time,
content, content,
color color,
}); });
} }
return list; return list;
@ -111,12 +116,12 @@ export default {
if (isBottom && el) { if (isBottom && el) {
el?.scrollTo({ el?.scrollTo({
top: el.scrollHeight, top: el.scrollHeight,
behavior: "smooth" behavior: "smooth",
}); });
} }
}, },
{ {
immediate: true immediate: true,
} }
); );
} }
@ -135,15 +140,21 @@ export default {
taskModal.value.open = false; taskModal.value.open = false;
}; };
function triggerRun(id: string) {
ctx.emit("run", id);
taskModal.value.open = false;
}
return { return {
detail, detail,
taskModal, taskModal,
activeKey, activeKey,
taskViewOpen, taskViewOpen,
taskViewClose, taskViewClose,
tabPosition tabPosition,
triggerRun,
}; };
} },
}; };
</script> </script>
@ -154,7 +165,7 @@ export default {
.tab-title-text { .tab-title-text {
display: flex; display: flex;
max-width: 180px; //max-width: 180px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
View File

@ -249,7 +249,7 @@
<pi-task-form ref="taskFormRef" :edit-mode="editMode"></pi-task-form> <pi-task-form ref="taskFormRef" :edit-mode="editMode"></pi-task-form>
<pi-trigger-form ref="triggerFormRef" :edit-mode="editMode"></pi-trigger-form> <pi-trigger-form ref="triggerFormRef" :edit-mode="editMode"></pi-trigger-form>
<pi-task-view ref="taskViewRef"></pi-task-view> <pi-task-view ref="taskViewRef" @run="run"></pi-task-view>
<PiNotificationForm ref="notificationFormRef" :edit-mode="editMode"></PiNotificationForm> <PiNotificationForm ref="notificationFormRef" :edit-mode="editMode"></PiNotificationForm>
</fs-page> </fs-page>
</template> </template>

38
packages/ui/certd-client/src/views/framework/login/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="main login-page"> <div class="main login-page">
<a-form ref="formRef" class="user-layout-login" name="custom-validation" :model="formState" v-bind="layout" @finish="handleFinish" @finish-failed="handleFinishFailed"> <a-form v-if="!twoFactor.loginId" ref="formRef" class="user-layout-login" name="custom-validation" :model="formState" v-bind="layout" @finish="handleFinish" @finish-failed="handleFinishFailed">
<!-- <div class="login-title">登录</div>--> <!-- <div class="login-title">登录</div>-->
<a-tabs v-model:active-key="formState.loginType" :tab-bar-style="{ textAlign: 'center', borderBottom: 'unset' }"> <a-tabs v-model:active-key="formState.loginType" :tab-bar-style="{ textAlign: 'center', borderBottom: 'unset' }">
<a-tab-pane key="password" tab="密码登录" :disabled="sysPublicSettings.passwordLoginEnabled !== true"> <a-tab-pane key="password" tab="密码登录" :disabled="sysPublicSettings.passwordLoginEnabled !== true">
@ -49,6 +49,23 @@
<router-link v-if="hasRegisterTypeEnabled()" class="register" :to="{ name: 'register' }"> 注册 </router-link> <router-link v-if="hasRegisterTypeEnabled()" class="register" :to="{ name: 'register' }"> 注册 </router-link>
</a-form-item> </a-form-item>
</a-form> </a-form>
<a-form v-else ref="twoFactorFormRef" class="user-layout-login" :model="twoFactor" v-bind="layout">
<div class="mb-10 flex flex-center">请打开您的Authenticator APP，获取动态验证码。</div>
<a-form-item name="verifyCode">
<a-input v-model:value="twoFactor.verifyCode" placeholder="请输入动态验证码" allow-clear>
<template #prefix>
<fs-icon icon="ion:lock-closed-outline"></fs-icon>
</template>
</a-input>
</a-form-item>
<a-form-item>
<loading-button type="primary" size="large" html-type="button" class="login-button" :click="handleTwoFactorSubmit">OTP验证登录</loading-button>
</a-form-item>
<a-form-item class="user-login-other">
<a class="register" @click="twoFactor.loginId = null"> 返回 </a>
</a-form-item>
</a-form>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -113,11 +130,28 @@ export default defineComponent({
}, },
}; };
const twoFactor = reactive({
loginId: "",
verifyCode: "",
});
const handleTwoFactorSubmit = async () => {
await userStore.loginByTwoFactor(twoFactor);
};
const handleFinish = async (values: any) => { const handleFinish = async (values: any) => {
loading.value = true; loading.value = true;
try { try {
const loginType = formState.loginType; const loginType = formState.loginType;
await userStore.login(loginType, toRaw(formState)); await userStore.login(loginType, toRaw(formState));
} catch (e: any) {
//@ts-ignore
if (e.code === 10020) {
//@ts-ignore
twoFactor.loginId = e.data;
} else {
throw e;
}
} finally { } finally {
loading.value = false; loading.value = false;
} }
@ -150,6 +184,8 @@ export default defineComponent({
isLoginError, isLoginError,
sysPublicSettings, sysPublicSettings,
hasRegisterTypeEnabled, hasRegisterTypeEnabled,
twoFactor,
handleTwoFactorSubmit,
}; };
}, },
}); });

3
packages/ui/certd-client/src/views/sys/settings/tabs/safe.vue
View File

@ -4,8 +4,7 @@
<h2>站点隐藏</h2> <h2>站点隐藏</h2>
<a-form-item label="启用站点隐藏" :name="['hidden', 'enabled']" :required="true"> <a-form-item label="启用站点隐藏" :name="['hidden', 'enabled']" :required="true">
<div class="flex"> <div class="flex">
<a-switch v-model:checked="formState.hidden.enabled" :disabled="!settingsStore.isPlus" /> <a-switch v-model:checked="formState.hidden.enabled" />
<vip-button class="ml-5" mode="button"></vip-button>
</div> </div>
<div class="helper"> <div class="helper">

8
packages/ui/certd-server/CHANGELOG.md
View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) ## [1.33.4](https://github.com/certd/certd/compare/v1.33.3...v1.33.4) (2025-04-15)
### Bug Fixes ### Bug Fixes

28
packages/ui/certd-server/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@certd/ui-server", "name": "@certd/ui-server",
"version": "1.33.4", "version": "1.33.5",
"description": "fast-server base midway", "description": "fast-server base midway",
"private": true, "private": true,
"type": "module", "type": "module",
@ -38,19 +38,19 @@
"@aws-sdk/client-acm": "^3.699.0", "@aws-sdk/client-acm": "^3.699.0",
"@aws-sdk/client-cloudfront": "^3.699.0", "@aws-sdk/client-cloudfront": "^3.699.0",
"@aws-sdk/client-s3": "^3.705.0", "@aws-sdk/client-s3": "^3.705.0",
"@certd/acme-client": "^1.33.4", "@certd/acme-client": "^1.33.5",
"@certd/basic": "^1.33.4", "@certd/basic": "^1.33.5",
"@certd/commercial-core": "^1.33.4", "@certd/commercial-core": "^1.33.5",
"@certd/jdcloud": "^1.33.4", "@certd/jdcloud": "^1.33.5",
"@certd/lib-huawei": "^1.33.4", "@certd/lib-huawei": "^1.33.5",
"@certd/lib-k8s": "^1.33.4", "@certd/lib-k8s": "^1.33.5",
"@certd/lib-server": "^1.33.4", "@certd/lib-server": "^1.33.5",
"@certd/midway-flyway-js": "^1.33.4", "@certd/midway-flyway-js": "^1.33.5",
"@certd/pipeline": "^1.33.4", "@certd/pipeline": "^1.33.5",
"@certd/plugin-cert": "^1.33.4", "@certd/plugin-cert": "^1.33.5",
"@certd/plugin-lib": "^1.33.4", "@certd/plugin-lib": "^1.33.5",
"@certd/plugin-plus": "^1.33.4", "@certd/plugin-plus": "^1.33.5",
"@certd/plus-core": "^1.33.4", "@certd/plus-core": "^1.33.5",
"@corsinvest/cv4pve-api-javascript": "^8.3.0", "@corsinvest/cv4pve-api-javascript": "^8.3.0",
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120", "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.120",
"@huaweicloud/huaweicloud-sdk-core": "^3.1.120", "@huaweicloud/huaweicloud-sdk-core": "^3.1.120",

12
packages/ui/certd-server/src/controller/sys/settings/sys-safe-settings-controller.ts
View File

@ -1,8 +1,7 @@
import {ALL, Body, Controller, Inject, Post, Provide} from '@midwayjs/core'; import { ALL, Body, Controller, Inject, Post, Provide } from "@midwayjs/core";
import {BaseController, SysSafeSetting} from '@certd/lib-server'; import { BaseController, SysSafeSetting } from "@certd/lib-server";
import {cloneDeep} from 'lodash-es'; import { cloneDeep } from "lodash-es";
import {SafeService} from "../../../modules/sys/settings/safe-service.js"; import { SafeService } from "../../../modules/sys/settings/safe-service.js";
import {isPlus} from "@certd/plus-core";
/** /**
@ -25,9 +24,6 @@ export class SysSettingsController extends BaseController {
@Post("/save", { summary: "sys:settings:edit" }) @Post("/save", { summary: "sys:settings:edit" })
async safeSave(@Body(ALL) body: any) { async safeSave(@Body(ALL) body: any) {
if (!isPlus()) {
throw new Error('本功能需要开通专业版')
}
await this.safeService.saveSafeSetting(body); await this.safeService.saveSafeSetting(body);
return this.ok({}); return this.ok({});
} }

2
packages/ui/certd-server/src/controller/user/login/login-controller.ts
View File

@ -63,7 +63,7 @@ export class LoginController extends BaseController {
) { ) {
const token = await this.loginService.loginByTwoFactor({ const token = await this.loginService.loginByTwoFactor({
loginCode: body.loginCode, loginId: body.loginId,
verifyCode: body.verifyCode, verifyCode: body.verifyCode,
}); });

7
packages/ui/certd-server/src/middleware/global-exception.ts
View File

@ -1,7 +1,7 @@
import { Provide } from '@midwayjs/core'; import { Provide } from '@midwayjs/core';
import { IMidwayKoaContext, IWebMiddleware, NextFunction } from '@midwayjs/koa'; import { IMidwayKoaContext, IWebMiddleware, NextFunction } from '@midwayjs/koa';
import { logger } from '@certd/basic'; import { logger } from '@certd/basic';
import { Result } from '@certd/lib-server'; import { Result, TextException } from "@certd/lib-server";
@Provide() @Provide()
export class GlobalExceptionMiddleware implements IWebMiddleware { export class GlobalExceptionMiddleware implements IWebMiddleware {
@ -14,12 +14,15 @@ export class GlobalExceptionMiddleware implements IWebMiddleware {
await next(); await next();
logger.info('请求完成:', url, Date.now() - startTime + 'ms'); logger.info('请求完成:', url, Date.now() - startTime + 'ms');
} catch (err) { } catch (err) {
if(err instanceof TextException){
delete err.stack
}
logger.error('请求异常:', url, Date.now() - startTime + 'ms', err); logger.error('请求异常:', url, Date.now() - startTime + 'ms', err);
ctx.status = 200; ctx.status = 200;
if (err.code == null || typeof err.code !== 'number') { if (err.code == null || typeof err.code !== 'number') {
err.code = 1; err.code = 1;
} }
ctx.body = Result.error(err.code, err.message); ctx.body = Result.error(err.code, err.message,err.data);
} }
}; };
} }

10
packages/ui/certd-server/src/modules/login/service/login-service.ts
View File

@ -158,21 +158,21 @@ export class LoginService {
//要检查 //要检查
const randomKey = utils.id.simpleNanoId(12) const randomKey = utils.id.simpleNanoId(12)
cache.set(`login_2fa_code:${randomKey}`, userId, { cache.set(`login_2fa_code:${randomKey}`, userId, {
ttl: 60 * 1000, ttl: 60 * 1000 * 2,
}) })
throw new Need2FAException('已开启多重认证，请在60秒内输入验证码') throw new Need2FAException('已开启多重认证，请在2分钟内输入OPT验证码',randomKey)
} }
} }
async loginByTwoFactor(req: { loginCode: string; verifyCode: string }) { async loginByTwoFactor(req: { loginId: string; verifyCode: string }) {
//检查是否开启多重认证 //检查是否开启多重认证
if (!isPlus()) { if (!isPlus()) {
throw new Error('本功能需要开通专业版') throw new Error('本功能需要开通专业版')
} }
const userId = cache.get(`login_2fa_code:${req.loginCode}`) const userId = cache.get(`login_2fa_code:${req.loginId}`)
if (!userId) { if (!userId) {
throw new AuthException('登录状态已失效，请重新登录') throw new AuthException('已超时，请返回重新登录')
} }
await this.twoFactorService.verifyAuthenticatorCode(userId, req.verifyCode) await this.twoFactorService.verifyAuthenticatorCode(userId, req.verifyCode)