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

update

Browse Source
This commit is contained in:
imhao183
2020-04-22 08:05:36 +08:00
parent 7c0666e13c
commit 5ec14502f8
9 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/imhandler/GetMediaUploadTokenHandler.java
+2 -2
View File
@@ -80,9 +80,9 @@ public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTo
resultBuilder.setPort(80);
} else {
token = UploadFileAction.getToken(type);
resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT)
resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP)
.setServer(MediaServerConfig.SERVER_IP);
resultBuilder.setPort(MediaServerConfig.HTTP_SERVER_PORT);
resultBuilder.setPort(80);
}
resultBuilder.setToken(token);
broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class GetQiniuUploadTokenHandler extends IMHandler<Byte> {
resultBuilder.setPort(80);
} else {
token = UploadFileAction.getToken(type);
resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT)
resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP)
.setServer(MediaServerConfig.SERVER_IP);
resultBuilder.setPort(MediaServerConfig.HTTP_SERVER_PORT);
resultBuilder.setPort(80);
}
resultBuilder.setToken(token);
broker/src/main/java/io/moquette/imhandler/RouteHandler.java
+1 -3
View File
@@ -18,7 +18,6 @@ import win.liyufan.im.IMTopic;
import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_IP;
import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_Long_Port;
import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_Short_Port;
@Handler(IMTopic.RouteTopic)
public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
@@ -27,7 +26,6 @@ public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
Member member = mServer.getHazelcastInstance().getCluster().getLocalMember();
String serverIp = member.getStringAttribute(HZ_Cluster_Node_External_IP);
String longPort = member.getStringAttribute(HZ_Cluster_Node_External_Long_Port);
String shortPort = member.getStringAttribute(HZ_Cluster_Node_External_Short_Port);
ClientSession clientSession = m_sessionsStore.sessionForClient(clientID);
boolean isSessionAlreadyStored = clientSession != null;
@@ -37,7 +35,7 @@ public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
m_sessionsStore.updateExistSession(fromUser, clientID, request, true);
}
WFCMessage.RouteResponse response = WFCMessage.RouteResponse.newBuilder().setHost(serverIp).setLongPort(Integer.parseInt(longPort)).setShortPort(Integer.parseInt(shortPort)).build();
WFCMessage.RouteResponse response = WFCMessage.RouteResponse.newBuilder().setHost(serverIp).setLongPort(Integer.parseInt(longPort)).setShortPort(80).build();
byte[] data = response.toByteArray();
ackPayload.ensureWritable(data.length).writeBytes(data);