Merge branch 'master' of http://git.shengws.com/xmg123/Xcx_New

controllers/xcx_mobile_api_controller.go/xcx_api_controller.go

@@ -6,7 +6,6 @@ import (
 	"Xcx_New/models"
 	"Xcx_New/service"
 	"Xcx_New/utils"
-	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
@@ -27,7 +26,7 @@ func XcxApiControllersRegisterRouters() {
 	beego.Router("/xcx/api/mobile/patient", &XcxApiController{}, "Get:GetPatientList")
 
 	//获取登录后的信息
-	beego.Router("/xcx/api/mobile/getdatainfo", &XcxApiController{}, "Post:GetDataInfo")
+	beego.Router("/xcx/api/mobile/getdatainfo", &XcxApiController{}, "Get:GetDataInfo")
 
 	//获取排班数据
 	beego.Router("/xcx/api/mobile/schedule", &XcxApiController{}, "Get:GetScheduleInfo")
@@ -202,23 +201,29 @@ func (this *XcxApiController) GetPatientList() {
 }
 
 func (this *XcxApiController) GetDataInfo() {
-	dataBody := make(map[string]interface{}, 0)
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	appid, _ := dataBody["appid"].(string)
-	key, _ := dataBody["key"].(string)
-	iv, _ := dataBody["iv"].(string)
-	encryptedData, _ := dataBody["encryptedData"].(string)
-
+	// dataBody := make(map[string]interface{}, 0)
+	// fmt.Println("dataBody",dataBody)
+	// err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	// if err != nil {
+	// 	utils.ErrorLog(err.Error())
+	// 	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	// 	return
+	// }
+	// fmt.Println(err)
+	// appid, _ := dataBody["appid"].(string)
+	// key, _ := dataBody["key"].(string)
+	// iv, _ := dataBody["iv"].(string)
+	// encryptedData, _ := dataBody["encryptedData"].(string)
+	appid := this.GetString("appid")
+	key := this.GetString("key")
+	iv := this.GetString("iv")
+	encryptedData := this.GetString("encryptedData")
 	list, _ := service.DecryptData(appid, key, iv, encryptedData)
-	//if err == nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-	//	return
-	//}
+	fmt.Println(list)
+	// if err == nil {
+	// 	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	// 	return
+	// }
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,