1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-20 04:16:53 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix user settings loading failure after reinstallation (#9395)

Browse source
This commit is contained in:
ssongliu 2025-07-03 14:52:04 +08:00 • committed by GitHub
parent c23c5b2859
commit fc81801c4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/init/hook/hook.go
View file

@ -36,12 +36,13 @@ func Init() {
} }
func handleUserInfo(tags string, settingRepo repo.ISettingRepo) { func handleUserInfo(tags string, settingRepo repo.ISettingRepo) {
global.LOG.Debug("change-user-info", tags)
if len(tags) == 0 { if len(tags) == 0 {
return return
} }
settingMap := make(map[string]string) settingMap := make(map[string]string)
if tags == "use_existing" { if tags == "use_existing" {
settingMap["Port"] = global.CONF.Conn.Port settingMap["ServerPort"] = common.LoadParams("ORIGINAL_PORT")
settingMap["UserName"] = global.CONF.Base.Username settingMap["UserName"] = global.CONF.Base.Username
settingMap["Password"] = global.CONF.Base.Password settingMap["Password"] = global.CONF.Base.Password
settingMap["SecurityEntrance"] = global.CONF.Conn.Entrance settingMap["SecurityEntrance"] = global.CONF.Conn.Entrance
@ -63,6 +64,7 @@ func handleUserInfo(tags string, settingRepo repo.ISettingRepo) {
settingMap["SecurityEntrance"] = common.RandStrAndNum(10) settingMap["SecurityEntrance"] = common.RandStrAndNum(10)
} }
for key, val := range settingMap { for key, val := range settingMap {
global.LOG.Debug("update --- ", key, val)
if len(val) == 0 { if len(val) == 0 {
continue continue
} }
@ -70,12 +72,12 @@ func handleUserInfo(tags string, settingRepo repo.ISettingRepo) {
val, _ = encrypt.StringEncrypt(val) val, _ = encrypt.StringEncrypt(val)
} }
if err := settingRepo.Update(key, val); err != nil { if err := settingRepo.Update(key, val); err != nil {
global.LOG.Fatalf("update %s before start failed, err: %v", key, err) global.LOG.Errorf("update %s before start failed, err: %v", key, err)
} }
} }
_, _ = cmd.RunDefaultWithStdoutBashCf("%s sed -i '/CHANGE_USER_INFO=%v/d' /usr/local/bin/1pctl", cmd.SudoHandleCmd(), global.CONF.Base.ChangeUserInfo) _, _ = cmd.RunDefaultWithStdoutBashCf("%s sed -i '/CHANGE_USER_INFO=%v/d' /usr/local/bin/1pctl", cmd.SudoHandleCmd(), global.CONF.Base.ChangeUserInfo)
_, _ = cmd.RunDefaultWithStdoutBashCf("%s sed -i '/ORIGINAL_PASSWORD=%v/d' /usr/local/bin/1pctl", cmd.SudoHandleCmd(), "******") _, _ = cmd.RunDefaultWithStdoutBashCf("%s sed -i -e 's#ORIGINAL_PASSWORD=.*#ORIGINAL_PASSWORD=**********#g' /usr/local/bin/1pctl", cmd.SudoHandleCmd())
} }
func generateKey() { func generateKey() {

2
core/init/migration/migrations/init.go
View file

@ -53,7 +53,7 @@ var InitSetting = &gormigrate.Migration{
if err := tx.Create(&model.Setting{Key: "Password", Value: pass}).Error; err != nil { if err := tx.Create(&model.Setting{Key: "Password", Value: pass}).Error; err != nil {
return err return err
} }
_, _ = cmd.RunDefaultWithStdoutBashCf("%s sed -i '/ORIGINAL_PASSWORD=%v/d' /usr/local/bin/1pctl", cmd.SudoHandleCmd(), "******") _, _ = cmd.RunDefaultWithStdoutBashCf("%s sed -i -e 's#ORIGINAL_PASSWORD=.*#ORIGINAL_PASSWORD=**********#g' /usr/local/bin/1pctl", cmd.SudoHandleCmd())
if err := tx.Create(&model.Setting{Key: "Theme", Value: "light"}).Error; err != nil { if err := tx.Create(&model.Setting{Key: "Theme", Value: "light"}).Error; err != nil {
return err return err
} }