Commit ec7561fc3e3e64c57007ea4524a4b7def864c43a
1 parent
cbb22685
Exists in
master
提交修改
Showing
1 changed file
with
37 additions
and
3 deletions
Show diff stats
src/HttpServer/logic/logic.go
| @@ -404,15 +404,15 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { | @@ -404,15 +404,15 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { | ||
| 404 | if roommap1[k] != nil { | 404 | if roommap1[k] != nil { |
| 405 | r2 := val.(map[string]interface{}) | 405 | r2 := val.(map[string]interface{}) |
| 406 | r1 := roommap1[k].(map[string]interface{}) | 406 | r1 := roommap1[k].(map[string]interface{}) |
| 407 | - //比较unlockId | ||
| 408 | - rr2 := r2["unlockId"].([]interface {}) | 407 | + //比较unlockId,不做验证 |
| 408 | + /*rr2 := r2["unlockId"].([]interface {}) | ||
| 409 | rr1 := r1["unlockId"].([]interface {}) | 409 | rr1 := r1["unlockId"].([]interface {}) |
| 410 | if len(rr2) < len(rr1) { | 410 | if len(rr2) < len(rr1) { |
| 411 | logger.Error("HandleNewSaveData failed4,err=%v", err) | 411 | logger.Error("HandleNewSaveData failed4,err=%v", err) |
| 412 | resp.Result.Code = ERROR_SRVDB_FAILED | 412 | resp.Result.Code = ERROR_SRVDB_FAILED |
| 413 | resp.Result.Data = "ERROR_SRVDB_FAILED" | 413 | resp.Result.Data = "ERROR_SRVDB_FAILED" |
| 414 | break | 414 | break |
| 415 | - } | 415 | + }*/ |
| 416 | 416 | ||
| 417 | //比较furnitData | 417 | //比较furnitData |
| 418 | rrr2 := r2["furnitData"].(map[string]interface{}) | 418 | rrr2 := r2["furnitData"].(map[string]interface{}) |
| @@ -460,6 +460,40 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { | @@ -460,6 +460,40 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { | ||
| 460 | break | 460 | break |
| 461 | } | 461 | } |
| 462 | 462 | ||
| 463 | + //签到数据校验 | ||
| 464 | + issign1,ok1 := m1["isSign"].(bool) | ||
| 465 | + issign2,ok2 := m2["isSign"].(bool) | ||
| 466 | + if ok1 && ok2 { | ||
| 467 | + if !issign2 && issign1 { | ||
| 468 | + logger.Error("HandleNewSaveData failed30,err=%v", err) | ||
| 469 | + resp.Result.Code = ERROR_SRVDB_FAILED | ||
| 470 | + resp.Result.Data = "ERROR_SRVDB_FAILED" | ||
| 471 | + break | ||
| 472 | + } | ||
| 473 | + } | ||
| 474 | + | ||
| 475 | + signNowLoop1,ok1 := m1["signNowLoop"].(float64) | ||
| 476 | + signNowLoop2,ok2 := m2["signNowLoop"].(float64) | ||
| 477 | + signLoopId1,ok3 := m2["signLoopId"].(float64) | ||
| 478 | + signLoopId2,ok4 := m2["signLoopId"].(float64) | ||
| 479 | + if ok1 && ok2 && ok3 && ok4 { | ||
| 480 | + if signLoopId2 < signLoopId1 { | ||
| 481 | + logger.Error("HandleNewSaveData failed31,err=%v", err) | ||
| 482 | + resp.Result.Code = ERROR_SRVDB_FAILED | ||
| 483 | + resp.Result.Data = "ERROR_SRVDB_FAILED" | ||
| 484 | + break | ||
| 485 | + } | ||
| 486 | + | ||
| 487 | + if signLoopId1 == signLoopId2 { | ||
| 488 | + if signNowLoop2 < signNowLoop1 { | ||
| 489 | + logger.Error("HandleNewSaveData failed33,err=%v", err) | ||
| 490 | + resp.Result.Code = ERROR_SRVDB_FAILED | ||
| 491 | + resp.Result.Data = "ERROR_SRVDB_FAILED" | ||
| 492 | + break | ||
| 493 | + } | ||
| 494 | + } | ||
| 495 | + } | ||
| 496 | + | ||
| 463 | //全部校验过后 | 497 | //全部校验过后 |
| 464 | var tmp GetDataSaveDesc | 498 | var tmp GetDataSaveDesc |
| 465 | tmp.Data_uid = strconv.Itoa(rdata.Uuid) | 499 | tmp.Data_uid = strconv.Itoa(rdata.Uuid) |