diff --git a/core/app/dto/setting.go b/core/app/dto/setting.go index b795816ce..2823bd87e 100644 --- a/core/app/dto/setting.go +++ b/core/app/dto/setting.go @@ -17,7 +17,6 @@ type SettingInfo struct { Theme string `json:"theme"` MenuTabs string `json:"menuTabs"` Language string `json:"language"` - SystemIP string `json:"systemIP"` ServerPort string `json:"serverPort"` SSL string `json:"ssl"` diff --git a/core/init/migration/migrations/init.go b/core/init/migration/migrations/init.go index 29bbc88d6..43e229b61 100644 --- a/core/init/migration/migrations/init.go +++ b/core/init/migration/migrations/init.go @@ -105,9 +105,6 @@ var InitSetting = &gormigrate.Migration{ if err := tx.Create(&model.Setting{Key: "SecurityEntrance", Value: global.CONF.Conn.Entrance}).Error; err != nil { return err } - if err := tx.Create(&model.Setting{Key: "JWTSigningKey", Value: common.RandStr(16)}).Error; err != nil { - return err - } if err := tx.Create(&model.Setting{Key: "EncryptKey", Value: encryptKey}).Error; err != nil { return err } @@ -117,9 +114,6 @@ var InitSetting = &gormigrate.Migration{ if err := tx.Create(&model.Setting{Key: "ExpirationDays", Value: "0"}).Error; err != nil { return err } - if err := tx.Create(&model.Setting{Key: "SystemIP", Value: ""}).Error; err != nil { - return err - } if err := tx.Create(&model.Setting{Key: "ComplexityVerification", Value: constant.StatusEnable}).Error; err != nil { return err } diff --git a/frontend/src/views/setting/panel/index.vue b/frontend/src/views/setting/panel/index.vue index 2f79f676b..2f4fe45d5 100644 --- a/frontend/src/views/setting/panel/index.vue +++ b/frontend/src/views/setting/panel/index.vue @@ -313,12 +313,11 @@ const search = async () => { const res = await getSettingInfo(); form.userName = res.data.userName; form.password = '******'; - form.sessionTimeout = Number(res.data.sessionTimeout); - form.panelName = res.data.panelName; + form.theme = res.data.theme; form.menuTabs = res.data.menuTabs; + form.panelName = res.data.panelName; form.language = res.data.language; - form.complexityVerification = res.data.complexityVerification; - form.developerMode = res.data.developerMode; + form.sessionTimeout = Number(res.data.sessionTimeout); form.proxyUrl = res.data.proxyUrl; form.proxyType = res.data.proxyType; @@ -327,12 +326,16 @@ const search = async () => { form.proxyUser = res.data.proxyUser; form.proxyPasswd = res.data.proxyPasswd; form.proxyPasswdKeep = res.data.proxyPasswdKeep; + form.apiInterfaceStatus = res.data.apiInterfaceStatus; form.apiKey = res.data.apiKey; form.ipWhiteList = res.data.ipWhiteList; form.apiKeyValidityTime = res.data.apiKeyValidityTime; + + form.developerMode = res.data.developerMode; form.hideMenu = res.data.hideMenu; - form.theme = res.data.theme; + + form.complexityVerification = res.data.complexityVerification; if (isMasterProductPro.value) { const xpackRes = await getXpackSetting();