From 2e43f8ed5baebc4affe78de1e66511e21a75e340 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Wed, 8 Apr 2020 09:04:03 +0800 Subject: [PATCH] Modify: use INT represent Database port --- models/init.go | 2 +- pkg/conf/conf.go | 2 +- pkg/conf/defaults.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/models/init.go b/models/init.go index 4714199..9153f01 100644 --- a/models/init.go +++ b/models/init.go @@ -32,7 +32,7 @@ func Init() { // 未指定数据库时,使用SQLite db, err = gorm.Open("sqlite3", util.RelativePath(conf.DatabaseConfig.DBFile)) } else { - db, err = gorm.Open(conf.DatabaseConfig.Type, fmt.Sprintf("%s:%s@(%s:%s)/%s?charset=utf8&parseTime=True&loc=Local", + db, err = gorm.Open(conf.DatabaseConfig.Type, fmt.Sprintf("%s:%s@(%s:%d)/%s?charset=utf8&parseTime=True&loc=Local", conf.DatabaseConfig.User, conf.DatabaseConfig.Password, conf.DatabaseConfig.Host, diff --git a/pkg/conf/conf.go b/pkg/conf/conf.go index 8bf72f5..d28d043 100644 --- a/pkg/conf/conf.go +++ b/pkg/conf/conf.go @@ -15,7 +15,7 @@ type database struct { Name string TablePrefix string DBFile string - Port string + Port int } // system 系统通用配置 diff --git a/pkg/conf/defaults.go b/pkg/conf/defaults.go index f2b2fad..f4ff903 100644 --- a/pkg/conf/defaults.go +++ b/pkg/conf/defaults.go @@ -13,6 +13,7 @@ var RedisConfig = &redis{ var DatabaseConfig = &database{ Type: "UNSET", DBFile: "cloudreve.db", + Port: 3306, } // SystemConfig 系统公用配置