1
0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-13 17:24:44 +08:00

feat: Support fix node (#7549)

This commit is contained in:
ssongliu 2024-12-24 17:22:47 +08:00 committed by GitHub
parent c6346b7b6f
commit 542512fc58
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 21 additions and 14 deletions

View File

@ -197,20 +197,6 @@ func (u *SettingService) UpdatePort(port uint) error {
if err := firewall.UpdatePort(oldPort.Value, fmt.Sprintf("%v", port)); err != nil {
return err
}
masterAddr, err := settingRepo.Get(repo.WithByKey("MasterAddr"))
if err != nil {
global.LOG.Errorf("load master addr from db failed, err: %v", err)
return err
}
if len(masterAddr.Value) != 0 {
oldMasterPort := loadPort(masterAddr.Value)
if len(oldMasterPort) != 0 {
if err := xpack.UpdateMasterAddr(strings.ReplaceAll(masterAddr.Value, oldMasterPort, fmt.Sprintf("%v", port))); err != nil {
global.LOG.Errorf("update master addr from db failed, err: %v", err)
return err
}
}
}
if err := settingRepo.Update("ServerPort", strconv.Itoa(int(port))); err != nil {
return err
@ -222,6 +208,23 @@ func (u *SettingService) UpdatePort(port uint) error {
global.LOG.Errorf("restart system port failed, err: %v", err)
}
}()
masterAddr, err := settingRepo.Get(repo.WithByKey("MasterAddr"))
if err != nil {
global.LOG.Errorf("load master addr from db failed, err: %v", err)
return
}
if len(masterAddr.Value) != 0 {
oldMasterPort := loadPort(masterAddr.Value)
if len(oldMasterPort) != 0 {
newMasterAddr := strings.ReplaceAll(masterAddr.Value, oldMasterPort, fmt.Sprintf("%v", port))
_ = settingRepo.Update("MasterAddr", newMasterAddr)
if err := xpack.UpdateMasterAddr(newMasterAddr); err != nil {
global.LOG.Errorf("update master addr from db failed, err: %v", err)
return
}
}
}
}()
return nil
}
@ -306,6 +309,7 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error {
} else {
addrItem = strings.ReplaceAll(addrItem, "http://", "https://")
}
_ = settingRepo.Update("MasterAddr", addrItem)
if err := xpack.UpdateMasterAddr(addrItem); err != nil {
global.LOG.Errorf("update master addr from db failed, err: %v", err)
}

View File

@ -76,6 +76,7 @@ const message = {
helpDoc: 'Help Document',
bind: 'Bind',
unbind: 'Unbind',
fix: 'Fix',
},
search: {
timeStart: 'Time start',

View File

@ -75,6 +75,7 @@ const message = {
helpDoc: '幫助文档',
bind: '綁定',
unbind: '解除綁定',
fix: '修復',
},
search: {
timeStart: '開始時間',

View File

@ -75,6 +75,7 @@ const message = {
helpDoc: '帮助文档',
bind: '绑定',
unbind: '解绑',
fix: '修复',
},
search: {
timeStart: '开始时间',