anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add gzip

Browse Source
This commit is contained in:
heavyrain.lee
2019-05-25 22:56:11 +08:00
parent b1c5692322
commit 36aa0518ed
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/imhandler/IMHandler.java
+1 -3
View File
@@ -205,9 +205,7 @@ abstract public class IMHandler<T> {
} }
} }
if(errorCode != ErrorCode.ERROR_CODE_ASYNC_HANDLER) { response(ackPayload, errorCode, callback);
response(ackPayload, errorCode, callback);
}
} else { } else {
LOG.error("Handler {} preAction failure", this.getClass().getName()); LOG.error("Handler {} preAction failure", this.getClass().getName());
ByteBuf ackPayload = Unpooled.buffer(1); ByteBuf ackPayload = Unpooled.buffer(1);
broker/src/main/java/io/moquette/persistence/RPCCenter.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class RPCCenter {
info.future.cancel(true); info.future.cancel(true);
if (info.callback != null) { if (info.callback != null) {
info.callback.getResponseExecutor().execute(() -> { info.callback.getResponseExecutor().execute(() -> {
if (errorCode == 0) { if (errorCode == 0 || errorCode == ErrorCode.ERROR_CODE_ASYNC_HANDLER.getCode()) {
info.callback.onSuccess(message); info.callback.onSuccess(message);
} else { } else {
info.callback.onError(ErrorCode.fromCode(errorCode)); info.callback.onError(ErrorCode.fromCode(errorCode));
broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java
+19 -2
View File
@@ -23,8 +23,10 @@ import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY; import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS; import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.zip.GZIPOutputStream;
import cn.wildfirechat.server.ThreadPoolExecutorWrapper; import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
import com.google.gson.Gson; import com.google.gson.Gson;
@@ -174,8 +176,23 @@ public class Qos1PublishHandler extends QosPublishHandler {
data = AES.AESEncrypt(data, ""); data = AES.AESEncrypt(data, "");
} else { } else {
MemorySessionStore.Session session = m_sessionStore.getSession(clientID); MemorySessionStore.Session session = m_sessionStore.getSession(clientID);
if (session != null && session.getUsername().equals(fromUser)) if (session != null && session.getUsername().equals(fromUser)) {
data = AES.AESEncrypt(data, session.getSecret()); if (data.length > 10*1024) {
ByteArrayOutputStream out = new ByteArrayOutputStream();
GZIPOutputStream gzip;
try {
gzip = new GZIPOutputStream(out);
gzip.write(data);
gzip.close();
} catch (Exception e) {
e.printStackTrace();
}
data = out.toByteArray();
code = (byte)ErrorCode.ERROR_CODE_ASYNC_HANDLER.code;
}
data = AES.AESEncrypt(data, session.getSecret());
}
} }
} }
ackPayload.clear(); ackPayload.clear();
common/src/main/java/cn/wildfirechat/common/ErrorCode.java
+1 -1
View File
@@ -56,7 +56,7 @@ public enum ErrorCode {
ERROR_CODE_NOT_IMPLEMENT(254, "not implement"), ERROR_CODE_NOT_IMPLEMENT(254, "not implement"),
ERROR_CODE_ASYNC_HANDLER(255, "异步执行，服务器内部逻辑需要此代码，为正常情况，不能返回客户端"),; ERROR_CODE_SUCCESS_GZIPED(255, "success withe gzip response"),;
public int code; public int code;
public String msg; public String msg;