Merge remote-tracking branch 'origin/V1' into V1

# Conflicts:
#	web/src/main/resources/application-dev.yml

common/pom.xml

@@ -11,7 +11,7 @@
     <artifactId>common</artifactId>
     <name>common</name>
     <description>智慧小区公共库</description>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
     <properties>
         <swagger2.version>2.7.0</swagger2.version>
         <jwts.version>0.10.5</jwts.version>

lapi/src/main/java/com/jpsoft/smart/lapi/LapiApplication.java

@@ -3,6 +3,7 @@ package com.jpsoft.smart.lapi;
 import com.jpsoft.smart.lapi.handler.HeartReportHandler;
 import com.jpsoft.smart.lapi.handler.ParseRequestHandler;
 import com.jpsoft.smart.lapi.handler.PersonVerificationHandler;
+import com.jpsoft.smart.lapi.handler.TextDecodeHandler;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -50,10 +51,10 @@ public class LapiApplication implements CommandLineRunner {
                 .childHandler(new ChannelInitializer(){
                     @Override
                     protected void initChannel(Channel channel) throws Exception {
-//				channel.pipeline().addLast(textDecodeHandler);
+//				channel.pipeline().addLast(new TextDecodeHandler());
 //				channel.pipeline().addLast(new HttpRequestDecoder());
                         channel.pipeline().addLast(new HttpServerCodec());
-                        channel.pipeline().addLast(new HttpObjectAggregator(2048));
+                        channel.pipeline().addLast(new HttpObjectAggregator(2048*10000));
                         channel.pipeline().addLast(new ParseRequestHandler());
                         channel.pipeline().addLast(heartReportHandler);
                         channel.pipeline().addLast(personVerificationHandler);

lapi/src/main/java/com/jpsoft/smart/lapi/handler/ParseRequestHandler.java

@@ -43,7 +43,8 @@ public class ParseRequestHandler extends SimpleChannelInboundHandler<FullHttpReq
 
             ctx.fireChannelRead(heartReportInfo);
         }
-        else if(request.uri().contains("PersonVerification")) {
+        else if(request.uri().contains("Notifications")) {
+            log.warn("PersonVerification"+request.uri());
             PersonVerification personVerification = new PersonVerification();
             personVerification.setUri(request.uri());
 

lapi/src/main/java/com/jpsoft/smart/lapi/handler/PersonVerificationHandler.java

@@ -17,7 +17,15 @@ import java.util.Date;
 public class PersonVerificationHandler extends SimpleChannelInboundHandler<PersonVerification> {
     @Override
     protected void channelRead0(ChannelHandlerContext channelHandlerContext, PersonVerification personVerification) throws Exception {
+        log.warn(personVerification.toString());
         JSONObject jsonObject = personVerification.getJsonObject();
+
+        log.warn("DeviceCode"+jsonObject.getStr("DeviceCode"));
+        log.warn(jsonObject.toString());
+      //  JSONObject faceJson = jsonObject.get("FaceInfoList");
+        log.warn("FaceInfoList" +jsonObject.getStr("FaceInfoList"));
+        JSONObject faceJson = new JSONObject(jsonObject.getStr("FaceInfoList").substring(1,jsonObject.getStr("FaceInfoList").length()-1));
+        log.warn("faceJson"+faceJson);
         long timestamp = jsonObject.getLong("Timestamp");
 
         Date date = new Date(timestamp);

web/src/main/resources/application.yml

@@ -86,7 +86,7 @@ jwt:
 
 mybatis:
   typeAliasesPackage: com.jpsoft.smart.**.entity
-  mapperLocations: classpath:mapper/**/*.xml
+  mapperLocations: classpath*:mapper/**/*.xml
   configuration:
     default-statement-timeout: 60