diff --git a/packages/core/basic/src/utils/util.request.ts b/packages/core/basic/src/utils/util.request.ts index df1db445..9342d73a 100644 --- a/packages/core/basic/src/utils/util.request.ts +++ b/packages/core/basic/src/utils/util.request.ts @@ -144,6 +144,9 @@ export function createAxiosService({ logger }: { logger: Logger }) { } else { logger.info('http response status:', response?.status); } + if (response?.config?.returnResponse) { + return response; + } return response.data; }, (error: any) => { diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 145452df..fc8c5369 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -93,7 +93,7 @@ "socks-proxy-agent": "^8.0.4", "strip-ansi": "^7.1.0", "svg-captcha": "^1.4.0", - "tencentcloud-sdk-nodejs": "^4.0.44", + "tencentcloud-sdk-nodejs": "^4.0.983", "typeorm": "^0.3.20", "uuid": "^10.0.0" }, diff --git a/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts b/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts new file mode 100644 index 00000000..01d33c54 --- /dev/null +++ b/packages/ui/certd-server/src/modules/monitor/entity/site-info.ts @@ -0,0 +1,29 @@ +import { Column, PrimaryGeneratedColumn } from 'typeorm'; + +/** + */ +// @Entity('cd_site_info') +export class SiteInfoEntity { + @PrimaryGeneratedColumn() + id: number; + @Column({ name: 'user_id', comment: '用户id' }) + userId: number; + @Column({ comment: '站点名称', length: 100 }) + name: string; + @Column({ comment: '域名', length: 100 }) + domain: string; + @Column({ name: 'cert_info', comment: '证书详情', length: 1000 }) + certInfo: string; + @Column({ name: 'cert_status', comment: '证书状态', length: 100 }) + certStatus: string; + @Column({ name: 'cert_valid_to', comment: '证书到期时间', length: 100 }) + certValidTo: Date; + @Column({ name: 'last_time', comment: '上次检查时间' }) + lastTime: Date; + @Column({ name: 'pipeline_id', comment: '关联流水线id' }) + pipelineId: number; + @Column({ name: 'create_time', comment: '创建时间', default: () => 'CURRENT_TIMESTAMP' }) + createTime: Date; + @Column({ name: 'update_time', comment: '修改时间', default: () => 'CURRENT_TIMESTAMP' }) + updateTime: Date; +}