diff --git a/serverlogic/src/main/resources/application.properties b/serverlogic/src/main/resources/application.properties index 42c7a3e76..e7d2b0bfe 100644 --- a/serverlogic/src/main/resources/application.properties +++ b/serverlogic/src/main/resources/application.properties @@ -1,18 +1,15 @@ #server info -server.id = 10153 +server.id = 50215 server.openTime = 20190101000101 server.num = 1 -#0为默认开发环境,1为正式环境 -server.isLAN = 0 -server.sendlog37 = false -#services.core.gmport=7901 + # redis config # Redis数据库索引(默认为0) -spring.redis.database=0 +spring.redis.database=13 #spring.redis.database=2 # Redis服务器地址 -spring.redis.host=60.1.1.21 +spring.redis.host=60.1.1.14 # Redis服务器连接端口 spring.redis.port=6379 # Redis服务器连接密码(默认为空) @@ -34,8 +31,7 @@ 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/jieling_10153 -spring.data.mongodbcore.uri = mongodb://60.1.1.14:27017/jl_core +spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_50215 #spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212 mongodb.options.maxWaitTime = 120000 mongodb.options.connectTimeout = 1000 @@ -47,7 +43,7 @@ mongodb.options.maxConnectionIdleTime = 1000 # netty config -netty.tcpPort = 16080 +netty.tcpPort = 26080 netty.chatTcpPort = 20001 netty.logintcpPort = 18091 netty.udpPort = 18092