From 43de7e4678563f0677a66b89f93c7eff3c999635 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 28 Sep 2020 18:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=AD=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E9=87=8D=E5=86=99=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/server/settings/rewrite/createPopup.go   |  2 ++
 .../servers/server/settings/rewrite/updatePopup.go   |  2 ++
 .../servers/server/settings/rewrite/createPopup.html | 12 +++++++++++-
 .../servers/server/settings/rewrite/updatePopup.html | 10 ++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go b/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go
index 84947396..c1462965 100644
--- a/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go
+++ b/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go
@@ -33,6 +33,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Mode           string
 	RedirectStatus int
 	ProxyHost      string
+	WithQuery      bool
 	IsBreak        bool
 	IsOn           bool
 
@@ -67,6 +68,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Mode:           params.Mode,
 		RedirectStatus: types.Int32(params.RedirectStatus),
 		ProxyHost:      params.ProxyHost,
+		WithQuery:      params.WithQuery,
 		IsBreak:        params.IsBreak,
 		IsOn:           params.IsOn,
 	})
diff --git a/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go b/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go
index a4e642e5..4b2c2143 100644
--- a/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go
+++ b/internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go
@@ -53,6 +53,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	Mode           string
 	RedirectStatus int
 	ProxyHost      string
+	WithQuery      bool
 	IsBreak        bool
 	IsOn           bool
 
@@ -81,6 +82,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Mode:           params.Mode,
 		RedirectStatus: types.Int32(params.RedirectStatus),
 		ProxyHost:      params.ProxyHost,
+		WithQuery:      params.WithQuery,
 		IsBreak:        params.IsBreak,
 		IsOn:           params.IsOn,
 	})
diff --git a/web/views/@default/servers/server/settings/rewrite/createPopup.html b/web/views/@default/servers/server/settings/rewrite/createPopup.html
index e132dcc2..7ac8171d 100644
--- a/web/views/@default/servers/server/settings/rewrite/createPopup.html
+++ b/web/views/@default/servers/server/settings/rewrite/createPopup.html
@@ -48,11 +48,21 @@
 					<p class="comment">如果转发的方式为隐式而且目标URL为不同的域名时需要用到此选项，用于修改被代理服务接收到的域名，默认和客户端请求的主机名一致，通常不必填写，支持<a href="http://teaos.cn/doc/proxy/Variables.md#%E8%AF%B7%E6%B1%82%E7%9B%B8%E5%85%B3%E5%8F%98%E9%87%8F" target="_blank">请求变量</a>。</p>
 				</td>
 			</tr>
+			<tr>
+				<td>是否保留URL参数</td>
+				<td>
+					<div class="ui checkbox">
+						<input type="checkbox" name="withQuery" value="1" checked="checked"/>
+						<label></label>
+					</div>
+					<p class="comment">选中此选项，将会把用户输入的URL中的参数部分转发到目标URL上。</p>
+				</td>
+			</tr>
 			<tr>
 				<td>是否终止往下匹配</td>
 				<td>
 					<div class="ui checkbox">
-						<input type="checkbox" name="isBreak" value="1" checked="checked"/>
+						<input type="checkbox" name="isBreak" value="1"/>
 						<label></label>
 					</div>
 					<p class="comment">如果选中了此选项，一旦匹配成功，不会继续匹配其他的重写规则或路径规则。</p>
diff --git a/web/views/@default/servers/server/settings/rewrite/updatePopup.html b/web/views/@default/servers/server/settings/rewrite/updatePopup.html
index bbd06383..df8a4b77 100644
--- a/web/views/@default/servers/server/settings/rewrite/updatePopup.html
+++ b/web/views/@default/servers/server/settings/rewrite/updatePopup.html
@@ -49,6 +49,16 @@
 					<p class="comment">如果转发的方式为隐式而且目标URL为不同的域名时需要用到此选项，用于修改被代理服务接收到的域名，默认和客户端请求的主机名一致，通常不必填写，支持<a href="http://teaos.cn/doc/proxy/Variables.md#%E8%AF%B7%E6%B1%82%E7%9B%B8%E5%85%B3%E5%8F%98%E9%87%8F" target="_blank">请求变量</a>。</p>
 				</td>
 			</tr>
+			<tr>
+				<td>是否保留URL参数</td>
+				<td>
+					<div class="ui checkbox">
+						<input type="checkbox" name="withQuery" value="1" v-model="rewriteRule.withQuery"/>
+						<label></label>
+					</div>
+					<p class="comment">选中此选项，将会把用户输入的URL中的参数部分转发到目标URL上。</p>
+				</td>
+			</tr>
 			<tr>
 				<td>是否终止往下匹配</td>
 				<td>