diff --git a/packages/ui/certd-server/src/plugins/index.ts b/packages/ui/certd-server/src/plugins/index.ts index 2774fffc..d6a2c8f6 100644 --- a/packages/ui/certd-server/src/plugins/index.ts +++ b/packages/ui/certd-server/src/plugins/index.ts @@ -15,3 +15,4 @@ export * from './plugin-gcore/index.js'; export * from './plugin-qnap/index.js'; export * from './plugin-aws/index.js'; export * from './plugin-dnsla/index.js'; +export * from './plugin-upyun/index.js'; diff --git a/packages/ui/certd-server/src/plugins/plugin-notification/dingtalk/index.ts b/packages/ui/certd-server/src/plugins/plugin-notification/dingtalk/index.ts index e1981a68..e97e19ae 100644 --- a/packages/ui/certd-server/src/plugins/plugin-notification/dingtalk/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-notification/dingtalk/index.ts @@ -131,7 +131,7 @@ export class DingTalkNotification extends BaseNotification { data: { at: at, text: { - content: `· ${body.title}\n· ${body.content}\n· 查看详情: ${body.url}`, + content: `${body.title}\n${body.content}\n查看详情: ${body.url}`, }, msgtype:"text" }, diff --git a/packages/ui/certd-server/src/plugins/plugin-notification/feishu/index.ts b/packages/ui/certd-server/src/plugins/plugin-notification/feishu/index.ts index 5f9a7678..031eb1c7 100644 --- a/packages/ui/certd-server/src/plugins/plugin-notification/feishu/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-notification/feishu/index.ts @@ -106,7 +106,7 @@ export class DingTalkNotification extends BaseNotification { } if (atText){ - atText = `\n· ${atText}` + atText = `\n${atText}` } let sign:any = {} @@ -125,7 +125,7 @@ export class DingTalkNotification extends BaseNotification { data: { ...sign, content: { - text: `· ${body.title}\n· ${body.content}\n· 查看详情: ${body.url}${atText}`, + text: `${body.title}\n${body.content}\n查看详情: ${body.url}${atText}`, }, msg_type:"text" }, diff --git a/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts b/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts index b67ff03d..c4b92ac7 100644 --- a/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts @@ -62,7 +62,7 @@ export class QywxNotification extends BaseNotification { data: { msgtype: 'text', text: { - content: `· ${body.title}\n· ${body.content}\n· 查看详情: ${body.url}`, + content: `${body.title}\n${body.content}\n查看详情: ${body.url}`, mentioned_list: this.mentionedList, mentioned_mobile_list: this.mentionedMobileList, }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 32e36fb0..25892d42 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ importers: packages/core/acme-client: dependencies: '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../basic '@peculiar/x509': specifier: ^1.11.0 @@ -204,10 +204,10 @@ importers: packages/core/pipeline: dependencies: '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../basic '@certd/plus-core': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../pro/plus-core dayjs: specifier: ^1.11.7 @@ -342,7 +342,7 @@ importers: packages/libs/lib-k8s: dependencies: '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/basic '@kubernetes/client-node': specifier: 0.21.0 @@ -382,16 +382,16 @@ importers: packages/libs/lib-server: dependencies: '@certd/acme-client': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/pipeline '@certd/plus-core': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../pro/plus-core '@midwayjs/cache': specifier: ~3.14.0 @@ -534,16 +534,16 @@ importers: packages/plugins/plugin-cert: dependencies: '@certd/acme-client': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/pipeline '@certd/plugin-lib': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../plugin-lib '@google-cloud/publicca': specifier: ^1.3.0 @@ -610,10 +610,10 @@ importers: specifier: ^1.7.10 version: 1.8.0 '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/pipeline '@kubernetes/client-node': specifier: 0.21.0 @@ -701,19 +701,19 @@ importers: packages/pro/commercial-core: dependencies: '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/basic '@certd/lib-server': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../libs/lib-server '@certd/pipeline': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/pipeline '@certd/plugin-plus': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../plugin-plus '@certd/plus-core': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../plus-core '@midwayjs/core': specifier: ~3.20.3 @@ -798,22 +798,22 @@ importers: specifier: ^1.0.2 version: 1.0.2 '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/basic '@certd/lib-k8s': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../libs/lib-k8s '@certd/pipeline': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../plugins/plugin-lib '@certd/plus-core': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../plus-core ali-oss: specifier: ^6.21.0 @@ -910,7 +910,7 @@ importers: packages/pro/plus-core: dependencies: '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/basic dayjs: specifier: ^1.11.7 @@ -1185,10 +1185,10 @@ importers: version: 0.1.3(zod@3.24.2) devDependencies: '@certd/lib-iframe': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../libs/lib-iframe '@certd/pipeline': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/pipeline '@rollup/plugin-commonjs': specifier: ^25.0.7 @@ -1368,40 +1368,40 @@ importers: specifier: ^3.705.0 version: 3.758.0(aws-crt@1.25.3) '@certd/acme-client': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/basic '@certd/commercial-core': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../pro/commercial-core '@certd/lib-huawei': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../libs/lib-huawei '@certd/lib-k8s': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../libs/lib-k8s '@certd/lib-server': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../libs/lib-server '@certd/midway-flyway-js': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../libs/midway-flyway-js '@certd/pipeline': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../plugins/plugin-lib '@certd/plugin-plus': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../pro/plugin-plus '@certd/plus-core': - specifier: ^1.31.5 + specifier: ^1.31.7 version: link:../../pro/plus-core '@corsinvest/cv4pve-api-javascript': specifier: ^8.3.0 @@ -1574,6 +1574,9 @@ importers: typeorm: specifier: ^0.3.20 version: 0.3.21(better-sqlite3@11.8.1)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) + upyun: + specifier: ^3.4.6 + version: 3.4.6 uuid: specifier: ^10.0.0 version: 10.0.0 @@ -5345,6 +5348,9 @@ packages: peerDependencies: axios: '>= 0.17.0' + axios@0.26.1: + resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==} + axios@1.8.2: resolution: {integrity: sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==} @@ -5372,6 +5378,9 @@ packages: balanced-match@2.0.0: resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==} + base-64@1.0.0: + resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==} + base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} @@ -5660,6 +5669,9 @@ packages: chardet@0.7.0: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} + charenc@0.0.2: + resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==} + check-error@1.0.3: resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} @@ -6075,6 +6087,9 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} + crypt@0.0.2: + resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==} + crypto-js@4.2.0: resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==} @@ -7438,6 +7453,9 @@ packages: resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==} engines: {node: '>=12.0.0'} + hmacsha1@1.0.0: + resolution: {integrity: sha512-4FP6J0oI8jqb6gLLl9tSwVdosWJ/AKSGJ+HwYf6Ixe4MUcEkst4uWzpVQrNOCin0fzTRQbXV8ePheU8WiiDYBw==} + hookable@5.5.3: resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} @@ -7680,6 +7698,9 @@ packages: resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==} engines: {node: '>= 0.4'} + is-buffer@1.1.6: + resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} + is-buffer@2.0.5: resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==} engines: {node: '>=4'} @@ -7809,6 +7830,9 @@ packages: resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==} engines: {node: '>=0.10.0'} + is-promise@4.0.0: + resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==} + is-reference@1.2.1: resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==} @@ -8529,6 +8553,9 @@ packages: mathml-tag-names@2.1.3: resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==} + md5@2.3.0: + resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==} + mdast-util-to-hast@13.2.0: resolution: {integrity: sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==} @@ -11564,6 +11591,10 @@ packages: resolution: {integrity: sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==} engines: {node: '>=10'} + upyun@3.4.6: + resolution: {integrity: sha512-ThAI7woGkVE2lsOq8MFYb0Oeg8avOQQbY3XmXmaq1aZVjzcglcMuI/RImBrq+KJw7nX39iNKCJKYs65xiAF53Q==} + engines: {node: '>=8.0.0'} + uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} @@ -17346,6 +17377,12 @@ snapshots: fast-deep-equal: 3.1.3 is-buffer: 2.0.5 + axios@0.26.1: + dependencies: + follow-redirects: 1.15.9(debug@4.4.0) + transitivePeerDependencies: + - debug + axios@1.8.2(debug@4.4.0): dependencies: follow-redirects: 1.15.9(debug@4.4.0) @@ -17394,6 +17431,8 @@ snapshots: balanced-match@2.0.0: {} + base-64@1.0.0: {} + base64-js@1.5.1: {} base64url@3.0.1: {} @@ -17739,6 +17778,8 @@ snapshots: chardet@0.7.0: {} + charenc@0.0.2: {} + check-error@1.0.3: dependencies: get-func-name: 2.0.2 @@ -18165,6 +18206,8 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 + crypt@0.0.2: {} + crypto-js@4.2.0: {} crypto-random-string@2.0.0: {} @@ -18985,13 +19028,13 @@ snapshots: resolve: 1.22.10 semver: 6.3.1 - eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8): + eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8): dependencies: eslint: 7.32.0 prettier: 2.8.8 prettier-linter-helpers: 1.0.0 optionalDependencies: - eslint-config-prettier: 8.10.0(eslint@8.57.0) + eslint-config-prettier: 8.10.0(eslint@7.32.0) eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8): dependencies: @@ -19854,6 +19897,8 @@ snapshots: highlight.js@11.11.1: {} + hmacsha1@1.0.0: {} + hookable@5.5.3: {} hosted-git-info@2.8.9: {} @@ -20105,6 +20150,8 @@ snapshots: call-bound: 1.0.4 has-tostringtag: 1.0.2 + is-buffer@1.1.6: {} + is-buffer@2.0.5: {} is-callable@1.2.7: {} @@ -20204,6 +20251,8 @@ snapshots: is-plain-object@5.0.0: {} + is-promise@4.0.0: {} + is-reference@1.2.1: dependencies: '@types/estree': 1.0.6 @@ -20996,6 +21045,12 @@ snapshots: mathml-tag-names@2.1.3: {} + md5@2.3.0: + dependencies: + charenc: 0.0.2 + crypt: 0.0.2 + is-buffer: 1.1.6 + mdast-util-to-hast@13.2.0: dependencies: '@types/hast': 3.0.4 @@ -21327,7 +21382,7 @@ snapshots: eslint: 7.32.0 eslint-config-prettier: 8.10.0(eslint@7.32.0) eslint-plugin-node: 11.1.0(eslint@7.32.0) - eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8) + eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8) execa: 5.1.1 inquirer: 7.3.3 json5: 2.2.3 @@ -24370,6 +24425,18 @@ snapshots: semver-diff: 3.1.1 xdg-basedir: 4.0.0 + upyun@3.4.6: + dependencies: + axios: 0.26.1 + base-64: 1.0.0 + form-data: 4.0.2 + hmacsha1: 1.0.0 + is-promise: 4.0.0 + md5: 2.3.0 + mime-types: 2.1.35 + transitivePeerDependencies: + - debug + uri-js@4.4.1: dependencies: punycode: 2.3.1