From 9cd7f0d681757efa95b50bfc6912facc00fd95dc Mon Sep 17 00:00:00 2001
From: igophper <34326532+igophper@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:58:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=91=E7=AB=99404?=
 =?UTF-8?q?=E9=87=8D=E5=AE=9A=E5=90=91=E6=AC=A1=E6=95=B0=E8=BF=87=E5=A4=9A?=
 =?UTF-8?q?=20(#3054)=20(#3056)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs #3054
---
 backend/app/service/website.go | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/backend/app/service/website.go b/backend/app/service/website.go
index 0c5df1905..43a167a19 100644
--- a/backend/app/service/website.go
+++ b/backend/app/service/website.go
@@ -2093,15 +2093,8 @@ func (w WebsiteService) OperateRedirect(req request.NginxRedirectReq) (err error
 			})
 		}
 	case "404":
-		if req.KeepPath && !req.RedirectRoot {
-			target = req.Target + "$request_uri"
-		}
 		if req.RedirectRoot {
 			target = "/"
-		} else {
-			if req.KeepPath {
-				target = req.Target + "$request_uri"
-			}
 		}
 		block = &components.Block{
 			Directives: []components.IDirective{
@@ -2116,7 +2109,7 @@ func (w WebsiteService) OperateRedirect(req request.NginxRedirectReq) (err error
 						Directives: []components.IDirective{
 							&components.Directive{
 								Name:       "return",
-								Parameters: []string{"301", target},
+								Parameters: []string{req.Redirect, target},
 							},
 						},
 					},