chore: axios proxy问题修复

packages/core/acme-client/src/auto.js

@@ -187,10 +187,22 @@ module.exports = async function(client, userOpts) {
     }
 
 
-    await runPromisesSerially(challengePromises);
+    try {
+        await runPromisesSerially(challengePromises);
+    }
+    finally {
+        await runPromisesSerially(clearTasks);
+    }
+
+    // try {
+    //     await Promise.allSettled(challengePromises);
+    // }
+    // finally {
+    //     log('清理challenge');
+    //     await Promise.allSettled(clearTasks);
+    // }
+
 
-    log('清理challenge');
-    await runPromisesSerially(clearTasks);
     log('challenge结束');
 
     // log('[auto] Waiting for challenge valid status');

packages/core/acme-client/src/http.js

@@ -3,10 +3,20 @@
  */
 
 const { createHmac, createSign, constants: { RSA_PKCS1_PADDING } } = require('crypto');
+const HttpsProxyAgent = require('https-proxy-agent');
 const { getJwk } = require('./crypto');
 const { log } = require('./logger');
-const axios = require('./axios');
+const axios1 = require('./axios');
 
+const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy;
+let httpsAgent = null;
+if (httpsProxy) {
+    httpsAgent = new HttpsProxyAgent(httpsProxy);
+}
+const axios = axios1.create({
+    proxy: false,
+    httpsAgent
+});
 
 /**
  * ACME HTTP client

packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts

@@ -37,7 +37,7 @@ export class CertApplyPlugin extends AbstractTaskPlugin {
       span: 24,
     },
     helper:
-      "支持通配符域名，例如： *.foo.com 、 *.test.handsfree.work\n" +
+      "支持通配符域名，例如： *.foo.com、foo.com、*.test.handsfree.work\n" +
       "支持多个域名、多个子域名、多个通配符域名打到一个证书上（域名必须是在同一个DNS提供商解析）\n" +
       "多级子域名要分成多个域名输入（*.foo.com的证书不能用于xxx.yyy.foo.com）\n" +
       "输入一个回车之后，再输入下一个",

packages/ui/certd-client/src/components/editable.vue

@@ -1,14 +1,7 @@
 <template>
   <div class="pi-editable" :class="{ disabled, 'hover-show': hoverShow }">
     <div v-if="isEdit" class="input">
-      <a-input
-        ref="inputRef"
-        v-model:value="valueRef"
-        :validate-status="modelValue ? '' : 'error'"
-        v-bind="input"
-        @keyup.enter="save()"
-        @blur="save()"
-      >
+      <a-input ref="inputRef" v-model:value="valueRef" :validate-status="modelValue ? '' : 'error'" v-bind="input" @keyup.enter="save()" @blur="save()">
         <template #suffix>
           <fs-icon icon="ant-design:check-outlined" @click="save()"></fs-icon>
         </template>
@@ -81,6 +74,7 @@ export default {
 
 <style lang="less">
 .pi-editable {
+  flex: 1;
   line-height: 34px;
 
   span.fs-iconify {

packages/ui/certd-server/package.json

@@ -46,6 +46,7 @@
     "cache-manager": "^3.6.3",
     "dayjs": "^1.11.7",
     "glob": "^7.2.3",
+    "https-proxy-agent": "^7.0.4",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^8.5.1",
     "koa-send": "^5.0.1",