diff --git a/engine.go b/engine.go index 106f5b84..1246590d 100644 --- a/engine.go +++ b/engine.go @@ -1086,13 +1086,13 @@ func (engine *Engine) TZTime(t time.Time) (r time.Time) { return } -func (engine *Engine) NowTime(SQLTypeName string) interface{} { +func (engine *Engine) NowTime(sqlTypeName string) interface{} { t := time.Now() - return engine.FormatTime(SQLTypeName, t) + return engine.FormatTime(sqlTypeName, t) } -func (engine *Engine) FormatTime(SQLTypeName string, t time.Time) (v interface{}) { - switch SQLTypeName { +func (engine *Engine) FormatTime(sqlTypeName string, t time.Time) (v interface{}) { + switch sqlTypeName { case Time: s := engine.TZTime(t).Format("2006-01-02 15:04:05") //time.RFC3339 v = s[11:19] diff --git a/session.go b/session.go index 36625653..93a523fe 100644 --- a/session.go +++ b/session.go @@ -1964,7 +1964,7 @@ func (session *Session) byte2Time(col *Column, data []byte) (outTime time.Time, outErr = errors.New(fmt.Sprintf("unsupported time format %v: %v", sdata, err)) return } - outTime = x + outTime = session.Engine.TZTime(x) return } @@ -2402,10 +2402,10 @@ func (session *Session) value2Interface(col *Column, fieldValue reflect.Value) ( } } switch fieldValue.Interface().(type) { - case time.Time: - tf := session.Engine.FormatTime(col.SQLType.Name,fieldValue.Interface().(time.Time)) + case time.Time: + tf := session.Engine.FormatTime(col.SQLType.Name, fieldValue.Interface().(time.Time)) return tf, nil - default: + default: return fieldValue.Interface(), nil } } diff --git a/xorm.go b/xorm.go index 11028edf..88d99e79 100644 --- a/xorm.go +++ b/xorm.go @@ -24,7 +24,7 @@ func NewEngine(driverName string, dataSourceName string) (*Engine, error) { DriverName: driverName, DataSourceName: dataSourceName, Filters: make([]Filter, 0), - TimeZone: "UTC", + TimeZone: "Local", } engine.SetMapper(SnakeMapper{})