diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index 4be0be5a1..0857487a6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -1424,7 +1424,7 @@ public class RedisUtil { RedisKey.PLAYER_INFO_CACHE.equals(type) || RedisKey.FAMILY_INFO.equals(type) || RedisKey.PIDGIDTEMP.equals(type) || RedisKey.SERVER_WORLDLEVE_INFO.equals(type) || RedisKey.FAMILY_RED_PACKAGE.equals(type) || "red_remain_list".equals(type) || - RedisKey.FAMILY_RED_PACKAGE_INCRE_ID.equals(type) || RedisKey.GUILD_FORCE_RANK.equals(type) || + RedisKey.FAMILY_RED_PACKAGE_INCRE_ID.equals(type) || /*RedisKey.GUILD_FORCE_RANK.equals(type) ||*/ "red_already_list".equals(type) || RedisKey.CAR_DEALY_GUILD_FIGHT_PEOPLE_NUM.equals(type) || RedisKey.SERVER_SPLIT_INFO.equals(type) || RedisKey.FAMILY_LOGS.equals(type) || RedisKey.SERVER_SPLIT_MAIL_INFO.equals(type) || RedisKey.CROSS_ARENA_ROBOT_INFO.equals(type) || diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index b9515e822..da2daeb94 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -551,11 +551,6 @@ public class PlayerLogic { } - - private String getRewardOfDay(int goodsId,int days){ - return ""; - } - public CommonProto.TeamOneInfo.Builder getUserTeamOneInfo(int uid,int teamId) throws Exception { User user = PlayerLogic.getInstance().getUserByRpc(uid); CommonProto.TeamOneInfo.Builder oneInfo = CBean2Proto.getTeamOneInfo(user); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java index 0fa5cddb9..e9f24ec9a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java @@ -6,12 +6,10 @@ import com.ljsd.jieling.logic.dao.GuilidManager; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.GuildInfo; import com.ljsd.jieling.logic.dao.root.User; +import org.springframework.data.redis.core.ZSetOperations; import rpc.protocols.CommonProto; import rpc.protocols.PlayerInfoProto; -import org.springframework.data.redis.core.ZSetOperations; -import java.util.Map; -import java.util.Optional; import java.util.Set; /** @@ -32,12 +30,19 @@ public class GuildForceRank extends AbstractRank { @Override public double getScore(double... data) { - return data[0]; + Double zSetScore = RedisUtil.getInstence().getZSetScore(redisKey, "", Integer.toString((int) data[0])); + if (zSetScore <= 0) { + return 1800; + } + return zSetScore; } @Override protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { GuildInfo guildInfo = GuilidManager.getGuildInfo(Integer.parseInt(data.getValue())); + if (guildInfo == null) { + return; + } CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() .setRank(index) .setParam1(getParam1(data.getScore())) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java b/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java index f2760dd46..1d9f26a38 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java @@ -53,24 +53,24 @@ public class HttpPool { if (statusCode >= 200 && statusCode < 300) { needBack = false; String result = EntityUtils.toString(responseEntity, "UTF-8"); - LOGGER.debug("Http Send,第" + (sendTimes + 1) + "次调用成功,返回码为:[" + statusCode + "]"); + LOGGER.info("Http Send,第" + (sendTimes + 1) + "次调用成功,返回码为:[" + statusCode + "]"); return result; // break; } else { - LOGGER.error("Http Send,第" + (sendTimes + 1) + "次调用出错,返回码为:[" + statusCode + "]"); + LOGGER.info("Http Send,第" + (sendTimes + 1) + "次调用出错,返回码为:[" + statusCode + "]"); if (sendTimes + 1 <= maxSendTimes) { - LOGGER.debug("Http Send," + (sendIntervalTime / 1000) + "秒后,重新发起请求..."); + LOGGER.info("Http Send," + (sendIntervalTime / 1000) + "秒后,重新发起请求..."); try { Thread.sleep(sendIntervalTime); } catch (InterruptedException e) { e.printStackTrace(); } } else { - LOGGER.debug("Http Send,达到重发最大次数,退出程序!"); + LOGGER.info("Http Send,达到重发最大次数,退出程序!"); } } } catch (IOException e) { - LOGGER.error("Http Send error", e); + LOGGER.info("Http Send error", e); } finally { sendTimes++; if (httpResponse != null) { @@ -78,7 +78,7 @@ public class HttpPool { try { EntityUtils.consume(responseEntity); } catch (IOException e) { - LOGGER.error("EntityUtils.consume(responseEntity)", e); + LOGGER.info("EntityUtils.consume(responseEntity)", e); } } }