增加ack超时时间设置

mpush-api/src/main/java/com/mpush/api/push/PushContext.java

@@ -73,7 +73,7 @@ public class PushContext {
     /**
      * 推送超时时间
      */
-    private long timeout = 3000;
+    private int timeout = 3000;
 
     public PushContext(byte[] context) {
         this.context = context;
@@ -144,11 +144,11 @@ public PushContext setBroadcast(boolean broadcast) {
         return this;
     }
 
-    public long getTimeout() {
+    public int getTimeout() {
         return timeout;
     }
 
-    public PushContext setTimeout(long timeout) {
+    public PushContext setTimeout(int timeout) {
         this.timeout = timeout;
         return this;
     }

mpush-client/src/main/java/com/mpush/client/push/PushRequest.java

@@ -57,7 +57,7 @@ private enum Status {init, success, failure, offline, timeout}
     private PushCallback callback;
     private String userId;
     private byte[] content;
-    private long timeout;
+    private int timeout;
     private ClientLocation location;
     private Future<?> future;
     private String result;
@@ -91,6 +91,7 @@ private void sendToConnServer(RemoteRouter remoteRouter) {
         GatewayPushMessage pushMessage =
                 new GatewayPushMessage(userId, content, gatewayConn)
                         .setClientType(location.getClientType())
+                        .setTimeout(timeout - 500)
                         .addFlag(ackModel.flag);
 
         pushMessage.sendRaw(f -> {
@@ -228,7 +229,7 @@ public PushRequest setContent(byte[] content) {
         return this;
     }
 
-    public PushRequest setTimeout(long timeout) {
+    public PushRequest setTimeout(int timeout) {
         this.timeout = timeout;
         return this;
     }

mpush-common/src/main/java/com/mpush/common/message/gateway/GatewayPushMessage.java

@@ -40,6 +40,7 @@ public class GatewayPushMessage extends ByteBufMessage {
     public String userId;
     public Set<String> tags;
     public int clientType;
+    public int timeout;
     public byte[] content;
 
     public GatewayPushMessage(String userId, byte[] content, Connection connection) {
@@ -57,6 +58,7 @@ public void decode(ByteBuf body) {
         userId = decodeString(body);
         tags = decodeSet(body);
         clientType = decodeInt(body);
+        timeout = decodeInt(body);
         content = decodeBytes(body);
     }
 
@@ -65,6 +67,7 @@ public void encode(ByteBuf body) {
         encodeString(body, userId);
         encodeSet(body, tags);
         encodeInt(body, clientType);
+        encodeInt(body, timeout);
         encodeBytes(body, content);
     }
 
@@ -90,6 +93,11 @@ public GatewayPushMessage addFlag(byte flag) {
         return this;
     }
 
+    public GatewayPushMessage setTimeout(int timeout) {
+        this.timeout = timeout;
+        return this;
+    }
+
     public boolean isBroadcast() {
         return userId == null;
     }
@@ -113,6 +121,7 @@ public String toString() {
         return "GatewayPushMessage{" +
                 "userId='" + userId + '\'' +
                 ", clientType='" + clientType + '\'' +
+                ", timeout='" + timeout + '\'' +
                 ", content='" + content.length + '\'' +
                 '}';
     }

mpush-core/src/main/java/com/mpush/core/ack/AckMessageQueue.java

@@ -42,7 +42,9 @@
  */
 public final class AckMessageQueue {
     private final Logger logger = LoggerFactory.getLogger(AckMessageQueue.class);
+    private static final int DEFAULT_TIMEOUT = 3000;
     public static final AckMessageQueue I = new AckMessageQueue();
+
     private final ConcurrentMap<Integer, AckContext> queue = new ConcurrentHashMap<>();
     private final ScheduledExecutorService scheduledExecutor;
 
@@ -52,10 +54,10 @@ private AckMessageQueue() {
         });
     }
 
-    public void put(int sessionId, AckContext context) {
+    public void put(int sessionId, AckContext context, int timeout) {
         queue.put(sessionId, context);
         context.pushMessageId = sessionId;
-        scheduledExecutor.schedule(context, 3, TimeUnit.SECONDS);
+        scheduledExecutor.schedule(context, timeout > 0 ? timeout : DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
     }
 
     public AckContext getAndRemove(int sessionId) {