1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-11-12 20:50:43 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(website): fix issue with backup failed in websites (#8068)

Browse source
This commit is contained in:
zhengkunwang 2025-03-05 15:37:18 +08:00 • committed by GitHub
parent a37fa5c77c
commit 53a99400c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
agent/app/service/backup_website.go
View file

@ -33,7 +33,7 @@ func (u *BackupService) WebsiteBackup(req dto.CommonBackup) error {
} }
timeNow := time.Now().Format(constant.DateTimeSlimLayout) timeNow := time.Now().Format(constant.DateTimeSlimLayout)
itemDir := fmt.Sprintf("website/%s", req.Name) itemDir := fmt.Sprintf("website/%s", website.Alias)
backupDir := path.Join(global.Dir.LocalBackupDir, itemDir) backupDir := path.Join(global.Dir.LocalBackupDir, itemDir)
fileName := fmt.Sprintf("%s_%s.tar.gz", website.Alias, timeNow+common.RandStrAndNum(5)) fileName := fmt.Sprintf("%s_%s.tar.gz", website.Alias, timeNow+common.RandStrAndNum(5))
@ -45,7 +45,7 @@ func (u *BackupService) WebsiteBackup(req dto.CommonBackup) error {
record := &model.BackupRecord{ record := &model.BackupRecord{
Type: "website", Type: "website",
Name: website.Alias, Name: website.Alias,
DetailName: req.DetailName, DetailName: website.Alias,
SourceAccountIDs: "1", SourceAccountIDs: "1",
DownloadAccountID: 1, DownloadAccountID: 1,
FileDir: itemDir, FileDir: itemDir,
@ -184,7 +184,7 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback
} }
taskName := i18n.GetMsgByKey("TaskRecover") + i18n.GetMsgByKey("websiteDir") taskName := i18n.GetMsgByKey("TaskRecover") + i18n.GetMsgByKey("websiteDir")
t.Log(taskName) t.Log(taskName)
if err = fileOp.TarGzExtractPro(fmt.Sprintf("%s/%s.web.tar.gz", tmpPath, website.Alias), GetSitePath(*website, SiteDir), ""); err != nil { if err = fileOp.TarGzExtractPro(fmt.Sprintf("%s/%s.web.tar.gz", tmpPath, website.Alias), GetSitePath(*website, SitesDir), secret); err != nil {
t.LogFailedWithErr(taskName, err) t.LogFailedWithErr(taskName, err)
return err return err
} }

3
agent/app/service/website_utils.go
View file

@ -1161,6 +1161,7 @@ const (
SiteErrorLog = "error.log" SiteErrorLog = "error.log"
WebsiteRootDir = "WebsiteRootDir" WebsiteRootDir = "WebsiteRootDir"
SiteDir = "SiteDir" SiteDir = "SiteDir"
SitesDir = "SitesDir"
SiteIndexDir = "SiteIndexDir" SiteIndexDir = "SiteIndexDir"
SiteProxyDir = "SiteProxyDir" SiteProxyDir = "SiteProxyDir"
SiteSSLDir = "SiteSSLDir" SiteSSLDir = "SiteSSLDir"
@ -1185,6 +1186,8 @@ func GetSitePath(website model.Website, confType string) string {
return path.Join(GteSiteDir(website.Alias), "log", "error.log") return path.Join(GteSiteDir(website.Alias), "log", "error.log")
case SiteDir: case SiteDir:
return GteSiteDir(website.Alias) return GteSiteDir(website.Alias)
case SitesDir:
return path.Join(GetWebSiteRootDir(), "sites")
case SiteIndexDir: case SiteIndexDir:
return path.Join(GteSiteDir(website.Alias), "index") return path.Join(GteSiteDir(website.Alias), "index")
case SiteCacheDir: case SiteCacheDir:

2
frontend/src/views/website/website/index.vue
View file

@ -466,7 +466,7 @@ const buttons = [
click: (row: Website.Website) => { click: (row: Website.Website) => {
let params = { let params = {
type: 'website', type: 'website',
name: row.primaryDomain, name: row.alias,
detailName: row.alias, detailName: row.alias,
}; };
dialogBackupRef.value!.acceptParams(params); dialogBackupRef.value!.acceptParams(params);