From 54980429beaf542b8353a3c6c3000753735be0c6 Mon Sep 17 00:00:00 2001 From: csznet Date: Fri, 19 Apr 2024 00:34:36 +0800 Subject: [PATCH] Refactor database path handling in conf package --- conf/conf.go | 2 +- main.go | 5 +++++ sql/sql.go | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conf/conf.go b/conf/conf.go index bf0441e..7258f42 100644 --- a/conf/conf.go +++ b/conf/conf.go @@ -45,7 +45,7 @@ var TcpTimeout int var version string // 数据库位置 -var Db = "goForward.db" +var Db string func init() { if version != "" { diff --git a/main.go b/main.go index 1313617..646e315 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "flag" + "strings" "sync" "csz.net/goForward/conf" @@ -66,4 +67,8 @@ func init() { flag.StringVar(&conf.WebPass, "pass", "", "Web Password") flag.IntVar(&conf.TcpTimeout, "tt", 60, "Tcp Timeout") flag.Parse() + if !strings.HasSuffix(conf.Db, ".db") { + conf.Db += ".db" + } + sql.Once() } diff --git a/sql/sql.go b/sql/sql.go index a9cfc57..6e4f2d7 100644 --- a/sql/sql.go +++ b/sql/sql.go @@ -16,7 +16,7 @@ import ( // 定义数据库指针 var db *gorm.DB -func init() { +func Once() { var err error var dbPath string executablePath, err := os.Executable()