1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-09 23:17:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Exclude system ip from snapshot backups (#10100)

Browse source 
Refs  #9991
This commit is contained in:
ssongliu 2025-08-22 11:05:50 +08:00 • committed by GitHub
parent fd9c421969
commit 5fd9d20f99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
agent/app/service/snapshot.go
View file

@ -121,7 +121,7 @@ func (u *SnapshotService) LoadSnapshotData() (dto.SnapshotData, error) {
} }
i := 0 i := 0
for _, item := range itemBackups { for _, item := range itemBackups {
if item.Label != "app" && item.Label != "system_snapshot" { if item.Label != "app" && item.Label != "system_snapshot" && item.Label != "tmp" {
itemBackups[i] = item itemBackups[i] = item
i++ i++
} }

1
agent/app/service/snapshot_create.go
View file

@ -242,6 +242,7 @@ func loadDbConn(snap *snapHelper, targetDir string, req dto.SnapshotCreate) erro
return err return err
} }
snap.snapAgentDB = agentDb snap.snapAgentDB = agentDb
_ = snap.snapAgentDB.Model(&model.Setting{}).Where("key = ?", "SystemIP").Updates(map[string]interface{}{"value": ""}).Error
coreDb, err := common.LoadDBConnByPathWithErr(path.Join(targetDir, "db/core.db"), "core.db") coreDb, err := common.LoadDBConnByPathWithErr(path.Join(targetDir, "db/core.db"), "core.db")
snap.Task.LogWithStatus(i18n.GetWithName("SnapNewDB", "core"), err) snap.Task.LogWithStatus(i18n.GetWithName("SnapNewDB", "core"), err)
if err != nil { if err != nil {

2
frontend/src/api/modules/setting.ts
View file

@ -136,7 +136,7 @@ export const updateAppStoreConfig = (req: App.AppStoreConfigUpdate) => {
// snapshot // snapshot
export const loadSnapshotInfo = () => { export const loadSnapshotInfo = () => {
return http.get<Setting.SnapshotData>(`/settings/snapshot/load`); return http.get<Setting.SnapshotData>(`/settings/snapshot/load`, {}, TimeoutEnum.T_60S);
}; };
export const snapshotCreate = (param: Setting.SnapshotCreate) => { export const snapshotCreate = (param: Setting.SnapshotCreate) => {
return http.post(`/settings/snapshot`, param); return http.post(`/settings/snapshot`, param);

2
frontend/src/views/setting/snapshot/create/index.vue
View file

@ -397,6 +397,8 @@ const load18n = (node: any, label: string) => {
return i18n.global.t('setting.' + label + 'Label'); return i18n.global.t('setting.' + label + 'Label');
case 'system_snapshot': case 'system_snapshot':
return i18n.global.t('setting.snapshotLabel'); return i18n.global.t('setting.snapshotLabel');
case 'master':
return i18n.global.t('xpack.node.masterBackup');
default: default:
return label; return label;
} }