From 4ed0f035798e4998a4d884df7306d2f1ab57798a Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Mon, 16 Nov 2026 16:41:34 +0800 Subject: [PATCH] feat(website): added a feature for bulk-clearing reverse proxy cache --- agent/app/service/website_op.go | 87 +++++++++++++++++++- agent/app/service/website_proxy.go | 30 +++++-- agent/i18n/lang/en.yaml | 5 ++ agent/i18n/lang/es-ES.yaml | 5 ++ agent/i18n/lang/fa.yaml | 5 ++ agent/i18n/lang/ja.yaml | 5 ++ agent/i18n/lang/ko.yaml | 5 ++ agent/i18n/lang/lo.yaml | 5 ++ agent/i18n/lang/ms.yaml | 5 ++ agent/i18n/lang/pt-BR.yaml | 5 ++ agent/i18n/lang/ru.yaml | 5 ++ agent/i18n/lang/tr.yaml | 5 ++ agent/i18n/lang/zh-Hant.yaml | 5 ++ agent/i18n/lang/zh.yaml | 5 ++ agent/utils/files/file_op.go | 22 +++-- frontend/src/components/del-dialog/index.vue | 25 +++++- frontend/src/lang/modules/en.ts | 2 + frontend/src/lang/modules/es-es.ts | 2 + frontend/src/lang/modules/fa.ts | 2 + frontend/src/lang/modules/ja.ts | 2 + frontend/src/lang/modules/ko.ts | 2 + frontend/src/lang/modules/lo.ts | 2 + frontend/src/lang/modules/ms.ts | 2 + frontend/src/lang/modules/pt-br.ts | 2 + frontend/src/lang/modules/ru.ts | 2 + frontend/src/lang/modules/tr.ts | 2 + frontend/src/lang/modules/zh-Hant.ts | 1 + frontend/src/lang/modules/zh.ts | 3 +- frontend/src/views/website/website/index.vue | 12 ++- 29 files changed, 237 insertions(+), 23 deletions(-) diff --git a/agent/app/service/website_op.go b/agent/app/service/website_op.go index aca767896..8016a709f 100644 --- a/agent/app/service/website_op.go +++ b/agent/app/service/website_op.go @@ -2,17 +2,35 @@ package service import ( "context" + "errors" "fmt" + "sort" + "github.com/1Panel-dev/1Panel/agent/app/dto/request" + "github.com/1Panel-dev/1Panel/agent/app/model" "github.com/1Panel-dev/1Panel/agent/app/repo" "github.com/1Panel-dev/1Panel/agent/app/task" "github.com/1Panel-dev/1Panel/agent/constant" "github.com/1Panel-dev/1Panel/agent/i18n" - "sort" + "gorm.io/gorm" ) func (w WebsiteService) BatchOpWebsite(req request.BatchWebsiteOp) error { - websites, _ := websiteRepo.List(repo.WithByIDs(req.IDs)) + if req.Operate == "clearProxyCache" { + opTask, err := task.NewTaskWithOps(i18n.GetMsgByKey("ProxyCacheClear"), task.TaskBatch, task.TaskScopeWebsite, req.TaskID, 0) + if err != nil { + return err + } + opTask.AddSubTask("", func(t *task.Task) error { + return batchClearProxyCache(t, req.IDs) + }, nil) + go func() { _ = opTask.Execute() }() + return nil + } + websites, err := websiteRepo.List(repo.WithByIDs(req.IDs)) + if err != nil { + return err + } opTask, err := task.NewTaskWithOps(i18n.GetMsgByKey("Status"), task.TaskBatch, task.TaskScopeWebsite, req.TaskID, 0) if err != nil { return err @@ -57,8 +75,66 @@ func (w WebsiteService) BatchOpWebsite(req request.BatchWebsiteOp) error { return nil } +func batchClearProxyCache(t *task.Task, ids []uint) error { + websites, err := websiteRepo.GetBy(repo.WithByIDs(ids)) + if err != nil { + return err + } + // A nil entry is a requested website that no longer exists. + pending := make(map[uint]*model.Website, len(ids)) + for _, id := range ids { + pending[id] = nil + } + for i := range websites { + pending[websites[i].ID] = &websites[i] + } + + sitesDir := GetSiteDir("") + var cleared, skipped, failed int + var needsReload bool + for _, id := range ids { + web, ok := pending[id] + if !ok { + continue + } + delete(pending, id) + if web == nil { + t.LogFailedWithErr(fmt.Sprintf("ID %d", id), gorm.ErrRecordNotFound) + failed++ + continue + } + changed, err := cleanWebsiteProxyCache(sitesDir, web.Alias) + needsReload = needsReload || changed + switch { + case err != nil: + t.LogFailedWithErr(web.PrimaryDomain, err) + failed++ + case changed: + t.LogSuccess(web.PrimaryDomain) + cleared++ + default: + t.Log(web.PrimaryDomain + " · " + i18n.GetMsgByKey("ProxyCacheEmpty")) + skipped++ + } + } + summary := i18n.GetMsgWithMap("ProxyCacheSummary", map[string]interface{}{"cleared": cleared, "skipped": skipped, "failed": failed}) + t.Log(summary) + if needsReload { + if err := reloadProxyCacheNginx(); err != nil { + return fmt.Errorf("%s: %w", i18n.GetMsgByKey("ProxyCacheReloadFailed"), err) + } + } + if failed > 0 { + return errors.New(summary) + } + return nil +} + func (w WebsiteService) BatchSetGroup(req request.BatchWebsiteGroup) error { - websites, _ := websiteRepo.List(repo.WithByIDs(req.IDs)) + websites, err := websiteRepo.List(repo.WithByIDs(req.IDs)) + if err != nil { + return err + } for _, web := range websites { web.WebsiteGroupID = req.GroupID if err := websiteRepo.Save(context.Background(), &web); err != nil { @@ -69,7 +145,10 @@ func (w WebsiteService) BatchSetGroup(req request.BatchWebsiteGroup) error { } func (w WebsiteService) BatchSetHttps(ctx context.Context, req request.BatchWebsiteHttps) error { - websites, _ := websiteRepo.List(repo.WithByIDs(req.IDs)) + websites, err := websiteRepo.List(repo.WithByIDs(req.IDs)) + if err != nil { + return err + } opTask, err := task.NewTaskWithOps(i18n.GetMsgByKey("SSL"), task.TaskBatch, task.TaskScopeWebsite, req.TaskID, 0) if err != nil { return err diff --git a/agent/app/service/website_proxy.go b/agent/app/service/website_proxy.go index 10a244610..3f0333b8f 100644 --- a/agent/app/service/website_proxy.go +++ b/agent/app/service/website_proxy.go @@ -460,13 +460,33 @@ func (w WebsiteService) ClearProxyCache(req request.NginxCommonReq) error { if err != nil { return err } - cacheDir := GetSitePath(website, SiteCacheDir) - fileOp := files.NewFileOp() - if fileOp.Stat(cacheDir) { - if err = fileOp.CleanDir(cacheDir); err != nil { - return err + if _, err := cleanWebsiteProxyCache(GetSiteDir(""), website.Alias); err != nil { + return err + } + return reloadProxyCacheNginx() +} + +func cleanWebsiteProxyCache(sitesDir, alias string) (bool, error) { + if alias == "" || alias == "." || alias == ".." || filepath.Base(alias) != alias { + return false, fmt.Errorf("invalid website alias %q", alias) + } + cacheDir := filepath.Join(sitesDir, alias, "cache") + for _, dir := range []string{filepath.Dir(cacheDir), cacheDir} { + info, err := os.Lstat(dir) + if os.IsNotExist(err) { + return false, nil + } + if err != nil { + return false, err + } + if !info.IsDir() { + return false, fmt.Errorf("%s is not a directory", dir) } } + return files.NewFileOp().CleanDir(cacheDir) +} + +func reloadProxyCacheNginx() error { nginxInstall, err := getAppInstallByKey(constant.AppOpenresty) if err != nil { return err diff --git a/agent/i18n/lang/en.yaml b/agent/i18n/lang/en.yaml index dc267fd5a..e4e202324 100644 --- a/agent/i18n/lang/en.yaml +++ b/agent/i18n/lang/en.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "To check for image updates in the current runtime e ErrPHPExtensionsConflict: "A PHP extension template with this name exists with different content" ErrModelTokenizerDirOverlap: "The model and tokenizer directories must be different, and neither can contain the other" + +ProxyCacheClear: "Clear reverse proxy caches" +ProxyCacheEmpty: "Nothing to clear" +ProxyCacheSummary: "Cleared {{ .cleared }}, nothing to clear {{ .skipped }}, failed {{ .failed }}" +ProxyCacheReloadFailed: "Caches cleared, OpenResty reload failed" diff --git a/agent/i18n/lang/es-ES.yaml b/agent/i18n/lang/es-ES.yaml index f6ca0bd17..12e955141 100644 --- a/agent/i18n/lang/es-ES.yaml +++ b/agent/i18n/lang/es-ES.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "Para comprobar actualizaciones de imágenes en el e ErrPHPExtensionsConflict: "Ya existe una plantilla de extensiones PHP con este nombre y contenido diferente; no se ha sobrescrito" ErrModelTokenizerDirOverlap: "Los directorios de modelos y tokenizadores deben ser distintos y ninguno puede contener al otro" + +ProxyCacheClear: "Vaciar la caché del proxy inverso" +ProxyCacheEmpty: "Nada que vaciar" +ProxyCacheSummary: "Sitios con caché vaciada: {{ .cleared }}. Sin caché que vaciar: {{ .skipped }}. Con errores: {{ .failed }}." +ProxyCacheReloadFailed: "Se ha vaciado la caché, pero no se ha podido recargar OpenResty" diff --git a/agent/i18n/lang/fa.yaml b/agent/i18n/lang/fa.yaml index 6dc9ec086..b01ac0287 100644 --- a/agent/i18n/lang/fa.yaml +++ b/agent/i18n/lang/fa.yaml @@ -821,3 +821,8 @@ ErrImageCheckProxyRequired: "برای بررسی به‌روزرسانی تصا ErrPHPExtensionsConflict: "قالب افزونه PHP با این نام و محتوای متفاوت از قبل وجود دارد؛ بازنویسی نشد" ErrModelTokenizerDirOverlap: "پوشه‌های مدل و توکن‌ساز باید متفاوت باشند و هیچ‌کدام نباید درون دیگری قرار گیرد" + +ProxyCacheClear: "پاک‌سازی کش پراکسی معکوس" +ProxyCacheEmpty: "چیزی برای پاک‌سازی وجود ندارد" +ProxyCacheSummary: "پاک‌شده: {{ .cleared }}، بدون نیاز به پاک‌سازی: {{ .skipped }}، ناموفق: {{ .failed }}" +ProxyCacheReloadFailed: "کش پاک شد، اما بارگذاری مجدد OpenResty ناموفق بود" diff --git a/agent/i18n/lang/ja.yaml b/agent/i18n/lang/ja.yaml index ed8cbd7e5..a57a9c84c 100644 --- a/agent/i18n/lang/ja.yaml +++ b/agent/i18n/lang/ja.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "現在の実行環境でイメージの更新を確 ErrPHPExtensionsConflict: "同じ名前で内容が異なる PHP 拡張機能テンプレートが既に存在するため、上書きしませんでした" ErrModelTokenizerDirOverlap: "モデルとトークナイザーのディレクトリは別々にし、一方が他方を含まないようにしてください" + +ProxyCacheClear: "リバースプロキシキャッシュを消去" +ProxyCacheEmpty: "消去するキャッシュはありません" +ProxyCacheSummary: "消去済み {{ .cleared }} 件、消去不要 {{ .skipped }} 件、失敗 {{ .failed }} 件" +ProxyCacheReloadFailed: "キャッシュは消去されましたが、OpenResty の再読み込みに失敗しました" diff --git a/agent/i18n/lang/ko.yaml b/agent/i18n/lang/ko.yaml index 22df56725..ebb27e056 100644 --- a/agent/i18n/lang/ko.yaml +++ b/agent/i18n/lang/ko.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "현재 실행 환경에서 이미지 업데이트 ErrPHPExtensionsConflict: "같은 이름에 내용이 다른 PHP 확장 템플릿이 이미 있어 덮어쓰지 않았습니다" ErrModelTokenizerDirOverlap: "모델 디렉터리와 토크나이저 디렉터리는 서로 달라야 하며 서로 포함할 수 없습니다" + +ProxyCacheClear: "리버스 프록시 캐시 비우기" +ProxyCacheEmpty: "비울 캐시 없음" +ProxyCacheSummary: "완료 {{ .cleared }}개, 비울 캐시 없음 {{ .skipped }}개, 실패 {{ .failed }}개" +ProxyCacheReloadFailed: "캐시는 비웠지만 OpenResty를 다시 로드하지 못했습니다" diff --git a/agent/i18n/lang/lo.yaml b/agent/i18n/lang/lo.yaml index 5f2fcdcc7..aa37fec20 100644 --- a/agent/i18n/lang/lo.yaml +++ b/agent/i18n/lang/lo.yaml @@ -811,3 +811,8 @@ ErrImageCheckProxyRequired: "ເພື່ອກວດສອບການອັບ ErrPHPExtensionsConflict: "ມີແມ່ແບບສ່ວນຂະຫຍາຍ PHP ຊື່ນີ້ຢູ່ແລ້ວແຕ່ເນື້ອຫາຕ່າງກັນ; ບໍ່ໄດ້ຂຽນທັບ" ErrModelTokenizerDirOverlap: "ໂຟນເດີໂມເດວ ແລະ tokenizer ຕ້ອງແຕກຕ່າງກັນ ແລະ ບໍ່ສາມາດຢູ່ພາຍໃນກັນໄດ້" + +ProxyCacheClear: "ລ້າງແຄຊ reverse proxy" +ProxyCacheEmpty: "ບໍ່ມີແຄຊທີ່ຕ້ອງລ້າງ" +ProxyCacheSummary: "ລ້າງແລ້ວ {{ .cleared }}, ບໍ່ມີແຄຊທີ່ຕ້ອງລ້າງ {{ .skipped }}, ລົ້ມເຫຼວ {{ .failed }}" +ProxyCacheReloadFailed: "ລ້າງແຄຊແລ້ວ ແຕ່ໂຫຼດ OpenResty ຄືນໃໝ່ບໍ່ສຳເລັດ" diff --git a/agent/i18n/lang/ms.yaml b/agent/i18n/lang/ms.yaml index 053cdaa75..d6ec7733e 100644 --- a/agent/i18n/lang/ms.yaml +++ b/agent/i18n/lang/ms.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "Untuk menyemak kemas kini imej dalam persekitaran s ErrPHPExtensionsConflict: "Templat sambungan PHP dengan nama ini sudah wujud tetapi kandungannya berbeza; tidak ditulis ganti" ErrModelTokenizerDirOverlap: "Direktori model dan tokenizer mestilah berbeza dan tidak boleh mengandungi satu sama lain" + +ProxyCacheClear: "Kosongkan cache proksi terbalik" +ProxyCacheEmpty: "Tiada cache untuk dikosongkan" +ProxyCacheSummary: "Dikosongkan: {{ .cleared }}, tiada cache untuk dikosongkan: {{ .skipped }}, gagal: {{ .failed }}" +ProxyCacheReloadFailed: "Cache telah dikosongkan, tetapi OpenResty gagal dimuat semula" diff --git a/agent/i18n/lang/pt-BR.yaml b/agent/i18n/lang/pt-BR.yaml index b89f02af8..400c1f406 100644 --- a/agent/i18n/lang/pt-BR.yaml +++ b/agent/i18n/lang/pt-BR.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "Para verificar atualizações de imagens no ambient ErrPHPExtensionsConflict: "Já existe um modelo de extensões PHP com este nome e conteúdo diferente; ele não foi sobrescrito" ErrModelTokenizerDirOverlap: "Os diretórios de modelos e tokenizadores devem ser diferentes e nenhum pode conter o outro" + +ProxyCacheClear: "Limpar cache do proxy reverso" +ProxyCacheEmpty: "Nenhum cache para limpar" +ProxyCacheSummary: "Sites com cache limpo: {{ .cleared }}. Sem cache para limpar: {{ .skipped }}. Com falha: {{ .failed }}." +ProxyCacheReloadFailed: "O cache foi limpo, mas houve uma falha ao recarregar o OpenResty" diff --git a/agent/i18n/lang/ru.yaml b/agent/i18n/lang/ru.yaml index 00ae5dcba..e91e61097 100644 --- a/agent/i18n/lang/ru.yaml +++ b/agent/i18n/lang/ru.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "Для проверки обновлений обр ErrPHPExtensionsConflict: "Шаблон расширений PHP с таким именем уже существует и имеет другое содержимое; перезапись не выполнена" ErrModelTokenizerDirOverlap: "Каталоги моделей и токенизаторов должны различаться и не могут быть вложены друг в друга" + +ProxyCacheClear: "Очистить кэш обратного прокси" +ProxyCacheEmpty: "Кэш пуст" +ProxyCacheSummary: "Кэш очищен: {{ .cleared }}, кэш пуст: {{ .skipped }}, ошибок: {{ .failed }}" +ProxyCacheReloadFailed: "Кэш очищен, но не удалось перезагрузить конфигурацию OpenResty" diff --git a/agent/i18n/lang/tr.yaml b/agent/i18n/lang/tr.yaml index 8528be355..f2d1ad406 100644 --- a/agent/i18n/lang/tr.yaml +++ b/agent/i18n/lang/tr.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "Geçerli çalışma ortamında imaj güncellemeleri ErrPHPExtensionsConflict: "Bu ada sahip ancak içeriği farklı bir PHP uzantı şablonu zaten mevcut; üzerine yazılmadı" ErrModelTokenizerDirOverlap: "Model ve tokenizer dizinleri farklı olmalı ve biri diğerini içermemelidir" + +ProxyCacheClear: "Ters vekil önbelleğini temizle" +ProxyCacheEmpty: "Temizlenecek önbellek yok" +ProxyCacheSummary: "Temizlenen: {{ .cleared }}, temizlenecek önbelleği olmayan: {{ .skipped }}, başarısız: {{ .failed }}" +ProxyCacheReloadFailed: "Önbellek temizlendi ancak OpenResty yeniden yüklenemedi" diff --git a/agent/i18n/lang/zh-Hant.yaml b/agent/i18n/lang/zh-Hant.yaml index ef2f54ab6..7a67cc984 100644 --- a/agent/i18n/lang/zh-Hant.yaml +++ b/agent/i18n/lang/zh-Hant.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "目前運行環境下,如需檢查映像是否更 ErrPHPExtensionsConflict: "同名 PHP 擴充模版已存在且內容不同,未覆蓋" ErrModelTokenizerDirOverlap: "模型目錄和分詞器目錄不能相同或互相包含" + +ProxyCacheClear: "清空反代快取" +ProxyCacheEmpty: "無需清理" +ProxyCacheSummary: "已清空 {{ .cleared }} 個,無需清理 {{ .skipped }} 個,失敗 {{ .failed }} 個" +ProxyCacheReloadFailed: "快取已清空,OpenResty 重新載入失敗" diff --git a/agent/i18n/lang/zh.yaml b/agent/i18n/lang/zh.yaml index 046ba270f..48b6692eb 100644 --- a/agent/i18n/lang/zh.yaml +++ b/agent/i18n/lang/zh.yaml @@ -820,3 +820,8 @@ ErrImageCheckProxyRequired: "当前运行环境下,如需检查镜像是否更 ErrPHPExtensionsConflict: "同名 PHP 扩展模版已存在且内容不同,未覆盖" ErrModelTokenizerDirOverlap: "模型目录和分词器目录不能相同或互相包含" + +ProxyCacheClear: "清空反代缓存" +ProxyCacheEmpty: "无需清理" +ProxyCacheSummary: "已清空 {{ .cleared }} 个,无需清理 {{ .skipped }} 个,失败 {{ .failed }} 个" +ProxyCacheReloadFailed: "缓存已清空,OpenResty 重载失败" diff --git a/agent/utils/files/file_op.go b/agent/utils/files/file_op.go index d426f42ba..687bc3020 100644 --- a/agent/utils/files/file_op.go +++ b/agent/utils/files/file_op.go @@ -181,20 +181,26 @@ func (f FileOp) DeleteFile(dst string) error { return f.Fs.Remove(dst) } -func (f FileOp) CleanDir(dst string) error { +// CleanDir reports whether any entry was removed, including on partial failure. +func (f FileOp) CleanDir(dst string) (bool, error) { if IsProtected(dst) { - return buserr.New("ErrPathNotDelete") + return false, buserr.New("ErrPathNotDelete") } - items, err := afero.ReadDir(f.Fs, dst) + dir, err := f.Fs.Open(dst) if err != nil { - return err + return false, err } - for _, item := range items { - if err := f.Fs.RemoveAll(filepath.Join(dst, item.Name())); err != nil { - return err + defer dir.Close() + names, err := dir.Readdirnames(-1) + if err != nil { + return false, err + } + for i, name := range names { + if err := f.Fs.RemoveAll(filepath.Join(dst, name)); err != nil { + return i > 0, err } } - return nil + return len(names) > 0, nil } func (f FileOp) RmRf(dst string) error { diff --git a/frontend/src/components/del-dialog/index.vue b/frontend/src/components/del-dialog/index.vue index 66ab42f65..e9ce3bf52 100644 --- a/frontend/src/components/del-dialog/index.vue +++ b/frontend/src/components/del-dialog/index.vue @@ -17,11 +17,19 @@ -