temp change

src/main/java/com/tidecloud/dataacceptance/web/BSJDeviceController.java

@@ -29,7 +29,7 @@ import redis.clients.jedis.JedisPool;
  * @author: chudk 
  * @date:   2017年10月30日 上午9:44:50   
  */
-@RestController("setting")
+//@RestController("bsjsetting")
 public class BSJDeviceController {
     
     private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);

src/main/java/com/tidecloud/dataacceptance/web/DeviceController.java

@@ -26,7 +26,7 @@ import redis.clients.jedis.JedisPool;
  * @author: chudk 
  * @date:   2017年10月30日 上午9:44:50   
  */
-@RestController("setting")
+//@RestController("setting")
 public class DeviceController {
     
     private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);

src/main/java/com/tidecloud/dataacceptance/web/WatchController.java

@@ -23,7 +23,7 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
  * @author: chudk 
  * @date:   2017年9月28日 上午11:14:50   
  */
-@RestController
+//@RestController
 public class WatchController {
     
     private static final Logger logger = LoggerFactory.getLogger(WatchController.class);

src/main/java/com/tidecloud/dataacceptance/web/YiTongDeviceController.java

@@ -34,7 +34,7 @@ import redis.clients.jedis.JedisPool;
  * @author: chudk 
  * @date:   2017年10月30日 上午9:44:50   
  */
-@RestController("setting")
+//@RestController("yitongsetting")
 public class YiTongDeviceController {
     
     private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);

src/main/java/com/tidecloud/dataacceptance/web/YuGuangDeviceController.java

@@ -27,7 +27,7 @@ import redis.clients.jedis.JedisPool;
  * @author: chudk 
  * @date:   2017年10月30日 上午9:44:50   
  */
-@RestController("setting")
+//@RestController("yuguangsetting")
 public class YuGuangDeviceController {
     
     private static final Logger logger = LoggerFactory.getLogger(YuGuangDeviceController.class);

src/main/resources/logback.xml

@@ -19,15 +19,6 @@
 		<!-- 添加附加的appender,最多只能添加一个 -->
 		<appender-ref ref="CONSOLE" />
 	</appender>
-	<appender name="ASYNC_INFO_FILE" class="ch.qos.logback.classic.AsyncAppender">
-		<!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-		<discardingThreshold>0</discardingThreshold>
-		<!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-		<queueSize>512</queueSize>
-		<!-- 添加附加的appender,最多只能添加一个 -->
-		<appender-ref ref="STRATEGY-THREAD-INFO" />
-	</appender>
-	
 	<appender name="STRATEGY-THREAD-INFO" class="ch.qos.logback.classic.sift.SiftingAppender">
 		<discriminator>
 			<key>strategyName</key>
@@ -52,14 +43,16 @@
 
 		</sift>
 	</appender>
-	<appender name="ASYNC_ERROR_FILE" class="ch.qos.logback.classic.AsyncAppender">
+	
+	<appender name="ASYNC_INFO_FILE" class="ch.qos.logback.classic.AsyncAppender">
 		<!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
 		<discardingThreshold>0</discardingThreshold>
 		<!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
 		<queueSize>512</queueSize>
 		<!-- 添加附加的appender,最多只能添加一个 -->
-		<appender-ref ref="STRATEGY-THREAD-ERROR" />
+		<appender-ref ref="STRATEGY-THREAD-INFO" />
 	</appender>
+	
 	<appender name="STRATEGY-THREAD-ERROR" class="ch.qos.logback.classic.sift.SiftingAppender">
 		<discriminator>
 			<key>strategyName</key>
@@ -88,6 +81,15 @@
 			</appender>
 		</sift>
 	</appender>
+	<appender name="ASYNC_ERROR_FILE" class="ch.qos.logback.classic.AsyncAppender">
+		<!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+		<discardingThreshold>0</discardingThreshold>
+		<!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+		<queueSize>512</queueSize>
+		<!-- 添加附加的appender,最多只能添加一个 -->
+		<appender-ref ref="STRATEGY-THREAD-ERROR" />
+	</appender>
+	
 	 <root level="INFO">
         <appender-ref ref="ASYNC_CONSOLE"/>
         <appender-ref ref="ASYNC_INFO_FILE"/>

src/test/java/com/tidecloud/dataacceptance/HelloClient.java

@@ -47,7 +47,8 @@ public class HelloClient {
         ExecutorService singleThreadPool = Executors.newFixedThreadPool(20);
         
         int i =0 ;
-        while (i++<2) {
+       // while (i++<2) 
+        {
         	
         	singleThreadPool.execute(()->{
         		 

src/test/java/com/tidecloud/dataacceptance/HelloClientIntHandler.java

@@ -51,6 +51,8 @@ public class HelloClientIntHandler extends ChannelInboundHandlerAdapter {
         		,0x00 ,0x00 ,0x00 ,0x00 ,0x2B ,0x04 ,0x4B ,0x7D ,0x02 ,0x01 ,(byte)0xD9 ,0x30 ,0x01 ,0x1C ,0x31 ,0x01 ,0x0F ,0x13 ,0x7E
         		
         };
+        String msg1 = "[3G*3925079946*0116*UD2,070418,155939,V,38.034930,N,114.4015300,E,0.00,0.0,0.0,0,60,52,4,0,00000010,7,255,460,0,12447,45388,132,12500,40896,127,12500,10589,125,12500,40897,122,13000,40087,121,12500,47974,120,12500,49241,120,2,TP-LINK_5AEC,b0:95:8e:d7:5a:ec,-94,guojiahuan,50:bd:5f:7b:af:7c,-85,13.1]";
+		
        String message = "[3G*3925160519*00A1*UD,040418,101823,A,29.719760,N,119.6245500,E,2.81,49.2,0.0,3,71,9,0,0,00000011,4,255,460,0,22463,34421,130,22463,24421,120,22575,14074,119,22463,34961,113,0,78.8]";
 //      byte[] a=  {0x02,0x00,0x00,0x35,0x01,0x23,0x12,0x31,0x23,0x12,0x07,0x5D,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x13,0x01,
 //    		  0x8D,0x6D,0xB4,0x07,0x1B,0x08,