|
|
@@ -22,8 +22,7 @@ const (
|
|
|
tagPartToPackage = "toPackage"
|
|
|
tagPartToStruct = "toStruct"
|
|
|
tagPartToField = "toField"
|
|
|
- tagPartParseTime = "parseTime"
|
|
|
- tagPartFormatTime = "formatTime"
|
|
|
+ tagPartTimeLayout = "timeLayout"
|
|
|
tagPartJoinWith = "joinWith"
|
|
|
tagPartSplitWith = "splitWith"
|
|
|
tagPartTrim = "trim"
|
|
|
@@ -35,8 +34,7 @@ type Tag struct {
|
|
|
ToPackage string
|
|
|
ToStruct string
|
|
|
ToField string
|
|
|
- ParseTime string
|
|
|
- FormatTime string
|
|
|
+ TimeLayout string
|
|
|
JoinWith string
|
|
|
SplitWith string
|
|
|
Trim string
|
|
|
@@ -130,8 +128,7 @@ func parseFieldTag(field reflect.StructField, tagStr string) (*Tag, error) {
|
|
|
ToPackage: "",
|
|
|
ToStruct: "",
|
|
|
ToField: field.Name,
|
|
|
- ParseTime: time.DateTime,
|
|
|
- FormatTime: time.DateTime,
|
|
|
+ TimeLayout: time.DateTime,
|
|
|
JoinWith: defaultStringSliceSeparator,
|
|
|
SplitWith: defaultStringSliceSeparator,
|
|
|
Trim: "",
|
|
|
@@ -162,10 +159,8 @@ func parseFieldTag(field reflect.StructField, tagStr string) (*Tag, error) {
|
|
|
tag.ToStruct = tagPartKeyValue[1]
|
|
|
case tagPartToField:
|
|
|
tag.ToField = tagPartKeyValue[1]
|
|
|
- case tagPartParseTime:
|
|
|
- tag.ParseTime = tagPartKeyValue[1]
|
|
|
- case tagPartFormatTime:
|
|
|
- tag.FormatTime = tagPartKeyValue[1]
|
|
|
+ case tagPartTimeLayout:
|
|
|
+ tag.TimeLayout = tagPartKeyValue[1]
|
|
|
case tagPartJoinWith:
|
|
|
if strutils.IsStringEmpty(tagPartKeyValue[1]) {
|
|
|
return nil, errors.New(tagPartJoinWith + "没有赋值分隔符")
|