diff --git a/.gitignore b/.gitignore index d38a05a6e..bf2258f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ test/**/*.js /packages/ui/certd-server/data/db.sqlite /packages/ui/certd-server/data/keys.yaml /packages/pro/ + +test.js \ No newline at end of file diff --git a/docker/run/docker-compose.yaml b/docker/run/docker-compose.yaml index 3e49be154..b6fba9111 100644 --- a/docker/run/docker-compose.yaml +++ b/docker/run/docker-compose.yaml @@ -13,7 +13,8 @@ services: - "7001:7001" # ↓↓↓↓ ---------------------------------------------------------- https端口，可以根据实际情况，是否暴露相关服务端口 - "7002:7002" - + networks: + - ip6net # #↓↓↓↓ -------------------------------------------------------------- 如果出现getaddrinfo ENOTFOUND等错误，可以尝试设置dns配置 # dns: # - 223.5.5.5 @@ -44,4 +45,9 @@ services: # - certd_typeorm_dataSource_default_password=yourpasswd # 密码 # - certd_typeorm_dataSource_default_database=certd # 数据库名 - +networks: + ip6net: + enable_ipv6: true + ipam: + config: + - subnet: 2001:db8::/64 diff --git a/packages/core/acme-client/src/agents.js b/packages/core/acme-client/src/agents.js index 9cd739056..022987d16 100644 --- a/packages/core/acme-client/src/agents.js +++ b/packages/core/acme-client/src/agents.js @@ -88,11 +88,11 @@ class HttpError extends Error { if (url) { this.message = `${this.message}:${url}`; } - // const { stack, cause } = error; - delete this.cause; - delete this.stack; - // this.cause = cause; - // this.stack = stack; + const { stack, cause } = error; + // delete this.cause; + // delete this.stack; + this.cause = cause; + this.stack = stack; delete error.stack; delete error.cause; delete error.response; diff --git a/packages/core/basic/src/utils/util.request.ts b/packages/core/basic/src/utils/util.request.ts index f673b757d..6293d4307 100644 --- a/packages/core/basic/src/utils/util.request.ts +++ b/packages/core/basic/src/utils/util.request.ts @@ -57,9 +57,9 @@ export class HttpError extends Error { data: error.response?.data, }; - // const { stack, cause } = error; - // this.cause = cause; - // this.stack = stack; + const { stack, cause } = error; + this.cause = cause; + this.stack = stack; delete error.response; delete error.config; delete error.request; diff --git a/packages/core/pipeline/src/core/run-history.ts b/packages/core/pipeline/src/core/run-history.ts index 322a67271..977aa2c37 100644 --- a/packages/core/pipeline/src/core/run-history.ts +++ b/packages/core/pipeline/src/core/run-history.ts @@ -116,10 +116,14 @@ export class RunHistory { } logError(runnable: Runnable, e: Error) { - // delete e.stack; - // delete e.cause; - const errorInfo = runnable.runnableType === "step" ? e : e.message; - this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}] ：`, errorInfo); + const { cause, stack } = e; + delete e.stack; + delete e.cause; + if (runnable.runnableType === "step") { + this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}] ：`, e, stack, cause); + } else { + this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}] ：`, e.message); + } } finally(runnable: Runnable) { diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts index d31543655..25fde2a57 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -74,16 +74,16 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { }) renewDays!: number; - @TaskInput({ - title: "强制更新", - component: { - name: "a-switch", - vModel: "checked", - }, - order: 100, - helper: "是否强制重新申请证书", - }) - forceUpdate!: string; + // @TaskInput({ + // title: "强制更新", + // component: { + // name: "a-switch", + // vModel: "checked", + // }, + // order: 100, + // helper: "是否强制重新申请证书", + // }) + // forceUpdate!: string; @TaskInput({ title: "成功后邮件通知", @@ -221,11 +221,11 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { * 是否更新证书 */ async condition() { - if (this.forceUpdate) { - this.logger.info("强制更新证书选项已勾选，准备申请新证书"); - this.logger.warn("申请完之后，切记取消强制更新，避免申请过多证书。"); - return null; - } + // if (this.forceUpdate) { + // this.logger.info("强制更新证书选项已勾选，准备申请新证书"); + // this.logger.warn("申请完之后，切记取消强制更新，避免申请过多证书。"); + // return null; + // } let inputChanged = this.ctx.inputChanged; if (inputChanged) { diff --git a/packages/ui/certd-client/src/views/certd/history/crud.tsx b/packages/ui/certd-client/src/views/certd/history/crud.tsx index 687e8e2e4..4b2c5c60f 100644 --- a/packages/ui/certd-client/src/views/certd/history/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/history/crud.tsx @@ -139,7 +139,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat width: 300, cellRender: ({ row, value }) => { debugger; - return {value}; + return ( + {value} + ); } } }, diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts index c5b44672c..3f570aa7d 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts @@ -5,6 +5,7 @@ export type StatusEnumItem = { icon: string; spin?: boolean; iconSpin?: boolean; + iconColor?: string; }; export type StatusEnumType = { [key: string]: StatusEnumItem; diff --git a/test.js b/test.js new file mode 100644 index 000000000..2d0102522 --- /dev/null +++ b/test.js @@ -0,0 +1,20 @@ +import axios from 'axios' + +import dns from "dns"; + +// axios.request({ +// url:"http://[2407:3740:0:301::c]/" +// }).then(res=>{ +// console.log(res) +// }) +// +// dns.resolve("api.cloudflare.com", (err, address) => { +// console.log(address); +// }) + +import {http} from '@certd/basic' +http.request({ + url:"https://api.cloudflare.com" +}).then(res=>{ + console.log(res) +})