Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e74ba09

Browse files
author
alber
committed
Merge branch 'dev'
2 parents 58d7afe + 7a81bce commit e74ba09

File tree

2 files changed

+31
-71
lines changed

2 files changed

+31
-71
lines changed

‎deploy/k8s/sql/create_table.sql‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ CREATE TABLE `device` (
3434
`model` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '机型',
3535
`system_version` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '系统版本',
3636
`sdk_version` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'app版本',
37-
`status` tinyint NOT NULL DEFAULT '0'COMMENT '在线状态,0:离线;1:在线',
38-
`conn_addr` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '连接层服务器地址',
37+
`brand_push_id`varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULLCOMMENT '厂商推送ID',
38+
`connect_addr` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '连接层服务器地址',
3939
`client_addr` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '客户端地址',
4040
PRIMARY KEY (`id`),
4141
KEY `idx_user_id` (`user_id`) USING BTREE
@@ -73,32 +73,12 @@ CREATE TABLE `group` (
7373
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '群组名称',
7474
`avatar_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '群组头像',
7575
`introduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '群组简介',
76-
`user_num` int NOT NULL DEFAULT '0' COMMENT '群组人数',
7776
`extra` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '附加属性',
77+
`members` json NOT NULL COMMENT '群组成员',
7878
PRIMARY KEY (`id`)
7979
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='群组';
8080
/*!40101 SET character_set_client = @saved_cs_client */;
8181

82-
--
83-
-- Table structure for table `group_user`
84-
--
85-
86-
/*!40101 SET @saved_cs_client = @@character_set_client */;
87-
/*!50503 SET character_set_client = utf8mb4 */;
88-
CREATE TABLE `group_user` (
89-
`group_id` bigint unsigned NOT NULL COMMENT '组id',
90-
`user_id` bigint unsigned NOT NULL COMMENT '用户id',
91-
`created_at` datetime NOT NULL COMMENT '创建时间',
92-
`updated_at` datetime NOT NULL COMMENT '更新时间',
93-
`member_type` tinyint NOT NULL COMMENT '成员类型,1:管理员;2:普通成员',
94-
`remarks` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '备注',
95-
`extra` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '附加属性',
96-
`status` tinyint NOT NULL COMMENT '状态',
97-
PRIMARY KEY (`group_id`,`user_id`),
98-
KEY `idx_user_id` (`user_id`) USING BTREE
99-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='群组成员';
100-
/*!40101 SET character_set_client = @saved_cs_client */;
101-
10282
--
10383
-- Table structure for table `message`
10484
--
@@ -177,4 +157,4 @@ CREATE TABLE `user_message` (
177157
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
178158
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
179159

180-
-- Dump completed on 2025-08-25 23:23:41
160+
-- Dump completed on 2025-08-31 21:51:04

‎sql/create_table.sql‎

Lines changed: 27 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
-- Current Database: `gim`
1515
--
1616

17-
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `gim` /*!40100 DEFAULT */ /*!80016 DEFAULT ENCRYPTION='N' */;
17+
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `gim` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin */ /*!80016 DEFAULT ENCRYPTION='N' */;
1818

1919
USE `gim`;
2020

@@ -30,16 +30,16 @@ CREATE TABLE `device` (
3030
`updated_at` datetime NOT NULL COMMENT '更新时间',
3131
`user_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '账户id',
3232
`type` tinyint NOT NULL COMMENT '设备类型,1:Android;2:IOS;3:Windows; 4:MacOS;5:Web',
33-
`brand` varchar(20) NOT NULL COMMENT '手机厂商',
34-
`model` varchar(20) NOT NULL COMMENT '机型',
35-
`system_version` varchar(10) NOT NULL COMMENT '系统版本',
36-
`sdk_version` varchar(10) NOT NULL COMMENT 'app版本',
37-
`status` tinyint NOT NULL DEFAULT '0'COMMENT '在线状态,0:离线;1:在线',
38-
`conn_addr` varchar(25) NOT NULL COMMENT '连接层服务器地址',
39-
`client_addr` varchar(25) NOT NULL COMMENT '客户端地址',
33+
`brand` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '手机厂商',
34+
`model` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '机型',
35+
`system_version` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '系统版本',
36+
`sdk_version` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'app版本',
37+
`brand_push_id`varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULLCOMMENT '厂商推送ID',
38+
`connect_addr` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '连接层服务器地址',
39+
`client_addr` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '客户端地址',
4040
PRIMARY KEY (`id`),
4141
KEY `idx_user_id` (`user_id`) USING BTREE
42-
) ENGINE=InnoDB AUTO_INCREMENT=10000 COMMENT='设备';
42+
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='设备';
4343
/*!40101 SET character_set_client = @saved_cs_client */;
4444

4545
--
@@ -53,11 +53,11 @@ CREATE TABLE `friend` (
5353
`friend_id` bigint unsigned NOT NULL COMMENT '好友id',
5454
`created_at` datetime NOT NULL COMMENT '创建时间',
5555
`updated_at` datetime NOT NULL COMMENT '更新时间',
56-
`remarks` varchar(20) NOT NULL COMMENT '备注',
57-
`extra` varchar(1024) NOT NULL COMMENT '附加属性',
56+
`remarks` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '备注',
57+
`extra` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '附加属性',
5858
`status` tinyint NOT NULL COMMENT '状态,1:申请,2:同意',
5959
PRIMARY KEY (`user_id`,`friend_id`) USING BTREE
60-
) ENGINE=InnoDB COMMENT='好友';
60+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='好友';
6161
/*!40101 SET character_set_client = @saved_cs_client */;
6262

6363
--
@@ -70,33 +70,13 @@ CREATE TABLE `group` (
7070
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
7171
`created_at` datetime NOT NULL COMMENT '创建时间',
7272
`updated_at` datetime NOT NULL COMMENT '更新时间',
73-
`name` varchar(50) NOT NULL COMMENT '群组名称',
74-
`avatar_url` varchar(255) NOT NULL COMMENT '群组头像',
75-
`introduction` varchar(255) NOT NULL COMMENT '群组简介',
76-
`user_num`intNOT NULL DEFAULT '0'COMMENT '群组人数',
77-
`extra`varchar(1024) NOT NULL COMMENT '附加属性',
73+
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '群组名称',
74+
`avatar_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '群组头像',
75+
`introduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '群组简介',
76+
`extra`varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULLCOMMENT '附加属性',
77+
`members` json NOT NULL COMMENT '群组成员',
7878
PRIMARY KEY (`id`)
79-
) ENGINE=InnoDB AUTO_INCREMENT=10000 COMMENT='群组';
80-
/*!40101 SET character_set_client = @saved_cs_client */;
81-
82-
--
83-
-- Table structure for table `group_user`
84-
--
85-
86-
/*!40101 SET @saved_cs_client = @@character_set_client */;
87-
/*!50503 SET character_set_client = utf8mb4 */;
88-
CREATE TABLE `group_user` (
89-
`group_id` bigint unsigned NOT NULL COMMENT '组id',
90-
`user_id` bigint unsigned NOT NULL COMMENT '用户id',
91-
`created_at` datetime NOT NULL COMMENT '创建时间',
92-
`updated_at` datetime NOT NULL COMMENT '更新时间',
93-
`member_type` tinyint NOT NULL COMMENT '成员类型,1:管理员;2:普通成员',
94-
`remarks` varchar(20) NOT NULL COMMENT '备注',
95-
`extra` varchar(1024) NOT NULL COMMENT '附加属性',
96-
`status` tinyint NOT NULL COMMENT '状态',
97-
PRIMARY KEY (`group_id`,`user_id`),
98-
KEY `idx_user_id` (`user_id`) USING BTREE
99-
) ENGINE=InnoDB COMMENT='群组成员';
79+
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='群组';
10080
/*!40101 SET character_set_client = @saved_cs_client */;
10181

10282
--
@@ -114,7 +94,7 @@ CREATE TABLE `message` (
11494
`content` blob NOT NULL COMMENT '消息内容',
11595
`status` tinyint NOT NULL DEFAULT '0' COMMENT '消息状态,0:未处理1:消息撤回',
11696
PRIMARY KEY (`id`)
117-
) ENGINE=InnoDB AUTO_INCREMENT=10000 COMMENT='消息';
97+
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='消息';
11898
/*!40101 SET character_set_client = @saved_cs_client */;
11999

120100
--
@@ -132,7 +112,7 @@ CREATE TABLE `seq` (
132112
`seq` bigint unsigned NOT NULL COMMENT '序列号',
133113
PRIMARY KEY (`id`),
134114
UNIQUE KEY `uk_object` (`object_type`,`object_id`)
135-
) ENGINE=InnoDB AUTO_INCREMENT=10000 COMMENT='序列号';
115+
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='序列号';
136116
/*!40101 SET character_set_client = @saved_cs_client */;
137117

138118
--
@@ -145,14 +125,14 @@ CREATE TABLE `user` (
145125
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
146126
`created_at` datetime NOT NULL COMMENT '创建时间',
147127
`updated_at` datetime NOT NULL COMMENT '更新时间',
148-
`phone_number` varchar(20) NOT NULL COMMENT '手机号',
149-
`nickname` varchar(20) NOT NULL COMMENT '昵称',
128+
`phone_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '手机号',
129+
`nickname` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '昵称',
150130
`sex` tinyint NOT NULL COMMENT '性别,0:未知;1:男;2:女',
151-
`avatar_url` varchar(256) NOT NULL COMMENT '用户头像链接',
152-
`extra` varchar(1024) NOT NULL COMMENT '附加属性',
131+
`avatar_url` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '用户头像链接',
132+
`extra` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '附加属性',
153133
PRIMARY KEY (`id`),
154134
UNIQUE KEY `uk_phone_number` (`phone_number`)
155-
) ENGINE=InnoDB AUTO_INCREMENT=10000 COMMENT='用户';
135+
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='用户';
156136
/*!40101 SET character_set_client = @saved_cs_client */;
157137

158138
--
@@ -168,7 +148,7 @@ CREATE TABLE `user_message` (
168148
`updated_at` datetime NOT NULL COMMENT '更新时间',
169149
`message_id` bigint unsigned NOT NULL COMMENT '消息ID',
170150
PRIMARY KEY (`user_id`,`seq`) USING BTREE
171-
) ENGINE=InnoDB COMMENT='用户消息';
151+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='用户消息';
172152
/*!40101 SET character_set_client = @saved_cs_client */;
173153
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
174154

@@ -177,4 +157,4 @@ CREATE TABLE `user_message` (
177157
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
178158
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
179159

180-
-- Dump completed on 2025-08-25 23:23:41
160+
-- Dump completed on 2025-08-31 21:51:04

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /