diff --git a/models/init.go b/models/init.go index 02af046..447922a 100644 --- a/models/init.go +++ b/models/init.go @@ -9,7 +9,9 @@ import ( "github.com/gin-gonic/gin" "github.com/jinzhu/gorm" + _ "github.com/jinzhu/gorm/dialects/mssql" _ "github.com/jinzhu/gorm/dialects/mysql" + _ "github.com/jinzhu/gorm/dialects/postgres" _ "github.com/jinzhu/gorm/dialects/sqlite" ) @@ -33,16 +35,14 @@ func Init() { case "UNSET", "sqlite", "sqlite3": // 未指定数据库或者明确指定为 sqlite 时,使用 SQLite3 数据库 db, err = gorm.Open("sqlite3", util.RelativePath(conf.DatabaseConfig.DBFile)) - case "mysql": - // 当前只支持 sqlite3 与 mysql 数据库 - // TODO: import 其他 gorm 支持的主流数据库?否则直接 Open 没有任何意义。 - // TODO: 数据库连接其他参数允许用户自定义?譬如编码更换为 utf8mb4 以支持表情。 - db, err = gorm.Open("mysql", fmt.Sprintf("%s:%s@(%s:%d)/%s?charset=utf8&parseTime=True&loc=Local", + case "mysql", "postgres", "mssql": + db, err = gorm.Open(conf.DatabaseConfig.Type, fmt.Sprintf("%s:%s@(%s:%d)/%s?charset=%s&parseTime=True&loc=Local", conf.DatabaseConfig.User, conf.DatabaseConfig.Password, conf.DatabaseConfig.Host, conf.DatabaseConfig.Port, - conf.DatabaseConfig.Name)) + conf.DatabaseConfig.Name, + conf.DatabaseConfig.Charset)) default: util.Log().Panic("不支持数据库类型: %s", conf.DatabaseConfig.Type) } diff --git a/pkg/conf/conf.go b/pkg/conf/conf.go index b9be97c..ceeb597 100644 --- a/pkg/conf/conf.go +++ b/pkg/conf/conf.go @@ -16,6 +16,7 @@ type database struct { TablePrefix string DBFile string Port int + Charset string } // system 系统通用配置 diff --git a/pkg/conf/defaults.go b/pkg/conf/defaults.go index 3482cb8..64a3721 100644 --- a/pkg/conf/defaults.go +++ b/pkg/conf/defaults.go @@ -12,9 +12,10 @@ var RedisConfig = &redis{ // DatabaseConfig 数据库配置 var DatabaseConfig = &database{ - Type: "UNSET", - DBFile: "cloudreve.db", - Port: 3306, + Type: "UNSET", + Charset: "utf8", + DBFile: "cloudreve.db", + Port: 3306, } // SystemConfig 系统公用配置 @@ -68,5 +69,5 @@ var SSLConfig = &ssl{ } var UnixConfig = &unix{ - Listen: "", + Listen: "", }