添加推送服务

Author: hero

go_push/gateway/push_job.go

@@ -15,12 +15,17 @@ func NewPushTask() *PushTask {
 	var p *PushTask
 	p.DistributionTask = make(chan *PushJob, 10)
 	p.JobChan = make([]chan *PushJob, len(roomTitle)) //一个房间对应一个job
-	GetRoomManage().AllRoom.Range(func(key, value interface{}) bool {
-		return true
-	})
+	for i, _ := range roomTitle {
+		go p.distributionTask(i) //分发任务
+	}
 	return p
 }
 
-func (p *PushTask) distributionTask() {
+func (p *PushTask) distributionTask(roomId int) {
 
 }
+
+func (p *PushTask) pushWork(roomId int) {
+     var (
+	 )
+}

go_push/gateway/room.go

@@ -4,12 +4,12 @@ import "sync"
 
 //一个房间代表一个订阅推送类型
 type Room struct {
-	id    string
+	id    int
 	title string
 	RConn sync.Map
 }
 
-func NewRoom(id,title string) *Room {
+func newRoom(id int ,title string) *Room {
 	return &Room{
 		id: id,
 		title:title,

go_push/gateway/room_manage.go

@@ -22,6 +22,14 @@ func GetRoomManage() *RoomManage {
 	return manage
 }
 
+func (r *RoomManage) NewRoom(id int, title string) error {
+	_, ok := r.AllRoom.Load(id)
+	if ok {
+		return errors.New("already exists")
+	}
+	r.AllRoom.Store(id, newRoom(id, title))
+}
+
 func (r *RoomManage) AddConn(ws *WsConnection) {
 	r.AllConn.Store(ws.GetWsId(), ws)
 }
@@ -30,7 +38,7 @@ func (r *RoomManage) DelConn(ws *WsConnection) {
 	r.AllConn.Delete(ws.GetWsId())
 }
 
-func (r *RoomManage) AddRoom(id string, ws *WsConnection) error {
+func (r *RoomManage) AddRoom(id int, ws *WsConnection) error {
 	var room *Room
 	val, ok := r.AllRoom.Load(id)
 	if !ok {
@@ -43,7 +51,7 @@ func (r *RoomManage) AddRoom(id string, ws *WsConnection) error {
 	return nil
 }
 
-func (r *RoomManage) LeaveRoom(id string, ws *WsConnection) error {
+func (r *RoomManage) LeaveRoom(id int, ws *WsConnection) error {
 	val, ok := r.AllRoom.Load(id)
 	if !ok {
 		return errors.New("not find room")
@@ -56,7 +64,7 @@ func (r *RoomManage) LeaveRoom(id string, ws *WsConnection) error {
 	return nil
 }
 
-func (r *RoomManage) PushRoom(id string, msg *WSMessage) error {
+func (r *RoomManage) PushRoom(id int, msg *WSMessage) error {
 	val, ok := r.AllRoom.Load(id)
 	if !ok {
 		return errors.New("not find room")

go_push/gateway/ws_server.go

@@ -5,7 +5,6 @@ import (
 	"github.com/gorilla/websocket"
 	"net"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -24,7 +23,7 @@ func InitWsServer() {
 	NewRoomManage()
 	//初始化房间
 	for i := 0; i < 4; i++ {
-		NewRoom(strconv.Itoa(i), roomTitle[i])
+		_ = GetRoomManage().NewRoom(i, roomTitle[i])
 		fmt.Println("新建房间推送类型", roomTitle[i])
 	}
 	// HTTP服务