1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-09 20:05:54 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix the problem of abnormal acquisition of user-info (#8902)

Browse source
This commit is contained in:
ssongliu 2025-06-04 17:30:52 +08:00 • committed by GitHub
parent 1d58810a78
commit 705642c3c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/cmd/server/cmd/listen-ip.go
View file

@ -48,7 +48,7 @@ func updateBindInfo(protocol string) error {
fmt.Println(i18n.GetMsgWithMapForCmd("SudoHelper", map[string]interface{}{"cmd": "sudo 1pctl listen-ip ipv6"}))
return nil
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
return err
}

10
core/cmd/server/cmd/reset.go
View file

@ -39,7 +39,7 @@ var resetMFACmd = &cobra.Command{
fmt.Println(i18n.GetMsgWithMapForCmd("SudoHelper", map[string]interface{}{"cmd": "sudo 1pctl reset mfa"}))
return nil
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
return err
}
@ -55,7 +55,7 @@ var resetSSLCmd = &cobra.Command{
fmt.Println(i18n.GetMsgWithMapForCmd("SudoHelper", map[string]interface{}{"cmd": "sudo 1pctl reset https"}))
return nil
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
return err
}
@ -71,7 +71,7 @@ var resetEntranceCmd = &cobra.Command{
fmt.Println(i18n.GetMsgWithMapForCmd("SudoHelper", map[string]interface{}{"cmd": "sudo 1pctl reset entrance"}))
return nil
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
return err
}
@ -87,7 +87,7 @@ var resetBindIpsCmd = &cobra.Command{
fmt.Println(i18n.GetMsgWithMapForCmd("SudoHelper", map[string]interface{}{"cmd": "sudo 1pctl reset ips"}))
return nil
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
return err
}
@ -103,7 +103,7 @@ var resetDomainCmd = &cobra.Command{
fmt.Println(i18n.GetMsgWithMapForCmd("SudoHelper", map[string]interface{}{"cmd": "sudo 1pctl reset domain"}))
return nil
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
return err
}

5
core/cmd/server/cmd/root.go
View file

@ -3,6 +3,7 @@ package cmd
import (
"fmt"
"os/user"
"path"
"strings"
"time"
@ -36,7 +37,7 @@ type setting struct {
About string `json:"about" gorm:"type:longText"`
}
func loadDBConn() (*gorm.DB, error) {
func loadDBConn(dbName string) (*gorm.DB, error) {
stdout, err := cmdUtils.RunDefaultWithStdoutBashC("grep '^BASE_DIR=' /usr/local/bin/1pctl | cut -d'=' -f2")
if err != nil {
return nil, fmt.Errorf("handle load `BASE_DIR` failed, err: %v", err)
@ -49,7 +50,7 @@ func loadDBConn() (*gorm.DB, error) {
baseDir = baseDir[:strings.LastIndex(baseDir, "/")]
}
db, err := gorm.Open(sqlite.Open(baseDir+"/1panel/db/core.db"), &gorm.Config{})
db, err := gorm.Open(sqlite.Open(path.Join(baseDir, "1panel/db", dbName)), &gorm.Config{})
if err != nil {
return nil, fmt.Errorf("init my db conn failed, err: %v \n", err)
}

6
core/cmd/server/cmd/update.go
View file

@ -99,7 +99,7 @@ func username() {
return
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
fmt.Println(i18n.GetMsgWithMapForCmd("DBConnErr", map[string]interface{}{"err": err.Error()}))
return
@ -131,7 +131,7 @@ func password() {
fmt.Println("\n" + i18n.GetMsgByKeyForCmd("UpdateUPasswordBlank"))
return
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
fmt.Println("\n" + i18n.GetMsgWithMapForCmd("DBConnErr", map[string]interface{}{"err": err.Error()}))
return
@ -196,7 +196,7 @@ func port() {
fmt.Println(i18n.GetMsgByKeyForCmd("UpdatePortUsed"))
return
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
fmt.Println(i18n.GetMsgWithMapForCmd("DBConnErr", map[string]interface{}{"err": err.Error()}))
return

8
core/cmd/server/cmd/user-info.go
View file

@ -22,10 +22,14 @@ var userinfoCmd = &cobra.Command{
fmt.Println(i18n.GetMsgWithMapForCmd("SudoHelper", map[string]interface{}{"cmd": "sudo 1pctl user-info"}))
return nil
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
return fmt.Errorf("init my db conn failed, err: %v \n", err)
}
agentDB, err := loadDBConn("agent.db")
if err != nil {
return fmt.Errorf("init my agent db conn failed, err: %v \n", err)
}
user := getSettingByKey(db, "UserName")
pass := "********"
if isDefault(db) {
@ -39,7 +43,7 @@ var userinfoCmd = &cobra.Command{
port := getSettingByKey(db, "ServerPort")
ssl := getSettingByKey(db, "SSL")
entrance := getSettingByKey(db, "SecurityEntrance")
address := getSettingByKey(db, "SystemIP")
address := getSettingByKey(agentDB, "SystemIP")
protocol := "http"
if ssl == constant.StatusEnable {

2
core/cmd/server/cmd/version.go
View file

@ -23,7 +23,7 @@ var versionCmd = &cobra.Command{
fmt.Println(i18n.GetMsgWithMapForCmd("SudoHelper", map[string]interface{}{"cmd": "sudo 1pctl version"}))
return nil
}
db, err := loadDBConn()
db, err := loadDBConn("core.db")
if err != nil {
return err
}