From 00a31df3ba06eef41059a4da32f057b88bb2559c Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Fri, 4 Nov 2022 20:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=B7=B3=E8=BD=AC=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BF=BD=E7=95=A5=E8=B7=B3=E8=BD=AC=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/server/settings/redirects/createPopup.go   | 10 ++++++----
 .../js/components/server/http-host-redirect-box.js     |  1 +
 .../servers/server/settings/redirects/createPopup.html |  7 +++++++
 .../servers/server/settings/redirects/createPopup.js   |  1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

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 01d7b582..f020d101 100644
--- a/internal/web/actions/default/servers/server/settings/redirects/createPopup.go
+++ b/internal/web/actions/default/servers/server/settings/redirects/createPopup.go
@@ -39,10 +39,11 @@ func (this *CreatePopupAction) RunPost(params struct {
 	KeepArgs       bool
 
 	// 域名
-	DomainsAll        bool
-	DomainsBeforeJSON []byte
-	DomainAfter       string
-	DomainAfterScheme string
+	DomainsAll              bool
+	DomainsBeforeJSON       []byte
+	DomainBeforeIgnorePorts bool
+	DomainAfter             string
+	DomainAfterScheme       string
 
 	// 端口
 	PortsAll        bool
@@ -128,6 +129,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 				return
 			}
 		}
+		config.DomainBeforeIgnorePorts = params.DomainBeforeIgnorePorts
 		if len(params.DomainAfter) == 0 {
 			this.FailField("domainAfter", "请输入跳转后域名")
 			return
diff --git a/web/public/js/components/server/http-host-redirect-box.js b/web/public/js/components/server/http-host-redirect-box.js
index e90c28e5..fbc70cee 100644
--- a/web/public/js/components/server/http-host-redirect-box.js
+++ b/web/public/js/components/server/http-host-redirect-box.js
@@ -130,6 +130,7 @@ Vue.component("http-host-redirect-box", {
 							<div style="margin-top: 0.4em">
 								<grey-label><strong>域名跳转</strong></grey-label>
 								<grey-label v-if="redirect.domainAfterScheme != null && redirect.domainAfterScheme.length > 0">{{redirect.domainAfterScheme}}</grey-label>
+								<grey-label v-if="redirect.domainBeforeIgnorePorts">忽略端口</grey-label>
 							</div>
 						</div>
 						<div v-if="redirect.type == 'port'">
diff --git a/web/views/@default/servers/server/settings/redirects/createPopup.html b/web/views/@default/servers/server/settings/redirects/createPopup.html
index cf31dbea..e6997055 100644
--- a/web/views/@default/servers/server/settings/redirects/createPopup.html
+++ b/web/views/@default/servers/server/settings/redirects/createPopup.html
@@ -80,6 +80,13 @@
                     <domains-box name="domainsBeforeJSON" :v-domains="redirect.domainsBefore"></domains-box>
                 </td>
             </tr>
+            <tr>
+                <td class="color-border">忽略跳转前端口</td>
+                <td>
+                    <checkbox name="domainBeforeIgnorePorts" v-model="redirect.domainBeforeIgnorePorts"></checkbox>
+                    <p class="comment">选中后，表示忽略跳转前域名端口，只要域名匹配时就跳转；如不选中，则表示只有域名和端口同时匹配时才会跳转。</p>
+                </td>
+            </tr>
             <tr>
                 <td class="color-border">跳转后域名 *</td>
                 <td>
diff --git a/web/views/@default/servers/server/settings/redirects/createPopup.js b/web/views/@default/servers/server/settings/redirects/createPopup.js
index 4f4868fd..02856a7a 100644
--- a/web/views/@default/servers/server/settings/redirects/createPopup.js
+++ b/web/views/@default/servers/server/settings/redirects/createPopup.js
@@ -21,6 +21,7 @@ Tea.context(function () {
 
 			domainsAll: false,
 			domainBefore: [],
+			domainBeforeIgnorePorts: true,
 			domainAfter: "",
 			domainAfterScheme: "",