提交

陆恒
1 parent 24391aaa
Showing 2 changed files with 22 additions and 5 deletions Show diff stats
src/HttpServer/logic/logic.go
src/common/redis/def.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
 	}
@@ -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
 )
...	...	@@ -290,7 +290,7 @@ func HandleNewSaveData(w http.ResponseWriter, data string) {
290	290
291	291
292	292	//
293		- rkey := "cat:cafe:data:where:data_uid:" + strconv.Itoa(rdata.Uuid)
	293	+ rkey := redis.USER_NEW_DATA_KEY + strconv.Itoa(rdata.Uuid)
294	294	val,err := redishandler.GetRedisClient().GetString(rkey)
295	295	if err != nil {
296	296	logger.Error("HandleNewSaveData ERROR_SRVDB_FAILED failed=%v,val=%v", err,val)
...	...	@@ -501,14 +501,22 @@ func HandleNewGetData(w http.ResponseWriter, data string) {
501	501	break
502	502	}
503	503
504		- rkey := "cat:cafe:data:where:data_uid:" + strconv.Itoa(rdata.Uuid)
	504	+ isfind := false
	505	+ //先去取出新的数据
	506	+ rkey := redis.USER_NEW_DATA_KEY + strconv.Itoa(rdata.Uuid)
505	507
506	508	val,err := redishandler.GetRedisClient().GetString(rkey)
507	509	if err != nil {
508	510	logger.Error("HandleNewGetData err=%v",err)
509		- resp.Result.Data.Base_data = "{}"
510		- //resp.Result.Code = ERROR_JSONUNMASHFAILED
511		- break
	511	+ //如果不存在数据则去老的取
	512	+ rkey1 := "cat:cafe:data:where:data_uid:" + strconv.Itoa(rdata.Uuid)
	513	+ val,err = redishandler.GetRedisClient().GetString(rkey1)
	514	+ if err != nil {
	515	+ resp.Result.Data.Base_data = "{}"
	516	+ //resp.Result.Code = ERROR_JSONUNMASHFAILED
	517	+ break
	518	+ }
	519	+ isfind = true
512	520	}
513	521
514	522	var final GetDataSaveDesc
...	...	@@ -521,6 +529,14 @@ func HandleNewGetData(w http.ResponseWriter, data string) {
521	529
522	530	resp.Result.Data.Base_data = final.Data_value
523	531
	532	+ //如果是从老的数据过来的存入新的数据key
	533	+ if isfind {
	534	+ err = redishandler.GetRedisClient().SetString(rkey,val)
	535	+ if err != nil {
	536	+ logger.Error("HandleNewGetData err=%v",err)
	537	+ }
	538	+ }
	539	+
524	540
525	541	break
526	542	}
...	...
...	...	@@ -20,4 +20,5 @@ const (
20	20	USER_BEINVITE_UUIDRELATION = "CATCAFE_USER_BEINVITE_UUIDRELATION" //玩家被邀请关系记录表
21	21	USER_INVITEWORK_RELATION = "CATCAFE_USER_INVITEWORK_RELATION" //玩家被邀请打工记录表
22	22	USER_BACKUP_DATA = "CATCAFE_USER_BACKUP_DATA" //玩家数据保存的备份
	23	+ USER_NEW_DATA_KEY = "cat:cafe:data_new:where:data_uid:" //玩家数据保存的新的key
23	24	)
...	...