From a831515aad2adb959c41a9df54393bf6aef9093d Mon Sep 17 00:00:00 2001 From: mashiyu Date: Tue, 22 Jan 2019 17:16:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/serverlogic/build.gradle b/serverlogic/build.gradle index a518a3c10..f5fc66648 100644 --- a/serverlogic/build.gradle +++ b/serverlogic/build.gradle @@ -8,7 +8,6 @@ version '1.0.0-SNAPSHOT' sourceCompatibility = 1.8 repositories { - maven { url "http://repo.spring.io/libs-release" } mavenLocal() mavenCentral() } From c28ba0913e79edf3967e348b2f7842bfb07306a8 Mon Sep 17 00:00:00 2001 From: mashiyu Date: Tue, 22 Jan 2019 18:55:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/build.gradle | 1 + hotfix/build.gradle | 3 +++ netty/build.gradle | 1 + serverlogic/build.gradle | 17 +++++++++++++++++ .../network/server/ProtocolsManager.java | 13 +++++++------ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 6b8a0402e..2836f7e9d 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -8,6 +8,7 @@ version '1.0.0-SNAPSHOT' sourceCompatibility = 1.8 repositories { + mavenLocal() mavenCentral() } diff --git a/hotfix/build.gradle b/hotfix/build.gradle index bdeadca3f..ac9f39401 100644 --- a/hotfix/build.gradle +++ b/hotfix/build.gradle @@ -8,6 +8,7 @@ version '1.0.0-SNAPSHOT' sourceCompatibility = 1.8 repositories { + mavenLocal() mavenCentral() } @@ -16,6 +17,8 @@ dependencies { } jar { + baseName = 'hotfix' + version = '1.0.0' manifest{ attributes 'Manifest-Version':'1.0' attributes 'Premain-Class':'com.ljsd.jieling.hotfix.JavaAgent' diff --git a/netty/build.gradle b/netty/build.gradle index 70d3d2523..1ba0bc82b 100644 --- a/netty/build.gradle +++ b/netty/build.gradle @@ -8,6 +8,7 @@ version '1.0.0-SNAPSHOT' sourceCompatibility = 1.8 repositories { + mavenLocal() mavenCentral() } diff --git a/serverlogic/build.gradle b/serverlogic/build.gradle index f5fc66648..af5193d58 100644 --- a/serverlogic/build.gradle +++ b/serverlogic/build.gradle @@ -36,4 +36,21 @@ jar { manifest { attributes 'Main-Class': 'com.ljsd.jieling.ServerlogicApplication' } +} + + +//依赖编译,然后打包JAR +task taskJar(type:Jar, dependsOn: compileJava) { + from 'build/classes/main' + destinationDir = file('build/libs') +} + +//删除lib中的jar +task clearJars(type:Delete){ + delete 'lib' +} + +task copyJars(type: Copy, dependsOn:clearJars) { + from configurations.runtime + into 'lib' // 目标位置 } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java index 621465ec6..2560a6544 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java @@ -256,6 +256,13 @@ public class ProtocolsManager implements ProtocolsAbstract { private int checkAndRefresh(ISession session, PacketNetData packetNetData) { int myToken = 0; if (packetNetData.getMsgId()== MessageTypeProto.MessageType.LOGIN_REQUEST_VALUE){ + + if (OnlineUserManager.checkUidOnline(session.getUid())){ + ISession iSession = OnlineUserManager.getSessionByUid(session.getUid()); + MessageUtil.sendErrorCode(session, ErrorCode.reloginCode); + OnlineUserManager.userOffline(iSession.getUid()); + iSession.close(); + } OnlineUserManager.userOnline(session.getUid(),session); //TODO 更新token @@ -266,12 +273,6 @@ public class ProtocolsManager implements ProtocolsAbstract { } - if (OnlineUserManager.checkUidOnline(session.getUid())){ - ISession iSession = OnlineUserManager.getSessionByUid(session.getUid()); - MessageUtil.sendErrorCode(session, ErrorCode.reloginCode); - iSession.close(); - } - // if (myToken != packetNetData.getToken()){ // return 1; // } From 65a6d59259ab4f53346b1c58ca3c0b9cd99667e6 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 23 Jan 2019 09:50:50 +0800 Subject: [PATCH 3/6] error code --- .../jieling/config/SCHeroRankUpConfig.java | 32 ++++++++++++------- .../com/ljsd/jieling/util/MessageUtil.java | 19 ++++++++--- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java index 579a0e938..88f7a1ac8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java @@ -3,11 +3,12 @@ package com.ljsd.jieling.config; import com.ljsd.jieling.logic.STableManager; import com.ljsd.jieling.logic.Table; +import java.util.HashMap; import java.util.Map; @Table(name = "HeroRankupConfig") public class SCHeroRankUpConfig implements BaseConfig{ - public static Map scHeroRankUpConfigMap; + public static Map> scHeroRankUpConfigByType; private int id; @@ -23,17 +24,28 @@ public class SCHeroRankUpConfig implements BaseConfig{ private int openStar; - private int consumeMaterial[]; - - private int[] consumeCard[]; + private int consumeMaterial[][]; @Override public void init() throws Exception { - scHeroRankUpConfigMap = STableManager.getConfig(SCHeroRankUpConfig.class); + Map> result = new HashMap<>(); + Map config = STableManager.getConfig(SCHeroRankUpConfig.class); + for(SCHeroRankUpConfig scHeroRankUpConfig: config.values()){ + int type = scHeroRankUpConfig.getType(); + if(!result.containsKey(type)){ + result.put(type,new HashMap<>()); + } + if(type == 1){ + result.get(type).put(scHeroRankUpConfig.getLimitLevel(),scHeroRankUpConfig); + }else{ + result.get(type).put(scHeroRankUpConfig.getLimitStar(),scHeroRankUpConfig); + } + } + scHeroRankUpConfigByType = result; } - public static Map getScHeroRankUpConfigMap() { - return scHeroRankUpConfigMap; + public static Map getScHeroRankUpConfigByType(int type) { + return scHeroRankUpConfigByType.get(type); } public int getId() { @@ -64,11 +76,7 @@ public class SCHeroRankUpConfig implements BaseConfig{ return openStar; } - public int[] getConsumeMaterial() { + public int[][] getConsumeMaterial() { return consumeMaterial; } - - public int[][] getConsumeCard() { - return consumeCard; - } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java index e125f5662..44f29512c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -1,14 +1,18 @@ package com.ljsd.jieling.util; import com.google.protobuf.GeneratedMessage; +import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.netty.PackageConstant; import com.ljsd.jieling.netty.cocdex.Tea; import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Base64; + public class MessageUtil { private static final Logger LOGGER = LoggerFactory.getLogger(MessageUtil.class); @@ -79,11 +83,16 @@ public class MessageUtil { session.writeAndFlush(byteBuf); } -// public static void sendErrorResponse(Msg msg, GeneratedMessage error_message, int msgId) throws Exception { -// String protoEntity = Base64.getEncoder().encodeToString(error_message.toByteArray()); -// BaseGlobal.redisApp.hset(RedisKey.RESPONSE, String.valueOf(msg.getUid()), String.valueOf(Math.abs(msg.getIndex())), new ProtoEntity(msgId, protoEntity), -1); -// sendMessage(msg.getSession(), msg.getUid(), msg.getIndex(), 1, msgId, error_message, true); -// } + public static void sendErrorResponse(ISession session,int errorCode,int msgId,String errMsg) throws Exception { + GeneratedMessage generatedMessage = null; + if(errorCode!=1 && !StringUtil.isEmpty(errMsg)){ + generatedMessage = CommonProto.ErrorResponse.newBuilder().setErrCode(errorCode).setErrMsg(errMsg).build(); + } + byte[] byteBuf = wrappedBuffer(session.getUid(), session.getToken(), session.getIndex(), + errorCode,msgId, generatedMessage); + session.writeAndFlush(byteBuf); + + } // // public static void sendResponse(Msg msg, int msgId, GeneratedMessage generatedMessage) throws Exception { // String protoEntity = Base64.getEncoder().encodeToString(generatedMessage.toByteArray()); From 36b37390493139a945cd98268e4c3b292b6e26c9 Mon Sep 17 00:00:00 2001 From: mashiyu Date: Wed, 23 Jan 2019 09:53:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/build.gradle b/serverlogic/build.gradle index af5193d58..909be9998 100644 --- a/serverlogic/build.gradle +++ b/serverlogic/build.gradle @@ -47,10 +47,10 @@ task taskJar(type:Jar, dependsOn: compileJava) { //删除lib中的jar task clearJars(type:Delete){ - delete 'lib' + delete 'build/libs' } task copyJars(type: Copy, dependsOn:clearJars) { from configurations.runtime - into 'lib' // 目标位置 + into 'build/libs' // 目标位置 } \ No newline at end of file From f408616cc2ada398517b6a556ef271135d751149 Mon Sep 17 00:00:00 2001 From: mashiyu Date: Wed, 23 Jan 2019 10:02:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/build.gradle b/serverlogic/build.gradle index 909be9998..af5193d58 100644 --- a/serverlogic/build.gradle +++ b/serverlogic/build.gradle @@ -47,10 +47,10 @@ task taskJar(type:Jar, dependsOn: compileJava) { //删除lib中的jar task clearJars(type:Delete){ - delete 'build/libs' + delete 'lib' } task copyJars(type: Copy, dependsOn:clearJars) { from configurations.runtime - into 'build/libs' // 目标位置 + into 'lib' // 目标位置 } \ No newline at end of file From 477bcdab2828f46b3bd8c546fab222e509bb67bc Mon Sep 17 00:00:00 2001 From: mashiyu Date: Wed, 23 Jan 2019 10:38:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/1.Map_101.txt | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 conf/server/1.Map_101.txt diff --git a/conf/server/1.Map_101.txt b/conf/server/1.Map_101.txt deleted file mode 100644 index 04d2194b5..000000000 --- a/conf/server/1.Map_101.txt +++ /dev/null @@ -1,24 +0,0 @@ -id Event Groups -int int mut,int#int,2 -1 101005 9#14|10#14|9#15|10#15 -2 101001 5#8|6#8|5#9|6#9 -3 101005 8#11|9#11|8#12|9#12 -4 101005 7#19|8#19|8#20 -5 101010 8#9 -6 101008 10#11 -7 101009 2#18 -8 101004 10#5|10#6 -9 101005 1#7|2#7|1#8|2#8 -10 101005 2#14|3#14|2#15|3#15 -11 101006 8#3 -12 101007 5#5 -13 101001 3#16|4#16|3#17|4#17 -14 101011 7#16 -15 101001 6#2|5#3|6#3 -16 101001 8#4|9#4|8#5|7#6|7#7 -17 101012 3#5|4#5|3#6|4#6 -18 101005 4#19|3#20 -19 101001 4#11|4#12 -20 101002 1#12|2#12|1#13|2#13|5#18|6#18|6#19 -21 101001 6#14|6#15 -22 101003 4#4