Merge pull request #101 from anlingyi/release

1.6.6-beta

Author: anlingyi

README.md

@@ -1,9 +1,11 @@
 # XEChat-Idea
 
-> Version 1.6.5-beta
+> Version 1.6.6-beta
 
 > 基于Netty的IDEA即时聊天插件：让你能够在IDEA里实现聊天、下棋、斗地主！(理论上支持JetBrains全系列开发工具🙂)
 
+> 浏览器端：[XEChat-Web](https://github.com/anlingyi/xechat-web)
+
 - [目录](#xechat-idea)
     - [项目介绍](#项目介绍)
         - [项目结构](#项目结构)
@@ -103,6 +105,7 @@
 * [实现一个自定义命令](https://xeblog.cn/articles/79)
 * [实现一个自定义消息](https://xeblog.cn/articles/100)
 * [实现一个联机对战游戏](https://xeblog.cn/articles/95)
+* [WebSocket协议接入文档](https://xeblog.cn/articles/112)
 
 ## 运行 & 部署
 

xechat-commons/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.xeblog</groupId>
     <artifactId>xechat-commons</artifactId>
-    <version>1.6.5-beta</version>
+    <version>1.6.6-beta</version>
     <build>
         <plugins>
             <plugin>

xechat-commons/src/main/java/cn/xeblog/commons/entity/LoginDTO.java

@@ -1,5 +1,6 @@
 package cn.xeblog.commons.entity;
 
+import cn.xeblog.commons.enums.Platform;
 import cn.xeblog.commons.enums.UserStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -16,16 +17,63 @@
 @AllArgsConstructor
 public class LoginDTO implements Serializable {
 
+    /**
+     * 昵称
+     */
     private String username;
 
+    /**
+     * 状态
+     */
     private UserStatus status;
 
+    /**
+     * 是否是重连
+     */
     private boolean reconnected;
 
+    /**
+     * 插件版本
+     */
     private String pluginVersion;
 
+    /**
+     * 令牌
+     */
     private String token;
 
+    /**
+     * 全局唯一ID
+     */
     private String uuid;
 
+    /**
+     * 来源平台
+     */
+    private Platform platform;
+
+    public void setStatus(UserStatus status) {
+        this.status = status;
+    }
+
+    public void setStatus(String status) {
+        try {
+            this.status = UserStatus.valueOf(status);
+        } catch (Exception e) {
+            this.status = UserStatus.FISHING;
+        }
+    }
+
+    public void setPlatform(Platform platform) {
+        this.platform = platform;
+    }
+
+    public void setPlatform(String platform) {
+        try {
+            this.platform = Platform.valueOf(platform);
+        } catch (Exception e) {
+            this.platform = Platform.IDEA;
+        }
+    }
+
 }

xechat-commons/src/main/java/cn/xeblog/commons/entity/Request.java

@@ -1,6 +1,7 @@
 package cn.xeblog.commons.entity;
 
 import cn.xeblog.commons.enums.Action;
+import cn.xeblog.commons.enums.Protocol;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -30,4 +31,21 @@ public class Request<T> implements Serializable {
      */
     private Action action;
 
+    private Protocol protocol;
+
+    public Request(T body, Action action) {
+        this.body = body;
+        this.action = action;
+    }
+
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    public void setAction(String action) {
+        try {
+            this.action = Action.valueOf(action);
+        } catch (Exception e) {
+        }
+    }
 }

xechat-commons/src/main/java/cn/xeblog/commons/entity/User.java

@@ -1,6 +1,7 @@
 package cn.xeblog.commons.entity;
 
 import cn.xeblog.commons.enums.Permissions;
+import cn.xeblog.commons.enums.Platform;
 import cn.xeblog.commons.enums.UserStatus;
 import io.netty.channel.Channel;
 import lombok.*;
@@ -74,6 +75,10 @@ public class User implements Serializable {
     @Setter
     private int permit;
 
+    @Getter
+    @Setter
+    private Platform platform;
+
     /**
      * 通道
      */
@@ -98,6 +103,7 @@ public User(String id, String username, UserStatus status, String ip, IpRegion r
         this.ip = ip;
         this.region = region;
         this.channel = channel;
+        this.platform = Platform.IDEA;
     }
 
     public void send(Response response) {

xechat-commons/src/main/java/cn/xeblog/commons/entity/UserMsgDTO.java

@@ -54,4 +54,12 @@ public boolean hasUser(String username) {
         return false;
     }
 
+    public void setMsgType(MsgType msgType) {
+        this.msgType = msgType;
+    }
+
+    public void setMsgType(String msgType) {
+        this.msgType = MsgType.valueOf(msgType);
+    }
+
 }

xechat-commons/src/main/java/cn/xeblog/commons/entity/WeatherDTO.java

@@ -28,4 +28,12 @@ public class WeatherDTO implements Serializable {
      */
     private String location;
 
+    public void setType(WeatherType type) {
+        this.type = type;
+    }
+
+    public void setType(String type) {
+        this.type = WeatherType.build(type);
+    }
+
 }

xechat-commons/src/main/java/cn/xeblog/commons/entity/game/GameInviteResultDTO.java

@@ -24,4 +24,12 @@ public GameInviteResultDTO(InviteStatus status) {
         this.status = status;
     }
 
+    public void setStatus(InviteStatus status) {
+        this.status = status;
+    }
+
+    public void setStatus(String status) {
+        this.status = InviteStatus.valueOf(status);
+    }
+
 }

xechat-commons/src/main/java/cn/xeblog/commons/entity/game/GameRoomMsgDTO.java

@@ -66,4 +66,12 @@ public enum MsgType {
         ROOM_CLOSE;
     }
 
+    public void setMsgType(MsgType msgType) {
+        this.msgType = msgType;
+    }
+
+    public void setMsgType(String msgType) {
+        this.msgType = MsgType.valueOf(msgType);
+    }
+
 }

xechat-commons/src/main/java/cn/xeblog/commons/enums/Platform.java

@@ -0,0 +1,20 @@
+package cn.xeblog.commons.enums;
+
+/**
+ * 平台
+ *
+ * @author anlingyi
+ * @date 2023/9/1 8:20 PM
+ */
+public enum Platform {
+
+    /**
+     * Jetbrains平台
+     */
+    IDEA,
+    /**
+     * Web平台
+     */
+    WEB
+
+}