Skip to content
Snippets Groups Projects
Commit 2c1ea7e0 authored by pantianying's avatar pantianying
Browse files

fix code

parent 7112f082
No related branches found
No related tags found
No related merge requests found
...@@ -171,10 +171,11 @@ func (refconfig *ReferenceConfig) getUrlMap() url.Values { ...@@ -171,10 +171,11 @@ func (refconfig *ReferenceConfig) getUrlMap() url.Values {
urlMap.Set(constant.ENVIRONMENT_KEY, consumerConfig.ApplicationConfig.Environment) urlMap.Set(constant.ENVIRONMENT_KEY, consumerConfig.ApplicationConfig.Environment)
//filter //filter
urlMap.Set(constant.REFERENCE_FILTER_KEY, mergeValue(consumerConfig.Filter, refconfig.Filter, constant.DEFAULT_REFERENCE_FILTERS)) var defaultReferenceFilter = constant.DEFAULT_REFERENCE_FILTERS
if refconfig.Generic { if refconfig.Generic {
urlMap.Set(constant.REFERENCE_FILTER_KEY, mergeValue(consumerConfig.Filter, refconfig.Filter, constant.GENERIC_REFERENCE_FILTERS)) defaultReferenceFilter = defaultReferenceFilter + constant.DEFAULT_REFERENCE_FILTERS
} }
urlMap.Set(constant.REFERENCE_FILTER_KEY, mergeValue(consumerConfig.Filter, refconfig.Filter, defaultReferenceFilter))
for _, v := range refconfig.Methods { for _, v := range refconfig.Methods {
urlMap.Set("methods."+v.Name+"."+constant.LOADBALANCE_KEY, v.Loadbalance) urlMap.Set("methods."+v.Name+"."+constant.LOADBALANCE_KEY, v.Loadbalance)
......
...@@ -301,7 +301,7 @@ func test3() { ...@@ -301,7 +301,7 @@ func test3() {
time.Sleep(3 * time.Second) time.Sleep(3 * time.Second)
println("\n\n\nstart to generic invoke") println("\n\n\nstart to generic invoke")
resp, err := referenceConfig.GetRPCService().(*config.GenericService).Invoke([]interface{}{"GetUser", []string{"java.lang.String"}, "A003"}) resp, err := referenceConfig.GetRPCService().(*config.GenericService).Invoke([]interface{}{"GetUser", []string{"java.lang.String"}, []interface{}{"A003"}})
if err != nil { if err != nil {
panic(err) panic(err)
} }
......
...@@ -81,7 +81,7 @@ func struct2MapAll(obj interface{}) interface{} { ...@@ -81,7 +81,7 @@ func struct2MapAll(obj interface{}) interface{} {
t := reflect.TypeOf(obj) t := reflect.TypeOf(obj)
v := reflect.ValueOf(obj) v := reflect.ValueOf(obj)
if t.Kind() == reflect.Struct { if t.Kind() == reflect.Struct {
result := make(map[string]interface{}) result := make(map[string]interface{}, t.NumField())
for i := 0; i < t.NumField(); i++ { for i := 0; i < t.NumField(); i++ {
if v.Field(i).Kind() == reflect.Struct { if v.Field(i).Kind() == reflect.Struct {
if v.Field(i).CanInterface() { if v.Field(i).CanInterface() {
...@@ -100,7 +100,7 @@ func struct2MapAll(obj interface{}) interface{} { ...@@ -100,7 +100,7 @@ func struct2MapAll(obj interface{}) interface{} {
return result return result
} else if t.Kind() == reflect.Slice { } else if t.Kind() == reflect.Slice {
value := reflect.ValueOf(obj) value := reflect.ValueOf(obj)
var newTemps []interface{} var newTemps = make([]interface{}, 0, value.Len())
for i := 0; i < value.Len(); i++ { for i := 0; i < value.Len(); i++ {
newTemp := struct2MapAll(value.Index(i).Interface()) newTemp := struct2MapAll(value.Index(i).Interface())
newTemps = append(newTemps, newTemp) newTemps = append(newTemps, newTemp)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment