This commit is contained in:
@@ -182,7 +182,7 @@ public abstract class WebSocket<G extends Serializable, T> {
|
||||
*/
|
||||
CompletableFuture<Integer> sendPacket(WebSocketPacket 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;
|
||||
}
|
||||
|
||||
@@ -315,7 +315,7 @@ public abstract class WebSocket<G extends Serializable, T> {
|
||||
*
|
||||
* @return userid
|
||||
*/
|
||||
public final G userid() {
|
||||
public final G getUserid() {
|
||||
return _userid;
|
||||
}
|
||||
|
||||
@@ -496,6 +496,6 @@ public abstract class WebSocket<G extends Serializable, T> {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return this.userid() + "@" + _remoteAddr;
|
||||
return this.getUserid() + "@" + _remoteAddr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ public abstract class WebSocketNode {
|
||||
public final void postDestroy(AnyValue conf) {
|
||||
if (this.localEngine == null) return;
|
||||
//关掉所有本地本地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);
|
||||
}
|
||||
|
||||
|
||||
@@ -30,15 +30,15 @@ public class ChatWebSocket extends WebSocket<Integer, Object> {
|
||||
|
||||
@RestOnMessage(name = "sendmessage")
|
||||
public void onChatMessage(ChatMessage message, Map<String, String> extmap) {
|
||||
message.fromuserid = userid();
|
||||
message.fromusername = "用户" + userid();
|
||||
message.fromuserid = getUserid();
|
||||
message.fromusername = "用户" + getUserid();
|
||||
System.out.println("获取消息: message: " + message + ", map: " + extmap);
|
||||
super.broadcastMessage(message);
|
||||
}
|
||||
|
||||
@RestOnMessage(name = "joinroom")
|
||||
public void onJoinRoom(int roomid) {
|
||||
service.joinRoom(userid(), roomid);
|
||||
service.joinRoom(getUserid(), roomid);
|
||||
System.out.println("加入房间: roomid: " + roomid);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user