Merge branch 'ver1.1' of http://192.168.0.204/yzg/yzg-util

 Conflicts:
	yzg-util-mq/src/main/java/com/yanzuoguang/mq/service/MqService.java

yzg-util-mq/src/main/java/com/yanzuoguang/mq/plan/YzgMqProcedure.java

@@ -42,7 +42,7 @@ public class YzgMqProcedure implements InitializingBean {
     /**
      * 64秒
      */
-    public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MIN = new TimeUnit("Second", 1000 * 64);
+    public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MIN = new TimeUnit("Second", 1000);
     /**
      * 6 小时
      */

yzg-util-mq/src/main/java/com/yanzuoguang/mq/service/MqService.java

@@ -88,7 +88,6 @@ public interface MqService {
     @ApiOperation(value = "消息收到确认")
     void basicHandle(Message messageBody, Channel channel, String message, long dedTime, Consumer<String> consumerMessage);
 
-
     /**
      * 消息收到确认,出错时重发
      *