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

controllers/js/jsyb_controller.go

@@ -640,9 +640,9 @@ func (c *JSybController) ReadCard() {
 	operator_id := c.GetString("operator_id")
 	operator := c.GetString("operator")
 
-	//result, request := service.Jsyb9001(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, url, cainfo, ak)
-	//fmt.Println(request)
-	//fmt.Println(result)
+	result, request := service.Jsyb9001(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, url, cainfo, ak)
+	fmt.Println(request)
+	fmt.Println(result)
 
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
 

main.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -15,12 +14,12 @@ import (
 )
 
 func init() {
-	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	CreateLog(miConfig)
-	UploadLog(miConfig)
+	//service.ConnectDB()
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }

service/jsyb_service.go

@@ -1012,43 +1012,43 @@ func Jsyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		return err.Error(), ""
 	}
 
-	reader := bytes.NewReader(bytesData)
+	//reader := bytes.NewReader(bytesData)
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
 	//gdyb_url := beego.AppConfig.String("gdyb_url")
 	//gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
 	//url := gdyb_url
 
-	request, err := http.NewRequest("POST", request_url+"9001", reader)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-
-	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", "")
-	request.Header.Set("_api_signature", "")
-
-	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(), ""
-	}
-	str := string(respBytes)
-	fmt.Println(str)
-	return str, ""
-
-	//request_url = request_url + "9001"
-	//return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+	//request, err := http.NewRequest("POST", request_url+"9001", reader)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//	return err.Error(), ""
+	//}
+	//
+	//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", "")
+	//
+	//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(), ""
+	//}
+	//str := string(respBytes)
+	//fmt.Println(str)
+	//return str, ""
+
+	request_url = request_url + "9001"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 
 }