|
@@ -44,7 +44,7 @@ func fieldsDefault(t reflect.Type) (res []any) {
|
|
|
// проверяем тег, если он есть
|
|
|
tag := fType.Tag.Get("rest")
|
|
|
if len(tag) > 0 && (strings.Contains(tag, "default") || strings.Contains(tag, "fixed")) {
|
|
|
- res = append(res, camelToSnake(fType.Name))
|
|
|
+ res = append(res, fType.Name)
|
|
|
}
|
|
|
}
|
|
|
return
|
|
@@ -56,7 +56,7 @@ func fieldsFixed(t reflect.Type) (res []any) {
|
|
|
// проверяем тег, если он есть
|
|
|
tag := fType.Tag.Get("rest")
|
|
|
if len(tag) > 0 && strings.Contains(tag, "fixed") {
|
|
|
- res = append(res, camelToSnake(fType.Name))
|
|
|
+ res = append(res, fType.Name)
|
|
|
}
|
|
|
}
|
|
|
return
|
|
@@ -66,7 +66,7 @@ func parseName(val reflect.Value) (res *Field, err error) {
|
|
|
switch val.Kind() {
|
|
|
case reflect.String:
|
|
|
return &Field{
|
|
|
- Name: camelToSnake(val.String()),
|
|
|
+ Name: val.String(),
|
|
|
}, nil
|
|
|
case reflect.Map:
|
|
|
jm := make(json.Map)
|
|
@@ -80,7 +80,6 @@ func parseName(val reflect.Value) (res *Field, err error) {
|
|
|
err = fmt.Errorf("name is empty")
|
|
|
return
|
|
|
}
|
|
|
- name = camelToSnake(name)
|
|
|
fields := jm.Slice("fields", nil)
|
|
|
res = &Field{
|
|
|
Name: name,
|
|
@@ -134,7 +133,7 @@ func fieldVal(val reflect.Value, fieldName string, files RequestFiles, names ...
|
|
|
var field reflect.Value
|
|
|
for i := 0; i < val.NumField(); i++ {
|
|
|
f := val.Type().Field(i)
|
|
|
- if camelToSnake(f.Name) == rField.Name {
|
|
|
+ if f.Name == rField.Name {
|
|
|
tag := f.Tag.Get("rest")
|
|
|
if len(tag) > 0 && strings.Contains(tag, "ignore") {
|
|
|
return true
|
|
@@ -267,7 +266,7 @@ func FieldNames(s any) (FieldNamesList, error) {
|
|
|
// Перебираем поля структуры
|
|
|
for i := 0; i < t.NumField(); i++ {
|
|
|
field := t.Field(i)
|
|
|
- fields = append(fields, camelToSnake(field.Name))
|
|
|
+ fields = append(fields, field.Name)
|
|
|
}
|
|
|
return fields, nil
|
|
|
}
|