Merge branch 'v2-dev' into v2-invite

packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/acme.ts

@@ -332,15 +332,22 @@ export class AcmeService {
         value: recordValue,
       };
       this.logger.info("添加 TXT 解析记录", JSON.stringify(recordReq));
-      const recordRes = await dnsProvider.createRecord(recordReq);
-      this.logger.info("添加 TXT 解析记录成功", JSON.stringify(recordRes));
-      return {
-        recordReq,
-        recordRes,
-        dnsProvider,
-        challenge,
-        keyAuthorization,
-      };
+      try {
+        const recordRes = await dnsProvider.createRecord(recordReq);
+        this.logger.info("添加 TXT 解析记录成功", JSON.stringify(recordRes));
+         return {
+          recordReq,
+          recordRes,
+          dnsProvider,
+          challenge,
+          keyAuthorization,
+        };
+      } catch (e: any) {
+        //@ts-ignore
+        e.message = `[${dnsProvider?.constructor?.name}错误] ${e.message}`;
+        throw e
+      }
+     
     };
 
     const doDnsPersistVerify = async (challenge: any, plan: DnsPersistVerifyPlan) => {

packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts

@@ -230,7 +230,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
           if(form.challengeType === 'cname' ){
               return '请按照上面的提示，给要申请证书的域名添加CNAME记录，添加后，点击验证，验证成功后不要删除记录，申请和续期证书会一直用它'
           }else if (form.challengeType === 'http'){
-              return '请按照上面的提示，给每个域名设置文件上传配置，证书申请过程中会上传校验文件到网站根目录的.well-known/acme-challenge/目录下'
+              return '请按照上面的提示，给每个域名设置文件上传配置，证书申请过程中会上传校验文件到网站根目录文件夹下，请确保该校验文件可以公网http访问到'
           }else if (form.challengeType === 'dnses'){
               return '给每个域名单独配置dns提供商'
           }else if (form.challengeType === 'dns-persist'){