diff --git a/backend/app/service/website.go b/backend/app/service/website.go index 411da5b0a..1ff1278c1 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -1496,14 +1496,6 @@ func (w WebsiteService) UpdateAuthBasic(req request.NginxAuthUpdate) (err error) if !fileOp.Stat(absoluteAuthPath) { _ = fileOp.CreateFile(absoluteAuthPath) } - defer func() { - if err != nil { - switch req.Operate { - case "create": - - } - } - }() params = append(params, dto.NginxParam{Name: "auth_basic", Params: []string{`"Authentication"`}}) params = append(params, dto.NginxParam{Name: "auth_basic_user_file", Params: []string{authPath}}) @@ -1511,7 +1503,9 @@ func (w WebsiteService) UpdateAuthBasic(req request.NginxAuthUpdate) (err error) if err != nil { return } - authArray = strings.Split(string(authContent), "\n") + if len(authContent) > 0 { + authArray = strings.Split(string(authContent), "\n") + } switch req.Operate { case "disable": return deleteNginxConfig(constant.NginxScopeServer, params, &website) @@ -1582,6 +1576,9 @@ func (w WebsiteService) UpdateAuthBasic(req request.NginxAuthUpdate) (err error) defer passFile.Close() writer := bufio.NewWriter(passFile) for _, line := range authArray { + if line == "" { + continue + } _, err = writer.WriteString(line + "\n") if err != nil { return @@ -1591,6 +1588,15 @@ func (w WebsiteService) UpdateAuthBasic(req request.NginxAuthUpdate) (err error) if err != nil { return } + authContent, err = fileOp.GetContent(absoluteAuthPath) + if err != nil { + return + } + if len(authContent) == 0 { + if err = deleteNginxConfig(constant.NginxScopeServer, params, &website); err != nil { + return + } + } return } diff --git a/frontend/src/layout/components/Sidebar/components/Collapse.vue b/frontend/src/layout/components/Sidebar/components/Collapse.vue index 8f0c31e64..603d2be96 100644 --- a/frontend/src/layout/components/Sidebar/components/Collapse.vue +++ b/frontend/src/layout/components/Sidebar/components/Collapse.vue @@ -1,5 +1,5 @@