diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index 90d06d6..4978d02 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -272,6 +272,11 @@ type GetDataResp struct { Result GetDataResult `json:"result"` } +type GetDataSaveDesc struct { + Data_uid string `json:"data_uid"` + Data_value string `json:"data_value"` +} + type TextCheckReq struct{ Token string `json:"token"` Text string `json:"text"` diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index c0043f5..32d8270 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -298,6 +298,15 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { resp.Result.Data = "get redis failed" break } + var final GetDataSaveDesc + err = json.Unmarshal([]byte(val), &final) + if err != nil { + logger.Error("HandleNewGetData failed1,err=%v", err) + resp.Result.Code = ERROR_SRVDB_FAILED + break + } + val = final.Data_value + //解析val json m1 := make(map[string]interface{}) @@ -395,7 +404,17 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { } //全部校验过后 - err = redishandler.GetRedisClient().SetString(rkey,rdata.Value) + var tmp GetDataSaveDesc + tmp.Data_uid = strconv.Itoa(rdata.Uuid) + tmp.Data_value = rdata.Value + savestr,err:= json.Marshal(&tmp) + if err != nil { + logger.Error("HandleNewSaveData failed7,err=%v", err) + resp.Result.Code = ERROR_SRVDB_FAILED + resp.Result.Data = "ERROR_SRVDB_FAILED" + break + } + err = redishandler.GetRedisClient().SetString(rkey,string(savestr)) if err != nil { logger.Error("HandleNewSaveData failed7,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -464,7 +483,16 @@ func HandleNewGetData(w http.ResponseWriter, data string) { resp.Result.Code = ERROR_JSONUNMASHFAILED break } - resp.Result.Data.Base_data = val + + var final GetDataSaveDesc + err = json.Unmarshal([]byte(val), &final) + if err != nil { + logger.Error("HandleNewGetData failed1,err=%v", err) + resp.Result.Code = ERROR_SRVDB_FAILED + break + } + + resp.Result.Data.Base_data = final.Data_value break -- libgit2 0.21.0