diff --git a/server/hallserver/app.go b/server/hallserver/app.go
index b4d3f3bd..86d499e0 100644
--- a/server/hallserver/app.go
+++ b/server/hallserver/app.go
@@ -25,9 +25,11 @@ func (this *App) Init() {
 	playerMgr.init()
 	wspListener.init()
 	httpListener.init()
+	roomMgr.init()
 }
 
 func (this *App) UnInit() {
+	roomMgr.unInit()
 	httpListener.unInit()
 	playerMgr.unInit()
 	handlerMgr.unInit()
diff --git a/server/hallserver/export.go b/server/hallserver/export.go
index 24d38ad9..16530aa1 100644
--- a/server/hallserver/export.go
+++ b/server/hallserver/export.go
@@ -5,3 +5,4 @@ var wspListener = new(WSPListener)
 var playerMgr = new(PlayerMgr)
 var handlerMgr = new(HandlerMgr)
 var httpListener = new(HttpListener)
+var roomMgr = new(RoomMgr)
diff --git a/server/hallserver/playermgr.go b/server/hallserver/playermgr.go
index 54f889bb..7923858e 100644
--- a/server/hallserver/playermgr.go
+++ b/server/hallserver/playermgr.go
@@ -30,40 +30,6 @@ func (this *PlayerMgr) init() {
 					})
 			}
 		})
-	conn := q5.NewMysql(
-		mt.Table.GameDb.GetById(0).GetHost(),
-		mt.Table.GameDb.GetById(0).GetPort(),
-		mt.Table.GameDb.GetById(0).GetUser(),
-		mt.Table.GameDb.GetById(0).GetPasswd(),
-		mt.Table.GameDb.GetById(0).GetDatabase(),
-	)
-	conn.Open()
-	rows, err := conn.Query("SELECT * FROM t_user LIMIT 1")
-	if err == nil {
-		dataSet := f5.NewDataSet(rows)
-		if dataSet.Next() {
-			columns := dataSet.GetColumns()
-			for i := 0; i < len(columns); i++ {
-				f5.GetSysLog().Info(
-					"%s:%s",
-					columns[i],
-					*dataSet.GetByName(columns[i]))
-			}
-		}
-	} else {
-		f5.GetSysLog().Info("mysql error:%s\n", err)
-	}
-	{
-		f5.GetJsStyleDb().OrmSelectOne(
-			GAME_DB,
-			"t_user",
-			[][]string{
-				[]string{"account_id", "100"},
-			},
-			func(err error, row *f5.DataSet) {
-				fmt.Println(row)
-			})
-	}
 }
 
 func (this *PlayerMgr) unInit() {
diff --git a/server/hallserver/proto/cs_proto.proto b/server/hallserver/proto/cs_proto.proto
index 0d6c535e..b53da1fb 100644
--- a/server/hallserver/proto/cs_proto.proto
+++ b/server/hallserver/proto/cs_proto.proto
@@ -116,3 +116,90 @@ message SMReconnect
     optional int32 errcode = 1; //错误码 0：成功 1:重连失败
     optional string errmsg = 2; //错误描述
 }
+
+//创建房间
+message CMCreateRoom
+{
+    optional string passwd = 1; //密码，空：无密码
+}
+
+message SMCreateRoom
+{
+
+}
+
+//获取房间列表
+message CMRoomList
+{
+
+}
+
+message SMRoomList
+{
+
+}
+
+//加入房间
+message CMJoinRoom
+{
+    optional string room_id = 1; //房间号
+    optional string passwd = 2; //密码，空：无密码
+}
+
+message SMJoinRoom
+{
+
+}
+
+//解散房间
+message CMDisbandRoom
+{
+    optional string room_id = 1; //房间号
+}
+
+message SMDisbandRoom
+{
+
+}
+
+//退出房间
+message CMLeaveRoom
+{
+    optional string room_id = 1; //房间号
+}
+
+message SMLeaveRoom
+{
+
+}
+
+//修改房间
+message CMModifyRoom
+{
+    optional string room_id = 1; //房间号
+}
+
+message SMModifyRoom
+{
+
+}
+
+//开始游戏
+message CMStartGame
+{
+}
+
+message SMStartGame
+{
+
+}
+
+//准备
+message CMSetPrepare
+{
+}
+
+//踢人
+message CMKickout
+{
+}
diff --git a/server/hallserver/room.go b/server/hallserver/room.go
new file mode 100644
index 00000000..50d21d19
--- /dev/null
+++ b/server/hallserver/room.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+	"cs"
+)
+
+type Room struct {
+	cs.MsgHandlerImpl
+
+}
diff --git a/server/hallserver/roommgr.go b/server/hallserver/roommgr.go
new file mode 100644
index 00000000..aa56c65c
--- /dev/null
+++ b/server/hallserver/roommgr.go
@@ -0,0 +1,17 @@
+package main
+
+import (
+	"cs"
+)
+
+type RoomMgr struct {
+	cs.MsgHandlerImpl
+	idHash map[int32]*Room
+}
+
+func (this *RoomMgr) init() {
+	this.idHash = make(map[int32]*Room)
+}
+
+func (this *RoomMgr) unInit() {
+}