gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-14 01:34:47 +08:00
Code

fix: 快照前清空服务器地址 (#4068)

Browse Source
This commit is contained in:
ssongliu 2024-03-05 12:04:07 +08:00 committed by GitHub
parent ab11d7257c
commit 5633bdd41e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ func (u *SnapshotService) SnapshotImport(req dto.SnapshotImport) error {
for _, snap := range req.Names { for _, snap := range req.Names {
shortName := strings.TrimPrefix(snap, "snapshot_") shortName := strings.TrimPrefix(snap, "snapshot_")
nameItems := strings.Split(shortName, "_") nameItems := strings.Split(shortName, "_")
if !strings.HasPrefix(shortName, "1panel_v") || !strings.HasSuffix(shortName, ".tar.gz") || len(nameItems) != 3 { if !strings.HasPrefix(shortName, "1panel_v") || !strings.HasSuffix(shortName, ".tar.gz") || len(nameItems) < 3 {
return fmt.Errorf("incorrect snapshot name format of %s", shortName) return fmt.Errorf("incorrect snapshot name format of %s", shortName)
} }
if strings.HasSuffix(snap, ".tar.gz") { if strings.HasSuffix(snap, ".tar.gz") {

3
backend/app/service/snapshot_create.go
View File

@ -140,6 +140,8 @@ func snapPanelData(snap snapHelper, localDir, targetDir string) {
} }
_ = snapshotRepo.Update(snap.SnapID, map[string]interface{}{"status": "OnSaveData"}) _ = snapshotRepo.Update(snap.SnapID, map[string]interface{}{"status": "OnSaveData"})
sysIP, _ := settingRepo.Get(settingRepo.WithByKey("SystemIP"))
_ = settingRepo.Update("SystemIP", "")
checkPointOfWal() checkPointOfWal()
if err := handleSnapTar(dataDir, targetDir, "1panel_data.tar.gz", exclusionRules); err != nil { if err := handleSnapTar(dataDir, targetDir, "1panel_data.tar.gz", exclusionRules); err != nil {
status = err.Error() status = err.Error()
@ -148,6 +150,7 @@ func snapPanelData(snap snapHelper, localDir, targetDir string) {
snap.Status.PanelData = status snap.Status.PanelData = status
_ = snapshotRepo.UpdateStatus(snap.Status.ID, map[string]interface{}{"panel_data": status}) _ = snapshotRepo.UpdateStatus(snap.Status.ID, map[string]interface{}{"panel_data": status})
_ = settingRepo.Update("SystemIP", sysIP.Value)
} }
func snapCompress(snap snapHelper, rootDir string) { func snapCompress(snap snapHelper, rootDir string) {

1
backend/router/ro_dashboard.go
View File

@ -16,6 +16,7 @@ func (s *DashboardRouter) InitRouter(Router *gin.RouterGroup) {
Use(middleware.PasswordExpired()) Use(middleware.PasswordExpired())
baseApi := v1.ApiGroupApp.BaseApi baseApi := v1.ApiGroupApp.BaseApi
{ {
cmdRouter.GET("/base/os", baseApi.LoadDashboardOsInfo)
cmdRouter.GET("/base/:ioOption/:netOption", baseApi.LoadDashboardBaseInfo) cmdRouter.GET("/base/:ioOption/:netOption", baseApi.LoadDashboardBaseInfo)
cmdRouter.GET("/current/:ioOption/:netOption", baseApi.LoadDashboardCurrentInfo) cmdRouter.GET("/current/:ioOption/:netOption", baseApi.LoadDashboardCurrentInfo)
cmdRouter.POST("/system/restart/:operation", baseApi.SystemRestart) cmdRouter.POST("/system/restart/:operation", baseApi.SystemRestart)