From 7984b625ba6727132f205db8e25f790bce27b2f7 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 20 May 2025 23:37:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=88=E6=8B=8D?=
 =?UTF-8?q?=E4=BA=91=20CDN=20=E8=AE=BE=E7=BD=AE=E8=AF=81=E4=B9=A6=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=92=8C=E5=BC=BA=E5=88=B6=20HTTPS=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/framework/login/index.vue       |  2 +-
 .../plugins/plugin-depoy-to-cdn.ts            | 34 +++++++++++++------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/packages/ui/certd-client/src/views/framework/login/index.vue b/packages/ui/certd-client/src/views/framework/login/index.vue
index a748bde7..5badc566 100644
--- a/packages/ui/certd-client/src/views/framework/login/index.vue
+++ b/packages/ui/certd-client/src/views/framework/login/index.vue
@@ -54,7 +54,7 @@
     <a-form v-else ref="twoFactorFormRef" class="user-layout-login" :model="twoFactor" v-bind="layout">
       <div class="mb-10 flex flex-center">请打开您的Authenticator APP，获取动态验证码。</div>
       <a-form-item name="verifyCode">
-        <a-input ref="verifyCodeInputRef" v-model:value="twoFactor.verifyCode" placeholder="请输入动态验证码" allow-clear>
+        <a-input ref="verifyCodeInputRef" v-model:value="twoFactor.verifyCode" placeholder="请输入动态验证码" allow-clear @keydown.enter="handleTwoFactorSubmit">
           <template #prefix>
             <fs-icon icon="ion:lock-closed-outline"></fs-icon>
           </template>
diff --git a/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts b/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts
index 8f6fbf85..15584b1f 100644
--- a/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-upyun/plugins/plugin-depoy-to-cdn.ts
@@ -110,30 +110,44 @@ export class UpyunDeployToCdn extends AbstractTaskPlugin {
     this.logger.info(`登录成功`);
     const certId = await upyunClient.uploadCert(cookie, this.cert);
     this.logger.info(`上传证书成功：${certId}`);
-    await this.ctx.utils.sleep(5000);
     for (const item of this.cdnList) {
 
-      const data :any= {
+      this.logger.info(`开始部署证书：${item}`);
+
+      const data1 :any= {
+        crt_id: certId,
+        domain_name: item,
+      }
+
+      const res1=await upyunClient.doRequest({
+        cookie: cookie,
+        url: "https://console.upyun.com/api/https/migrate/domain",
+        method: "POST",
+        data: data1
+      });
+
+      this.logger.info(`设置证书成功：${JSON.stringify(res1)}`);
+
+      const data2 :any= {
         certificate_id: certId,
         domain: item,
       }
 
       if (this.forceHttps !== 'keep') {
-        data.force_https = Boolean(this.forceHttps);
+        data2.force_https = Boolean(this.forceHttps);
       }
       if (this.https !=='keep') {
-        data.https = Boolean(this.https);
+        data2.https = Boolean(this.https);
       }
-      this.logger.info(`开始部署证书：${item}`);
-      const res = await upyunClient.doRequest({
+
+      this.logger.info(`设置证书参数：${JSON.stringify(data2)}`);
+      const res2 = await upyunClient.doRequest({
         cookie: cookie,
         url: "https://console.upyun.com/api/https/certificate/manager",
         method: "POST",
-        data: data
+        data: data2
       });
-      this.logger.info(`部署成功：${JSON.stringify(res)}`);
-
-
+      this.logger.info(`设置证书参数成功：${JSON.stringify(res2)}`);
     }
 
     this.logger.info("部署成功");