From 9048589a4ddb6d7432350a2030f8445b9fac7d83 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 5 Jun 2024 16:47:05 +0800
Subject: [PATCH] 1

---
 httpcli.go | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/httpcli.go b/httpcli.go
index c13ce79..ff8e88f 100644
--- a/httpcli.go
+++ b/httpcli.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	net_url "net/url"
-	//"strings"
+	"strings"
 )
 
 const (
@@ -64,31 +64,25 @@ func HttpGetEx(url string, params map[string]string,
 	}
 }
 
-/*
-func HttpGetAsJson(url string, params map[string]string) (map, string, error) {
-	respStr, err := HttpGet(url, params)
-	if err != nil {
-		return nil, respStr, err
+func HttpPost(url string, params map[string]string, contentType string, body string) (string, error) {
+	if !StrContains(url, "?") {
+		url = url + "?"
 	}
-	respObj := NewXoFromJsonStr(respStr)
-	if !respObj.IsObject() {
-		return nil, respStr, errors.New("HttpGetAsJson error invalid json format")
+	{
+		u := net_url.Values{}
+		for key, val := range params {
+			u.Set(key, val)
+		}
+		url = url + u.Encode()
 	}
-	return respObj, respStr, err
-}
-
-func HttpPostContent(url string, contentType string, body string, response *string) (error) {
-	*response = ""
 	resp, err := http.Post(url, contentType, strings.NewReader(body))
 	if err != nil {
-		return err
+		return "", err
 	}
 	defer resp.Body.Close()
 	if bytes, err := ioutil.ReadAll(resp.Body); err == nil {
-		*response = string(bytes)
-		return nil
+		return string(bytes), nil
 	} else {
-		return err
+		return "", err
 	}
 }
-*/