Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/bin/start.sh

 #!/bin/sh
 PORT="@profiles.server.port@"
-DEBUG_PORT=@profiles.server.debug.port@
+DEBUG=@profiles.server.debug@
 BASEDIR=`dirname $0`/..
 BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@";
@@ -56,12 +56,12 @@ cd "$BASEDIR/boot";
 echo "starting application $PROJECT_NAME......"
 exec "$JAVACMD" $JAVA_OPTS \
 				$EXTRA_JVM_ARGUMENTS \
+				$DEBUG \
 				-Dapp.name="$PROJECT_NAME" \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
 				-Djava.io.tmpdir=$TEMP_PATH \
 				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
-				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java

@@ -91,6 +91,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
                 recordHikService.syncDoorEvents(hikQuery);
                 recordHikService.deletFakeRecord(hikQuery, null);
             }else{
+                log.info("同步设备上门禁事件！");
                 HikDoorEventReq hikDoorEventReq = new HikDoorEventReq();
                 hikDoorEventReq.setStartTime(startTime.toJdkDate());
                 hikDoorEventReq.setEndTime(DateUtil.endOfDay(new Date()));
@@ -100,7 +101,6 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
                 }
                 recordHikService.deletFakeRecord(hikQuery, null);
             }
-            //syncDoorEvents();
         }
     }