Merge branch 'master' of ssh://101.201.226.163:50022/ccsens_wiki/common

ccmq/src/main/java/com/ccsens/ccmq/lowlevel/client/netty/tcphexserver/ModbusDecoder.java

@@ -64,10 +64,12 @@ public class ModbusDecoder extends ByteToMessageDecoder {
 
 
             CCModBusEntity ccModBusEntity = new CCModBusEntity(in);
-//            for (int i = 0; i < ccModBusEntity.getModbusData().length; i++) {
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < ccModBusEntity.getModbusData().length; i++) {
 //                log.info("modBus数据包：{}",ccModBusEntity.getModbusData()[i]);
-//            }
-
+                builder.append(String.format("%02x", ccModBusEntity.getModbusData()[i])).append(",");
+            }
+            log.info("modBus数据：{}", builder);
             CCModBusEntity.Error error = ccModBusEntity.valid();
             log.info("modBus数据检查：{}", error);
             switch (error) {

ccmq/src/main/java/com/ccsens/ccmq/lowlevel/client/netty/tcphexserver/ModbusEncoder.java

@@ -27,9 +27,11 @@ public class ModbusEncoder extends MessageToByteEncoder<OutMessageSet> {
                 log.info("modbusData不等于空");
                 byte[] modbusData = ccModBusEntity.getModbusData();
                 log.info("长度：{}", modbusData.length);
+                StringBuilder builder = new StringBuilder();
                 for (int i = 0; i < modbusData.length; i++) {
-                    log.info("转化后的数据：{}", Integer.toHexString(modbusData[i] & 0xFF));
+                    builder.append(Integer.toHexString(modbusData[i] & 0xFF)).append(" ");
                 }
+                log.info("转化后的数据：{}", builder);
                 out.writeBytes(modbusData);
             }
         }

ccmq/src/main/resources/application-dev.properties

@@ -29,7 +29,7 @@ spring.rabbitmq.password=111111
 # spring.rabbitmq.listener.simple.acknowledge-mode=manual
 
 # MongoDB配置信息
-spring.data.mongodb.uri=mongodb://wei:111111@49.233.89.188:27017/test
+spring.data.mongodb.uri=mongodb://wei:111111@49.233.89.188:27017/test?maxPoolSize=1000
 spring.data.mongodb.option.socket-timeout=5000
 spring.data.mongodb.option.max-connection-idle-time=10000
 

ccmq/src/main/resources/application-prod.properties

@@ -30,7 +30,7 @@ spring.rabbitmq.password=111111
 # spring.rabbitmq.listener.simple.acknowledge-mode=manual
 
 # MongoDB配置信息
-spring.data.mongodb.uri=mongodb://wei:111111@127.0.0.1:27017/test
+spring.data.mongodb.uri=mongodb://wei:111111@127.0.0.1:27017/test?maxPoolSize=1000
 
 # 最大连接数，每一台服务器
 spring.data.mongodb.option.max-connection-per-host=100

ccmq/src/main/resources/application-test.properties

@@ -27,7 +27,7 @@ spring.rabbitmq.password=111111
 # spring.rabbitmq.listener.simple.acknowledge-mode=manual
 
 # MongoDB配置信息
-spring.data.mongodb.uri=mongodb://wei:111111@49.233.89.188:27017/test
+spring.data.mongodb.uri=mongodb://wei:111111@49.233.89.188:27017/test?maxPoolSize=1000
 # 最大连接数，每一台服务器
 spring.data.mongodb.option.max-connection-per-host=100
 # 可阻塞线程队列容量
@@ -45,7 +45,8 @@ spring.data.mongodb.option.socket-timeout=10000
 spring.data.mongodb.option.socket-keep-alive=true
 
 ## 连接空闲时间8小时，否则连接太过频繁
-spring.data.mongodb.option.max-connection-idle-time=28800000
+#spring.data.mongodb.option.max-connection-idle-time=28800000
+spring.data.mongodb.option.max-connection-idle-time=60000
 spring.data.mongodb.option.max-connection-life-time=0
 #心跳
 spring.data.mongodb.option.heartbeat-socket-timeout=10000

ccmq/src/main/resources/application-wiki.properties

@@ -26,7 +26,7 @@ spring.rabbitmq.username=yu
 spring.rabbitmq.password=sd12345
 # spring.rabbitmq.listener.simple.acknowledge-mode=manual
 # MongoDB配置信息
-spring.data.mongodb.uri=mongodb://yulei:sxwiki_mongo#@49.232.6.143:27017/test
+spring.data.mongodb.uri=mongodb://yulei:sxwiki_mongo#@49.232.6.143:27017/test?maxPoolSize=1000
 # 最大连接数，每一台服务器
 spring.data.mongodb.option.max-connection-per-host=100
 # 可阻塞线程队列容量

ccmq/src/main/resources/logback-spring.xml

@@ -55,9 +55,9 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${log.path}/${log.name.debug}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
             <!-- 日志保存周期 -->
-            <maxHistory>30</maxHistory>
+            <maxHistory>180</maxHistory>
             <!-- 总大小 -->
-            <totalSizeCap>100MB</totalSizeCap>
+            <totalSizeCap>500MB</totalSizeCap>
         </rollingPolicy>
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
@@ -76,9 +76,9 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${log.path}/${log.name.info}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
             <!-- 日志保存周期 -->
-            <maxHistory>30</maxHistory>
+            <maxHistory>180</maxHistory>
             <!-- 总大小 -->
-            <totalSizeCap>100MB</totalSizeCap>
+            <totalSizeCap>500MB</totalSizeCap>
         </rollingPolicy>
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
@@ -97,9 +97,9 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${log.path}/${log.name.warn}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
             <!-- 日志保存周期 -->
-            <maxHistory>30</maxHistory>
+            <maxHistory>180</maxHistory>
             <!-- 总大小 -->
-            <totalSizeCap>100MB</totalSizeCap>
+            <totalSizeCap>500MB</totalSizeCap>
         </rollingPolicy>
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
@@ -118,9 +118,9 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${log.path}/${log.name.error}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
             <!-- 日志保存周期 -->
-            <maxHistory>30</maxHistory>
+            <maxHistory>180</maxHistory>
             <!-- 总大小 -->
-            <totalSizeCap>100MB</totalSizeCap>
+            <totalSizeCap>500MB</totalSizeCap>
         </rollingPolicy>
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>