feat:anonymous monitoring

Author: songzhibin97

ognl.go

@@ -524,7 +524,7 @@ func parseString(t reflect.Type, v reflect.Value, value string) (interface{}, Ty
 		if !v.Elem().IsValid() {
 			return nil, Invalid, nil
 		}
-		return parseString(t, v.Elem(), value)
+		return parseString(t.Elem(), v.Elem(), value)
 
 	case reflect.Map:
 		// MUST map key is string
@@ -549,14 +549,29 @@ func parseString(t reflect.Type, v reflect.Value, value string) (interface{}, Ty
 		}
 
 		if rv.CanInterface() {
+			nv, nt, ne := parseString(reflect.TypeOf(rv.Interface()), reflect.ValueOf(rv.Interface()), value)
+			if ne == nil && nt != Invalid {
+				return nv, nt, ne
+			}
 			return rv.Interface(), Type(rv.Kind()), nil
 		}
 
 		cp := reflect.New(v.Type()).Elem()
 		cp.Set(v)
 		rv = cp.FieldByName(value)
 
-		return reflect.NewAt(rv.Type(), unsafe.Pointer(rv.UnsafeAddr())).Elem().Interface(), Type(rv.Kind()), nil
+		res := reflect.NewAt(rv.Type(), unsafe.Pointer(rv.UnsafeAddr())).Elem().Interface()
+
+		rt, _ := t.FieldByName(value)
+
+		if rt.Anonymous {
+			nv, nt, ne := parseString(reflect.TypeOf(res), reflect.ValueOf(res), value)
+			if ne == nil && nt != Invalid {
+				return nv, nt, ne
+			}
+		}
+
+		return res, Type(rv.Kind()), nil
 
 	default:
 		return nil, Invalid, ErrInvalidStructure
@@ -575,7 +590,7 @@ func parseInt(t reflect.Type, v reflect.Value, tokenValue int) (interface{}, Typ
 		if !v.Elem().IsValid() {
 			return nil, Invalid, nil
 		}
-		return parseInt(t, v.Elem(), tokenValue)
+		return parseInt(t.Elem(), v.Elem(), tokenValue)
 	case reflect.Map:
 		// MUST map key is int
 		if t.Key().Kind() != reflect.Int {
@@ -611,14 +626,29 @@ func parseInt(t reflect.Type, v reflect.Value, tokenValue int) (interface{}, Typ
 		}
 
 		if value.CanInterface() {
+			nv, nt, ne := parseInt(reflect.TypeOf(value), reflect.ValueOf(value), tokenValue)
+			if ne == nil && nt != Invalid {
+				return nv, nt, ne
+			}
 			return value.Interface(), Type(value.Kind()), nil
 		}
 
 		cp := reflect.New(v.Type()).Elem()
 		cp.Set(v)
 		value = cp.Field(tokenValue)
 
-		return reflect.NewAt(value.Type(), unsafe.Pointer(value.UnsafeAddr())).Elem().Interface(), Type(value.Kind()), nil
+		res := reflect.NewAt(value.Type(), unsafe.Pointer(value.UnsafeAddr())).Elem().Interface()
+
+		rt := t.Field(tokenValue)
+
+		if rt.Anonymous {
+			nv, nt, ne := parseInt(reflect.TypeOf(res), reflect.ValueOf(res), tokenValue)
+			if ne == nil && nt != Invalid {
+				return nv, nt, ne
+			}
+		}
+
+		return res, Type(value.Kind()), nil
 
 	default:
 		return nil, Invalid, ErrParseInt

ognl_test.go

@@ -215,3 +215,43 @@ func TestGet(t *testing.T) {
 		}
 	}
 }
+
+type Repetition struct {
+	Repetition string
+}
+
+type RepetitionDetail struct {
+	*Repetition
+}
+
+func TestRepetition(t *testing.T) {
+
+	r := RepetitionDetail{
+		Repetition: &Repetition{
+			Repetition: "r1",
+		},
+	}
+
+	vv := Get(r, "Repetition").Value()
+	assert.Equal(t, vv, "r1")
+}
+
+type repetition struct {
+	repetition string
+}
+
+type repetitionDetail struct {
+	*repetition
+}
+
+func TestRepetition2(t *testing.T) {
+
+	r := repetitionDetail{
+		repetition: &repetition{
+			repetition: "r2",
+		},
+	}
+
+	vv := Get(r, "repetition").Value()
+	assert.Equal(t, vv, "r2")
+}