From 8e31ca0acf4cd73af88ae5b1afa2b579f255ecef Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Tue, 1 Sep 2020 10:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamecommon/src/main/java/util/TimeUtils.java | 10 ++++------ .../java/com/ljsd/jieling/netty/cocdex/Tea.java | 2 +- .../ljsd/jieling/bloody/UserBloodySnpInfo.java | 2 -- .../jieling/config/json/GlobalPlatConfigure.java | 2 +- .../ljsd/jieling/config/json/KTSDKConstans.java | 12 ++++++------ .../ljsd/jieling/config/json/SDK37Constans.java | 10 +++++----- .../config/reportData/DataMessageUtils.java | 9 +++++---- .../jieling/core/function/EndlessFunction.java | 3 ++- .../jieling/handler/FastChallengeHandler.java | 2 ++ .../com/ljsd/jieling/handler/map/MapLogic.java | 2 +- .../ljsd/jieling/logic/dao/CardRandomManager.java | 13 ------------- .../java/com/ljsd/jieling/logic/dao/Equip.java | 2 +- .../com/ljsd/jieling/logic/dao/GoodsInfo.java | 8 -------- .../com/ljsd/jieling/logic/dao/GuilidManager.java | 1 - .../com/ljsd/jieling/logic/dao/PlayerManager.java | 13 +++++++------ .../ljsd/jieling/logic/dao/QuestionOption.java | 14 -------------- .../java/com/ljsd/jieling/logic/dao/RingFire.java | 5 ----- .../jieling/logic/dao/UserMissionManager.java | 6 +++--- .../ljsd/jieling/logic/family/DeathPathLogic.java | 3 +-- .../jieling/logic/family/GuildFightLogic.java | 15 ++++++++------- .../com/ljsd/jieling/logic/fight/CombatLogic.java | 14 ++++++++------ .../java/com/ljsd/jieling/util/AyyncWorker.java | 6 ------ .../src/main/java/config/SGameSetting.java | 2 +- 23 files changed, 56 insertions(+), 100 deletions(-) delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CardRandomManager.java delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GoodsInfo.java delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/dao/QuestionOption.java delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RingFire.java diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index 933844561..d1a93d814 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -107,7 +107,7 @@ public class TimeUtils { /** * 年月日 时分秒, 格式如: 20110111011059 */ - private static final DateFormat ymdhmsFormat_new = new SimpleDateFormat("yyyyMMddHHmmss"); + private static final String ymdhmsFormat_new = "yyyyMMddHHmmss"; /** * 年月日 时分, 格式如: 2011-01-11 01:10 */ @@ -120,7 +120,7 @@ public class TimeUtils { /** * 年月日,格式如19700710 */ - private static final DateFormat ymdFormat = new SimpleDateFormat("yyyyMMdd"); + private static final String ymdFormat = "yyyyMMdd"; /** * 年月日,格式如1970年07月10日 */ @@ -280,16 +280,14 @@ public class TimeUtils { * 获取时间戳字符串yyyyMMDDHHmmss */ public static String getTimeStamp(Long time) { - Date data = new Date(time); - return ymdhmsFormat_new.format(data); + return new SimpleDateFormat(ymdhmsFormat_new).format(new Date(time)); } /** * 获取时间戳字符串yyyyMMdd */ public static String getTimeStampYMD(Long time) { - Date data = new Date(time); - return ymdFormat.format(data); + return new SimpleDateFormat(ymdFormat).format(new Date(time)); } diff --git a/netty/src/main/java/com/ljsd/jieling/netty/cocdex/Tea.java b/netty/src/main/java/com/ljsd/jieling/netty/cocdex/Tea.java index 2de12e359..8deb1f634 100644 --- a/netty/src/main/java/com/ljsd/jieling/netty/cocdex/Tea.java +++ b/netty/src/main/java/com/ljsd/jieling/netty/cocdex/Tea.java @@ -9,7 +9,7 @@ import java.util.Random; * 加密解密轮数应为8的倍数,推荐加密轮数为64轮 */ public class Tea { - public static int[] KEY = new int[]{//加密解密所用的KEY + public static final int[] KEY = new int[]{//加密解密所用的KEY 0x789f5645, 0xf68bd5a4, 0x81963ffa, 0x458fac58 }; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/bloody/UserBloodySnpInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/bloody/UserBloodySnpInfo.java index dc322c1ed..63458b701 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/bloody/UserBloodySnpInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/bloody/UserBloodySnpInfo.java @@ -11,7 +11,6 @@ import java.util.HashMap; import java.util.Map; public class UserBloodySnpInfo { - private int serverId; private int uid; @@ -37,7 +36,6 @@ public class UserBloodySnpInfo { public UserBloodySnpInfo(int uid, String name) { this.uid = uid; this.name = name; - this.serverId = GameApplication.serverId; } public void updateHeroSkill(String heroId, String skills){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/json/GlobalPlatConfigure.java b/serverlogic/src/main/java/com/ljsd/jieling/config/json/GlobalPlatConfigure.java index 5328aa57d..9c796378b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/json/GlobalPlatConfigure.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/json/GlobalPlatConfigure.java @@ -1,5 +1,5 @@ package com.ljsd.jieling.config.json; public class GlobalPlatConfigure { - public static PlatConfigure platConfigure = new PlatConfigure(); + protected static PlatConfigure platConfigure = new PlatConfigure(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/json/KTSDKConstans.java b/serverlogic/src/main/java/com/ljsd/jieling/config/json/KTSDKConstans.java index 0cf0e5df9..024594eff 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/json/KTSDKConstans.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/json/KTSDKConstans.java @@ -1,12 +1,12 @@ package com.ljsd.jieling.config.json; public class KTSDKConstans { - public static String appidTest = "jl_test"; - public static String appidOnlie = "lj_jl_7qdsc"; - public static String appidTestOnline = "lj_jl_8qdcs"; + public static final String appidTest = "jl_test"; + public static final String appidOnlie = "lj_jl_7qdsc"; + public static final String appidTestOnline = "lj_jl_8qdcs"; public static String appid = appidTest; - public static String appkey = "c0fb59eb68559b6c9c1463e4d5d0c806"; - public static String md5Key = "0A008C48E74E8A399F1F80DBED71161C"; - public static String appsecret = "d53b3e8ef74bf72d8aafce3a1c8671a0"; + public static final String appkey = "c0fb59eb68559b6c9c1463e4d5d0c806"; + public static final String md5Key = "0A008C48E74E8A399F1F80DBED71161C"; + public static final String appsecret = "d53b3e8ef74bf72d8aafce3a1c8671a0"; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/json/SDK37Constans.java b/serverlogic/src/main/java/com/ljsd/jieling/config/json/SDK37Constans.java index 9b30cd66d..0184806b3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/json/SDK37Constans.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/json/SDK37Constans.java @@ -1,9 +1,9 @@ package com.ljsd.jieling.config.json; public class SDK37Constans { - public static String gid = "1006856"; - public static String pid = "1"; - public static String appkey = "$5wl2BKfodm4nqxVIC0XeHPb9ZRLQFz?"; - public static String payKey = "cxSeo5IBl6;kdPOJRgjEYHp9LsQMf+1V"; - public static String chatKey = "37opkldcs341"; + public static final String gid = "1006856"; + public static final String pid = "1"; + public static final String appkey = "$5wl2BKfodm4nqxVIC0XeHPb9ZRLQFz?"; + public static final String payKey = "cxSeo5IBl6;kdPOJRgjEYHp9LsQMf+1V"; + public static final String chatKey = "37opkldcs341"; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/reportData/DataMessageUtils.java b/serverlogic/src/main/java/com/ljsd/jieling/config/reportData/DataMessageUtils.java index 16f76898d..29dff2c88 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/reportData/DataMessageUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/reportData/DataMessageUtils.java @@ -16,6 +16,7 @@ import com.ljsd.jieling.util.http.HttpPool; import org.apache.http.HttpResponse; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.message.BasicNameValuePair; +import org.luaj.vm2.ast.Str; import util.StringUtil; import java.io.UnsupportedEncodingException; @@ -143,15 +144,15 @@ public class DataMessageUtils { return null; } final String reserved_char = ";/?:@=&"; - String ret = ""; + StringBuilder ret = new StringBuilder(); for(int i=0; i < url.length(); i++) { String cs = String.valueOf( url.charAt(i) ); if(reserved_char.contains(cs)){ - ret += cs; + ret.append(cs); }else{ - ret += URLEncoder.encode(cs, "utf-8"); + ret.append(URLEncoder.encode(cs, "utf-8")); } } - return ret.replace("+", "%20"); + return ret.toString().replace("+", "%20"); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java b/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java index 6a24f453f..66fdd2118 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java @@ -19,6 +19,7 @@ import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Query; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -54,7 +55,7 @@ public class EndlessFunction implements FunctionManager { Query query = new Query(); query.with(new Sort(Sort.Direction.DESC,"playerManager.level")); query.fields().include("playerManager.level"); - List users = null; + List users = new ArrayList<>(); try { users = MongoUtil.getLjsdMongoTemplate().findAllByCondition(query, User.class); } catch (Exception e) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java index 2f2824a14..34f21706a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java @@ -76,6 +76,8 @@ public class FastChallengeHandler extends BaseHandler heroIids; - - private Map totalConuntByType; - - -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java index 1ec438454..fd012ebaa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java @@ -241,7 +241,7 @@ public class Equip extends PropertyItem implements Cloneable{ return result; } private int getRandomSkill(int[] skills){ - if(skills.length<0){ + if(skills.length<=0){ return 0; } int poolId = MathUtils.randomFromArray(skills); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GoodsInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GoodsInfo.java deleted file mode 100644 index 5ec66bb6e..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GoodsInfo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.ljsd.jieling.logic.dao; - -public class GoodsInfo { - private int goodsId; - private int type; - private int startTime; - private int endTime; -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java index a1ea59003..27fda7a9b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java @@ -1,6 +1,5 @@ package com.ljsd.jieling.logic.dao; -import com.ljsd.GameApplication; import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 48d79c905..6110430fc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -335,20 +335,21 @@ public class PlayerManager extends MongoBase { } public void vipFlush( Set removePrivileges) { - if (vipInfo.isEmpty()){ + if (vipInfo.isEmpty()) { return; } - for(Integer id : vipInfo.keySet()){ + for (Map.Entry entry : vipInfo.entrySet()) { + Integer id = entry.getKey(); SPrivilegeTypeConfig sPrivilegeTypeConfig = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(id); - if(null == sPrivilegeTypeConfig){ + if (null == sPrivilegeTypeConfig) { continue; } int refreshType = sPrivilegeTypeConfig.getRefreshType()[0]; - if(refreshType == 1&&vipInfo.get(id).getCount()>0){ - vipInfo.put(id,new VipInfo()); + if (refreshType == 1 && entry.getValue().getCount() > 0) { + vipInfo.put(id, new VipInfo()); } } - for(Integer remove : removePrivileges){ + for (Integer remove : removePrivileges) { vipInfo.remove(remove); } updateString("vipInfo", vipInfo); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/QuestionOption.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/QuestionOption.java deleted file mode 100644 index 5468b5f11..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/QuestionOption.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ljsd.jieling.logic.dao; - - -public class QuestionOption { - private String content = ""; - private int type; - private String[] options ; - - public QuestionOption(String content, int type, String[] options) { - this.content = content; - this.type = type; - this.options = options; - } -} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RingFire.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RingFire.java deleted file mode 100644 index 4b7c5d448..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RingFire.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.ljsd.jieling.logic.dao; - -public class RingFire { - private int level; -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index 6d5a3f551..6ec7bfba1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -277,8 +277,8 @@ public class UserMissionManager extends MongoBase { for(int quality:qualityArray){ qualityNum.put(quality,qualityNum.getOrDefault(quality,0)+1); } - for(int quality:qualityNum.keySet()){ - List sMazeTreasures = SMazeTreasure.mazeMapByTaskType.get(quality); + for(Map.Entry entry:qualityNum.entrySet()){ + List sMazeTreasures = SMazeTreasure.mazeMapByTaskType.get(entry.getKey()); int[][] treasures = new int[sMazeTreasures.size()][]; for(int i = 0 ; i blockingQueue) { this.blockingQueue = blockingQueue; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 138b74753..83f6c706a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -266,19 +266,20 @@ public class GuildFightLogic { public static void familyFightMatching() throws Exception { RedisUtil redisUtil = RedisUtil.getInstence(); // Thread.sleep(10000); - Set guildIds = GuilidManager.guildInfoMap.keySet(); - if (guildIds.size() < 1) { + int guildIds = GuilidManager.guildInfoMap.size(); + if (guildIds < 1) { return; } String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, "", false); SGuildSetting guildSetting = sGuildSetting; - for (Integer gid : guildIds) { + for (Map.Entry guildInfoMapEntry : GuilidManager.guildInfoMap.entrySet()) { + Integer gid = guildInfoMapEntry.getKey(); if(redisUtil.getZSetScore("guild-release","",String.valueOf(gid))>0){ continue; } Map configMap = STableManager.getConfig(SGuildLevelConfig.class); //todo 人数限制 - GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); + GuildInfo guildInfo = guildInfoMapEntry.getValue(); if(guildInfo.getDefendInfo().size() guildIds = GuilidManager.guildInfoMap.keySet(); - for (Integer gid : guildIds) { + for (Map.Entry entry : GuilidManager.guildInfoMap.entrySet()) { + Integer gid = entry.getKey(); int enemyFamily = getEnemyFamily(gid); if (enemyFamily == -1) { continue; } - GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); + GuildInfo guildInfo = entry.getValue(); GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class); // GuildInfo enemyInfo = GuilidManager.guildInfoMap.get(enemyFamily); Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder().setId(enemyFamily) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 551997d64..4b28f81d8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -634,11 +634,12 @@ public class CombatLogic { } int nowTime = (int)(TimeUtils.now()/1000); User findUser = UserManager.getUser(findUserId); - String findRewardMail = ItemUtil.getMailReward(findUser,findRewardgroup, 1.0f); String title = SErrorCodeEerverConfig.getI18NMessage("adventuren_boss_find_reward_title"); String content = SErrorCodeEerverConfig.getI18NMessage("adventuren_boss_find_reward__txt"); - MailLogic.getInstance().sendMail(findUserId,title,content,findRewardMail,nowTime, Global.MAIL_EFFECTIVE_TIME); - + if (findRewardgroup != null) { + String findRewardMail = ItemUtil.getMailReward(findUser,findRewardgroup, 1.0f); + MailLogic.getInstance().sendMail(findUserId,title,content,findRewardMail,nowTime, Global.MAIL_EFFECTIVE_TIME); + } User killUser = UserManager.getUser(killUid); String killRewardMail = ItemUtil.getMailReward(killUser,killReward, 1.0f); title = SErrorCodeEerverConfig.getI18NMessage("adventuren_boss_kill_reward_title"); @@ -1046,10 +1047,11 @@ public class CombatLogic { int count = 0; do { isOver = true; - Iterator it = tempMap.keySet().iterator(); + Iterator> it = tempMap.entrySet().iterator(); while(it.hasNext()){ - int key = it.next(); - int value = tempMap.get(key); + Map.Entry entry = it.next(); + int key = entry.getKey(); + int value = entry.getValue(); SEquipConfig sEquipConfig = config.get(key); if(sEquipConfig==null) continue; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/AyyncWorker.java b/serverlogic/src/main/java/com/ljsd/jieling/util/AyyncWorker.java index 01da7002a..6a7f51882 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/AyyncWorker.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/AyyncWorker.java @@ -7,13 +7,11 @@ import com.ljsd.jieling.logic.dao.root.User; */ public class AyyncWorker implements AyncWorkerRunnable { private User user; - private boolean isTask; private AyncWorkerRunnable ayncWorkerRunnable; public AyyncWorker(User user, boolean isTask, AyncWorkerRunnable ayncWorkerRunnable) { this.user = user; - this.isTask = isTask; this.ayncWorkerRunnable = ayncWorkerRunnable; } @@ -28,10 +26,6 @@ public class AyyncWorker implements AyncWorkerRunnable { this.user = user; } - public void setTask(boolean task) { - isTask = task; - } - public User getUser() { return user; } diff --git a/tablemanager/src/main/java/config/SGameSetting.java b/tablemanager/src/main/java/config/SGameSetting.java index a834bf140..0e3458e0e 100644 --- a/tablemanager/src/main/java/config/SGameSetting.java +++ b/tablemanager/src/main/java/config/SGameSetting.java @@ -293,7 +293,7 @@ public class SGameSetting implements BaseConfig { } public void setShowRank(int showRank) { - showRank = showRank; + this.showRank = showRank; } public int getMaxNameLength() {