github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 解决重定向设置重定向到首页但是编辑显示错误的问题 (#1803)

pull/1806/head
zhengkunwang 2023-08-01 18:25:12 +08:00 committed by GitHub
parent a84d8dd828
commit a0a26f237b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/app/dto/response/nginx.go
View File

@ -36,15 +36,16 @@ type NginxAntiLeechRes struct {
}
type NginxRedirectConfig struct {
WebsiteID uint `json:"websiteID"`
Name string `json:"name"`
Domains []string `json:"domains"`
KeepPath bool `json:"keepPath"`
Enable bool `json:"enable"`
Type string `json:"type"`
Redirect string `json:"redirect"`
Path string `json:"path"`
Target string `json:"target"`
FilePath string `json:"filePath"`
Content string `json:"content"`
WebsiteID uint `json:"websiteID"`
Name string `json:"name"`
Domains []string `json:"domains"`
KeepPath bool `json:"keepPath"`
Enable bool `json:"enable"`
Type string `json:"type"`
Redirect string `json:"redirect"`
Path string `json:"path"`
Target string `json:"target"`
FilePath string `json:"filePath"`
Content string `json:"content"`
RedirectRoot bool `json:"redirectRoot"`
}

2
backend/app/service/website.go
View File

@ -2233,9 +2233,11 @@ func (w WebsiteService) GetRedirect(id uint) (res []response.NginxRedirectConfig
if strings.HasSuffix(dirParams[1], "$request_uri") {
redirectConfig.KeepPath = true
redirectConfig.Target = strings.TrimSuffix(dirParams[1], "$request_uri")
redirectConfig.RedirectRoot = false
} else {
redirectConfig.KeepPath = false
redirectConfig.Target = dirParams[1]
redirectConfig.RedirectRoot = redirectConfig.Target == "/"
}
}
}