test/1Panel
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/1Panel.git synced 2024-12-02 20:08:03 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

fix: 1pctl 数据库路径修改

Browse Source
This commit is contained in:
ssongliu 2023-02-20 15:39:26 +08:00 committed by ssongliu
parent 9d0b731730
commit deca1d01d3
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/init/viper/viper.go
View File

@ -45,6 +45,9 @@ func Init() {
if len(baseDir) == 0 {
panic("error `BASE_DIR` find in /usr/bin/1pctl")
}
if strings.HasSuffix(baseDir, "/") {
baseDir = baseDir[:strings.LastIndex(baseDir, "/")]
}
reader := bytes.NewReader(conf.AppYaml)
if err := v.ReadConfig(reader); err != nil {
panic(fmt.Errorf("Fatal error config file: %s \n", err))

17
cmd/server/cmd/user-info.go
View File

@ -2,8 +2,10 @@ package cmd
import (
"fmt"
"strings"
"github.com/1Panel-dev/1Panel/backend/global"
cmdUtils "github.com/1Panel-dev/1Panel/backend/utils/cmd"
"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
"github.com/spf13/cobra"
"gorm.io/driver/sqlite"
@ -18,8 +20,19 @@ var userinfoCmd = &cobra.Command{
Use: "user-info",
Short: "获取用户信息",
RunE: func(cmd *cobra.Command, args []string) error {
fullPath := "/opt/1panel/db/1Panel.db"
db, err := gorm.Open(sqlite.Open(fullPath), &gorm.Config{})
stdout, err := cmdUtils.Exec("grep '^BASE_DIR=' /usr/bin/1pctl | cut -d'=' -f2")
if err != nil {
panic(err)
}
baseDir := strings.ReplaceAll(stdout, "\n", "")
if len(baseDir) == 0 {
fmt.Printf("error `BASE_DIR` find in /usr/bin/1pctl \n")
}
if strings.HasSuffix(baseDir, "/") {
baseDir = baseDir[:strings.LastIndex(baseDir, "/")]
}
db, err := gorm.Open(sqlite.Open(baseDir+"/1panel/db/1Panel.db"), &gorm.Config{})
if err != nil {
fmt.Printf("init my db conn failed, err: %v \n", err)
}

17
cmd/server/cmd/version.go
View File

@ -2,7 +2,9 @@ package cmd
import (
"fmt"
"strings"
cmdUtils "github.com/1Panel-dev/1Panel/backend/utils/cmd"
"github.com/spf13/cobra"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
@ -16,8 +18,19 @@ var versionCmd = &cobra.Command{
Use: "version",
Short: "获取系统版本信息",
RunE: func(cmd *cobra.Command, args []string) error {
fullPath := "/opt/1panel/db/1Panel.db"
db, err := gorm.Open(sqlite.Open(fullPath), &gorm.Config{})
stdout, err := cmdUtils.Exec("grep '^BASE_DIR=' /usr/bin/1pctl | cut -d'=' -f2")
if err != nil {
panic(err)
}
baseDir := strings.ReplaceAll(stdout, "\n", "")
if len(baseDir) == 0 {
fmt.Printf("error `BASE_DIR` find in /usr/bin/1pctl \n")
}
if strings.HasSuffix(baseDir, "/") {
baseDir = baseDir[:strings.LastIndex(baseDir, "/")]
}
db, err := gorm.Open(sqlite.Open(baseDir+"/1panel/db/1Panel.db"), &gorm.Config{})
if err != nil {
fmt.Printf("init my db conn failed, err: %v \n", err)
}