From 9e2cf35c4e468231246daaab565ce30541ce08e9 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 5 Jul 2019 15:48:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/GameApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index bb3098818..1aeeaa67b 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -89,7 +89,7 @@ public class GameApplication { MapLogic.getInstance().init(configurableApplicationContext); SensitivewordFilter.init(); - HttpPool.init(); +// HttpPool.init(); // 加载lua文件 CheckFight.getInstance().init("luafight/BattleMain.lua"); From aeeeb6199563f1908ba5eb0c9595587d71ca3d1f Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Fri, 5 Jul 2019 15:58:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/build.gradle | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/serverlogic/build.gradle b/serverlogic/build.gradle index be734f849..aa7615393 100644 --- a/serverlogic/build.gradle +++ b/serverlogic/build.gradle @@ -12,12 +12,20 @@ repositories { mavenCentral() } +jar { + baseName = 'serverlogic' + version = '1.0.0' + manifest { + attributes 'Main-Class': 'com.ljsd.GameApplication' + } +} + dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' + compile project(":netty") compile project(":hotfix") compile project(":common") - + testCompile group: 'junit', name: 'junit', version: '4.12' compile("org.javassist:javassist:3.18.2-GA") compile("org.springframework.boot:spring-boot:1.5.9.RELEASE") compile("org.springframework.boot:spring-boot-starter-test:1.5.9.RELEASE") @@ -35,15 +43,6 @@ dependencies { compile files("${System.properties['java.home']}/../lib/tools.jar") } -jar { - baseName = 'serverlogic' - version = '1.0.0' - manifest { - attributes 'Main-Class': 'com.ljsd.GameApplication' - } -} - - //依赖编译，然后打包JAR task taskJar(type:Jar, dependsOn: compileJava) { from 'build/classes/main' From d85f7facf523988d3a2dcb6f5d4b60047f4e13ee Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Fri, 5 Jul 2019 16:05:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hotfix/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/hotfix/build.gradle b/hotfix/build.gradle index ac9f39401..2affd22b9 100644 --- a/hotfix/build.gradle +++ b/hotfix/build.gradle @@ -18,7 +18,6 @@ dependencies { jar { baseName = 'hotfix' - version = '1.0.0' manifest{ attributes 'Manifest-Version':'1.0' attributes 'Premain-Class':'com.ljsd.jieling.hotfix.JavaAgent' From 5b84b17e4fb8b687a26e3ae8668da638b20e1b40 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Fri, 5 Jul 2019 16:07:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hotfix/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/hotfix/build.gradle b/hotfix/build.gradle index 2affd22b9..8cee9a89e 100644 --- a/hotfix/build.gradle +++ b/hotfix/build.gradle @@ -3,7 +3,6 @@ plugins { } group 'com.ljsd' -version '1.0.0-SNAPSHOT' sourceCompatibility = 1.8 From 891bd568b680e7a52f9c5ab859b5ccb7b3f42f1b Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Fri, 5 Jul 2019 16:13:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E8=A1=A8=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/STableManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java index fb9326e38..08a280b6a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java @@ -42,7 +42,7 @@ public class STableManager { String[] tableList = null; if (isHotFix) { CDataBaseVersion version = getJsonFilePathInJsonConf("c_database_version.json",CDataBaseVersion.class); - if (version == null || version.getTables().isEmpty() || version.getVersion() == currentDbVersion) { // 启动而不是热更 + if (version == null || version.getTables().isEmpty() || currentDbVersion >= version.getVersion()) { // 启动而不是热更 return; } currentDbVersion = version.getVersion();