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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10138
+org_id = 10028
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/gdyb_controller.go

@@ -80,7 +80,7 @@ func (c *GdybController) PostOne() {
 	card_sn := c.GetString("card_sn")
 	certificates := c.GetString("certificates")
 
-	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates)
+	result, inputLog := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 
@@ -88,8 +88,16 @@ func (c *GdybController) PostOne() {
 
 	}
 
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
+
+	} else {
+
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": dat,
+		"log": dat2,
 	})
 }
 
@@ -113,7 +121,7 @@ func (c *GdybController) PostTwo() {
 
 	id_card_type, _ := c.GetInt64("id_card_type")
 
-	result := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type)
+	result, _ := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -136,7 +144,8 @@ func (c *GdybController) PostThree() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
-	result := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	result, requestLog := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	saveLog(result, requestLog)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 	} else {
@@ -235,7 +244,7 @@ func (c *GdybController) PostFive() {
 	fmt.Println(respJSON["mdtrtarea_admvs"].(string))
 	fmt.Println(respJSON["secret_key"].(string))
 
-	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
+	result, requestLog := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
 		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string))
 
 	var dat map[string]interface{}
@@ -244,8 +253,17 @@ func (c *GdybController) PostFive() {
 	} else {
 		fmt.Println(err)
 	}
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":         dat,
+		"request_log": requestLog,
 	})
 }
 
@@ -262,7 +280,8 @@ func (c *GdybController) PostSix() {
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	result, requestlog := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	fmt.Println(requestlog)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -1759,32 +1759,10 @@ func (c *HisApiController) GetRegisterInfo() {
 
 	if config.IsOpen == 1 {
 		//service.Gdyb1201("", miConfig.OrgName, "1122", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1, "")
-
-		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&certificates=" + strconv.FormatInt(certificates, 10)
-		resp, requestErr := http.Get(api)
-		if requestErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		defer resp.Body.Close()
-		body, ioErr := ioutil.ReadAll(resp.Body)
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON map[string]interface{}
-
-		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(userJSON)
+		result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10))
+		saveLog(result, requestLog)
 		var res ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		if err := json.Unmarshal([]byte(result), &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
@@ -1884,37 +1862,12 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			//insutype = "390"
 
-			//if count == 1 {
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
-			//	return
-			//}
-			api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
-				insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
-				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
-				"&dept=" + roles.UserName + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
-			resp, requestErr := http.Get(api)
-			if requestErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			defer resp.Body.Close()
-			body, ioErr := ioutil.ReadAll(resp.Body)
-			if ioErr != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			var respJSON map[string]interface{}
-			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
+			result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type)
+
+			saveLog(result, requestLog)
 
-			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-			userJSONBytes, _ := json.Marshal(respJSON)
 			var res ResultThree
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			if err := json.Unmarshal([]byte(result), &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
@@ -1937,8 +1890,6 @@ func (c *HisApiController) GetRegisterInfo() {
 					"msg":         res.ErrMsg,
 				})
 				return
-				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
-				//return
 			}
 
 			his.Number = res.Output.Data.MdtrtID
@@ -2085,13 +2036,17 @@ func (c *HisApiController) GetUploadInfo() {
 
 	if tempOrder.ID == 0 {
 		var result string
+		var requestLog string
+
 		if miConfig.InsuplcAdmdvs == "440781" { //
-			result = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+			result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 		} else {
-			result = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+			result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 
 		}
 
+		saveLog(result, requestLog)
+
 		var respJSON2 map[string]interface{}
 		if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -2223,6 +2178,12 @@ func (c *HisApiController) GetUploadInfo() {
 
 				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 				userJSONBytes, _ := json.Marshal(respJSON)
+
+				request_respJSON := respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
+				requestJSONBytes, _ := json.Marshal(request_respJSON)
+
+				saveLog(string(userJSONBytes), string(requestJSONBytes))
+
 				var res ResultFour
 				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
@@ -2412,6 +2373,8 @@ func (c *HisApiController) GetUploadInfo() {
 							fmt.Println(err)
 						}
 
+						saveLog(result, src_resquest)
+
 						userJSONBytes, _ := json.Marshal(dat)
 
 						var res ResultSeven
@@ -2606,6 +2569,8 @@ func (c *HisApiController) GetUploadInfo() {
 				fmt.Println(err)
 			}
 
+			saveLog(result, src_resquest)
+
 			userJSONBytes, _ := json.Marshal(dat)
 
 			var res ResultSeven
@@ -3289,13 +3254,16 @@ func (c *HisApiController) GetPreUploadInfo() {
 	strconv.FormatInt(his.PatientId, 10)
 
 	var result string
+	var requestLog string
 	if miConfig.InsuplcAdmdvs == "440781" { //
-		result = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+		result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 	} else {
-		result = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+		result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
 
 	}
 
+	saveLog(result, requestLog)
+
 	var respJSON2 map[string]interface{}
 	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -3416,6 +3384,12 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			userJSONBytes, _ := json.Marshal(respJSON)
+
+			request_respJSON := respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
+			requestJSONBytes, _ := json.Marshal(request_respJSON)
+
+			saveLog(string(userJSONBytes), string(requestJSONBytes))
+
 			var res ResultFour
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
@@ -3586,7 +3560,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 					}
 
-					result := service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
+					result, request_log := service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result), &dat); err == nil {
 						fmt.Println(dat)
@@ -3594,6 +3568,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 						fmt.Println(err)
 					}
 
+					saveLog(result, request_log)
+
 					userJSONBytes, _ := json.Marshal(dat)
 
 					var res ResultSeven
@@ -3963,6 +3939,7 @@ func (c *HisApiController) Refund() {
 		} else {
 			fmt.Println(err)
 		}
+		saveLog(result, src_resquest)
 
 		userJSONBytes, _ := json.Marshal(dat)
 
@@ -3973,7 +3950,7 @@ func (c *HisApiController) Refund() {
 			return
 		}
 		if res.Infcode == 0 {
-			result := service.Gdyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
+			result, src_request := service.Gdyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -3981,6 +3958,8 @@ func (c *HisApiController) Refund() {
 				fmt.Println(err)
 			}
 
+			saveLog(result, src_request)
+
 			userJSONBytes, _ := json.Marshal(dat)
 
 			var res2 ResultSix
@@ -6102,3 +6081,39 @@ func RemoveRepeatedCode(arr []string) (newArr []string) {
 	}
 	return
 }
+
+func saveLog(result string, request string) {
+
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	dir := miConfig.OrgName + "日志"
+	utils.Mkdir(dir)
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
+	file_name := file + ".txt"
+	file_path := miConfig.OrgName + "日志" + "/" + file_name
+	exist, _ := utils.PathExists(file_path)
+	if exist { //存在
+		fmt.Println("存在")
+		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+		if err != nil {
+			fmt.Println("read fail")
+		}
+		content := "\r" + request + "\r" + result
+		n, _ := f.Seek(0, 2)
+		_, err = f.WriteAt([]byte(content), n)
+
+	} else { //不存在
+		fmt.Println("文件不存在，创建文件")
+		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
+		defer f.Close()
+		if err != nil {
+		} else {
+			_, err = f.Write([]byte("记录日志"))
+		}
+	}
+
+}

main.go

@@ -1,9 +1,17 @@
 package main
 
 import (
+	"context"
+	"fmt"
 	_ "gdyb/routers"
 	"gdyb/service"
+	"gdyb/utils"
 	"github.com/astaxie/beego"
+	"github.com/qiniu/api.v7/auth/qbox"
+	"github.com/qiniu/api.v7/storage"
+	"os"
+	"strconv"
+	"time"
 )
 
 func init() {
@@ -12,7 +20,74 @@ func init() {
 }
 
 func main() {
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	dir := miConfig.OrgName + "日志"
+	utils.Mkdir(dir)
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
+	file_name := file + ".txt"
+	file_path := miConfig.OrgName + "日志" + "/" + file_name
+	exist, _ := utils.PathExists(file_path)
+	if exist { //存在
+		fmt.Println("存在")
+		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+		if err != nil {
+			fmt.Println("read fail")
+		}
+		content := "\r\r\r"
+		n, _ := f.Seek(0, 2)
+		_, err = f.WriteAt([]byte(content), n)
 
+	} else { //不存在
+		fmt.Println("文件不存在，创建文件")
+		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
+		defer f.Close()
+		if err != nil {
+		} else {
+			_, err = f.Write([]byte("记录日志"))
+		}
+	}
+	//upload_qiniu(file_path,miConfig.OrgName+"_"+year+month+day)
 	beego.Run()
+}
+
+func upload_qiniu(filePath string, temp_key string) {
+	key := temp_key
+	//上传凭证,关于凭证这块大家可以去看看官方文档
+	putPolicy := storage.PutPolicy{
+		Scope: beego.AppConfig.String("qiniu_bucket"),
+	}
+	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
+	upToken := putPolicy.UploadToken(mac)
+	cfg := storage.Config{}
+	//空间对应机房
+	//其中关于Zone对象和机房的关系如下：
+	//    机房    Zone对象
+	//    华东    storage.ZoneHuadong
+	//    华北    storage.ZoneHuabei
+	//    华南    storage.ZoneHuanan
+	//    北美    storage.ZoneBeimei
+	//七牛云存储空间设置首页有存储区域
+	cfg.Zone = &storage.ZoneHuadong
+	//不启用HTTPS域名
+	cfg.UseHTTPS = false
+	//不使用CND加速
+	cfg.UseCdnDomains = false
+	//构建上传表单对象
+	formUploader := storage.NewFormUploader(&cfg)
+	ret := storage.PutRet{}
+	// 可选
+	putExtra := storage.PutExtra{
+		Params: map[string]string{},
+	}
+	err := formUploader.PutFile(context.Background(), &ret, upToken, key, filePath, &putExtra)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
 
 }

service/gdyb_service.go

@@ -21,7 +21,7 @@ import (
 	"time"
 	"unsafe"
 
-	ole "github.com/go-ole/go-ole"
+	"github.com/go-ole/go-ole"
 	"github.com/go-ole/go-ole/oleutil"
 )
 
@@ -141,7 +141,7 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 人员基本信息
-func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string) string {
+func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -178,11 +178,13 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
+	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 	gdyb_url := beego.AppConfig.String("gdyb_url")
@@ -202,7 +204,7 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -215,16 +217,16 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	fmt.Println(string(respBytes))
 	str := string(respBytes)
-	return str
+	return str, inputLog
 }
 
 func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
@@ -290,7 +292,7 @@ func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 }
 
 // 门诊挂号
-func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64) string {
+func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -325,11 +327,13 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
+	var requestLog string
 	bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2201"
@@ -342,7 +346,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -355,20 +359,20 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 // 门诊挂号撤销
-func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) string {
+func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -386,11 +390,14 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
+	var requestLog string
+
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 
@@ -404,7 +411,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -419,20 +426,20 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 // 门诊就诊信息上传
-func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id int64, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) string {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id int64, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -475,12 +482,13 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	input["diseinfo"] = diseinfo
 	input["mdtrtinfo"] = inputData
 	inputMessage["input"] = input //交易输入
-
+	var requestLog string
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 
@@ -495,7 +503,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -508,20 +516,20 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 // 门诊就诊信息上传
-func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id int64, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) string {
+func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id int64, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -567,12 +575,13 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	input["diseinfo"] = diseinfo
 	input["mdtrtinfo"] = inputData
 	inputMessage["input"] = input //交易输入
-
+	var requestLog string
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 
@@ -587,7 +596,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -600,16 +609,16 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 type Custom struct {
@@ -669,7 +678,7 @@ type Result struct {
 }
 
 //  门诊费用明细信息上传
-func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string) string {
+func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -815,15 +824,15 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 	input["feedetail"] = feedetail
 	inputMessage["input"] = input //交易输入
-
+	var requestLog string
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println("----------")
 	fmt.Println(string(bytesData))
 	fmt.Println("----------")
-
+	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return ""
+		return "", ""
 	}
 	reader := bytes.NewReader(bytesData)
 
@@ -840,7 +849,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return ""
+		return "", ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -853,21 +862,21 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return ""
+		return "", ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return ""
+		return "", ""
 	}
-	return string(respBytes)
+	return string(respBytes), requestLog
 	//var result RequestResult
 	//json.Unmarshal(respBytes, &result)
 	//return &result
 }
 
 //  门诊费用明细信息撤销
-func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) string {
+func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -888,9 +897,12 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+
+	var requestLog string
+	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 	gdyb_url := beego.AppConfig.String("gdyb_url")
@@ -909,7 +921,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	fmt.Println(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -922,21 +934,21 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 //  门诊预结算
 //func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
-func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) string {
+func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) (string, string) {
 
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -973,11 +985,15 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
+	var requestLog string
+
 	bytesData, err := json.Marshal(inputMessage)
+
+	requestLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 
@@ -994,7 +1010,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -1007,16 +1023,16 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, requestLog
 }
 
 //  门诊结算

utils/log.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"fmt"
+	"os"
 	"time"
 )
 
@@ -64,3 +65,34 @@ func magenta(s string) string {
 func formatLog(prefix string) string {
 	return time.Now().Format("[2006/01/02 15:04:05]") + " " + prefix + " "
 }
+
+func Mkdir(dir string) {
+	// 创建文件夹
+	exist, err := PathExists(dir)
+	if err != nil {
+		fmt.Println(err.Error())
+	} else {
+		if exist {
+			fmt.Println(dir + "文件夹已存在！")
+		} else {
+			// 文件夹名称，权限
+			err := os.Mkdir(dir, os.ModePerm)
+			if err != nil {
+				fmt.Println(dir+"文件夹创建失败：", err.Error())
+			} else {
+				fmt.Println(dir + "文件夹创建成功！")
+			}
+		}
+	}
+}
+
+func PathExists(path string) (bool, error) {
+	_, err := os.Stat(path)
+	if err == nil {
+		return true, nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, err
+}