lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2017-06-24 10:47:41 +08:00
parent 835435c220
commit a71a4d0fed
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/redkale/net/http/WebSocket.java
View File

@@ -182,7 +182,7 @@ public abstract class WebSocket<G extends Serializable, T> {
*/ */
CompletableFuture<Integer> sendPacket(WebSocketPacket packet) { CompletableFuture<Integer> sendPacket(WebSocketPacket packet) {
CompletableFuture<Integer> rs = this._runner.sendMessage(packet); CompletableFuture<Integer> rs = this._runner.sendMessage(packet);
if (_engine.finest) _engine.logger.finest("userid:" + userid() + " send websocket message(" + packet + ")" + " on " + this); if (_engine.finest) _engine.logger.finest("userid:" + getUserid() + " send websocket message(" + packet + ")" + " on " + this);
return rs == null ? CompletableFuture.completedFuture(RETCODE_WSOCKET_CLOSED) : rs; return rs == null ? CompletableFuture.completedFuture(RETCODE_WSOCKET_CLOSED) : rs;
} }
@@ -315,7 +315,7 @@ public abstract class WebSocket<G extends Serializable, T> {
* *
* @return userid * @return userid
*/ */
public final G userid() { public final G getUserid() {
return _userid; return _userid;
} }
@@ -496,6 +496,6 @@ public abstract class WebSocket<G extends Serializable, T> {
@Override @Override
public String toString() { public String toString() {
return this.userid() + "@" + _remoteAddr; return this.getUserid() + "@" + _remoteAddr;
} }
} }

2
src/org/redkale/net/http/WebSocketNode.java
View File

@@ -56,7 +56,7 @@ public abstract class WebSocketNode {
public final void postDestroy(AnyValue conf) { public final void postDestroy(AnyValue conf) {
if (this.localEngine == null) return; if (this.localEngine == null) return;
//关掉所有本地本地WebSocket //关掉所有本地本地WebSocket
this.localEngine.getLocalWebSockets().forEach(g -> disconnect(g.userid())); this.localEngine.getLocalWebSockets().forEach(g -> disconnect(g.getUserid()));
if (sncpNodeAddresses != null && localSncpAddress != null) sncpNodeAddresses.removeSetItem("redkale_sncpnodes", localSncpAddress); if (sncpNodeAddresses != null && localSncpAddress != null) sncpNodeAddresses.removeSetItem("redkale_sncpnodes", localSncpAddress);
} }

6
test/org/redkale/test/ws/ChatWebSocket.java
View File

@@ -30,15 +30,15 @@ public class ChatWebSocket extends WebSocket<Integer, Object> {
@RestOnMessage(name = "sendmessage") @RestOnMessage(name = "sendmessage")
public void onChatMessage(ChatMessage message, Map<String, String> extmap) { public void onChatMessage(ChatMessage message, Map<String, String> extmap) {
message.fromuserid = userid(); message.fromuserid = getUserid();
message.fromusername = "用户" + userid(); message.fromusername = "用户" + getUserid();
System.out.println("获取消息: message: " + message + ", map: " + extmap); System.out.println("获取消息: message: " + message + ", map: " + extmap);
super.broadcastMessage(message); super.broadcastMessage(message);
} }
@RestOnMessage(name = "joinroom") @RestOnMessage(name = "joinroom")
public void onJoinRoom(int roomid) { public void onJoinRoom(int roomid) {
service.joinRoom(userid(), roomid); service.joinRoom(getUserid(), roomid);
System.out.println("加入房间: roomid: " + roomid); System.out.println("加入房间: roomid: " + roomid);
} }