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/330/head
xiaojunnuo 2024-12-26 01:47:50 +08:00
parent 66fb9e5f49 d0e841f7de
commit 512a667e44
87 changed files with 469 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -3,6 +3,19 @@
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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
### Bug Fixes
* 免费套餐支持购买 ([f5ec987](https://github.com/certd/certd/commit/f5ec9870fd6af1f0c9099852bbdb4d07813ccce8))
* 修复某处金额转换丢失精度的bug ([d2d6f12](https://github.com/certd/certd/commit/d2d6f12218cbe7bd55f4ae082b93084be85f0a7b))
* 修复新版本小红点显示错误问题 ([fe4786e](https://github.com/certd/certd/commit/fe4786e168afe03a5243dd67971476c348339809))
### Performance Improvements
* 用户创建证书流水线没有购买套餐或者超限时提前报错 ([472f06c](https://github.com/certd/certd/commit/472f06c2d190d0ae48e8b53c18bc278437656a1c))
* 优化插件名称显示 ([26adf7d](https://github.com/certd/certd/commit/26adf7d437e674385f26a8f92fded6521a620671))
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
### Bug Fixes ### Bug Fixes

2
build.trigger
View File

@ -1 +1 @@
01:06 01:43

2
docker/run/docker-compose.yaml
View File

@ -34,6 +34,8 @@ services:
# #↓↓↓↓ ----------------------------- 如果忘记管理员密码，可以设置为true，重启之后，管理员密码将改成123456，然后请及时修改回false # #↓↓↓↓ ----------------------------- 如果忘记管理员密码，可以设置为true，重启之后，管理员密码将改成123456，然后请及时修改回false
- certd_system_resetAdminPasswd=false - certd_system_resetAdminPasswd=false
# 默认使用sqlite文件数据库，如果需要使用其他数据库，请设置以下环境变量 # 默认使用sqlite文件数据库，如果需要使用其他数据库，请设置以下环境变量
# 注意： 选定使用一种数据库之后，不支持更换数据库。
# 数据库迁移方法：1、使用新数据库重新部署一套，然后将旧数据同步过去，注意flyway_history表的数据不要同步
# #↓↓↓↓ ----------------------------- 使用postgresql数据库，需要提前创建数据库 # #↓↓↓↓ ----------------------------- 使用postgresql数据库，需要提前创建数据库
# - certd_flyway_scriptDir=./db/migration-pg # 升级脚本目录 # - certd_flyway_scriptDir=./db/migration-pg # 升级脚本目录
# - certd_typeorm_dataSource_default_type=postgres # 数据库类型 # - certd_typeorm_dataSource_default_type=postgres # 数据库类型

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

@ -3,6 +3,19 @@
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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
### Bug Fixes
* 免费套餐支持购买 ([f5ec987](https://github.com/certd/certd/commit/f5ec9870fd6af1f0c9099852bbdb4d07813ccce8))
* 修复某处金额转换丢失精度的bug ([d2d6f12](https://github.com/certd/certd/commit/d2d6f12218cbe7bd55f4ae082b93084be85f0a7b))
* 修复新版本小红点显示错误问题 ([fe4786e](https://github.com/certd/certd/commit/fe4786e168afe03a5243dd67971476c348339809))
### Performance Improvements
* 用户创建证书流水线没有购买套餐或者超限时提前报错 ([472f06c](https://github.com/certd/certd/commit/472f06c2d190d0ae48e8b53c18bc278437656a1c))
* 优化插件名称显示 ([26adf7d](https://github.com/certd/certd/commit/26adf7d437e674385f26a8f92fded6521a620671))
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
### Bug Fixes ### Bug Fixes

2
lerna.json
View File

@ -9,5 +9,5 @@
} }
}, },
"npmClient": "pnpm", "npmClient": "pnpm",
"version": "1.29.0" "version": "1.29.1"
} }

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.29.1](https://github.com/publishlab/node-acme-client/compare/v1.29.0...v1.29.1) (2024-12-25)
**Note:** Version bump only for package @certd/acme-client
# [1.29.0](https://github.com/publishlab/node-acme-client/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/publishlab/node-acme-client/compare/v1.28.4...v1.29.0) (2024-12-24)
**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.29.0", "version": "1.29.1",
"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.29.0", "@certd/basic": "^1.29.1",
"@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",
@ -65,5 +65,5 @@
"bugs": { "bugs": {
"url": "https://github.com/publishlab/node-acme-client/issues" "url": "https://github.com/publishlab/node-acme-client/issues"
}, },
"gitHead": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
### Bug Fixes
* 修复某处金额转换丢失精度的bug ([d2d6f12](https://github.com/certd/certd/commit/d2d6f12218cbe7bd55f4ae082b93084be85f0a7b))
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
### Features ### Features

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

@ -1 +1 @@
01:02 01:39

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

@ -1,7 +1,7 @@
{ {
"name": "@certd/basic", "name": "@certd/basic",
"private": false, "private": false,
"version": "1.29.0", "version": "1.29.1",
"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": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

6
packages/core/basic/src/utils/index.ts
View File

@ -9,6 +9,10 @@ export * from './util.merge.js';
export * from './util.cache.js'; export * from './util.cache.js';
export * from './util.string.js'; export * from './util.string.js';
export * from './util.lock.js'; export * from './util.lock.js';
export * from './util.mitter.js';
export * from './util.id.js';
export * from './util.domain.js';
export * from './util.amount.js';
import { stringUtils } from './util.string.js'; import { stringUtils } from './util.string.js';
import sleep from './util.sleep.js'; import sleep from './util.sleep.js';
import { http, download } from './util.request.js'; import { http, download } from './util.request.js';
@ -23,6 +27,7 @@ import { cache } from './util.cache.js';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { domainUtils } from './util.domain.js'; import { domainUtils } from './util.domain.js';
import { optionsUtils } from './util.options.js'; import { optionsUtils } from './util.options.js';
import { amountUtils } from './util.amount.js';
import { nanoid } from 'nanoid'; import { nanoid } from 'nanoid';
import * as id from './util.id.js'; import * as id from './util.id.js';
import { locker } from './util.lock.js'; import { locker } from './util.lock.js';
@ -46,4 +51,5 @@ export const utils = {
string: stringUtils, string: stringUtils,
locker, locker,
mitter, mitter,
amount: amountUtils,
}; };

9
packages/core/basic/src/utils/util.amount.ts Normal file
View File

@ -0,0 +1,9 @@
export const amountUtils = {
toCent(amount: number): number {
return parseInt((amount * 100).toFixed(0));
},
toYuan(amount: number): number {
return parseFloat((amount / 100).toFixed(2));
},
};

6
packages/core/pipeline/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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
### Performance Improvements
* 用户创建证书流水线没有购买套餐或者超限时提前报错 ([472f06c](https://github.com/certd/certd/commit/472f06c2d190d0ae48e8b53c18bc278437656a1c))
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
### Features ### Features

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

@ -1,7 +1,7 @@
{ {
"name": "@certd/pipeline", "name": "@certd/pipeline",
"private": false, "private": false,
"version": "1.29.0", "version": "1.29.1",
"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.29.0", "@certd/basic": "^1.29.1",
"@certd/plus-core": "^1.29.0", "@certd/plus-core": "^1.29.1",
"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": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

4
packages/core/pipeline/src/core/run-history.ts
View File

@ -146,6 +146,10 @@ export class RunnableCollection {
static initPipelineRunnableType(pipeline: Pipeline) { static initPipelineRunnableType(pipeline: Pipeline) {
pipeline.runnableType = "pipeline"; pipeline.runnableType = "pipeline";
if (pipeline.stages === undefined) {
pipeline.stages = [];
return;
}
pipeline.stages.forEach((stage) => { pipeline.stages.forEach((stage) => {
stage.runnableType = "stage"; stage.runnableType = "stage";
stage.tasks.forEach((task) => { stage.tasks.forEach((task) => {

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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
**Note:** Version bump only for package @certd/lib-huawei
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
**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.29.0", "version": "1.29.1",
"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",
@ -21,5 +21,5 @@
"prettier": "^2.8.8", "prettier": "^2.8.8",
"tslib": "^2.8.1" "tslib": "^2.8.1"
}, },
"gitHead": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
**Note:** Version bump only for package @certd/lib-iframe
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
**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.29.0", "version": "1.29.1",
"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": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
**Note:** Version bump only for package @certd/lib-k8s
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
**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.29.0", "version": "1.29.1",
"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.29.0", "@certd/basic": "^1.29.1",
"@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": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

4
packages/libs/lib-server/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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
**Note:** Version bump only for package @certd/lib-server
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
### Features ### Features

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

@ -1,6 +1,6 @@
{ {
"name": "@certd/lib-server", "name": "@certd/lib-server",
"version": "1.29.0", "version": "1.29.1",
"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.29.0", "@certd/acme-client": "^1.29.1",
"@certd/basic": "^1.29.0", "@certd/basic": "^1.29.1",
"@certd/pipeline": "^1.29.0", "@certd/pipeline": "^1.29.1",
"@certd/plus-core": "^1.29.0", "@certd/plus-core": "^1.29.1",
"@midwayjs/cache": "~3.14.0", "@midwayjs/cache": "~3.14.0",
"@midwayjs/core": "~3.17.1", "@midwayjs/core": "~3.17.1",
"@midwayjs/i18n": "~3.17.3", "@midwayjs/i18n": "~3.17.3",
@ -61,5 +61,5 @@
"typeorm": "^0.3.11", "typeorm": "^0.3.11",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
**Note:** Version bump only for package @certd/midway-flyway-js
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
**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.29.0", "version": "1.29.1",
"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": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
**Note:** Version bump only for package @certd/plugin-cert
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
### Bug Fixes ### Bug Fixes

10
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.29.0", "version": "1.29.1",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
@ -15,9 +15,9 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@certd/acme-client": "^1.29.0", "@certd/acme-client": "^1.29.1",
"@certd/basic": "^1.29.0", "@certd/basic": "^1.29.1",
"@certd/pipeline": "^1.29.0", "@certd/pipeline": "^1.29.1",
"@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",
@ -40,5 +40,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
**Note:** Version bump only for package @certd/plugin-lib
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
**Note:** Version bump only for package @certd/plugin-lib **Note:** Version bump only for package @certd/plugin-lib

10
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.29.0", "version": "1.29.1",
"type": "module", "type": "module",
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
@ -16,9 +16,9 @@
}, },
"dependencies": { "dependencies": {
"@alicloud/pop-core": "^1.7.10", "@alicloud/pop-core": "^1.7.10",
"@certd/basic": "^1.29.0", "@certd/basic": "^1.29.1",
"@certd/pipeline": "^1.29.0", "@certd/pipeline": "^1.29.1",
"@certd/plugin-cert": "^1.29.0", "@certd/plugin-cert": "^1.29.1",
"@kubernetes/client-node": "0.21.0", "@kubernetes/client-node": "0.21.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"iconv-lite": "^0.6.3", "iconv-lite": "^0.6.3",
@ -44,5 +44,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "36993cb6f8244f4a183d64fcdf5194282140d888" "gitHead": "f9128d4d452e344b6990c117a5d647add226437b"
} }

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

@ -3,6 +3,19 @@
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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
### Bug Fixes
* 免费套餐支持购买 ([f5ec987](https://github.com/certd/certd/commit/f5ec9870fd6af1f0c9099852bbdb4d07813ccce8))
* 修复某处金额转换丢失精度的bug ([d2d6f12](https://github.com/certd/certd/commit/d2d6f12218cbe7bd55f4ae082b93084be85f0a7b))
* 修复新版本小红点显示错误问题 ([fe4786e](https://github.com/certd/certd/commit/fe4786e168afe03a5243dd67971476c348339809))
### Performance Improvements
* 用户创建证书流水线没有购买套餐或者超限时提前报错 ([472f06c](https://github.com/certd/certd/commit/472f06c2d190d0ae48e8b53c18bc278437656a1c))
* 优化插件名称显示 ([26adf7d](https://github.com/certd/certd/commit/26adf7d437e674385f26a8f92fded6521a620671))
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
### Bug Fixes ### Bug Fixes

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

@ -1,6 +1,6 @@
{ {
"name": "@certd/ui-client", "name": "@certd/ui-client",
"version": "1.29.0", "version": "1.29.1",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite --open", "dev": "vite --open",
@ -66,8 +66,8 @@
"vuedraggable": "^4.1.0" "vuedraggable": "^4.1.0"
}, },
"devDependencies": { "devDependencies": {
"@certd/lib-iframe": "^1.29.0", "@certd/lib-iframe": "^1.29.1",
"@certd/pipeline": "^1.29.0", "@certd/pipeline": "^1.29.1",
"@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",

5
packages/ui/certd-client/src/store/modules/settings.ts
View File

@ -122,12 +122,11 @@ export const useSettingStore = defineStore({
}; };
return vipLabelMap[this.plusInfo?.vipType || "free"]; return vipLabelMap[this.plusInfo?.vipType || "free"];
}, },
// @ts-ignore getHeaderMenus(): { menus: any[] } {
getHeaderMenus() {
// @ts-ignore // @ts-ignore
return this.headerMenus?.menus || { menus: [] }; return this.headerMenus?.menus || { menus: [] };
}, },
isSuiteEnabled() { isSuiteEnabled(): boolean {
// @ts-ignore // @ts-ignore
return this.suiteSetting?.enabled === true; return this.suiteSetting?.enabled === true;
} }

5
packages/ui/certd-client/src/utils/index.ts
View File

@ -6,6 +6,7 @@ import * as mitt from "./util.mitt";
import { routerUtils } from "./util.router"; import { routerUtils } from "./util.router";
import { treeUtils } from "./util.tree"; import { treeUtils } from "./util.tree";
import { hashUtils } from "./util.hash"; import { hashUtils } from "./util.hash";
import { amountUtils } from "./util.amount";
export const util = { export const util = {
...envs, ...envs,
...sites, ...sites,
@ -14,5 +15,7 @@ export const util = {
...mitt, ...mitt,
router: routerUtils, router: routerUtils,
tree: treeUtils, tree: treeUtils,
hash: hashUtils hash: hashUtils,
amount: amountUtils
}; };
export const utils = util;

9
packages/ui/certd-client/src/utils/util.amount.ts Normal file
View File

@ -0,0 +1,9 @@
export const amountUtils = {
toCent(amount: number): number {
return parseInt((amount * 100).toFixed(0));
},
toYuan(amount: number): number {
return parseFloat((amount / 100).toFixed(2));
}
};

39
packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
View File

@ -4,10 +4,14 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, Edi
import { siteInfoApi } from "./api"; import { siteInfoApi } from "./api";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { notification } from "ant-design-vue"; import { notification } from "ant-design-vue";
import { useSettingStore } from "/@/store/modules/settings";
import { mySuiteApi } from "/@/views/certd/suite/mine/api";
import { mitter } from "/@/utils/util.mitt";
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet { export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const { t } = useI18n(); const { t } = useI18n();
const api = siteInfoApi; const api = siteInfoApi;
const { crudBinding } = crudExpose;
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => { const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
return await api.GetList(query); return await api.GetList(query);
}; };
@ -28,6 +32,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
return res; return res;
}; };
const settingsStore = useSettingStore();
return { return {
crudOptions: { crudOptions: {
request: { request: {
@ -51,6 +57,38 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
width: 600 width: 600
} }
}, },
actionbar: {
buttons: {
add: {
async click() {
if (!settingsStore.isPlus) {
//非plus
if (crudBinding.value.data.length >= 1) {
notification.error({
message: "基础版只能添加一个监控站点，请赞助升级专业版"
});
mitter.emit("openVipModal");
return;
}
}
//检查是否监控站点数量超出限制
if (settingsStore.isComm && settingsStore.suiteSetting.enabled) {
//检查数量是否超限
const suiteDetail = await mySuiteApi.SuiteDetailGet();
const max = suiteDetail.monitorCount.max;
if (max != -1 && max <= suiteDetail.monitorCount.used) {
notification.error({
message: `对不起，您最多只能创建条${max}监控记录，请购买或升级套餐`
});
return;
}
}
await crudExpose.openAdd({});
}
}
}
},
rowHandle: { rowHandle: {
fixed: "right", fixed: "right",
width: 240, width: 240,
@ -111,6 +149,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
form: { form: {
rules: [ rules: [
{ required: true, message: "请输入域名" }, { required: true, message: "请输入域名" },
//@ts-ignore
{ type: "domains", message: "请输入正确的域名" } { type: "domains", message: "请输入正确的域名" }
] ]
}, },

19
packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
View File

@ -15,6 +15,7 @@ import { useModal } from "/@/use/use-modal";
import CertView from "./cert-view.vue"; import CertView from "./cert-view.vue";
import { eachStages } from "./utils"; import { eachStages } from "./utils";
import { createNotificationApi as createNotificationApi } from "../notification/api"; import { createNotificationApi as createNotificationApi } from "../notification/api";
import { mySuiteApi } from "/@/views/certd/suite/mine/api";
export default function ({ crudExpose, context: { certdFormRef, groupDictRef, selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet { export default function ({ crudExpose, context: { certdFormRef, groupDictRef, selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const router = useRouter(); const router = useRouter();
const { t } = useI18n(); const { t } = useI18n();
@ -94,7 +95,23 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
lastResRef.value = res; lastResRef.value = res;
return res; return res;
}; };
function addCertdPipeline() {
const settingsStore = useSettingStore();
async function addCertdPipeline() {
//检查是否流水线数量超出限制
if (settingsStore.isComm && settingsStore.suiteSetting.enabled) {
//检查数量是否超限
const suiteDetail = await mySuiteApi.SuiteDetailGet();
const max = suiteDetail.pipelineCount.max;
if (max != -1 && max <= suiteDetail.pipelineCount.used) {
notification.error({
message: `对不起，您最多只能创建${max}条流水线，请购买或升级套餐`
});
return;
}
}
certdFormRef.value.open(async ({ form }: any) => { certdFormRef.value.open(async ({ form }: any) => {
// 添加certd pipeline // 添加certd pipeline
const triggers = []; const triggers = [];

4
packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<a-drawer v-model:open="stepDrawerVisible" placement="right" :closable="true" width="700px" class="step-form-drawer" :class="{ fullscreen }"> <a-drawer v-model:open="stepDrawerVisible" placement="right" :closable="true" width="760px" class="step-form-drawer" :class="{ fullscreen }">
<template #title> <template #title>
<div> <div>
编辑步骤 编辑步骤
@ -48,7 +48,7 @@
<a-card-meta> <a-card-meta>
<template #title> <template #title>
<fs-icon class="plugin-icon" :icon="item.icon || 'clarity:plugin-line'"></fs-icon> <fs-icon class="plugin-icon" :icon="item.icon || 'clarity:plugin-line'"></fs-icon>
<span class="title">{{ item.title }}</span> <span class="title" :title="item.title">{{ item.title }}</span>
<vip-button v-if="item.needPlus" mode="icon" /> <vip-button v-if="item.needPlus" mode="icon" />
</template> </template>
<template #description> <template #description>

8
packages/ui/certd-client/src/views/certd/suite/api.ts
View File

@ -52,6 +52,14 @@ export async function TradeCreate(form: TradeCreateReq) {
}); });
} }
export async function TradeCreateFree(form: TradeCreateReq) {
return await request({
url: "/suite/trade/createFree",
method: "POST",
data: form
});
}
export async function GetPaymentTypes() { export async function GetPaymentTypes() {
return await request({ return await request({
url: "/suite/trade/payments", url: "/suite/trade/payments",

15
packages/ui/certd-client/src/views/certd/suite/buy.vue
View File

@ -35,6 +35,7 @@ import { ref } from "vue";
import * as api from "./api"; import * as api from "./api";
import ProductInfo from "/@/views/certd/suite/product-info.vue"; import ProductInfo from "/@/views/certd/suite/product-info.vue";
import OrderModal from "/@/views/certd/suite/order-modal.vue"; import OrderModal from "/@/views/certd/suite/order-modal.vue";
import { notification } from "ant-design-vue";
const suites = ref([]); const suites = ref([]);
const addons = ref([]); const addons = ref([]);
@ -48,6 +49,20 @@ async function loadProducts() {
loadProducts(); loadProducts();
const orderModalRef = ref<any>(null); const orderModalRef = ref<any>(null);
async function doOrder(req: any) { async function doOrder(req: any) {
if (req.price === 0) {
//如果是0，直接请求创建订单
await api.TradeCreateFree({
productId: req.productId,
duration: req.duration,
num: 1,
payType: "free"
});
notification.success({
message: "套餐购买成功"
});
return;
}
await orderModalRef.value.open({ await orderModalRef.value.open({
...req ...req
}); });

2
packages/ui/certd-client/src/views/certd/suite/mine/api.ts
View File

@ -16,7 +16,7 @@ export type SuiteDetail = {
monitorCount?: SuiteValue; monitorCount?: SuiteValue;
}; };
export default { export const mySuiteApi = {
async GetList(query: any) { async GetList(query: any) {
return await request({ return await request({
url: apiPrefix + "/page", url: apiPrefix + "/page",

5
packages/ui/certd-client/src/views/certd/suite/mine/crud.tsx
View File

@ -1,10 +1,9 @@
import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud"; import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
import api from "./api"; import { mySuiteApi as api } from "./api";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import SuiteValueEdit from "/@/views/sys/suite/product/suite-value-edit.vue"; import SuiteValueEdit from "/@/views/sys/suite/product/suite-value-edit.vue";
import SuiteValue from "/@/views/sys/suite/product/suite-value.vue"; import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
import DurationValue from "/@/views/sys/suite/product/duration-value.vue"; import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
import dayjs from "dayjs";
import UserSuiteStatus from "/@/views/certd/suite/mine/user-suite-status.vue"; import UserSuiteStatus from "/@/views/certd/suite/mine/user-suite-status.vue";
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet { export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
@ -263,7 +262,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
userSuite: compute(({ row }) => { userSuite: compute(({ row }) => {
return row; return row;
}), }),
currentSuite: context.detail currentSuite: context.currentSuite
}, },
conditionalRender: { conditionalRender: {
match() { match() {

15
packages/ui/certd-client/src/views/certd/suite/mine/index.vue
View File

@ -15,20 +15,27 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { onActivated, onMounted, ref } from "vue"; import { computed, onActivated, onMounted, ref } from "vue";
import { useFs } from "@fast-crud/fast-crud"; import { useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud"; import createCrudOptions from "./crud";
import api, { SuiteDetail } from "/@/views/certd/suite/mine/api"; import { mySuiteApi, SuiteDetail } from "/@/views/certd/suite/mine/api";
import SuiteCard from "/@/views/framework/home/dashboard/suite-card.vue"; import SuiteCard from "/@/views/framework/home/dashboard/suite-card.vue";
defineOptions({ defineOptions({
name: "MySuites" name: "MySuites"
}); });
const detail = ref<SuiteDetail>({}); const detail = ref<SuiteDetail>({});
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { detail } }); const currentSuite = computed(() => {
if (detail.value?.suites && detail.value.suites.length > 0) {
return detail.value.suites[0];
}
return null;
});
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { detail, currentSuite } });
async function loadSuiteDetail() { async function loadSuiteDetail() {
detail.value = await api.SuiteDetailGet(); detail.value = await mySuiteApi.SuiteDetailGet();
} }
// 页面打开后获取列表数据 // 页面打开后获取列表数据

2
packages/ui/certd-client/src/views/certd/suite/product-info.vue
View File

@ -80,7 +80,7 @@ const productTypeDictRef = dict({
const emit = defineEmits(["order"]); const emit = defineEmits(["order"]);
async function doOrder() { async function doOrder() {
emit("order", { product: props.product, productId: props.product.id, duration: selected.value.duration }); emit("order", { product: props.product, productId: props.product.id, duration: selected.value.duration, price: selected.value.price });
} }
</script> </script>

9
packages/ui/certd-client/src/views/certd/trade/crud.tsx
View File

@ -162,7 +162,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
] ]
}), }),
column: { column: {
width: 100 width: 100,
align: "center"
} }
}, },
payType: { payType: {
@ -173,14 +174,16 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
data: [ data: [
{ label: "聚合支付", value: "yizhifu" }, { label: "聚合支付", value: "yizhifu" },
{ label: "支付宝", value: "alipay" }, { label: "支付宝", value: "alipay" },
{ label: "微信", value: "wxpay" } { label: "微信", value: "wxpay" },
{ label: "免费", value: "free" }
] ]
}), }),
column: { column: {
width: 100, width: 100,
component: { component: {
color: "auto" color: "auto"
} },
align: "center"
} }
}, },
payTime: { payTime: {

8
packages/ui/certd-client/src/views/framework/home/dashboard/suite-card.vue
View File

@ -36,8 +36,8 @@
</span> </span>
<span>(<expires-time-text :value="item.expiresTime" />)</span> <span>(<expires-time-text :value="item.expiresTime" />)</span>
</a-tag> </a-tag>
<div class="flex-o ml-5"> <div v-if="detail.suites?.length === 0" class="flex-o ml-5">
暂无套餐 <a-button v-if="detail.suites?.length === 0" class="ml-5" type="primary" size="small" @click="goBuy">去购买</a-button> 暂无套餐 <a-button class="ml-5" type="primary" size="small" @click="goBuy">去购买</a-button>
</div> </div>
</div> </div>
</a-popover> </a-popover>
@ -49,7 +49,7 @@
import SuiteValue from "/@/views/sys/suite/product/suite-value.vue"; import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
import { ref } from "vue"; import { ref } from "vue";
import ExpiresTimeText from "/@/components/expires-time-text.vue"; import ExpiresTimeText from "/@/components/expires-time-text.vue";
import api, { SuiteDetail } from "/@/views/certd/suite/mine/api"; import { mySuiteApi, SuiteDetail } from "/@/views/certd/suite/mine/api";
import { FsIcon } from "@fast-crud/fast-crud"; import { FsIcon } from "@fast-crud/fast-crud";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
@ -60,7 +60,7 @@ defineOptions({
const detail = ref<SuiteDetail>({}); const detail = ref<SuiteDetail>({});
async function loadSuiteDetail() { async function loadSuiteDetail() {
detail.value = await api.SuiteDetailGet(); detail.value = await mySuiteApi.SuiteDetailGet();
} }
loadSuiteDetail(); loadSuiteDetail();

5
packages/ui/certd-client/src/views/framework/register/index.vue
View File

@ -166,6 +166,11 @@ export default defineComponent({
{ {
required: true, required: true,
message: "请输入图片验证码" message: "请输入图片验证码"
},
{
min: 4,
max: 4,
message: "请输入4位图片验证码"
} }
], ],
smsCode: [ smsCode: [

8
packages/ui/certd-client/src/views/sys/suite/product/price-input.vue
View File

@ -7,7 +7,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed } from "vue"; import { computed } from "vue";
import { utils } from "/@/utils";
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
modelValue?: number; modelValue?: number;
@ -34,11 +34,11 @@ const priceValue = computed(() => {
if (props.modelValue == null) { if (props.modelValue == null) {
return 0; return 0;
} }
return (props.modelValue / 100.0).toFixed(2); return utils.amount.toYuan(props.modelValue);
}); });
const priceLabel = computed(() => { const priceLabel = computed(() => {
if (priceValue.value === 0 || priceValue.value === "0.00") { if (priceValue.value === 0) {
return "免费"; return "免费";
} }
return `¥${priceValue.value}`; return `¥${priceValue.value}`;
@ -47,7 +47,7 @@ const priceLabel = computed(() => {
const emit = defineEmits(["update:modelValue"]); const emit = defineEmits(["update:modelValue"]);
const onPriceChange = (price: number) => { const onPriceChange = (price: number) => {
emit("update:modelValue", price * 100); emit("update:modelValue", utils.amount.toCent(price));
}; };
</script> </script>

1
packages/ui/certd-client/src/views/sys/suite/setting/index.vue
View File

@ -17,6 +17,7 @@
<div style="height: 400px"> <div style="height: 400px">
<ProductManager @refreshed="onTableRefresh"></ProductManager> <ProductManager @refreshed="onTableRefresh"></ProductManager>
</div> </div>
<div class="helper">不建议设置免费套餐，可以在下方配置注册赠送套餐，或者在用户套餐管理中手动赠送套餐</div>
</a-form-item> </a-form-item>
<a-form-item label="注册赠送套餐" name="registerGift"> <a-form-item label="注册赠送套餐" name="registerGift">

4
packages/ui/certd-client/src/views/sys/suite/setting/suite-duration-selector.vue
View File

@ -7,6 +7,10 @@ import { ref, watch } from "vue";
import { dict } from "@fast-crud/fast-crud"; import { dict } from "@fast-crud/fast-crud";
import { request } from "/@/api/service"; import { request } from "/@/api/service";
defineOptions({
name: "SuiteDurationSelector"
});
const props = defineProps<{ const props = defineProps<{
modelValue?: { modelValue?: {
productId?: number; productId?: number;

12
packages/ui/certd-client/src/views/sys/suite/trade/crud.tsx
View File

@ -155,7 +155,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
component: { component: {
name: DurationValue, name: DurationValue,
vModel: "modelValue" vModel: "modelValue"
} },
align: "center"
} }
}, },
amount: { amount: {
@ -182,7 +183,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
] ]
}), }),
column: { column: {
width: 100 width: 100,
align: "center"
} }
}, },
payType: { payType: {
@ -193,14 +195,16 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
data: [ data: [
{ label: "聚合支付", value: "yizhifu" }, { label: "聚合支付", value: "yizhifu" },
{ label: "支付宝", value: "alipay" }, { label: "支付宝", value: "alipay" },
{ label: "微信", value: "wxpay" } { label: "微信", value: "wxpay" },
{ label: "免费", value: "free" }
] ]
}), }),
column: { column: {
width: 100, width: 100,
component: { component: {
color: "auto" color: "auto"
} },
align: "center"
} }
}, },
payTime: { payTime: {

113
packages/ui/certd-client/src/views/sys/suite/user-suite/api.ts
View File

@ -1,62 +1,65 @@
import { request } from "/src/api/service"; import { request } from "/src/api/service";
export function createApi() { const apiPrefix = "/sys/suite/user-suite";
const apiPrefix = "/sys/suite/user-suite"; export const sysUserSuiteApi = {
return { async GetList(query: any) {
async GetList(query: any) { return await request({
return await request({ url: apiPrefix + "/page",
url: apiPrefix + "/page", method: "post",
method: "post", data: query
data: query });
}); },
},
async AddObj(obj: any) { async AddObj(obj: any) {
return await request({ return await request({
url: apiPrefix + "/add", url: apiPrefix + "/add",
method: "post", method: "post",
data: obj data: obj
}); });
}, },
async UpdateObj(obj: any) { async UpdateObj(obj: any) {
return await request({ return await request({
url: apiPrefix + "/update", url: apiPrefix + "/update",
method: "post", method: "post",
data: obj data: obj
}); });
}, },
async DelObj(id: number) { async DelObj(id: number) {
return await request({ return await request({
url: apiPrefix + "/delete", url: apiPrefix + "/delete",
method: "post", method: "post",
params: { id } params: { id }
}); });
}, },
async GetObj(id: number) { async GetObj(id: number) {
return await request({ return await request({
url: apiPrefix + "/info", url: apiPrefix + "/info",
method: "post", method: "post",
params: { id } params: { id }
}); });
}, },
async ListAll() { async ListAll() {
return await request({ return await request({
url: apiPrefix + "/all", url: apiPrefix + "/all",
method: "post" method: "post"
}); });
}, },
async GetSimpleUserByIds(ids: number[]) { async GetSimpleUserByIds(ids: number[]) {
return await request({ return await request({
url: "/sys/authority/user/getSimpleUserByIds", url: "/sys/authority/user/getSimpleUserByIds",
method: "post", method: "post",
data: { ids } data: { ids }
}); });
} },
}; async PresentSuite(form: any) {
} return await request({
url: apiPrefix + "/presentSuite",
export const pipelineGroupApi = createApi(); method: "post",
data: form
});
}
};

70
packages/ui/certd-client/src/views/sys/suite/user-suite/crud.tsx
View File

@ -1,15 +1,14 @@
import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud"; import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
import { pipelineGroupApi } from "./api"; import { sysUserSuiteApi } from "./api";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import SuiteValueEdit from "/@/views/sys/suite/product/suite-value-edit.vue"; import SuiteValueEdit from "/@/views/sys/suite/product/suite-value-edit.vue";
import SuiteValue from "/@/views/sys/suite/product/suite-value.vue"; import SuiteValue from "/@/views/sys/suite/product/suite-value.vue";
import DurationValue from "/@/views/sys/suite/product/duration-value.vue"; import DurationValue from "/@/views/sys/suite/product/duration-value.vue";
import dayjs from "dayjs";
import createCrudOptionsUser from "/@/views/sys/authority/user/crud"; import createCrudOptionsUser from "/@/views/sys/authority/user/crud";
import UserSuiteStatus from "/@/views/certd/suite/mine/user-suite-status.vue"; import UserSuiteStatus from "/@/views/certd/suite/mine/user-suite-status.vue";
import SuiteDurationSelector from "../setting/suite-duration-selector.vue";
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet { export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const api = pipelineGroupApi; const api = sysUserSuiteApi;
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => { const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
return await api.GetList(query); return await api.GetList(query);
}; };
@ -26,7 +25,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
const addRequest = async (req: AddReq) => { const addRequest = async (req: AddReq) => {
const { form } = req; const { form } = req;
const res = await api.AddObj(form); const res = await api.PresentSuite(form);
return res; return res;
}; };
@ -57,16 +56,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
}, },
actionbar: { actionbar: {
buttons: { buttons: {
add: { show: false } add: { text: "赠送套餐" }
// buy: {
// text: "购买",
// type: "primary",
// click() {
// router.push({
// path: "/certd/suite/buy"
// });
// }
// }
} }
}, },
toolbar: { show: false }, toolbar: { show: false },
@ -112,7 +102,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
show: true show: true
}, },
form: { form: {
rules: [{ required: true, message: "此项必填" }] show: false
}, },
column: { column: {
width: 200 width: 200
@ -143,6 +133,37 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
} }
} }
}, },
//赠送
presentSuiteId: {
title: "赠送套餐",
type: "dict-select",
column: { show: false },
addForm: {
show: true,
component: {
name: SuiteDurationSelector,
vModel: "modelValue"
},
rules: [
{
validator: async (rule, value) => {
if (value && value.productId) {
return true;
}
throw new Error("请选择套餐");
}
}
]
},
valueResolve({ form, value }) {
debugger;
if (value && value.productId) {
form.productId = value.productId;
form.duration = value.duration;
}
},
form: { show: false }
},
productType: { productType: {
title: "类型", title: "类型",
type: "dict-select", type: "dict-select",
@ -158,7 +179,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
] ]
}), }),
form: { form: {
rules: [{ required: true, message: "此项必填" }] show: false
}, },
column: { column: {
width: 80, width: 80,
@ -179,6 +200,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
title: "域名数量", title: "域名数量",
type: "text", type: "text",
form: { form: {
show: false,
key: ["content", "maxDomainCount"], key: ["content", "maxDomainCount"],
component: { component: {
name: SuiteValueEdit, name: SuiteValueEdit,
@ -201,6 +223,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
title: "流水线数量", title: "流水线数量",
type: "text", type: "text",
form: { form: {
show: false,
key: ["content", "maxPipelineCount"], key: ["content", "maxPipelineCount"],
component: { component: {
name: SuiteValueEdit, name: SuiteValueEdit,
@ -223,6 +246,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
title: "部署次数", title: "部署次数",
type: "text", type: "text",
form: { form: {
show: false,
key: ["content", "maxDeployCount"], key: ["content", "maxDeployCount"],
component: { component: {
name: SuiteValueEdit, name: SuiteValueEdit,
@ -248,6 +272,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
title: "证书监控数量", title: "证书监控数量",
type: "text", type: "text",
form: { form: {
show: false,
key: ["content", "maxMonitorCount"], key: ["content", "maxMonitorCount"],
component: { component: {
name: SuiteValueEdit, name: SuiteValueEdit,
@ -269,7 +294,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
duration: { duration: {
title: "时长", title: "时长",
type: "text", type: "text",
form: {}, form: { show: false },
column: { column: {
component: { component: {
name: DurationValue, name: DurationValue,
@ -304,11 +329,17 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
type: "date", type: "date",
column: { column: {
width: 150 width: 150
},
form: {
show: false
} }
}, },
expiresTime: { expiresTime: {
title: "过期时间", title: "过期时间",
type: "date", type: "date",
form: {
show: false
},
column: { column: {
width: 150, width: 150,
component: { component: {
@ -328,7 +359,8 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
] ]
}), }),
form: { form: {
value: true value: true,
show: false
}, },
column: { column: {
width: 100, width: 100,

4
packages/ui/certd-client/src/views/sys/suite/user-suite/index.vue
View File

@ -11,10 +11,10 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { defineComponent, onActivated, onMounted } from "vue"; import { onActivated, onMounted } from "vue";
import { useFs } from "@fast-crud/fast-crud"; import { useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud"; import createCrudOptions from "./crud";
import { createApi } from "./api";
defineOptions({ defineOptions({
name: "UserSuites" name: "UserSuites"
}); });

7
packages/ui/certd-server/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.29.1](https://github.com/certd/certd/compare/v1.29.0...v1.29.1) (2024-12-25)
### Performance Improvements
* 用户创建证书流水线没有购买套餐或者超限时提前报错 ([472f06c](https://github.com/certd/certd/commit/472f06c2d190d0ae48e8b53c18bc278437656a1c))
* 优化插件名称显示 ([26adf7d](https://github.com/certd/certd/commit/26adf7d437e674385f26a8f92fded6521a620671))
# [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24) # [1.29.0](https://github.com/certd/certd/compare/v1.28.4...v1.29.0) (2024-12-24)
### Bug Fixes ### Bug Fixes

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

@ -1,6 +1,6 @@
{ {
"name": "@certd/ui-server", "name": "@certd/ui-server",
"version": "1.29.0", "version": "1.29.1",
"description": "fast-server base midway", "description": "fast-server base midway",
"private": true, "private": true,
"type": "module", "type": "module",
@ -34,18 +34,18 @@
"@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.29.0", "@certd/acme-client": "^1.29.1",
"@certd/basic": "^1.29.0", "@certd/basic": "^1.29.1",
"@certd/commercial-core": "^1.29.0", "@certd/commercial-core": "^1.29.1",
"@certd/lib-huawei": "^1.29.0", "@certd/lib-huawei": "^1.29.1",
"@certd/lib-k8s": "^1.29.0", "@certd/lib-k8s": "^1.29.1",
"@certd/lib-server": "^1.29.0", "@certd/lib-server": "^1.29.1",
"@certd/midway-flyway-js": "^1.29.0", "@certd/midway-flyway-js": "^1.29.1",
"@certd/pipeline": "^1.29.0", "@certd/pipeline": "^1.29.1",
"@certd/plugin-cert": "^1.29.0", "@certd/plugin-cert": "^1.29.1",
"@certd/plugin-lib": "^1.29.0", "@certd/plugin-lib": "^1.29.1",
"@certd/plugin-plus": "^1.29.0", "@certd/plugin-plus": "^1.29.1",
"@certd/plus-core": "^1.29.0", "@certd/plus-core": "^1.29.1",
"@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",
"@koa/cors": "^5.0.0", "@koa/cors": "^5.0.0",

10
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 { IWebMiddleware, IMidwayKoaContext, NextFunction } from '@midwayjs/koa'; import { IMidwayKoaContext, IWebMiddleware, NextFunction } from '@midwayjs/koa';
import { logger } from '@certd/basic'; import { logger } from '@certd/basic';
import { BaseException, Result } from '@certd/lib-server'; import { Result } from '@certd/lib-server';
@Provide() @Provide()
export class GlobalExceptionMiddleware implements IWebMiddleware { export class GlobalExceptionMiddleware implements IWebMiddleware {
@ -14,11 +14,7 @@ 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) {
logger.error('请求异常:', url, Date.now() - startTime + 'ms', err.message); logger.error('请求异常:', url, Date.now() - startTime + 'ms', err);
if (!(err instanceof BaseException)) {
logger.error(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;

2
packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts
View File

@ -4,7 +4,7 @@ import { optionsUtils } from '@certd/basic/dist/utils/util.options.js';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToAliyunCDN', name: 'DeployCertToAliyunCDN',
title: '部署证书至阿里云CDN', title: '阿里云-部署证书至CDN',
icon: 'ant-design:aliyun-outlined', icon: 'ant-design:aliyun-outlined',
group: pluginGroups.aliyun.key, group: pluginGroups.aliyun.key,
desc: '自动部署域名证书至阿里云CDN', desc: '自动部署域名证书至阿里云CDN',

2
packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts
View File

@ -5,7 +5,7 @@ import { CertInfo } from '@certd/plugin-cert';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToAliyunDCDN', name: 'DeployCertToAliyunDCDN',
title: '部署证书至阿里云DCDN', title: '阿里云-部署证书至DCDN',
icon: 'ant-design:aliyun-outlined', icon: 'ant-design:aliyun-outlined',
group: pluginGroups.aliyun.key, group: pluginGroups.aliyun.key,
desc: '依赖证书申请前置任务，自动部署域名证书至阿里云DCDN', desc: '依赖证书申请前置任务，自动部署域名证书至阿里云DCDN',

2
packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-oss/index.ts
View File

@ -3,7 +3,7 @@ import { AliyunAccess } from '@certd/plugin-lib';
import { CertInfo } from '@certd/plugin-cert'; import { CertInfo } from '@certd/plugin-cert';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToAliyunOSS', name: 'DeployCertToAliyunOSS',
title: '部署证书至阿里云OSS', title: '阿里云-部署证书至OSS',
icon: 'ant-design:aliyun-outlined', icon: 'ant-design:aliyun-outlined',
group: pluginGroups.aliyun.key, group: pluginGroups.aliyun.key,
desc: '自动部署域名证书至阿里云OSS', desc: '自动部署域名证书至阿里云OSS',

2
packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts
View File

@ -5,7 +5,7 @@ import { AbstractPlusTaskPlugin } from '@certd/plugin-plus';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'AliyunDeployCertToWaf', name: 'AliyunDeployCertToWaf',
title: '部署至阿里云WAF', title: '阿里云-部署至阿里云WAF',
icon: 'ant-design:aliyun-outlined', icon: 'ant-design:aliyun-outlined',
group: pluginGroups.aliyun.key, group: pluginGroups.aliyun.key,
desc: '部署证书到阿里云WAF', desc: '部署证书到阿里云WAF',

2
packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts
View File

@ -23,7 +23,7 @@ const regionDict = [
@IsTaskPlugin({ @IsTaskPlugin({
name: 'uploadCertToAliyun', name: 'uploadCertToAliyun',
title: '上传证书到阿里云', title: '阿里云-上传证书到阿里云',
icon: 'ant-design:aliyun-outlined', icon: 'ant-design:aliyun-outlined',
group: pluginGroups.aliyun.key, group: pluginGroups.aliyun.key,
desc: '如果不想在阿里云上同一份证书上传多次，可以把此任务作为前置任务，其他阿里云任务证书那一项选择此任务的输出', desc: '如果不想在阿里云上同一份证书上传多次，可以把此任务作为前置任务，其他阿里云任务证书那一项选择此任务的输出',

2
packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-deploy-to-cloudfront.ts
View File

@ -8,7 +8,7 @@ import { AbstractPlusTaskPlugin } from '@certd/plugin-plus';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'AwsDeployToCloudFront', name: 'AwsDeployToCloudFront',
title: '部署证书到 AWS CloudFront', title: 'AWS-部署证书到CloudFront',
desc: '部署证书到 AWS CloudFront', desc: '部署证书到 AWS CloudFront',
icon: 'clarity:plugin-line', icon: 'clarity:plugin-line',
group: pluginGroups.aws.key, group: pluginGroups.aws.key,

2
packages/ui/certd-server/src/plugins/plugin-aws/plugins/plugin-upload-to-acm.ts
View File

@ -5,7 +5,7 @@ import { AwsAcmClient } from '../libs/aws-acm-client.js';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'AwsUploadToACM', name: 'AwsUploadToACM',
title: '上传证书 AWS ACM', title: 'AWS-上传证书到ACM',
desc: '上传证书 AWS ACM', desc: '上传证书 AWS ACM',
icon: 'clarity:plugin-line', icon: 'clarity:plugin-line',
group: pluginGroups.aws.key, group: pluginGroups.aws.key,

2
packages/ui/certd-server/src/plugins/plugin-cachefly/plugins/plugin-deploy-to-cdn.ts
View File

@ -4,7 +4,7 @@ import { CacheflyAccess } from '../access.js';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'CacheFly', name: 'CacheFly',
title: '部署证书到 CacheFly', title: 'CacheFly-部署证书到CacheFly',
desc: '部署证书到 CacheFly', desc: '部署证书到 CacheFly',
icon: 'clarity:plugin-line', icon: 'clarity:plugin-line',
group: pluginGroups.cdn.key, group: pluginGroups.cdn.key,

2
packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts
View File

@ -6,7 +6,7 @@ import { optionsUtils } from '@certd/basic/dist/utils/util.options.js';
@IsTaskPlugin({ @IsTaskPlugin({
//命名规范，插件名称+功能（就是目录plugin-demo中的demo），大写字母开头，驼峰命名 //命名规范，插件名称+功能（就是目录plugin-demo中的demo），大写字母开头，驼峰命名
name: 'DemoTest', name: 'DemoTest',
title: 'Demo测试插件', title: 'Demo-测试插件',
icon: 'clarity:plugin-line', icon: 'clarity:plugin-line',
//插件分组 //插件分组
group: pluginGroups.other.key, group: pluginGroups.other.key,

2
packages/ui/certd-server/src/plugins/plugin-doge/plugins/deploy-to-cdn/index.ts
View File

@ -5,7 +5,7 @@ import dayjs from 'dayjs';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DogeCloudDeployToCDN', name: 'DogeCloudDeployToCDN',
title: '部署证书到多吉云CDN', title: '多吉云-部署到多吉云CDN',
icon: 'svg:icon-dogecloud', icon: 'svg:icon-dogecloud',
group: pluginGroups.cdn.key, group: pluginGroups.cdn.key,
default: { default: {

2
packages/ui/certd-server/src/plugins/plugin-gcore/plugins/plugin-flush.ts
View File

@ -4,7 +4,7 @@ import { GcoreAccess } from '../access.js';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'Gcoreflush', name: 'Gcoreflush',
title: '刷新证书 Gcore', title: 'Gcore-刷新Gcore证书',
desc: '刷新现有的证书', desc: '刷新现有的证书',
icon: 'clarity:plugin-line', icon: 'clarity:plugin-line',
group: pluginGroups.cdn.key, group: pluginGroups.cdn.key,

2
packages/ui/certd-server/src/plugins/plugin-gcore/plugins/plugin-upload.ts
View File

@ -4,7 +4,7 @@ import { GcoreAccess } from '../access.js';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'Gcoreupload', name: 'Gcoreupload',
title: '部署证书到 Gcore', title: 'Gcore-部署证书到Gcore',
desc: '仅上传 并不会部署到cdn', desc: '仅上传 并不会部署到cdn',
icon: 'clarity:plugin-line', icon: 'clarity:plugin-line',
group: pluginGroups.cdn.key, group: pluginGroups.cdn.key,

2
packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts
View File

@ -6,7 +6,7 @@ import path from 'path';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'CopyToLocal', name: 'CopyToLocal',
title: '复制到本机', title: '主机-复制到本机',
icon: 'solar:copy-bold-duotone', icon: 'solar:copy-bold-duotone',
desc: '【仅管理员使用】实际上是复制证书到docker容器内的某个路径，需要做目录映射到宿主机', desc: '【仅管理员使用】实际上是复制证书到docker容器内的某个路径，需要做目录映射到宿主机',
group: pluginGroups.host.key, group: pluginGroups.host.key,

2
packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts
View File

@ -3,7 +3,7 @@ import { SshClient } from '@certd/plugin-lib';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'hostShellExecute', name: 'hostShellExecute',
title: '执行远程主机脚本命令', title: '主机-执行远程主机脚本命令',
icon: 'tabler:brand-powershell', icon: 'tabler:brand-powershell',
group: pluginGroups.host.key, group: pluginGroups.host.key,
desc: '可以执行重启nginx等操作让证书生效', desc: '可以执行重启nginx等操作让证书生效',

2
packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts
View File

@ -6,7 +6,7 @@ import { SshAccess, SshClient } from '@certd/plugin-lib';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'uploadCertToHost', name: 'uploadCertToHost',
title: '部署证书到主机', title: '主机-部署证书到主机',
icon: 'line-md:uploading-loop', icon: 'line-md:uploading-loop',
group: pluginGroups.host.key, group: pluginGroups.host.key,
desc: '上传证书到主机，然后执行部署脚本命令', desc: '上传证书到主机，然后执行部署脚本命令',

2
packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-cdn/index.ts
View File

@ -6,7 +6,7 @@ import { resetLogConfigure } from '@certd/basic';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'HauweiDeployCertToCDN', name: 'HauweiDeployCertToCDN',
title: '部署证书至华为云CDN', title: '华为云-部署证书至CDN',
icon: 'svg:icon-huawei', icon: 'svg:icon-huawei',
group: pluginGroups.huawei.key, group: pluginGroups.huawei.key,
desc: '', desc: '',

20
packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts
View File

@ -30,6 +30,19 @@ export class QywxNotification extends BaseNotification {
}) })
mentionedList!: string[]; mentionedList!: string[];
@NotificationInput({
title: '提醒指定手机号成员',
component: {
name: 'a-select',
vModel: 'value',
mode: 'tags',
open: false,
},
required: false,
helper: '填写成员手机号，@all 为提醒所有人',
})
mentionedMobileList!: string[];
async send(body: NotificationBody) { async send(body: NotificationBody) {
if (!this.webhook) { if (!this.webhook) {
throw new Error('webhook地址不能为空'); throw new Error('webhook地址不能为空');
@ -47,10 +60,11 @@ export class QywxNotification extends BaseNotification {
url: this.webhook, url: this.webhook,
method: 'POST', method: 'POST',
data: { data: {
msgtype: 'markdown', msgtype: 'text',
markdown: { text: {
content: `# ${body.title}\n\n${body.content}\n\n[查看详情](${body.url})`, content: `· ${body.title}\n· ${body.content}\n· 查看详情: ${body.url}`,
mentioned_list: this.mentionedList, mentioned_list: this.mentionedList,
mentioned_mobile_list: this.mentionedMobileList,
}, },
}, },
}); });

2
packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/deploy-to-cdn/index.ts
View File

@ -6,7 +6,7 @@ import { QiniuAccess, QiniuClient } from '@certd/plugin-plus';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'QiniuDeployCertToCDN', name: 'QiniuDeployCertToCDN',
title: '部署证书至七牛云CDN', title: '七牛云-部署证书至CDN',
icon: 'svg:icon-qiniuyun', icon: 'svg:icon-qiniuyun',
group: pluginGroups.qiniu.key, group: pluginGroups.qiniu.key,
desc: '自动部署域名证书至七牛云CDN', desc: '自动部署域名证书至七牛云CDN',

2
packages/ui/certd-server/src/plugins/plugin-qiniu/plugin/upload-cert/index.ts
View File

@ -4,7 +4,7 @@ import { CertInfo } from '@certd/plugin-cert';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'QiniuCertUpload', name: 'QiniuCertUpload',
title: '上传到七牛云', title: '七牛云-上传证书到七牛云',
icon: 'svg:icon-qiniuyun', icon: 'svg:icon-qiniuyun',
group: pluginGroups.qiniu.key, group: pluginGroups.qiniu.key,
desc: '上传到七牛云', desc: '上传到七牛云',

2
packages/ui/certd-server/src/plugins/plugin-qnap/plugins/plugin-qnap.ts
View File

@ -7,7 +7,7 @@ import { SshAccess, SshClient } from '@certd/plugin-lib';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'QnapDeploy', name: 'QnapDeploy',
title: '部署证书到威联通', title: '威联通-部署证书到威联通',
icon: 'simple-icons:qnap', icon: 'simple-icons:qnap',
group: pluginGroups.panel.key, group: pluginGroups.panel.key,
desc: '部署证书到qnap', desc: '部署证书到qnap',

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/delete-expiring-cert/index.ts
View File

@ -6,7 +6,7 @@ import { remove } from 'lodash-es';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'TencentDeleteExpiringCert', name: 'TencentDeleteExpiringCert',
title: '删除腾讯云即将过期证书', title: '腾讯云-删除即将过期证书',
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,
desc: '仅删除未使用的证书', desc: '仅删除未使用的证书',

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-all/index.ts
View File

@ -3,7 +3,7 @@ import { AbstractPlusTaskPlugin } from '@certd/plugin-plus';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToTencentAll', name: 'DeployCertToTencentAll',
title: '部署证书到腾讯云任意云资源', title: '腾讯云-部署证书到任意云资源',
needPlus: true, needPlus: true,
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn-v2/index.ts
View File

@ -6,7 +6,7 @@ import { createRemoteSelectInputDefine } from '@certd/plugin-lib';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'TencentDeployCertToCDNv2', name: 'TencentDeployCertToCDNv2',
title: '部署到腾讯云CDN-v2', title: '腾讯云-部署到CDN-v2',
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,
desc: '推荐使用', desc: '推荐使用',

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts
View File

@ -4,7 +4,7 @@ import { CertInfo } from '@certd/plugin-cert';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToTencentCDN', name: 'DeployCertToTencentCDN',
title: '部署到腾讯云CDN', title: '腾讯云-部署到CDN（废弃）',
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,
desc: '已废弃，请使用v2版', desc: '已废弃，请使用v2版',

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts
View File

@ -4,7 +4,7 @@ import dayjs from 'dayjs';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToTencentCLB', name: 'DeployCertToTencentCLB',
title: '部署到腾讯云CLB', title: '腾讯云-部署到CLB',
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,
desc: '暂时只支持单向认证证书，暂时只支持通用负载均衡，必须开启sni', desc: '暂时只支持单向认证证书，暂时只支持通用负载均衡，必须开启sni',

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cos/index.ts
View File

@ -5,7 +5,7 @@ import { TencentSslClient } from '../../lib/index.js';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToTencentCosPlugin', name: 'DeployCertToTencentCosPlugin',
title: '部署证书到腾讯云COS', title: '腾讯云-部署证书到COS',
needPlus: false, needPlus: false,
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-eo/index.ts
View File

@ -3,7 +3,7 @@ import { TencentAccess } from '@certd/plugin-plus';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToTencentEO', name: 'DeployCertToTencentEO',
title: '部署到腾讯云EO', title: '腾讯云-部署到腾讯云EO',
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
desc: '腾讯云边缘安全加速平台EO，必须配置上传证书到腾讯云任务', desc: '腾讯云边缘安全加速平台EO，必须配置上传证书到腾讯云任务',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts
View File

@ -6,7 +6,7 @@ import { AbstractPlusTaskPlugin } from '@certd/plugin-plus';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'DeployCertToTencentTKEIngress', name: 'DeployCertToTencentTKEIngress',
title: '部署到腾讯云TKE-ingress', title: '腾讯云-部署到TKE-ingress',
needPlus: true, needPlus: true,
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/start-instances/index.ts
View File

@ -5,7 +5,7 @@ import { createRemoteSelectInputDefine } from '@certd/plugin-lib';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'TencentActionInstancesPlugin', name: 'TencentActionInstancesPlugin',
title: '腾讯云实例开关机', title: '腾讯云-实例开关机',
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,
desc: '腾讯云实例开关机', desc: '腾讯云实例开关机',

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/upload-to-tencent/index.ts
View File

@ -3,7 +3,7 @@ import dayjs from 'dayjs';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'UploadCertToTencent', name: 'UploadCertToTencent',
title: '上传证书到腾讯云', title: '腾讯云-上传证书到腾讯云',
icon: 'svg:icon-tencentcloud', icon: 'svg:icon-tencentcloud',
desc: '上传成功后输出：tencentCertId', desc: '上传成功后输出：tencentCertId',
group: pluginGroups.tencent.key, group: pluginGroups.tencent.key,

2
packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts
View File

@ -4,7 +4,7 @@ import { WoaiAccess } from '../access.js';
@IsTaskPlugin({ @IsTaskPlugin({
name: 'WoaiCDN', name: 'WoaiCDN',
title: '部署证书到我爱云 CDN', title: '我爱云-部署证书到我爱云CDN',
desc: '部署证书到我爱云CDN', desc: '部署证书到我爱云CDN',
icon: 'clarity:plugin-line', icon: 'clarity:plugin-line',
group: pluginGroups.cdn.key, group: pluginGroups.cdn.key,