Merge branch 'master' into master

pull/194/head
Hunter Long 2019-06-06 12:18:43 -07:00 committed by GitHub
commit 9013eb6c94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -194,7 +194,7 @@ func (db *DbConfig) Connect(retry bool, location string) error {
dbType = "sqlite3" dbType = "sqlite3"
case "mysql": case "mysql":
host := fmt.Sprintf("%v:%v", Configs.DbHost, Configs.DbPort) host := fmt.Sprintf("%v:%v", Configs.DbHost, Configs.DbPort)
conn = fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=UTC", Configs.DbUser, Configs.DbPass, host, Configs.DbData) conn = fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=UTC&time_zone=%%27UTC%%27", Configs.DbUser, Configs.DbPass, host, Configs.DbData)
case "postgres": case "postgres":
sslMode := "disable" sslMode := "disable"
if postgresSSL != "" { if postgresSSL != "" {