Merge branch 'v2-dev' into v2

pull/409/head
xiaojunnuo 2025-05-20 01:42:12 +08:00
commit cff7baaaad
40 changed files with 313 additions and 117 deletions

View File

@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
### Performance Improvements
* 1panel增加授权测试按钮 ([566b12f](https://github.com/certd/certd/commit/566b12f5d14ce10e8f5cf1807c58f7bf27f0d199))
* 优化钉钉通知标题颜色 ([a560999](https://github.com/certd/certd/commit/a560999d13eed18d08dd32ee530166569e3f8746))
* 优化飞书通知为卡片模式 ([a818a3d](https://github.com/certd/certd/commit/a818a3d293e22fb46979bc77055c05621a6fed81))
* 支持部署到宝塔aaWAF ([094565c](https://github.com/certd/certd/commit/094565ccd619ef671c6c11ce5fb7fd54a7a21d1c))
* aaWaf、cdnfly站点选择支持查询 ([8af3463](https://github.com/certd/certd/commit/8af3463668a40b9b99febb02e3b4e0d9d8d719b4))
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
### Bug Fixes

View File

@ -1 +1 @@
00:05
01:40

View File

@ -91,14 +91,14 @@ export default defineConfig({
{text: "多数据库支持", link: "/guide/install/database.md"},
{text: "开放接口", link: "/guide/open/index.md"},
{
text: "站点安全", link: "/guide/feature/safe"
text: "站点安全", link: "/guide/feature/safe/"
},
{
text: "插件列表", items: [
{text: "授权提供商", link: "/guide/plugins/access"},
{text: "DNS提供商", link: "/guide/plugins/dns-provider"},
{text: "任务插件", link: "/guide/plugins/deploy"},
{text: "通知插件", link: "/guide/plugins/notification"},
{text: "授权提供商", link: "/guide/plugins/access.md"},
{text: "DNS提供商", link: "/guide/plugins/dns-provider.md"},
{text: "任务插件", link: "/guide/plugins/deploy.md"},
{text: "通知插件", link: "/guide/plugins/notification.md"},
]
},
]
@ -106,7 +106,7 @@ export default defineConfig({
{
text: "常见问题",
items: [
{text: "QA", link: "/guide/qa/use"},
{text: "QA", link: "/guide/qa/use.md"},
{text: "常见报错处理", link: "/guide/qa/"},
{text: "群晖证书部署", link: "/guide/use/synology/"},
{text: "腾讯云密钥获取", link: "/guide/use/tencent/"},
@ -139,7 +139,6 @@ export default defineConfig({
{text: "捐赠", link: "/guide/donate/"},
{text: "开源协议", link: "/guide/license/"},
{text: "我的其他开源项目", link: "/guide/link/"},
]
}
],

View File

@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
### Performance Improvements
* 1panel增加授权测试按钮 ([566b12f](https://github.com/certd/certd/commit/566b12f5d14ce10e8f5cf1807c58f7bf27f0d199))
* 优化钉钉通知标题颜色 ([a560999](https://github.com/certd/certd/commit/a560999d13eed18d08dd32ee530166569e3f8746))
* 优化飞书通知为卡片模式 ([a818a3d](https://github.com/certd/certd/commit/a818a3d293e22fb46979bc77055c05621a6fed81))
* 支持部署到宝塔aaWAF ([094565c](https://github.com/certd/certd/commit/094565ccd619ef671c6c11ce5fb7fd54a7a21d1c))
* aaWaf、cdnfly站点选择支持查询 ([8af3463](https://github.com/certd/certd/commit/8af3463668a40b9b99febb02e3b4e0d9d8d719b4))
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
### Bug Fixes

View File

@ -9,5 +9,5 @@
}
},
"npmClient": "pnpm",
"version": "1.34.4"
"version": "1.34.5"
}

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/publishlab/node-acme-client/compare/v1.34.4...v1.34.5) (2025-05-19)
**Note:** Version bump only for package @certd/acme-client
## [1.34.4](https://github.com/publishlab/node-acme-client/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/acme-client

View File

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

View File

@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
### Performance Improvements
* 支持部署到宝塔aaWAF ([094565c](https://github.com/certd/certd/commit/094565ccd619ef671c6c11ce5fb7fd54a7a21d1c))
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
### Bug Fixes

View File

@ -1 +1 @@
23:58
01:35

View File

@ -1,7 +1,7 @@
{
"name": "@certd/basic",
"private": false,
"version": "1.34.4",
"version": "1.34.5",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@ -45,5 +45,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -209,6 +209,10 @@ export function createAxiosService({ logger }: { logger: Logger }) {
logger.error("AggregateError", error);
}
const err = new HttpError(error);
if (error.response?.config?.logParams === false) {
delete err.request?.params;
delete err.request?.data;
}
return Promise.reject(err);
}
);

View File

@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
### Performance Improvements
* 优化钉钉通知标题颜色 ([a560999](https://github.com/certd/certd/commit/a560999d13eed18d08dd32ee530166569e3f8746))
* 优化飞书通知为卡片模式 ([a818a3d](https://github.com/certd/certd/commit/a818a3d293e22fb46979bc77055c05621a6fed81))
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
### Bug Fixes

View File

@ -1,7 +1,7 @@
{
"name": "@certd/pipeline",
"private": false,
"version": "1.34.4",
"version": "1.34.5",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@ -17,8 +17,8 @@
"pub": "npm publish"
},
"dependencies": {
"@certd/basic": "^1.34.4",
"@certd/plus-core": "^1.34.4",
"@certd/basic": "^1.34.5",
"@certd/plus-core": "^1.34.5",
"dayjs": "^1.11.7",
"lodash-es": "^4.17.21",
"reflect-metadata": "^0.1.13"
@ -44,5 +44,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -218,7 +218,7 @@ export class Executor {
returnType: ResultType.error,
runnable: t,
});
errorMessage += `任务${t.title}执行失败,错误详情:${e.message}`;
errorMessage += `任务${t.title}执行失败,错误详情${e.message}`;
}
}
if (errorList.length > 0) {
@ -438,7 +438,7 @@ export class Executor {
const runnableError = error as RunnableError;
content = `流水线ID:${this.pipeline.id}运行ID:${this.runtime.id}\n\n`;
for (const re of runnableError.errors) {
content += ` - ${re.runnable.title} 执行失败\n 错误详情:${re.e.message}\n\n`;
content += ` - ${re.runnable.title} 执行失败,错误详情:${re.e?.error?.message}\n\n`;
}
} else {
content = `流水线ID:${this.pipeline.id}运行ID:${this.runtime.id}\n\n${this.currentStatusMap?.currentStep?.title} 执行失败\n\n错误详情:${error.message}`;

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
**Note:** Version bump only for package @certd/lib-huawei
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/lib-huawei

View File

@ -1,7 +1,7 @@
{
"name": "@certd/lib-huawei",
"private": false,
"version": "1.34.4",
"version": "1.34.5",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts",
@ -24,5 +24,5 @@
"prettier": "^2.8.8",
"tslib": "^2.8.1"
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
**Note:** Version bump only for package @certd/lib-iframe
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/lib-iframe

View File

@ -1,7 +1,7 @@
{
"name": "@certd/lib-iframe",
"private": false,
"version": "1.34.4",
"version": "1.34.5",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@ -31,5 +31,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
**Note:** Version bump only for package @certd/jdcloud
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/jdcloud

View File

@ -1,6 +1,6 @@
{
"name": "@certd/jdcloud",
"version": "1.34.4",
"version": "1.34.5",
"description": "jdcloud openApi sdk",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
@ -61,5 +61,5 @@
"fetch"
]
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
**Note:** Version bump only for package @certd/lib-k8s
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/lib-k8s

View File

@ -1,7 +1,7 @@
{
"name": "@certd/lib-k8s",
"private": false,
"version": "1.34.4",
"version": "1.34.5",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@ -17,7 +17,7 @@
"pub": "npm publish"
},
"dependencies": {
"@certd/basic": "^1.34.4",
"@certd/basic": "^1.34.5",
"@kubernetes/client-node": "0.21.0"
},
"devDependencies": {
@ -32,5 +32,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
**Note:** Version bump only for package @certd/lib-server
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/lib-server

View File

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

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/midway-flyway-js

View File

@ -1,6 +1,6 @@
{
"name": "@certd/midway-flyway-js",
"version": "1.34.4",
"version": "1.34.5",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@ -46,5 +46,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
**Note:** Version bump only for package @certd/plugin-cert
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/plugin-cert

View File

@ -1,7 +1,7 @@
{
"name": "@certd/plugin-cert",
"private": false,
"version": "1.34.4",
"version": "1.34.5",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@ -16,10 +16,10 @@
"pub": "npm publish"
},
"dependencies": {
"@certd/acme-client": "^1.34.4",
"@certd/basic": "^1.34.4",
"@certd/pipeline": "^1.34.4",
"@certd/plugin-lib": "^1.34.4",
"@certd/acme-client": "^1.34.5",
"@certd/basic": "^1.34.5",
"@certd/pipeline": "^1.34.5",
"@certd/plugin-lib": "^1.34.5",
"@google-cloud/publicca": "^1.3.0",
"dayjs": "^1.11.7",
"jszip": "^3.10.1",
@ -43,5 +43,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
### Performance Improvements
* aaWaf、cdnfly站点选择支持查询 ([8af3463](https://github.com/certd/certd/commit/8af3463668a40b9b99febb02e3b4e0d9d8d719b4))
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
**Note:** Version bump only for package @certd/plugin-lib

View File

@ -1,7 +1,7 @@
{
"name": "@certd/plugin-lib",
"private": false,
"version": "1.34.4",
"version": "1.34.5",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@ -18,8 +18,8 @@
"dependencies": {
"@alicloud/pop-core": "^1.7.10",
"@aws-sdk/client-s3": "^3.787.0",
"@certd/basic": "^1.34.4",
"@certd/pipeline": "^1.34.4",
"@certd/basic": "^1.34.5",
"@certd/pipeline": "^1.34.5",
"@kubernetes/client-node": "0.21.0",
"ali-oss": "^6.22.0",
"basic-ftp": "^5.0.5",
@ -50,5 +50,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "e2dadfdc4023c14f412940aa40c48d3e70353289"
"gitHead": "d23792fda2a185e8ba038434460792f738878a42"
}

View File

@ -38,6 +38,7 @@ export function createRemoteSelectInputDefine(opts?: {
required?: boolean;
rules?: any;
mergeScript?: string;
search?: boolean;
}) {
const title = opts?.title || "请选择";
const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
@ -47,6 +48,7 @@ export function createRemoteSelectInputDefine(opts?: {
const type = opts?.type || "plugin";
const watches = opts?.watches || [];
const helper = opts?.helper || "请选择";
const search = opts?.search ?? false;
let mode = "tags";
if (opts.multi === false) {
mode = undefined;
@ -63,6 +65,7 @@ export function createRemoteSelectInputDefine(opts?: {
type,
typeName,
action,
search,
watches: [certDomainsInputKey, accessIdInputKey, ...watches],
},
rules: opts?.rules,

View File

@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
### Performance Improvements
* aaWaf、cdnfly站点选择支持查询 ([8af3463](https://github.com/certd/certd/commit/8af3463668a40b9b99febb02e3b4e0d9d8d719b4))
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
### Bug Fixes

View File

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

View File

@ -1,7 +1,26 @@
<template>
<div class="remote-select">
<div class="flex flex-row">
<a-select class="remote-select-input" show-search :filter-option="filterOption" :options="optionsRef" :value="value" v-bind="attrs" @click="onClick" @update:value="emit('update:value', $event)" />
<a-select class="remote-select-input" show-search :filter-option="filterOption" :options="optionsRef" :value="value" v-bind="attrs" @click="onClick" @update:value="emit('update:value', $event)">
<template #dropdownRender="{ menuNode: menu }">
<template v-if="search">
<div class="flex w-full" style="padding: 4px 8px">
<a-input ref="inputRef" v-model:value="searchKeyRef" class="flex-1" allow-clear placeholder="查询关键字" @keydown.enter="doSearch" />
<a-button class="ml-2" :loading="loading" type="text" @click="doSearch">
<template #icon>
<search-outlined />
</template>
查询
</a-button>
</div>
<div v-if="hasError" class="helper p-2" :class="{ error: hasError }">
{{ message }}
</div>
<a-divider style="margin: 4px 0" />
</template>
<v-nodes :vnodes="menu" />
</template>
</a-select>
<div class="ml-5">
<fs-button :loading="loading" title="刷新选项" icon="ion:refresh-outline" @click="refreshOptions"></fs-button>
</div>
@ -13,16 +32,29 @@
</template>
<script setup lang="ts">
import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
import { inject, ref, useAttrs, watch } from "vue";
import { defineComponent, inject, ref, useAttrs, watch } from "vue";
import { PluginDefine } from "@certd/pipeline";
defineOptions({
name: "RemoteSelect",
});
const VNodes = defineComponent({
props: {
vnodes: {
type: Object,
required: true,
},
},
render() {
return this.vnodes;
},
});
const props = defineProps<
{
watches: string[];
search: boolean;
} & ComponentPropsType
>();
@ -36,6 +68,7 @@ const getCurrentPluginDefine: any = inject("getCurrentPluginDefine");
const getScope: any = inject("get:scope");
const getPluginType: any = inject("get:plugin:type");
const searchKeyRef = ref("");
const optionsRef = ref([]);
const message = ref("");
const hasError = ref(false);
@ -81,6 +114,9 @@ const getOptions = async () => {
typeName: form.type,
action: props.action,
input,
data: {
searchKey: props.search ? searchKeyRef.value : "",
},
},
{
onError(err: any) {
@ -114,6 +150,10 @@ async function refreshOptions() {
await getOptions();
}
async function doSearch() {
await refreshOptions();
}
watch(
() => {
const values = [];

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.34.5](https://github.com/certd/certd/compare/v1.34.4...v1.34.5) (2025-05-19)
### Performance Improvements
* 1panel增加授权测试按钮 ([566b12f](https://github.com/certd/certd/commit/566b12f5d14ce10e8f5cf1807c58f7bf27f0d199))
* 优化钉钉通知标题颜色 ([a560999](https://github.com/certd/certd/commit/a560999d13eed18d08dd32ee530166569e3f8746))
* 优化飞书通知为卡片模式 ([a818a3d](https://github.com/certd/certd/commit/a818a3d293e22fb46979bc77055c05621a6fed81))
## [1.34.4](https://github.com/certd/certd/compare/v1.34.3...v1.34.4) (2025-05-16)
### Bug Fixes

View File

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

View File

@ -125,15 +125,17 @@ export class DingTalkNotification extends BaseNotification {
at.isAtAll = true;
}
const color = body.errorMessage?'red':'green';
const res = await this.http.request({
url: webhook,
method: 'POST',
data: {
at: at,
text: {
content: `${body.title}\n${body.content}\n查看详情: ${body.url}`,
markdown: {
title: body.title,
text: `<font color='${color}'>${body.title}</font>\n\n\n ${body.content}\n\n\n[查看详情](${body.url})`,
},
msgtype:"text"
msgtype:"markdown"
},
});
if(res.errcode>100){

View File

@ -98,11 +98,11 @@ export class DingTalkNotification extends BaseNotification {
if(nameIndex>0){
name = id.substring(nameIndex+1)
}
return `<at user_id="${id}">${name}</at>`
return `<at id=${id}>${name}</at>`
}).join("");
}
if(this.isAtAll){
atText = `<at user_id="all">所有人</at>`
atText = `<at id=all>所有人</at>`
}
if (atText){
@ -118,16 +118,78 @@ export class DingTalkNotification extends BaseNotification {
}
}
const cardBody = {
"msg_type": "interactive",
"card": {
"schema": "2.0",
"config": {
"update_multi": true,
"style": {
"text_size": {
"normal_v2": {
"default": "normal",
"pc": "normal",
"mobile": "heading"
}
}
}
},
"header": {
"title": {
"tag": "plain_text",
"content": body.title
},
"subtitle": {
"tag": "plain_text",
"content": ""
},
"template": body.errorMessage?"red":"green",
"padding": "12px 12px 12px 12px"
},
"body": {
"direction": "vertical",
"padding": "12px 12px 12px 12px",
"elements": [
{
"tag": "markdown",
"content": body.content+atText,
"text_align": "left",
"text_size": "normal_v2",
"margin": "0px 0px 0px 0px"
},
{
"tag": "button",
"text": {
"tag": "plain_text",
"content": "查看详情"
},
"type": "default",
"width": "default",
"size": "medium",
"behaviors": [
{
"type": "open_url",
"default_url": body.url,
"pc_url": "",
"ios_url": "",
"android_url": ""
}
],
"margin": "0px 0px 0px 0px"
}
]
},
}
}
const res = await this.http.request({
url: webhook,
method: 'POST',
data: {
...sign,
content: {
text: `${body.title}\n${body.content}\n查看详情: ${body.url}${atText}`,
},
msg_type:"text"
...cardBody
},
});
if(res.code>100){

View File

@ -110,6 +110,7 @@ export class UpyunDeployToCdn extends AbstractTaskPlugin {
this.logger.info(`登录成功`);
const certId = await upyunClient.uploadCert(cookie, this.cert);
this.logger.info(`上传证书成功:${certId}`);
await this.ctx.utils.sleep(5000);
for (const item of this.cdnList) {
const data :any= {

View File

@ -46,7 +46,7 @@ importers:
packages/core/acme-client:
dependencies:
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../basic
'@peculiar/x509':
specifier: ^1.11.0
@ -207,10 +207,10 @@ importers:
packages/core/pipeline:
dependencies:
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../basic
'@certd/plus-core':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../pro/plus-core
dayjs:
specifier: ^1.11.7
@ -415,7 +415,7 @@ importers:
packages/libs/lib-k8s:
dependencies:
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/basic
'@kubernetes/client-node':
specifier: 0.21.0
@ -455,16 +455,16 @@ importers:
packages/libs/lib-server:
dependencies:
'@certd/acme-client':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/acme-client
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/basic
'@certd/pipeline':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/pipeline
'@certd/plus-core':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../pro/plus-core
'@midwayjs/cache':
specifier: ~3.14.0
@ -607,16 +607,16 @@ importers:
packages/plugins/plugin-cert:
dependencies:
'@certd/acme-client':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/acme-client
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/basic
'@certd/pipeline':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/pipeline
'@certd/plugin-lib':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../plugin-lib
'@google-cloud/publicca':
specifier: ^1.3.0
@ -689,10 +689,10 @@ importers:
specifier: ^3.787.0
version: 3.810.0(aws-crt@1.26.2)
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/basic
'@certd/pipeline':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/pipeline
'@kubernetes/client-node':
specifier: 0.21.0
@ -780,19 +780,19 @@ importers:
packages/pro/commercial-core:
dependencies:
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/basic
'@certd/lib-server':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../libs/lib-server
'@certd/pipeline':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/pipeline
'@certd/plugin-plus':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../plugin-plus
'@certd/plus-core':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../plus-core
'@midwayjs/core':
specifier: ~3.20.3
@ -877,22 +877,22 @@ importers:
specifier: ^1.0.2
version: 1.0.3
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/basic
'@certd/lib-k8s':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../libs/lib-k8s
'@certd/pipeline':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/pipeline
'@certd/plugin-cert':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../plugins/plugin-cert
'@certd/plugin-lib':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../plugins/plugin-lib
'@certd/plus-core':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../plus-core
ali-oss:
specifier: ^6.21.0
@ -995,7 +995,7 @@ importers:
packages/pro/plus-core:
dependencies:
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/basic
dayjs:
specifier: ^1.11.7
@ -1285,10 +1285,10 @@ importers:
version: 0.1.3(zod@3.24.4)
devDependencies:
'@certd/lib-iframe':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../libs/lib-iframe
'@certd/pipeline':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/pipeline
'@rollup/plugin-commonjs':
specifier: ^25.0.7
@ -1468,43 +1468,43 @@ importers:
specifier: ^3.705.0
version: 3.810.0(aws-crt@1.26.2)
'@certd/acme-client':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/acme-client
'@certd/basic':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/basic
'@certd/commercial-core':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../pro/commercial-core
'@certd/jdcloud':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../libs/lib-jdcloud
'@certd/lib-huawei':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../libs/lib-huawei
'@certd/lib-k8s':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../libs/lib-k8s
'@certd/lib-server':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../libs/lib-server
'@certd/midway-flyway-js':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../libs/midway-flyway-js
'@certd/pipeline':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../core/pipeline
'@certd/plugin-cert':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../plugins/plugin-cert
'@certd/plugin-lib':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../plugins/plugin-lib
'@certd/plugin-plus':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../pro/plugin-plus
'@certd/plus-core':
specifier: ^1.34.2
specifier: ^1.34.4
version: link:../../pro/plus-core
'@corsinvest/cv4pve-api-javascript':
specifier: ^8.3.0