Commit c06a7683c92874c8818f3c9145ad7e1283ba4c24
1 parent
a2eb3b99
Exists in
master
提交
Showing
2 changed files
with
35 additions
and
2 deletions
Show diff stats
src/HttpServer/logic/datadef.go
| @@ -272,6 +272,11 @@ type GetDataResp struct { | @@ -272,6 +272,11 @@ type GetDataResp struct { | ||
| 272 | Result GetDataResult `json:"result"` | 272 | Result GetDataResult `json:"result"` |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | +type GetDataSaveDesc struct { | ||
| 276 | + Data_uid string `json:"data_uid"` | ||
| 277 | + Data_value string `json:"data_value"` | ||
| 278 | +} | ||
| 279 | + | ||
| 275 | type TextCheckReq struct{ | 280 | type TextCheckReq struct{ |
| 276 | Token string `json:"token"` | 281 | Token string `json:"token"` |
| 277 | Text string `json:"text"` | 282 | Text string `json:"text"` |
src/HttpServer/logic/logic.go
| @@ -298,6 +298,15 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { | @@ -298,6 +298,15 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { | ||
| 298 | resp.Result.Data = "get redis failed" | 298 | resp.Result.Data = "get redis failed" |
| 299 | break | 299 | break |
| 300 | } | 300 | } |
| 301 | + var final GetDataSaveDesc | ||
| 302 | + err = json.Unmarshal([]byte(val), &final) | ||
| 303 | + if err != nil { | ||
| 304 | + logger.Error("HandleNewGetData failed1,err=%v", err) | ||
| 305 | + resp.Result.Code = ERROR_SRVDB_FAILED | ||
| 306 | + break | ||
| 307 | + } | ||
| 308 | + val = final.Data_value | ||
| 309 | + | ||
| 301 | 310 | ||
| 302 | //解析val json | 311 | //解析val json |
| 303 | m1 := make(map[string]interface{}) | 312 | m1 := make(map[string]interface{}) |
| @@ -395,7 +404,17 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { | @@ -395,7 +404,17 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { | ||
| 395 | } | 404 | } |
| 396 | 405 | ||
| 397 | //全部校验过后 | 406 | //全部校验过后 |
| 398 | - err = redishandler.GetRedisClient().SetString(rkey,rdata.Value) | 407 | + var tmp GetDataSaveDesc |
| 408 | + tmp.Data_uid = strconv.Itoa(rdata.Uuid) | ||
| 409 | + tmp.Data_value = rdata.Value | ||
| 410 | + savestr,err:= json.Marshal(&tmp) | ||
| 411 | + if err != nil { | ||
| 412 | + logger.Error("HandleNewSaveData failed7,err=%v", err) | ||
| 413 | + resp.Result.Code = ERROR_SRVDB_FAILED | ||
| 414 | + resp.Result.Data = "ERROR_SRVDB_FAILED" | ||
| 415 | + break | ||
| 416 | + } | ||
| 417 | + err = redishandler.GetRedisClient().SetString(rkey,string(savestr)) | ||
| 399 | if err != nil { | 418 | if err != nil { |
| 400 | logger.Error("HandleNewSaveData failed7,err=%v", err) | 419 | logger.Error("HandleNewSaveData failed7,err=%v", err) |
| 401 | resp.Result.Code = ERROR_SRVDB_FAILED | 420 | resp.Result.Code = ERROR_SRVDB_FAILED |
| @@ -464,7 +483,16 @@ func HandleNewGetData(w http.ResponseWriter, data string) { | @@ -464,7 +483,16 @@ func HandleNewGetData(w http.ResponseWriter, data string) { | ||
| 464 | resp.Result.Code = ERROR_JSONUNMASHFAILED | 483 | resp.Result.Code = ERROR_JSONUNMASHFAILED |
| 465 | break | 484 | break |
| 466 | } | 485 | } |
| 467 | - resp.Result.Data.Base_data = val | 486 | + |
| 487 | + var final GetDataSaveDesc | ||
| 488 | + err = json.Unmarshal([]byte(val), &final) | ||
| 489 | + if err != nil { | ||
| 490 | + logger.Error("HandleNewGetData failed1,err=%v", err) | ||
| 491 | + resp.Result.Code = ERROR_SRVDB_FAILED | ||
| 492 | + break | ||
| 493 | + } | ||
| 494 | + | ||
| 495 | + resp.Result.Data.Base_data = final.Data_value | ||
| 468 | 496 | ||
| 469 | 497 | ||
| 470 | break | 498 | break |