From 2cbd023d8d1fce243200048f3b7fede6d8d9c87f Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 6 Oct 2021 09:29:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BA=90=E7=AB=99=E6=97=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8E=BB=E9=99=A4=E4=B8=93=E5=B1=9E=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E4=B8=AD=E7=9A=84=E6=9C=AB=E5=B0=BE=E6=96=9C=E6=9D=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/server/settings/origins/addPopup.go      | 5 +++++
 .../default/servers/server/settings/origins/updatePopup.go   | 5 +++++
 .../@default/servers/server/settings/origins/addPopup.html   | 2 +-
 .../servers/server/settings/origins/updatePopup.html         | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/internal/web/actions/default/servers/server/settings/origins/addPopup.go b/internal/web/actions/default/servers/server/settings/origins/addPopup.go
index a44ceea8..a1492661 100644
--- a/internal/web/actions/default/servers/server/settings/origins/addPopup.go
+++ b/internal/web/actions/default/servers/server/settings/origins/addPopup.go
@@ -136,6 +136,11 @@ func (this *AddPopupAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
+
+		// 去除可能误加的斜杠
+		for index, domain := range domains {
+			domains[index] = strings.TrimSuffix(domain, "/")
+		}
 	}
 
 	createResp, err := this.RPC().OriginRPC().CreateOrigin(this.AdminContext(), &pb.CreateOriginRequest{
diff --git a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
index 84cb78ed..cd32ea6d 100644
--- a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
+++ b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go
@@ -195,6 +195,11 @@ func (this *UpdatePopupAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
+
+		// 去除可能误加的斜杠
+		for index, domain := range domains {
+			domains[index] = strings.TrimSuffix(domain, "/")
+		}
 	}
 
 	_, err = this.RPC().OriginRPC().UpdateOrigin(this.AdminContext(), &pb.UpdateOriginRequest{
diff --git a/web/views/@default/servers/server/settings/origins/addPopup.html b/web/views/@default/servers/server/settings/origins/addPopup.html
index e87d9237..7d192dc8 100644
--- a/web/views/@default/servers/server/settings/origins/addPopup.html
+++ b/web/views/@default/servers/server/settings/origins/addPopup.html
@@ -39,7 +39,7 @@
             <td>专属域名</td>
             <td>
                 <domains-box></domains-box>
-                <p class="comment">需要指定域名生效的时候才需要添加。</p>
+                <p class="comment">不为空时，指定的这些域名访问时当前源站才生效。</p>
             </td>
         </tr>
 		<tr>
diff --git a/web/views/@default/servers/server/settings/origins/updatePopup.html b/web/views/@default/servers/server/settings/origins/updatePopup.html
index 18d8a68f..d7c7555c 100644
--- a/web/views/@default/servers/server/settings/origins/updatePopup.html
+++ b/web/views/@default/servers/server/settings/origins/updatePopup.html
@@ -40,7 +40,7 @@
             <td>专属域名</td>
             <td>
                 <domains-box :v-domains="origin.domains"></domains-box>
-                <p class="comment">需要指定域名生效的时候才需要添加。</p>
+                <p class="comment">不为空时，指定的这些域名访问时当前源站才生效。</p>
             </td>
         </tr>
 		<tr>