Merge branch 'master' of http://git.shengws.com/csx/gdyb

service/jsyb_service.go

@@ -1,15 +1,12 @@
 package service
 
 import (
-	"bytes"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"gdyb/utils/csbhttp"
-	"io/ioutil"
-	"net/http"
 	"strconv"
 	"time"
 )
@@ -53,45 +50,46 @@ func Jsyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
-	var inputLog string
+	//var inputLog string
 	bytesData, _ := json.Marshal(inputMessage)
-	inputLog = string(bytesData)
+	//inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	reader := bytes.NewReader(bytesData)
-
-	request, err := http.NewRequest("POST", "http://10.72.3.87:8086/CSB/1101", reader)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-	key := "_api_access_key=" + access_key + "&_api_name=" + "hssServives" + "&_api_timestamp=" + strconv.FormatInt(timestamp, 10) + "&_api_version=" + "1.0.0"
-
-	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("_api_timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("_api_name", "hssServives")
-	request.Header.Set("_api_version", "1.0.0")
-	request.Header.Set("_api_access_key", access_key)
-	request.Header.Set("_api_signature", hmacsha1(key, secret_key))
-
-	client := http.Client{}
-	resp, err := client.Do(request)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-	respBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-	fmt.Println(string(respBytes))
-	str := string(respBytes)
-	return str, inputLog
-	//return HttpRequest(request_url, access_key, secret_key, timestamp, bytesData, string(bytesData)), ""
+	//reader := bytes.NewReader(bytesData)
+	//
+	//request, err := http.NewRequest("POST", "http://10.72.3.87:8086/CSB/1101", reader)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//	return err.Error(), ""
+	//}
+	//key := "_api_access_key=" + access_key + "&_api_name=" + "hssServives" + "&_api_timestamp=" + strconv.FormatInt(timestamp, 10) + "&_api_version=" + "1.0.0"
+	//
+	//request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	//request.Header.Set("_api_timestamp", strconv.FormatInt(timestamp, 10))
+	//request.Header.Set("_api_name", "hssServives")
+	//request.Header.Set("_api_version", "1.0.0")
+	//request.Header.Set("_api_access_key", access_key)
+	//request.Header.Set("_api_signature", hmacsha1(key, secret_key))
+	//
+	//client := http.Client{}
+	//resp, err := client.Do(request)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//	return err.Error(), ""
+	//}
+	//respBytes, err := ioutil.ReadAll(resp.Body)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//	return err.Error(), ""
+	//}
+	//fmt.Println(string(respBytes))
+	//str := string(respBytes)
+	//return str, inputLog
+	request_url = "http://10.72.3.87:8086/CSB/1101"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, bytesData, string(bytesData)), ""
 }
 func HttpRequest(url string, ak string, sk string, timestamp int64, requestByte []byte, json string) string {
 	fmt.Println(url)