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/BrokerConstants.java
-2
View File
@@ -26,7 +26,6 @@ public final class BrokerConstants {
public static final String SERVER_IP_PROPERTY_NAME = "server.ip";
public static final String PORT_PROPERTY_NAME = "port";
public static final String HOST_PROPERTY_NAME = "host";
public static final String HTTP_SERVER_PORT = "http_port";
public static final String HTTP_LOCAL_PORT = "local_port";
public static final String HTTP_ADMIN_PORT = "http.admin.port";
@@ -96,7 +95,6 @@ public final class BrokerConstants {
public static final String HZ_Cluster_Node_External_IP = "node_external_ip";
public static final String HZ_Cluster_Node_External_Long_Port = "node_external_long_port";
public static final String HZ_Cluster_Node_External_Short_Port = "node_external_short_port";
public static final String HZ_Cluster_Node_ID = "node_id";
public static final String HTTP_SERVER_SECRET_KEY = "http.admin.secret_key";
public static final String HTTP_SERVER_API_NO_CHECK_TIME = "http.admin.no_check_time";
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);
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+1 -2
View File
@@ -1833,12 +1833,11 @@ public class MemoryMessagesStore implements IMessagesStore {
Member member = m_Server.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);
if (!StringUtil.isNullOrEmpty(serverIp)) {
serverIPs.add(serverIp);
}
ports.add(Integer.parseInt(longPort));
ports.add(Integer.parseInt(shortPort));
ports.add(80);
} else {
return ErrorCode.ERROR_CODE_TOKEN_ERROR;
}
broker/src/main/java/io/moquette/server/Server.java
-4
View File
@@ -334,8 +334,6 @@ public class Server {
MediaServerConfig.SERVER_IP = getServerIp(config);
MediaServerConfig.HTTP_SERVER_PORT = Integer.parseInt(config.getProperty(BrokerConstants.HTTP_SERVER_PORT));
MediaServerConfig.FILE_STROAGE_ROOT = config.getProperty(BrokerConstants.FILE_STORAGE_ROOT, MediaServerConfig.FILE_STROAGE_ROOT);
File file = new File(MediaServerConfig.FILE_STROAGE_ROOT);
if (!file.exists()) {
@@ -375,7 +373,6 @@ public class Server {
String longPort = config.getProperty(BrokerConstants.PORT_PROPERTY_NAME);
String shortPort = config.getProperty(BrokerConstants.HTTP_SERVER_PORT);
String nodeIdStr = config.getProperty(BrokerConstants.NODE_ID);
ISet<Integer> nodeIdSet = hazelcastInstance.getSet(BrokerConstants.NODE_IDS);
int nodeId;
@@ -393,7 +390,6 @@ public class Server {
nodeIdSet.add(nodeId);
hazelcastInstance.getCluster().getLocalMember().setStringAttribute(HZ_Cluster_Node_External_Long_Port, longPort);
hazelcastInstance.getCluster().getLocalMember().setStringAttribute(HZ_Cluster_Node_External_Short_Port, shortPort);
hazelcastInstance.getCluster().getLocalMember().setIntAttribute(HZ_Cluster_Node_ID, nodeId);
hazelcastInstance.getCluster().getLocalMember().setStringAttribute(HZ_Cluster_Node_External_IP, serverIp);
Tokenor.setKey(config.getProperty(BrokerConstants.TOKEN_SECRET_KEY));
broker/src/main/java/io/moquette/server/config/MediaServerConfig.java
-1
View File
@@ -25,7 +25,6 @@ public class MediaServerConfig {
public static String QINIU_BUCKET_FAVORITE_DOMAIN;
public static String SERVER_IP = "localhost";
public static int HTTP_SERVER_PORT = 8080;
public static String FILE_STROAGE_ROOT = "fs";
public static boolean USER_QINIU = false;