feat: Support fix node

1Panel-dev · Dec 24, 2024 · 456b682 · 456b682
1 parent 18321d6
commit 456b682
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/core/app/service/setting.go b/core/app/service/setting.go
@@ -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)
 			}

diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
@@ -76,6 +76,7 @@ const message = {
             helpDoc: 'Help Document',
             bind: 'Bind',
             unbind: 'Unbind',
+            fix: 'Fix',
         },
         search: {
             timeStart: 'Time start',

diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
@@ -75,6 +75,7 @@ const message = {
             helpDoc: '幫助文档',
             bind: '綁定',
             unbind: '解除綁定',
+            fix: '修復',
         },
         search: {
             timeStart: '開始時間',

diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
@@ -75,6 +75,7 @@ const message = {
             helpDoc: '帮助文档',
             bind: '绑定',
             unbind: '解绑',
+            fix: '修复',
         },
         search: {
             timeStart: '开始时间',