lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-22 03:47:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化时区

Browse Source
This commit is contained in:
Minho
2018-03-23 17:50:10 +08:00
parent 7aead382ad
commit 7e9769dfbb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
commands/command.go
View File

@@ -30,13 +30,6 @@ import (
func RegisterDataBase() { func RegisterDataBase() {
beego.Info("正在初始化数据库配置.") beego.Info("正在初始化数据库配置.")
adapter := beego.AppConfig.String("db_adapter") adapter := beego.AppConfig.String("db_adapter")
timezone := beego.AppConfig.String("timezone")
location, err := time.LoadLocation(timezone)
if err == nil {
orm.DefaultTimeLoc = location
} else {
beego.Error("加载时区配置信息失败,请检查是否存在ZONEINFO环境变量:",err)
}
if adapter == "mysql" { if adapter == "mysql" {
host := beego.AppConfig.String("db_host") host := beego.AppConfig.String("db_host")
@@ -44,17 +37,25 @@ func RegisterDataBase() {
username := beego.AppConfig.String("db_username") username := beego.AppConfig.String("db_username")
password := beego.AppConfig.String("db_password") password := beego.AppConfig.String("db_password")
timezone := beego.AppConfig.String("timezone")
location, err := time.LoadLocation(timezone)
if err == nil {
orm.DefaultTimeLoc = location
} else {
beego.Error("加载时区配置信息失败,请检查是否存在ZONEINFO环境变量:",err)
}
port := beego.AppConfig.String("db_port") port := beego.AppConfig.String("db_port")
dataSource := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true&loc=%s", username, password, host, port, database, url.QueryEscape(timezone)) dataSource := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true&loc=%s", username, password, host, port, database, url.QueryEscape(timezone))
err := orm.RegisterDataBase("default", "mysql", dataSource) if err := orm.RegisterDataBase("default", "mysql", dataSource); err != nil {
if err != nil {
beego.Error("注册默认数据库失败:",err) beego.Error("注册默认数据库失败:",err)
os.Exit(1) os.Exit(1)
} }
} else if adapter == "sqlite3" { } else if adapter == "sqlite3" {
orm.DefaultTimeLoc = time.UTC
database := beego.AppConfig.String("db_database") database := beego.AppConfig.String("db_database")
if strings.HasPrefix(database, "./") { if strings.HasPrefix(database, "./") {
database = filepath.Join(conf.WorkingDirectory, string(database[1:])) database = filepath.Join(conf.WorkingDirectory, string(database[1:]))