From f8a5cfb683d42a356294c991d1e35c03ca3f54ae Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 15 Mar 2023 15:07:55 +0800
Subject: [PATCH] =?UTF-8?q?URL=E8=B7=B3=E8=BD=AC=E4=B9=8B=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D=E8=B7=B3=E8=BD=AC=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=90=8E=E5=9F=9F=E5=90=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/settings/redirects/createPopup.go   | 18 ++++++++++++++++++
 .../server/settings/redirects/createPopup.html |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/internal/web/actions/default/servers/server/settings/redirects/createPopup.go b/internal/web/actions/default/servers/server/settings/redirects/createPopup.go
index f020d101..49cd52c0 100644
--- a/internal/web/actions/default/servers/server/settings/redirects/createPopup.go
+++ b/internal/web/actions/default/servers/server/settings/redirects/createPopup.go
@@ -3,6 +3,7 @@ package redirects
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
@@ -134,6 +135,23 @@ func (this *CreatePopupAction) RunPost(params struct {
 			this.FailField("domainAfter", "请输入跳转后域名")
 			return
 		}
+
+		// 检查用户输入的是否为域名
+		if !domainutils.ValidateDomainFormat(params.DomainAfter) {
+			// 是否为URL
+			u, err := url.Parse(params.DomainAfter)
+			if err == nil {
+				if len(u.Host) == 0 {
+					this.FailField("domainAfter", "跳转后域名输入不正确")
+					return
+				}
+				params.DomainAfter = u.Host
+			} else {
+				this.FailField("domainAfter", "跳转后域名输入不正确")
+				return
+			}
+		}
+
 		config.DomainAfter = params.DomainAfter
 		config.DomainAfterScheme = params.DomainAfterScheme
 	case serverconfigs.HTTPHostRedirectTypePort:
diff --git a/web/views/@default/servers/server/settings/redirects/createPopup.html b/web/views/@default/servers/server/settings/redirects/createPopup.html
index e6997055..83ac1486 100644
--- a/web/views/@default/servers/server/settings/redirects/createPopup.html
+++ b/web/views/@default/servers/server/settings/redirects/createPopup.html
@@ -90,7 +90,8 @@
             <tr>
                 <td class="color-border">跳转后域名 *</td>
                 <td>
-                    <input type="text" name="domainAfter" maxlength="100" v-model="redirect.domainAfter"/>
+                    <input type="text" name="domainAfter" maxlength="100" v-model="redirect.domainAfter" placeholder="比如example.com"/>
+                    <p class="comment">这里填写的是网址中的域名部分，不需要添加<code-label>https://</code-label>部分。</p>
                 </td>
             </tr>
             <tr>