Merge branch 'master' of 60.1.1.230:backend/jieling_server

back_recharge
wangyuan 2019-11-07 12:04:55 +08:00
commit 934a5af05a
2 changed files with 1 additions and 2 deletions

View File

@ -206,7 +206,6 @@ public class RedisKey {
familyKey.add(FAMILY_FIGHT_ATTACK_COUNT);
familyKey.add(FAMILY_FIGHT_TOTAL_STAR);
familyKey.add(FAMILY_FIGHT_TOTAL_EXP);
familyKey.add(FAMILY_INFO);
familyKey.add(FAMILY_FIGHT_FINISH_MATCHING);
}
public static String getKey(String type, String key, boolean withoutServerId) {

View File

@ -1068,7 +1068,7 @@ public class RedisUtil {
public String getKey(String type,String key){
if(RedisKey.BLOODY_RANK.equals(type) || RedisKey.BLOODY_TEAM.equals(type) || RedisKey.PLAYER_INFO_CACHE.equals(type) || RedisKey.BLOODY_PERSON_BATTLE_INFO.equals(type)) {
if(RedisKey.BLOODY_RANK.equals(type) || RedisKey.BLOODY_TEAM.equals(type) || RedisKey.PLAYER_INFO_CACHE.equals(type) || RedisKey.BLOODY_PERSON_BATTLE_INFO.equals(type)||RedisKey.FAMILY_INFO.equals(type)) {
return type + RedisKey.Delimiter_colon + key;
}
if(RedisKey.familyKey.contains(type)){