From a74ed6a31702e21734b46c4a75f001b01a967c2e Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 6 Dec 2023 17:00:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E8=87=AA=E7=AD=BE?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=A1=AB=E5=86=99=20IP=20=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=20(#3200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/website_ca.go                 | 15 +++++++++++++++
 .../src/views/website/ssl/ca/obtain/index.vue     |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/backend/app/service/website_ca.go b/backend/app/service/website_ca.go
index 4e56446a7..15bb9abad 100644
--- a/backend/app/service/website_ca.go
+++ b/backend/app/service/website_ca.go
@@ -244,6 +244,21 @@ func (w WebsiteCAService) ObtainSSL(req request.WebsiteCAObtain) (*model.Website
 				websiteSSL.PrimaryDomain = domains[0]
 				websiteSSL.Domains = strings.Join(domains[1:], ",")
 			}
+			ipStrings := make([]string, len(ips))
+			for i, ip := range ips {
+				ipStrings[i] = ip.String()
+			}
+			if websiteSSL.PrimaryDomain == "" && len(ips) > 0 {
+				websiteSSL.PrimaryDomain = ipStrings[0]
+				ipStrings = ipStrings[1:]
+			}
+			if len(ipStrings) > 0 {
+				if websiteSSL.Domains != "" {
+					websiteSSL.Domains += ","
+				}
+				websiteSSL.Domains += strings.Join(ipStrings, ",")
+			}
+
 		}
 	}
 
diff --git a/frontend/src/views/website/ssl/ca/obtain/index.vue b/frontend/src/views/website/ssl/ca/obtain/index.vue
index 4ea61d0dd..9380d9356 100644
--- a/frontend/src/views/website/ssl/ca/obtain/index.vue
+++ b/frontend/src/views/website/ssl/ca/obtain/index.vue
@@ -95,8 +95,8 @@ const initData = () => ({
     keyType: 'P256',
     domains: '',
     id: 0,
-    time: 0,
-    unit: 'day',
+    time: 10,
+    unit: 'year',
     pushDir: false,
     dir: '',
     autoRenew: true,