From bc50530a90c9fa20cfb869cde0ee80d016f1fe53 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Mon, 25 May 2020 10:28:32 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/logic.go | 26 +++++++++++++++++++++-----
 src/common/redis/def.go       |  1 +
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index cc6db36..0df4470 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -290,7 +290,7 @@ func HandleNewSaveData(w http.ResponseWriter, data string) {
 
 
 		//
-		rkey := "cat:cafe:data:where:data_uid:" + strconv.Itoa(rdata.Uuid)
+		rkey := redis.USER_NEW_DATA_KEY + strconv.Itoa(rdata.Uuid)
 		val,err := redishandler.GetRedisClient().GetString(rkey)
 		if err != nil {
 			logger.Error("HandleNewSaveData ERROR_SRVDB_FAILED failed=%v,val=%v", err,val)
@@ -501,14 +501,22 @@ func HandleNewGetData(w http.ResponseWriter, data string) {
 			break
 		}
 
-		rkey := "cat:cafe:data:where:data_uid:" + strconv.Itoa(rdata.Uuid)
+		isfind := false
+		//先去取出新的数据
+		rkey := redis.USER_NEW_DATA_KEY + strconv.Itoa(rdata.Uuid)
 
 		 val,err := redishandler.GetRedisClient().GetString(rkey)
 		 if err != nil {
 		 	 logger.Error("HandleNewGetData err=%v",err)
-		 	 resp.Result.Data.Base_data = "{}"
-			 //resp.Result.Code = ERROR_JSONUNMASHFAILED
-			 break
+		 	 //如果不存在数据则去老的取
+		 	 rkey1 := "cat:cafe:data:where:data_uid:" + strconv.Itoa(rdata.Uuid)
+		 	 val,err = redishandler.GetRedisClient().GetString(rkey1)
+		 	 if err != nil {
+				 resp.Result.Data.Base_data = "{}"
+				 //resp.Result.Code = ERROR_JSONUNMASHFAILED
+				 break
+			 }
+			 isfind = true
 		 }
 
 		var final GetDataSaveDesc
@@ -521,6 +529,14 @@ func HandleNewGetData(w http.ResponseWriter, data string) {
 
 		resp.Result.Data.Base_data = final.Data_value
 
+		//如果是从老的数据过来的 存入新的数据key
+		if isfind {
+			err = redishandler.GetRedisClient().SetString(rkey,val)
+			if err != nil {
+				logger.Error("HandleNewGetData err=%v",err)
+			}
+		}
+
 
 		break
 	}
diff --git a/src/common/redis/def.go b/src/common/redis/def.go
index 2451683..89d991b 100644
--- a/src/common/redis/def.go
+++ b/src/common/redis/def.go
@@ -20,4 +20,5 @@ const (
 	USER_BEINVITE_UUIDRELATION = "CATCAFE_USER_BEINVITE_UUIDRELATION"	//玩家被邀请关系记录表
 	USER_INVITEWORK_RELATION = "CATCAFE_USER_INVITEWORK_RELATION"	//玩家被邀请打工记录表
 	USER_BACKUP_DATA = "CATCAFE_USER_BACKUP_DATA"	//玩家数据保存的备份
+	USER_NEW_DATA_KEY = "cat:cafe:data_new:where:data_uid:"	//玩家数据保存的新的key
 )
--
libgit2 0.21.0