@@ -197,20 +197,6 @@ func (u *SettingService) UpdatePort(port uint) error {
197197 if err := firewall .UpdatePort (oldPort .Value , fmt .Sprintf ("%v" , port )); err != nil {
198198 return err
199199 }
200- masterAddr , err := settingRepo .Get (repo .WithByKey ("MasterAddr" ))
201- if err != nil {
202- global .LOG .Errorf ("load master addr from db failed, err: %v" , err )
203- return err
204- }
205- if len (masterAddr .Value ) != 0 {
206- oldMasterPort := loadPort (masterAddr .Value )
207- if len (oldMasterPort ) != 0 {
208- if err := xpack .UpdateMasterAddr (strings .ReplaceAll (masterAddr .Value , oldMasterPort , fmt .Sprintf ("%v" , port ))); err != nil {
209- global .LOG .Errorf ("update master addr from db failed, err: %v" , err )
210- return err
211- }
212- }
213- }
214200
215201 if err := settingRepo .Update ("ServerPort" , strconv .Itoa (int (port ))); err != nil {
216202 return err
@@ -222,6 +208,23 @@ func (u *SettingService) UpdatePort(port uint) error {
222208 global .LOG .Errorf ("restart system port failed, err: %v" , err )
223209 }
224210 }()
211+
212+ masterAddr , err := settingRepo .Get (repo .WithByKey ("MasterAddr" ))
213+ if err != nil {
214+ global .LOG .Errorf ("load master addr from db failed, err: %v" , err )
215+ return
216+ }
217+ if len (masterAddr .Value ) != 0 {
218+ oldMasterPort := loadPort (masterAddr .Value )
219+ if len (oldMasterPort ) != 0 {
220+ newMasterAddr := strings .ReplaceAll (masterAddr .Value , oldMasterPort , fmt .Sprintf ("%v" , port ))
221+ _ = settingRepo .Update ("MasterAddr" , newMasterAddr )
222+ if err := xpack .UpdateMasterAddr (newMasterAddr ); err != nil {
223+ global .LOG .Errorf ("update master addr from db failed, err: %v" , err )
224+ return
225+ }
226+ }
227+ }
225228 }()
226229 return nil
227230}
@@ -306,6 +309,7 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error {
306309 } else {
307310 addrItem = strings .ReplaceAll (addrItem , "http://" , "https://" )
308311 }
312+ _ = settingRepo .Update ("MasterAddr" , addrItem )
309313 if err := xpack .UpdateMasterAddr (addrItem ); err != nil {
310314 global .LOG .Errorf ("update master addr from db failed, err: %v" , err )
311315 }
0 commit comments