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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10215
+org_id = 10188
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -57,11 +57,11 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-# gdyb_paasid = "sg03_prd"
+gdyb_paasid = "sg03_prd"
 # gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yrojyy"
 #gdyb_paasid = "sz_prd_yjyy"
-gdyb_paasid = "zq_prd_yjyy"
+# gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/sg/his_api_controller.go

@@ -2941,7 +2941,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			var res ResultTwo
 			api := "http://192.168.3.130:9532/" + "jsyb/1101?cert_no=" + "" +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&url=" + miConfig.Url + "&ak=" + "fb4f41a047934d588a89cdac7a102410"
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&url=" + miConfig.Url + "&ak=" + "1781ce9fb73a478289326c16ba8bf2c4"
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

service/jsyb_service.go

@@ -1,12 +1,15 @@
 package service
 
 import (
+	"bytes"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"gdyb/utils/csbhttp"
+	"io/ioutil"
+	"net/http"
 	"strconv"
 	"time"
 )
@@ -50,45 +53,45 @@ 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)
-	//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, ""
-	return HttpRequest(request_url, access_key, secret_key, timestamp, bytesData, 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)), ""
 }
 func HttpRequest(url string, ak string, sk string, timestamp int64, requestByte []byte, json string) string {
 	fmt.Println(url)