diff --git a/hotfix/build.gradle b/hotfix/build.gradle index ac9f39401..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 @@ -18,7 +17,6 @@ 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/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' 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"); 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();