lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-04-14 12:30:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复站点ip监控报主站与ip证书过期时间不一致的问题

Browse Source
This commit is contained in:
xiaojunnuo
2025-12-29 10:29:53 +08:00
parent 1347355cb1
commit 62f8525dd5
3 changed files with 106 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/ui/certd-server/src/modules/monitor/service/site-ip-service.ts
View File

@@ -175,7 +175,11 @@ export class SiteIpService extends BaseService<SiteIpEntity> {
await this.update(updateData);
logger.info(`测试站点ip成功: id=${updateData.id},ip=${entity.ipAddress},expiresTime=${updateData.certExpiresTime}`)
return updateData
return {
...updateData,
ipAddress: entity.ipAddress,
}
} catch (e) {
logger.error("check site ip error", e);

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

@@ -162,9 +162,6 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
this.logger.error("清理站点[${siteId}]证书失败",e)
}
}
}
}

121
pnpm-lock.yaml generated
View File

@@ -214,7 +214,7 @@ importers:
version: link:../basic
'@certd/plus-core':
specifier: ^1.37.16
version: link:../../pro/plus-core
version: 1.37.16
dayjs:
specifier: ^1.11.7
version: 1.11.13
@@ -462,7 +462,7 @@ importers:
version: link:../../plugins/plugin-lib
'@certd/plus-core':
specifier: ^1.37.16
version: link:../../pro/plus-core
version: 1.37.16
'@midwayjs/cache':
specifier: 3.14.0
version: 3.14.0
@@ -783,19 +783,19 @@ importers:
packages/pro/commercial-core:
dependencies:
'@certd/basic':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../core/basic
'@certd/lib-server':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../libs/lib-server
'@certd/pipeline':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../core/pipeline
'@certd/plugin-plus':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../plugin-plus
'@certd/plus-core':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../plus-core
'@midwayjs/core':
specifier: 3.20.11
@@ -880,22 +880,22 @@ importers:
specifier: ^1.0.2
version: 1.0.3
'@certd/basic':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../core/basic
'@certd/lib-k8s':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../libs/lib-k8s
'@certd/pipeline':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../core/pipeline
'@certd/plugin-cert':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../plugins/plugin-cert
'@certd/plugin-lib':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../plugins/plugin-lib
'@certd/plus-core':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../plus-core
ali-oss:
specifier: ^6.21.0
@@ -998,7 +998,7 @@ importers:
packages/pro/plus-core:
dependencies:
'@certd/basic':
specifier: ^1.37.16
specifier: ^1.37.15
version: link:../../core/basic
dayjs:
specifier: ^1.11.7
@@ -1490,7 +1490,7 @@ importers:
version: link:../../core/basic
'@certd/commercial-core':
specifier: ^1.37.16
version: link:../../pro/commercial-core
version: 1.37.16(better-sqlite3@11.10.0)(encoding@0.1.13)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.8.3))
'@certd/cv4pve-api-javascript':
specifier: ^8.4.2
version: 8.4.2
@@ -1520,10 +1520,10 @@ importers:
version: link:../../plugins/plugin-lib
'@certd/plugin-plus':
specifier: ^1.37.16
version: link:../../pro/plugin-plus
version: 1.37.16(encoding@0.1.13)
'@certd/plus-core':
specifier: ^1.37.16
version: link:../../pro/plus-core
version: 1.37.16
'@huaweicloud/huaweicloud-sdk-cdn':
specifier: ^3.1.120
version: 3.1.149
@@ -2879,9 +2879,18 @@ packages:
'@better-scroll/zoom@2.5.1':
resolution: {integrity: sha512-aGvFY5ooeZWS4RcxQLD+pGLpQHQxpPy0sMZV3yadcd2QK53PK9gS4Dp+BYfRv8lZ4/P2LoNEhr6Wq1DN6+uPlA==}
'@certd/commercial-core@1.37.16':
resolution: {integrity: sha512-JH6wlx88ljh2m2QiTJ1dvI/Up3jjOTEQqD/x3cfVmXHYfT//QFIL/O6cRIFKLWxN5Q+0k4YHmCDw/DI+WWdwlQ==}
'@certd/cv4pve-api-javascript@8.4.2':
resolution: {integrity: sha512-udGce7ewrVl4DmZvX+17PjsnqsdDIHEDatr8QP0AVrY2p+8JkaSPW4mXCKiLGf82C9K2+GXgT+qNIqgW7tfF9Q==}
'@certd/plugin-plus@1.37.16':
resolution: {integrity: sha512-lzxyHyq9K+sDDFlPICs/0/W1nODvxTwk7N+qI1gskTbNpPt5CY1b47sPhwLb6oRTeW2/8iVdmt283GECFEAXXg==}
'@certd/plus-core@1.37.16':
resolution: {integrity: sha512-PAyDMlLy/r5kx03A6pH4ICUAdPR9WZroGOx/ivJJo0Auk07uHU/kyXMfSCB6LytUHH0tOy36K+zuTCTdGr2NOA==}
'@certd/vue-js-cron-core@6.0.3':
resolution: {integrity: sha512-kqzoAMhYz9j6FGNWEODRYtt4NpUEUwjpkU89z5WVg2tCtOcI5VhwyUGOd8AxiBCRfd6PtXvzuqw85PaOps9wrQ==}
@@ -15437,12 +15446,84 @@ snapshots:
dependencies:
'@better-scroll/core': 2.5.1
'@certd/commercial-core@1.37.16(better-sqlite3@11.10.0)(encoding@0.1.13)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.8.3))':
dependencies:
'@certd/basic': link:packages/core/basic
'@certd/lib-server': link:packages/libs/lib-server
'@certd/pipeline': link:packages/core/pipeline
'@certd/plugin-plus': 1.37.16(encoding@0.1.13)
'@certd/plus-core': 1.37.16
'@midwayjs/core': 3.20.11
'@midwayjs/koa': 3.20.13
'@midwayjs/logger': 3.4.2
'@midwayjs/typeorm': 3.20.11
alipay-sdk: 4.14.0
dayjs: 1.11.13
typeorm: 0.3.24(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.8.3))
wechatpay-node-v3: 2.2.1
transitivePeerDependencies:
- '@google-cloud/spanner'
- '@sap/hana-client'
- babel-plugin-macros
- better-sqlite3
- encoding
- hdb-pool
- ioredis
- mongodb
- mssql
- mysql2
- oracledb
- pg
- pg-native
- pg-query-stream
- proxy-agent
- redis
- reflect-metadata
- sql.js
- sqlite3
- supports-color
- ts-node
- typeorm-aurora-data-api-driver
'@certd/cv4pve-api-javascript@8.4.2':
dependencies:
debug: 4.4.1(supports-color@8.1.1)
transitivePeerDependencies:
- supports-color
'@certd/plugin-plus@1.37.16(encoding@0.1.13)':
dependencies:
'@alicloud/pop-core': 1.8.0
'@baiducloud/sdk': 1.0.3
'@certd/basic': link:packages/core/basic
'@certd/lib-k8s': link:packages/libs/lib-k8s
'@certd/pipeline': link:packages/core/pipeline
'@certd/plugin-cert': link:packages/plugins/plugin-cert
'@certd/plugin-lib': link:packages/plugins/plugin-lib
'@certd/plus-core': 1.37.16
ali-oss: 6.23.0
baidu-aip-sdk: 4.16.16
basic-ftp: 5.0.5
cos-nodejs-sdk-v5: 2.14.7
crypto-js: 4.2.0
dayjs: 1.11.13
form-data: 4.0.2
https-proxy-agent: 7.0.6
js-yaml: 4.1.0
jsencrypt: 3.3.2
jsrsasign: 11.1.0
qiniu: 7.14.0
tencentcloud-sdk-nodejs: 4.1.112(encoding@0.1.13)
transitivePeerDependencies:
- encoding
- proxy-agent
- supports-color
'@certd/plus-core@1.37.16':
dependencies:
'@certd/basic': link:packages/core/basic
dayjs: 1.11.13
'@certd/vue-js-cron-core@6.0.3':
dependencies:
mustache: 4.2.0
@@ -21295,13 +21376,13 @@ snapshots:
resolve: 1.22.10
semver: 6.3.1
eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8):
eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.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@7.32.0)
eslint-config-prettier: 8.10.0(eslint@8.57.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:
@@ -23715,7 +23796,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@7.32.0))(eslint@7.32.0)(prettier@2.8.8)
eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8)
execa: 5.1.1
inquirer: 7.3.3
json5: 2.2.3