diff --git a/broker/migrate/h2/V42__create_secret_chat_table.sql b/broker/migrate/h2/V42__create_secret_chat_table.sql
new file mode 100755
index 00000000..bef3a20e
--- /dev/null
+++ b/broker/migrate/h2/V42__create_secret_chat_table.sql
@@ -0,0 +1,13 @@
+
+DROP TABLE IF EXISTS `t_secret_chat`;
+CREATE TABLE `t_secret_chat` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NOT NULL,
+  `_from` varchar(64) DEFAULT '',
+  `_from_cid` varchar(64) DEFAULT '',
+  `_to` varchar(64) DEFAULT '',
+  `_to_cid` varchar(64) DEFAULT '',
+  `_state` tinyint NOT NULL DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  UNIQUE INDEX `secret_chat_uid_index` (`_uid` DESC)
+);
diff --git a/broker/migrate/mysql/V49__create_secret_chat_table.sql b/broker/migrate/mysql/V49__create_secret_chat_table.sql
new file mode 100755
index 00000000..d4fd2890
--- /dev/null
+++ b/broker/migrate/mysql/V49__create_secret_chat_table.sql
@@ -0,0 +1,16 @@
+
+DROP TABLE IF EXISTS `t_secret_chat`;
+CREATE TABLE `t_secret_chat` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NOT NULL,
+  `_from` varchar(64) DEFAULT '',
+  `_from_cid` varchar(64) DEFAULT '',
+  `_to` varchar(64) DEFAULT '',
+  `_to_cid` varchar(64) DEFAULT '',
+  `_state` tinyint NOT NULL DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  UNIQUE INDEX `secret_chat_uid_index` (`_uid` DESC)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_bin;
diff --git a/common/src/main/java/cn/wildfirechat/common/ErrorCode.java b/common/src/main/java/cn/wildfirechat/common/ErrorCode.java
index 0b753474..ea50a1cf 100755
--- a/common/src/main/java/cn/wildfirechat/common/ErrorCode.java
+++ b/common/src/main/java/cn/wildfirechat/common/ErrorCode.java
@@ -28,7 +28,7 @@ public enum ErrorCode {
     ERROR_CODE_INVALID_MESSAGE(10, "invalid message"),
 
     //Group error
-    ERROR_CODE_GROUP_ALREADY_EXIST(11, "group aleady exist"),
+    ERROR_CODE_GROUP_ALREADY_EXIST(11, "group already exist"),
 
     //user error
     ERROR_CODE_FRIEND_ALREADY_REQUEST(16, "already send request"),
@@ -50,6 +50,17 @@ public enum ErrorCode {
     ERROR_CODE_CONFERENCE_ROOM_NOT_EXIST(60, "conference room not exist"),
     ERROR_CODE_CONFERENCE_SERVICE_NOT_AVAILABLE(61, "conference service not available"),
 
+
+    ERROR_CODE_SECRET_CHAT_ACCEPTED_BY_OTHER_CLIENT(81, "secret chat accepted by other client"),
+    ERROR_CODE_SECRET_CHAT_SESSION_NOT_EXIST(82, "secret chat session not exist"),
+    ERROR_CODE_SECRET_CHAT_NOT_SESSION_CLIENT(83, "not secret chat session client"),
+    ERROR_CODE_SECRET_CHAT_SESSION_NOT_READY(84, "secret chat session not ready"),
+    ERROR_CODE_SECRET_CHAT_SESSION_DESTROYED(85, "secret chat session destroyed"),
+    ERROR_CODE_SECRET_CHAT_MO_DISABLED(86, "origin side disable secret chat"),
+    ERROR_CODE_SECRET_CHAT_MT_DISABLED(87, "target side disable secret chat"),
+
+    ERROR_CODE_FUNCTION_DISABLED(220, "function disabled"),
+
     ERROR_CODE_CHANNEL_NO_EXIST(236, "channel no exist"),
     ERROR_CODE_CHANNEL_NO_SECRET(237, "channel no secret"),
     ERROR_CODE_USER_NOT_PREPARED(238, "user not prepared"),