增加工作目录配置功能

pull/1037/head
不帅你报警 4 years ago
parent b2ddac9abc
commit 77d7ef9714

@ -16,7 +16,7 @@ var (
) )
func init() { func init() {
flag.StringVar(&confPath, "c", util.RelativePath("conf.ini"), "配置文件路径") flag.StringVar(&confPath, "c", util.RelativeExecutablePath("conf.ini"), "配置文件路径")
flag.BoolVar(&isEject, "eject", false, "导出内置静态资源") flag.BoolVar(&isEject, "eject", false, "导出内置静态资源")
flag.StringVar(&scriptName, "database-script", "", "运行内置数据库助手脚本") flag.StringVar(&scriptName, "database-script", "", "运行内置数据库助手脚本")
flag.Parse() flag.Parse()

@ -26,6 +26,7 @@ type system struct {
Debug bool Debug bool
SessionSecret string SessionSecret string
HashIDSalt string HashIDSalt string
DataPath string
} }
type ssl struct { type ssl struct {

@ -48,11 +48,23 @@ func FormSlash(old string) string {
return path.Clean(strings.ReplaceAll(old, "\\", "/")) return path.Clean(strings.ReplaceAll(old, "\\", "/"))
} }
// RelativePath 获取相对工作目录的路径 // RelativeExecutablePath 获取相对可执行文件的路径
func RelativeExecutablePath(name string) string {
if filepath.IsAbs(name) {
return name
}
e, _ := os.Executable()
return filepath.Join(filepath.Dir(e), name)
}
//RelativePath 获取相对路径
func RelativePath(name string) string { func RelativePath(name string) string {
if filepath.IsAbs(name) { if filepath.IsAbs(name) {
return name return name
} }
e, _ := os.Getwd() if conf.SystemConfig.DataPath != "" {
return filepath.Join(e, name) return filepath.Join(conf.SystemConfig.DataPath, name)
} else {
return RelativeExecutablePath(name)
}
} }

Loading…
Cancel
Save