diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java index 3b1dcea..5ccb951 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java @@ -2,6 +2,7 @@ package com.cowr.local.ssjygl.netty; import com.alibaba.fastjson.JSONObject; import com.cowr.common.enums.Enums; +import com.cowr.local.ssjygl.main.Config; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.jfinal.log.Log; import io.netty.bootstrap.Bootstrap; @@ -194,7 +195,10 @@ public class NettyClient { @Override public void channelUnregistered(ChannelHandlerContext ctx) throws Exception { - log.debug("服务器已断开或无法连接,尝试重连。。。"); + log.debug("服务器已断开或无法连接,尝试重连。。。 IP:%s, port:%s, supermarket:%s", + Config.configprop.get("socketserver.host"), + Config.configprop.getInt("socketserver.port"), + Config.configprop.getInt("current.supermarket_id")); super.channelUnregistered(ctx); } diff --git a/ssjygl-xsx-local/src/main/resources/dev/db.properties b/ssjygl-xsx-local/src/main/resources/dev/db.properties index 1dbd269..add365e 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/db.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/db.properties @@ -1,12 +1,12 @@ # mysql # GRANT ALL PRIVILEGES ON *.* TO 'root'@'192.168.1.119' IDENTIFIED BY 'Local_1' WITH GRANT OPTION; -#jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true -#user=dev_ssjy_xsx -#password=Ssjy_xs_890 +jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +user=dev_ssjy_xsx +password=Ssjy_xs_890 -jdbcUrl=jdbc:mysql://192.168.20.2:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true -user=root -password=Ssjy_xsx_890 +#jdbcUrl=jdbc:mysql://192.168.20.2:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +#user=root +#password=Ssjy_xsx_890 # redis redis.basekey=ssjcgl_xsx_dev diff --git a/ssjygl-xsx-local/src/main/resources/tpl.xlsx b/ssjygl-xsx-local/src/main/resources/tpl.xlsx index 2951967..f13e699 100644 Binary files a/ssjygl-xsx-local/src/main/resources/tpl.xlsx and b/ssjygl-xsx-local/src/main/resources/tpl.xlsx differ diff --git a/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx b/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx index 56a69f5..d3b95ac 100644 Binary files a/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx and b/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx differ