Merge pull request #4 from ArtisanCloud/develop

Develop
ArtisanCloud · May 17, 2022 · 92bdd58 · 92bdd58
2 parents 19943e5 + d380b00
commit 92bdd58
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/http/drivers/gout/client.go b/http/drivers/gout/client.go
@@ -98,7 +98,7 @@ func (client *Client) PrepareRequest(method string, uri string, options *object.
 
 	// append query
 	queries = &object.StringMap{}
-	if (*options)["query"] != nil {
+	if !object.IsObjectNil((*options)["query"]) {
 		queries = (*options)["query"].(*object.StringMap)
 	}
 
@@ -287,8 +287,8 @@ func (client *Client) buildUri(uri *url.URL, config *object.HashMap) *url.URL {
 			}
 		} else {
 			// use app config base uri
-			mapHttp := (*client.Config)["http"].(object.HashMap)
-			strBaseUri := mapHttp["base_uri"].(string)
+			mapHttp := (*client.Config)["http"].(*object.HashMap)
+			strBaseUri := (*mapHttp)["base_uri"].(string)
 			baseUri, err = url.Parse(strBaseUri)
 			if err != nil {
 				print("cannot parse base url, pls make sure base_uri has scheme")

diff --git a/object/collection.go b/object/collection.go
@@ -180,6 +180,8 @@ func (c *Collection) Get(key string, defaultValue interface{}) interface{} {
 				switch hashedObject[segment].(type) {
 				case HashMap:
 					hashedObject = hashedObject[segment].(HashMap)
+				case *HashMap:
+					hashedObject = *(hashedObject[segment].(*HashMap))
 				case map[string]interface{}:
 					hashedObject = hashedObject[segment].(map[string]interface{})
 				default:

diff --git a/object/map.go b/object/map.go
@@ -47,8 +47,8 @@ func GetModelTags(t reflect.Type, tagName string) (tags []string) {
 	for i := 0; i < t.NumField(); i++ {
 		// Get the field, returns https://golang.org/pkg/reflect/#StructField
 		field := t.Field(i)
-		kind:=field.Type.Kind().String()
-		if kind == "struct" || kind=="ptr" {
+		kind := field.Type.Kind().String()
+		if kind == "struct" || kind == "ptr" {
 			subTags = GetModelTags(field.Type.Elem(), tagName)
 			tags = append(tags, subTags...)
 
@@ -62,3 +62,7 @@ func GetModelTags(t reflect.Type, tagName string) (tags []string) {
 	}
 	return tags
 }
+
+func IsObjectNil(obj interface{}) bool {
+	return obj == nil || (reflect.ValueOf(obj).Kind() == reflect.Ptr && reflect.ValueOf(obj).IsNil())
+}