Compare commits

...
5 Commits
Author SHA1 Message Date
imhao183 6c5354d17b 优化session处理 2019-12-18 11:37:39 +08:00
imhao183 c98bd1fb9b update version to 0.36 2019-12-18 10:54:08 +08:00
imhao183 fe525e9483 优化用户session逻辑 2019-12-18 09:02:59 +08:00
imhao183 6acea9b140 创建群时同步操作 2019-12-17 14:39:49 +08:00
imhao183 4beb573052 add ignore 2019-12-17 14:36:49 +08:00
10 changed files with 115 additions and 107 deletions
+3
View File
@@ -56,3 +56,6 @@ broker/media
common/target common/target
server/target server/target
sdk/target sdk/target
moments/target
monitor
wildfire_jmeter
+1 -1
View File
@@ -5,7 +5,7 @@
<relativePath>../</relativePath> <relativePath>../</relativePath>
<artifactId>wildfirechat-parent</artifactId> <artifactId>wildfirechat-parent</artifactId>
<groupId>cn.wildfirechat</groupId> <groupId>cn.wildfirechat</groupId>
<version>0.35</version> <version>0.36</version>
</parent> </parent>
<artifactId>moquette-broker</artifactId> <artifactId>moquette-broker</artifactId>
@@ -20,7 +20,7 @@ import win.liyufan.im.IMTopic;
public class GetTokenHandler extends IMHandler<WFCMessage.GetTokenRequest> { public class GetTokenHandler extends IMHandler<WFCMessage.GetTokenRequest> {
@Override @Override
public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetTokenRequest request, Qos1PublishHandler.IMCallback callback) { public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetTokenRequest request, Qos1PublishHandler.IMCallback callback) {
MemorySessionStore.Session session = m_sessionsStore.createUserSession(fromUser, clientID, request.getPlatform()); MemorySessionStore.Session session = m_sessionsStore.updateOrCreateUserSession(fromUser, clientID, request.getPlatform());
TokenAuthenticator authenticator = new TokenAuthenticator(); TokenAuthenticator authenticator = new TokenAuthenticator();
String strToken = authenticator.generateToken(fromUser); String strToken = authenticator.generateToken(fromUser);
String result = strToken + "|" + session.getSecret() + "|" + session.getDbSecret(); String result = strToken + "|" + session.getSecret() + "|" + session.getDbSecret();
@@ -1039,7 +1039,6 @@ public class DatabaseStore {
} }
void persistGroupInfo(final WFCMessage.GroupInfo groupInfo) { void persistGroupInfo(final WFCMessage.GroupInfo groupInfo) {
mScheduler.execute(()->{
Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
try { try {
@@ -1110,7 +1109,6 @@ public class DatabaseStore {
} finally { } finally {
DBUtil.closeDB(connection, statement); DBUtil.closeDB(connection, statement);
} }
});
} }
List<MemorySessionStore.Session> getUserActivedSessions(String uid) { List<MemorySessionStore.Session> getUserActivedSessions(String uid) {
@@ -1560,7 +1558,6 @@ public class DatabaseStore {
return null; return null;
} }
void updateGroupMemberCountDt(final String groupId, final int count, final long dt) { void updateGroupMemberCountDt(final String groupId, final int count, final long dt) {
mScheduler.execute(()->{
Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
try { try {
@@ -1592,7 +1589,6 @@ public class DatabaseStore {
} finally { } finally {
DBUtil.closeDB(connection, statement); DBUtil.closeDB(connection, statement);
} }
});
} }
void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember> memberList) { void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember> memberList) {
@@ -328,15 +328,24 @@ public class MemorySessionStore implements ISessionsStore {
} }
@Override @Override
public Session createUserSession(String username, String clientID, int platform) { public Session updateOrCreateUserSession(String username, String clientID, int platform) {
LOG.debug("createUserSession for client <{}>, user <{}>", clientID, username); LOG.debug("createUserSession for client <{}>, user <{}>", clientID, username);
Session session = sessions.get(clientID);
if (session != null && !session.username.equals(username)) {
if (userSessions.get(username) != null) {
userSessions.get(username).remove(clientID);
}
}
ClientSession clientSession = new ClientSession(clientID, this); ClientSession clientSession = new ClientSession(clientID, this);
Session session = databaseStore.getSession(username, clientID, clientSession); session = databaseStore.getSession(username, clientID, clientSession);
if (session == null) { if (session == null) {
session = databaseStore.createSession(username, clientID, clientSession, platform); session = databaseStore.createSession(username, clientID, clientSession, platform);
} }
sessions.put(clientID, session);
if (session.getDeleted() > 0) { if (session.getDeleted() > 0) {
session.setDeleted(0); session.setDeleted(0);
@@ -38,7 +38,7 @@ public interface ISessionsStore {
*/ */
boolean contains(String clientID); boolean contains(String clientID);
Session createUserSession(String username, String clientID, int platform); Session updateOrCreateUserSession(String username, String clientID, int platform);
ErrorCode loadActiveSession(String username, String clientID); ErrorCode loadActiveSession(String username, String clientID);
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>wildfirechat-parent</artifactId> <artifactId>wildfirechat-parent</artifactId>
<groupId>cn.wildfirechat</groupId> <groupId>cn.wildfirechat</groupId>
<version>0.35</version> <version>0.36</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -6,7 +6,7 @@
<!--<relativePath>../pom.xml</relativePath>--> <!--<relativePath>../pom.xml</relativePath>-->
<artifactId>wildfirechat-parent</artifactId> <artifactId>wildfirechat-parent</artifactId>
<groupId>cn.wildfirechat</groupId> <groupId>cn.wildfirechat</groupId>
<version>0.35</version> <version>0.36</version>
</parent> </parent>
<artifactId>distribution</artifactId> <artifactId>distribution</artifactId>
+1 -1
View File
@@ -12,7 +12,7 @@
<artifactId>wildfirechat-parent</artifactId> <artifactId>wildfirechat-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.35</version> <version>0.36</version>
<name>Wildfire Chat</name> <name>Wildfire Chat</name>
<description>Wildfire Chat Server</description> <description>Wildfire Chat Server</description>
<inceptionYear>2019</inceptionYear> <inceptionYear>2019</inceptionYear>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>wildfirechat-parent</artifactId> <artifactId>wildfirechat-parent</artifactId>
<groupId>cn.wildfirechat</groupId> <groupId>cn.wildfirechat</groupId>
<version>0.35</version> <version>0.36</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>