refactor: Simplify setting cache TTL management

- Removed the dynamic TTL function and standardized the cache TTL to a fixed duration for all settings.
- Updated cache logic in Create, Update, Get, and GetValueByKey methods to use the new fixed TTL, enhancing code clarity and maintainability.
- Added a new function to restart the core service after resetting settings, improving the reset command's functionality.

Author: HynoR

core/app/repo/setting.go

@@ -14,9 +14,8 @@ import (
 type SettingRepo struct{}
 
 var (
-	settingCache       = cache.New(5*time.Minute, 10*time.Minute)
-	settingDefaultTTL  = 5 * time.Minute
-	settingCriticalTTL = 5 * time.Second
+	settingCache = cache.New(5*time.Minute, 10*time.Minute)
+	settingTTL   = 5 * time.Minute
 )
 
 type ISettingRepo interface {
@@ -33,14 +32,6 @@ func NewISettingRepo() ISettingRepo {
 	return &SettingRepo{}
 }
 
-func loadSettingTTL(key string) time.Duration {
-	switch key {
-	case "AllowIPs", "BindDomain", "SSL":
-		return settingCriticalTTL
-	}
-	return settingDefaultTTL
-}
-
 func (u *SettingRepo) List(opts ...global.DBOption) ([]model.Setting, error) {
 	var settings []model.Setting
 	db := global.DB.Model(&model.Setting{})
@@ -59,7 +50,7 @@ func (u *SettingRepo) Create(key, value string) error {
 	if err := global.DB.Create(setting).Error; err != nil {
 		return err
 	}
-	settingCache.Set(key, value, loadSettingTTL(key))
+	settingCache.Set(key, value, settingTTL)
 	return nil
 }
 
@@ -72,7 +63,7 @@ func (u *SettingRepo) Get(opts ...global.DBOption) (model.Setting, error) {
 
 	err := db.First(&settings).Error
 	if err == nil && settings.Key != "" {
-		settingCache.Set(settings.Key, settings.Value, loadSettingTTL(settings.Key))
+		settingCache.Set(settings.Key, settings.Value, settingTTL)
 	}
 	return settings, err
 }
@@ -86,15 +77,15 @@ func (u *SettingRepo) GetValueByKey(key string) (string, error) {
 	if err := global.DB.Model(&model.Setting{}).Where("key = ?", key).First(&setting).Error; err != nil {
 		return "", err
 	}
-	settingCache.Set(key, setting.Value, loadSettingTTL(key))
+	settingCache.Set(key, setting.Value, settingTTL)
 	return setting.Value, nil
 }
 
 func (u *SettingRepo) Update(key, value string) error {
 	if err := global.DB.Model(&model.Setting{}).Where("key = ?", key).Updates(map[string]interface{}{"value": value}).Error; err != nil {
 		return err
 	}
-	settingCache.Set(key, value, loadSettingTTL(key))
+	settingCache.Set(key, value, settingTTL)
 	return nil
 }
 
@@ -106,15 +97,15 @@ func (u *SettingRepo) UpdateOrCreate(key, value string) error {
 			if err := global.DB.Create(&model.Setting{Key: key, Value: value}).Error; err != nil {
 				return err
 			}
-			settingCache.Set(key, value, loadSettingTTL(key))
+			settingCache.Set(key, value, settingTTL)
 			return nil
 		}
 		return result.Error
 	}
 	if err := global.DB.Model(&setting).UpdateColumn("value", value).Error; err != nil {
 		return err
 	}
-	settingCache.Set(key, value, loadSettingTTL(key))
+	settingCache.Set(key, value, settingTTL)
 	return nil
 }
 
@@ -125,6 +116,6 @@ func (u *SettingRepo) DefaultMenu() error {
 		Update("value", menus).Error; err != nil {
 		return err
 	}
-	settingCache.Set("HideMenu", menus, settingDefaultTTL)
+	settingCache.Set("HideMenu", menus, settingTTL)
 	return nil
 }

core/cmd/server/cmd/reset.go

@@ -2,9 +2,11 @@ package cmd
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/1Panel-dev/1Panel/core/constant"
 	"github.com/1Panel-dev/1Panel/core/i18n"
+	cmdUtils "github.com/1Panel-dev/1Panel/core/utils/cmd"
 	"github.com/1Panel-dev/1Panel/core/utils/passkey"
 	"github.com/spf13/cobra"
 )
@@ -62,7 +64,10 @@ var resetSSLCmd = &cobra.Command{
 			return err
 		}
 
-		return setSettingByKey(db, "SSL", constant.StatusDisable)
+		if err := setSettingByKey(db, "SSL", constant.StatusDisable); err != nil {
+			return err
+		}
+		return restartCoreAfterReset()
 	},
 }
 var resetEntranceCmd = &cobra.Command{
@@ -94,7 +99,10 @@ var resetBindIpsCmd = &cobra.Command{
 			return err
 		}
 
-		return setSettingByKey(db, "AllowIPs", "")
+		if err := setSettingByKey(db, "AllowIPs", ""); err != nil {
+			return err
+		}
+		return restartCoreAfterReset()
 	},
 }
 var resetDomainCmd = &cobra.Command{
@@ -110,7 +118,10 @@ var resetDomainCmd = &cobra.Command{
 			return err
 		}
 
-		return setSettingByKey(db, "BindDomain", "")
+		if err := setSettingByKey(db, "BindDomain", ""); err != nil {
+			return err
+		}
+		return restartCoreAfterReset()
 	},
 }
 
@@ -133,6 +144,22 @@ var resetPasskeyCmd = &cobra.Command{
 	},
 }
 
+func restartCoreAfterReset() error {
+	stdout, err := cmdUtils.RunDefaultWithStdoutBashC("1pctl restart core")
+	if len(stdout) != 0 {
+		fmt.Print(stdout)
+	}
+	if err == nil {
+		return nil
+	}
+
+	stdout = strings.TrimSpace(stdout)
+	if len(stdout) != 0 {
+		return fmt.Errorf("reset succeeded but restart core failed: %s", stdout)
+	}
+	return fmt.Errorf("reset succeeded but restart core failed: %v", err)
+}
+
 func loadResetHelper() {
 	fmt.Println(i18n.GetMsgByKeyForCmd("ResetCommands"))
 	fmt.Println("\nUsage:\n  1panel reset [command]\n\nAvailable Commands:")