Merge pull request #91 from anlingyi/release

1.6.5-beta

Author: anlingyi

README.md

@@ -1,6 +1,6 @@
 # XEChat-Idea
 
-> Version 1.6.4-beta
+> Version 1.6.5-beta
 
 > 基于Netty的IDEA即时聊天插件：让你能够在IDEA里实现聊天、下棋、斗地主！(理论上支持JetBrains全系列开发工具🙂)
 
@@ -50,7 +50,7 @@
 
 [了解更多...](https://xeblog.cn/?tag=xechat-idea)
 
-![](https://oss.xeblog.cn/prod/2f78edccf9c947d5827c3be0e8887b94.png)
+![](https://oss.xeblog.cn/prod/6382599251dc467380c3b1c1eff6bfa5.png)
 
 ![](https://oss.xeblog.cn/prod/87397d4da728467e912450f94e41b2ef.jpg)
 
@@ -234,7 +234,7 @@ http://plugins.xeblog.cn
 version: '3'
 services:
   xechat:
-    image: anlingyi/xechat-server:{Version}
+    image: anlingyi/xechat-server:1.6.5-beta
     container_name: xechat-server
     restart: always
     ports:

xechat-commons/pom.xml

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

xechat-commons/src/main/java/cn/xeblog/commons/constants/IpConstants.java

@@ -58,7 +58,7 @@ public interface IpConstants {
         put("香港特别行政区", "港");
         put("澳门特别行政区", "澳");
         put("台湾省", "台");
-        put("未知", "-");
+        put("未知", "中国");
     }};
 
 }

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

@@ -26,4 +26,6 @@ public class LoginDTO implements Serializable {
 
     private String token;
 
+    private String uuid;
+
 }

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

@@ -1,5 +1,6 @@
 package cn.xeblog.commons.entity;
 
+import cn.xeblog.commons.enums.Permissions;
 import cn.xeblog.commons.enums.UserStatus;
 import io.netty.channel.Channel;
 import lombok.*;
@@ -17,35 +18,76 @@ public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * uuid
+     */
+    @Getter
+    @Setter
+    private String uuid;
+
+    /**
+     * 用户ID
+     */
     @Getter
     @Setter
     private String id;
 
+    /**
+     * 用户昵称
+     */
     @Getter
     @Setter
     private String username;
 
+    /**
+     * 用户状态
+     */
     @Getter
     @Setter
     private UserStatus status;
 
+    /**
+     * 用户IP
+     */
     @Getter
     @Setter
     private String ip;
 
+    /**
+     * 用户所在区域
+     */
     @Getter
     @Setter
     private IpRegion region;
 
+    /**
+     * 用户角色
+     */
     @Getter
     @Setter
     private Role role;
 
+    /**
+     * 用户权限
+     */
+    @Getter
+    @Setter
+    private int permit;
+
+    /**
+     * 通道
+     */
     @Getter
     private transient Channel channel;
 
     public enum Role {
+        /**
+         * 管理员
+         */
         ADMIN,
+        /**
+         * 用户
+         */
         USER
     }
 
@@ -78,4 +120,45 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(id);
     }
+
+    /**
+     * 添加权限
+     *
+     * @param permissions
+     */
+    public void addPermit(Permissions permissions) {
+        this.permit |= permissions.getValue();
+    }
+
+    /**
+     * 移除权限
+     *
+     * @param permissions
+     */
+    public void removePermit(Permissions permissions) {
+        if (hasPermit(permissions)) {
+            this.permit ^= permissions.getValue();
+        }
+    }
+
+    /**
+     * 是否存在权限
+     *
+     * @param permissions
+     * @return
+     */
+    public boolean hasPermit(Permissions permissions) {
+        int value = permissions.getValue();
+        return (this.permit & value) == value;
+    }
+
+    /**
+     * 是否是管理员
+     *
+     * @return
+     */
+    public boolean isAdmin() {
+        return this.role == Role.ADMIN;
+    }
+
 }

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

@@ -29,7 +29,7 @@ public class ChessDTO extends GameDTO {
     public UI currentUI = UI.CLASSIC;
 
     public enum Option {
-        SURRENDER, UNDO, GAME_OVER, CHECK, DEFAULT
+        SURRENDER, UNDO, UNDO_CONSENT, UNDO_REJECT, GAME_OVER, CHECK, DEFAULT
     }
 
     @Getter

xechat-commons/src/main/java/cn/xeblog/commons/entity/react/BaseReact.java

@@ -0,0 +1,18 @@
+package cn.xeblog.commons.entity.react;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author anlingyi
+ * @date 2022/9/19 8:07 AM
+ */
+@Data
+public class BaseReact implements Serializable {
+
+    private String id;
+
+    private String uid;
+
+}

xechat-commons/src/main/java/cn/xeblog/commons/entity/react/React.java

@@ -0,0 +1,23 @@
+package cn.xeblog.commons.entity.react;
+
+/**
+ * @author anlingyi
+ * @date 2022/9/19 8:35 AM
+ */
+public enum React {
+
+    /**
+     * 上传文件
+     */
+    UPLOAD,
+    /**
+     * 下载文件
+     */
+    DOWNLOAD,
+    /**
+     * 管控
+     */
+    ADMIN
+    ;
+
+}

xechat-commons/src/main/java/cn/xeblog/commons/entity/react/request/AdminReact.java

@@ -0,0 +1,82 @@
+package cn.xeblog.commons.entity.react.request;
+
+import cn.xeblog.commons.entity.react.BaseReact;
+import cn.xeblog.commons.enums.Permissions;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author anlingyi
+ * @date 2023/2/18 8:07 PM
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AdminReact extends BaseReact {
+
+    /**
+     * 操作
+     */
+    private Operate operate;
+
+    /**
+     * 权限
+     */
+    private Permissions permissions;
+
+    /**
+     * 用户id
+     */
+    private String uid;
+
+    /**
+     * 配置值
+     */
+    private String value;
+
+    public AdminReact(Operate operate, String value) {
+        this.operate = operate;
+        this.value = value;
+    }
+
+    public AdminReact(Operate operate, Permissions permissions) {
+        this.operate = operate;
+        this.permissions = permissions;
+    }
+
+    public AdminReact(Operate operate, Permissions permissions, String uid) {
+        this.operate = operate;
+        this.permissions = permissions;
+        this.uid = uid;
+    }
+
+    public enum Operate {
+        /**
+         * 查询权限
+         */
+        QUERY_PERMIT,
+        /**
+         * 全局权限添加
+         */
+        GLOBAL_PERMIT_ADD,
+        /**
+         * 全局文件大小限制
+         */
+        GLOBAL_MAX_FILE_SIZE,
+        /**
+         * 全局权限移除
+         */
+        GLOBAL_PERMIT_REMOVE,
+        /**
+         * 用户权限添加
+         */
+        USER_PERMIT_ADD,
+        /**
+         * 用户权限移除
+         */
+        USER_PERMIT_REMOVE
+        ;
+    }
+
+}

xechat-commons/src/main/java/cn/xeblog/commons/entity/react/request/DownloadReact.java

@@ -0,0 +1,18 @@
+package cn.xeblog.commons.entity.react.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author anlingyi
+ * @date 2023/2/18 12:17 AM
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class DownloadReact {
+
+    private String fileName;
+
+}

xechat-commons/src/main/java/cn/xeblog/commons/entity/react/request/ReactRequest.java

@@ -0,0 +1,18 @@
+package cn.xeblog.commons.entity.react.request;
+
+import cn.xeblog.commons.entity.react.BaseReact;
+import cn.xeblog.commons.entity.react.React;
+import lombok.Data;
+
+/**
+ * @author anlingyi
+ * @date 2022/9/19 8:12 AM
+ */
+@Data
+public class ReactRequest<T> extends BaseReact {
+
+    private T body;
+
+    private React react;
+
+}

xechat-commons/src/main/java/cn/xeblog/commons/entity/react/request/UploadReact.java

@@ -0,0 +1,16 @@
+package cn.xeblog.commons.entity.react.request;
+
+import lombok.Data;
+
+/**
+ * @author anlingyi
+ * @date 2022/9/19 8:54 AM
+ */
+@Data
+public class UploadReact {
+
+    private String fileType;
+
+    private byte[] bytes;
+
+}

xechat-commons/src/main/java/cn/xeblog/commons/entity/react/result/AdminReactResult.java

@@ -0,0 +1,26 @@
+package cn.xeblog.commons.entity.react.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author anlingyi
+ * @date 2023/2/18 8:15 PM
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AdminReactResult {
+
+    /**
+     * 全局权限值
+     */
+    private int globalPermit;
+
+    /**
+     * 文件大小限制
+     */
+    private int maxFileSize;
+
+}