diff --git a/internal/data/cron.go b/internal/data/cron.go index 54e126a68..33d210418 100644 --- a/internal/data/cron.go +++ b/internal/data/cron.go @@ -66,8 +66,8 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH # 耗子面板 - 网站备份脚本 -panel-cli backup website -n %s -p %s -panel-cli backup clear -t website -f %s -s %d -p %s +panel-cli backup website -n '%s' -p '%s' +panel-cli backup clear -t website -f '%s' -s '%d' -p '%s' `, req.Target, req.BackupPath, req.Target, req.Save, req.BackupPath) } if req.BackupType == "mysql" || req.BackupType == "postgres" { @@ -76,8 +76,8 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH # 耗子面板 - 数据库备份脚本 -panel-cli backup database -t %s -n %s -p %s -panel-cli backup clear -t %s -f %s -s %d -p %s +panel-cli backup database -t '%s' -n '%s' -p '%s' +panel-cli backup clear -t '%s' -f '%s' -s '%d' -p '%s' `, req.BackupType, req.Target, req.BackupPath, req.BackupType, req.Target, req.Save, req.BackupPath) } } diff --git a/pkg/acme/solvers.go b/pkg/acme/solvers.go index 44db9a552..dcd55a851 100644 --- a/pkg/acme/solvers.go +++ b/pkg/acme/solvers.go @@ -45,11 +45,11 @@ func (s httpSolver) Present(_ context.Context, challenge acme.Challenge) error { } `, challenge.Token, challenge.KeyAuthorization) if err = os.WriteFile(s.conf, []byte(conf), 0644); err != nil { - return fmt.Errorf("无法写入OpenResty配置文件: %w", err) + return fmt.Errorf("无法写入Nginx配置文件: %w", err) } if err = systemctl.Reload("nginx"); err != nil { _, err = shell.Execf("nginx -t") - return fmt.Errorf("无法重载OpenResty: %w", err) + return fmt.Errorf("无法重载Nginx: %w", err) } return nil diff --git a/pkg/nginx/parser_test.go b/pkg/nginx/parser_test.go index 216f5340c..9e9f7da07 100644 --- a/pkg/nginx/parser_test.go +++ b/pkg/nginx/parser_test.go @@ -206,6 +206,7 @@ func (s *NginxTestSuite) TestAccessLog() { s.Equal("/www/wwwlogs/default.log", log) s.NoError(parser.SetAccessLog("/www/wwwlogs/access.log")) log, err = parser.GetAccessLog() + s.NoError(err) s.Equal("/www/wwwlogs/access.log", log) } @@ -217,5 +218,6 @@ func (s *NginxTestSuite) TestErrorLog() { s.Equal("/www/wwwlogs/default.log", log) s.NoError(parser.SetErrorLog("/www/wwwlogs/error.log")) log, err = parser.GetErrorLog() + s.NoError(err) s.Equal("/www/wwwlogs/error.log", log) }