open-source/MallChat
1
0
Fork 0
mirror of https://github.com/zongzibinbin/MallChat.git synced 2026-03-13 21:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhongzb
2023-06-07 20:25:14 +08:00
parent 6eec704b49 dec68a5940
commit e7740a4358
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docs/mallchat.sql
View File

@@ -47,7 +47,7 @@ CREATE TABLE `message` (
INDEX `idx_from_uid`(`from_uid`) USING BTREE, INDEX `idx_from_uid`(`from_uid`) USING BTREE,
INDEX `idx_create_time`(`create_time`) USING BTREE, INDEX `idx_create_time`(`create_time`) USING BTREE,
INDEX `idx_update_time`(`update_time`) USING BTREE INDEX `idx_update_time`(`update_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 5709 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '消息表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '消息表' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for message_mark -- Table structure for message_mark
@@ -66,7 +66,7 @@ CREATE TABLE `message_mark` (
INDEX `idx_uid`(`uid`) USING BTREE, INDEX `idx_uid`(`uid`) USING BTREE,
INDEX `idx_create_time`(`create_time`) USING BTREE, INDEX `idx_create_time`(`create_time`) USING BTREE,
INDEX `idx_update_time`(`update_time`) USING BTREE INDEX `idx_update_time`(`update_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '消息标记表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '消息标记表' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for room -- Table structure for room
@@ -83,7 +83,7 @@ CREATE TABLE `room` (
INDEX `idx_active_time`(`active_time`) USING BTREE, INDEX `idx_active_time`(`active_time`) USING BTREE,
INDEX `idx_create_time`(`create_time`) USING BTREE, INDEX `idx_create_time`(`create_time`) USING BTREE,
INDEX `idx_update_time`(`update_time`) USING BTREE INDEX `idx_update_time`(`update_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '会话表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '会话表' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Records of room -- Records of room
@@ -111,7 +111,7 @@ CREATE TABLE `user` (
UNIQUE INDEX `uniq_name`(`name`) USING BTREE, UNIQUE INDEX `uniq_name`(`name`) USING BTREE,
INDEX `idx_create_time`(`create_time`) USING BTREE, INDEX `idx_create_time`(`create_time`) USING BTREE,
INDEX `idx_update_time`(`update_time`) USING BTREE INDEX `idx_update_time`(`update_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 10024 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户表' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for user_backpack -- Table structure for user_backpack
@@ -130,7 +130,7 @@ CREATE TABLE `user_backpack` (
INDEX `idx_uid`(`uid`) USING BTREE, INDEX `idx_uid`(`uid`) USING BTREE,
INDEX `idx_create_time`(`create_time`) USING BTREE, INDEX `idx_create_time`(`create_time`) USING BTREE,
INDEX `idx_update_time`(`update_time`) USING BTREE INDEX `idx_update_time`(`update_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户背包表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户背包表' ROW_FORMAT = Dynamic;
DROP TABLE IF EXISTS `wx_msg`; DROP TABLE IF EXISTS `wx_msg`;
CREATE TABLE `wx_msg` ( CREATE TABLE `wx_msg` (
@@ -143,7 +143,7 @@ CREATE TABLE `wx_msg` (
INDEX `idx_open_id`(`open_id`) USING BTREE, INDEX `idx_open_id`(`open_id`) USING BTREE,
INDEX `idx_create_time`(`create_time`) USING BTREE, INDEX `idx_create_time`(`create_time`) USING BTREE,
INDEX `idx_update_time`(`update_time`) USING BTREE INDEX `idx_update_time`(`update_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信消息表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信消息表' ROW_FORMAT = Dynamic;
DROP TABLE IF EXISTS `black`; DROP TABLE IF EXISTS `black`;
CREATE TABLE `black` ( CREATE TABLE `black` (
@@ -154,7 +154,7 @@ CREATE TABLE `black` (
`update_time` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '修改时间', `update_time` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `idx_type_target`(`type`, `target`) USING BTREE UNIQUE INDEX `idx_type_target`(`type`, `target`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '黑名单' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '黑名单' ROW_FORMAT = Dynamic;
DROP TABLE IF EXISTS `role`; DROP TABLE IF EXISTS `role`;
CREATE TABLE `role` ( CREATE TABLE `role` (
@@ -165,7 +165,7 @@ CREATE TABLE `role` (
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
KEY `idx_create_time` (`create_time`) USING BTREE, KEY `idx_create_time` (`create_time`) USING BTREE,
KEY `idx_update_time` (`update_time`) USING BTREE KEY `idx_update_time` (`update_time`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='角色表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='角色表';
insert into role(id,`name`) values(1,'超级管理员'); insert into role(id,`name`) values(1,'超级管理员');
insert into role(id,`name`) values(2,'抹茶群聊管理员'); insert into role(id,`name`) values(2,'抹茶群聊管理员');

1
mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServerHandler.java
View File

@@ -93,6 +93,7 @@ public class NettyWebSocketServerHandler extends SimpleChannelInboundHandler<Tex
case AUTHORIZE: case AUTHORIZE:
getService().authorize(ctx.channel(), JSONUtil.toBean(wsBaseReq.getData(), WSAuthorize.class)); getService().authorize(ctx.channel(), JSONUtil.toBean(wsBaseReq.getData(), WSAuthorize.class));
log.info("主动认证 = " + msg.text()); log.info("主动认证 = " + msg.text());
break;
default: default:
log.info("未知类型"); log.info("未知类型");
} }