diff --git a/serverlogic/build.gradle b/serverlogic/build.gradle index 84f4d7105..1985c46f4 100644 --- a/serverlogic/build.gradle +++ b/serverlogic/build.gradle @@ -15,7 +15,6 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compile project(":netty") compile project(":hotfix") compile project(":common") @@ -28,7 +27,6 @@ dependencies { compile("com.google.protobuf:protobuf-java:2.5.0") compile("com.fasterxml.jackson.core:jackson-core:2.3.1") compile("com.fasterxml.jackson.core:jackson-databind:2.3.3") - compile("org.apache.poi:poi-ooxml:3.12") compile files("${System.properties['java.home']}/../lib/tools.jar") } diff --git a/serverlogic/out/production/resources/application.properties b/serverlogic/out/production/resources/application.properties deleted file mode 100644 index 0a1c9a236..000000000 --- a/serverlogic/out/production/resources/application.properties +++ /dev/null @@ -1,67 +0,0 @@ -#server info -server.id = 10180 -server.openTime = 20190101000101 - - -# redis config -# Redis数据库索引(默认为0) -spring.redis.database=0 -# Redis服务器地址 -spring.redis.host=60.1.1.14 -# Redis服务器连接端口 -spring.redis.port=6379 -# Redis服务器连接密码(默认为空) -spring.redis.password= -# 连接池最大连接数(使用负值表示没有限制) -spring.redis.pool.max-active=8 -# 连接池最大阻塞等待时间(使用负值表示没有限制) -spring.redis.pool.max-wait=-1 -# 连接池中的最大空闲连接 -spring.redis.pool.max-idle=8 -# 连接池中的最小空闲连接 -spring.redis.pool.min-idle=0 -# 连接超时时间(毫秒) -spring.redis.timeout=0 - -spring.redis.expireTime = -1 - - -#spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1 -#spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1 -#mongodb2 develop -spring.data.mongodb.uri = mongodb://60.1.1.14:27017/ysj_msy -mongodb.options.maxWaitTime = 120000 -mongodb.options.connectTimeout = 1000 -mongodb.options.socketTimeout = 0 -mongodb.options.threadsAllowedToBlockForConnectionMultiplier = 20 -mongodb.options.connectionsPerHost = 256 -mongodb.options.minConnectionsPerHost = 5 -mongodb.options.maxConnectionIdleTime = 1000 - - -# netty config -netty.tcpPort = 18090 -netty.chatTcpPort = 20001 -netty.logintcpPort = 18091 -netty.udpPort = 18092 -netty.udpTargetIp=127.0.0.1 -netty.udpTargetPort=10001 -netty.reconnectDelay=3000 -netty.bossThreadCount=1 -netty.workerThreadCount=10 -netty.readTimeout=32 -netty.writeTimeout=32 -netty.allTimeout=35 - - -#core -services.core.ip=60.1.1.180 -services.core.port=7900 -services.core.area=1000 -services.core.id=1 -services.core.weight=5 - -#arena service -services.fight.key=key_dir_checkserver_Hash - -logging.config = conf/logback-boot.xml \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 8b5cba945..65b72da6c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,4 +3,6 @@ include 'netty' include 'serverlogic' include 'hotfix' include 'common' +include 'test' +include 'test' diff --git a/test/build.gradle b/test/build.gradle new file mode 100644 index 000000000..7ab6dcbf8 --- /dev/null +++ b/test/build.gradle @@ -0,0 +1,20 @@ +plugins { + id 'java' +} + +version 'unspecified' + +sourceCompatibility = 1.8 + +repositories { + mavenLocal() + mavenCentral() +} + +dependencies { + compile project(":netty") + + testCompile group: 'junit', name: 'junit', version: '4.12' + compile("org.apache.poi:poi-ooxml:3.12") + +} \ No newline at end of file diff --git a/test/build/libs/test.jar b/test/build/libs/test.jar new file mode 100644 index 000000000..c585fb779 Binary files /dev/null and b/test/build/libs/test.jar differ diff --git a/test/build/tmp/jar/MANIFEST.MF b/test/build/tmp/jar/MANIFEST.MF new file mode 100644 index 000000000..59499bce4 --- /dev/null +++ b/test/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ExcelUtils.java b/test/src/main/java/ExcelUtils.java similarity index 98% rename from serverlogic/src/main/java/com/ljsd/jieling/util/ExcelUtils.java rename to test/src/main/java/ExcelUtils.java index 6d973cb8b..8a2e59552 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ExcelUtils.java +++ b/test/src/main/java/ExcelUtils.java @@ -1,5 +1,3 @@ -package com.ljsd.jieling.util; - import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -15,8 +13,10 @@ import java.util.Map; public class ExcelUtils { private static final Logger LOGGER = LoggerFactory.getLogger(ExcelUtils.class); private static boolean isWrite = true; + // excel鏂囦欢鍦板潃 private static String excelPath ="tmp/"; - private static String path = "C:/ljsd/jieling_conf/"; + // 鐢熸垚txt鏂囦欢鍦板潃 + private static String path = "conf/server/"; public static void main(String[] args) throws IOException { readExcelData();