common/config/config.go

@@ -17,6 +17,10 @@ func AppIsRelease() bool {
 	return GetMode() == RELEASE
 }
 
+func AppIsLocal() bool {
+	return GetMode() == LOCAL
+}
+
 //数据库的配置
 type MysqlConfig struct {
 	MYSQL_HOST     string

common/mylogrus/log.go

@@ -24,7 +24,7 @@ func init() {
 	filenamePrefix = logDir + filepath.Base(os.Args[0]) + "."
 	// stderr日志重定向
 	MyLog.SetOutput(os.Stdout)
-	RewriteStderrFile()
+	//RewriteStderrFile()
 
 	if config.AppIsRelease() {
 		MyLog.SetFormatter(&logrus.JSONFormatter{

debug.ini

 [DATABASE]
-MYSQL_HOST=47.244.34.27:3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=yX0jPAhO0I4s2zlA
+MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
+MYSQL_USERNAME=hilo_test
+MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
 MYSQL_DB=hilo
 [DATABASECODE]
-MYSQL_HOST=47.244.34.27:3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=yX0jPAhO0I4s2zlA
+MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
+MYSQL_USERNAME=hilo_test
+MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
 MYSQL_DB=hilo_code
 [REDIS]
-REDIS_HOST=47.244.34.27:6379
-REDIS_PASSWORD=8QZ9JD1zLvPR3yHf
-REDIS_CLUSTER_HOST=47.244.34.27:6379
-REDIS_CLUSTER_PASSWORD=8QZ9JD1zLvPR3yHf
+REDIS_HOST=172.19.0.2:6379
+REDIS_PASSWORD=yPyZH1DYMJhrVQgr
+REDIS_CLUSTER_HOST=172.19.0.2:6379
+REDIS_CLUSTER_PASSWORD=yPyZH1DYMJhrVQgr
 [JWT]
 SECRET=hilo1632
 ISSUER_API=hiloApi

local.ini

 [DATABASE]
-MYSQL_HOST=47.244.34.27:3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=yX0jPAhO0I4s2zlA
+MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
+MYSQL_USERNAME=hilo_test
+MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
 MYSQL_DB=hilo
 [DATABASECODE]
-MYSQL_HOST=47.244.34.27:3306
-MYSQL_USERNAME=root
-MYSQL_PASSWORD=yX0jPAhO0I4s2zlA
+MYSQL_HOST=hk-cynosdbmysql-grp-a3wqck8p.sql.tencentcdb.com:22303
+MYSQL_USERNAME=hilo_test
+MYSQL_PASSWORD=cPsTMSA9szQ6B9Y2zFXSvpDdduB8kZxC
 MYSQL_DB=hilo_code
 [REDIS]
-REDIS_HOST=47.244.34.27:6379
-REDIS_PASSWORD=8QZ9JD1zLvPR3yHf
-REDIS_CLUSTER_HOST=47.244.34.27:6379
-REDIS_CLUSTER_PASSWORD=8QZ9JD1zLvPR3yHf
+REDIS_HOST=43.135.4.137:6379
+REDIS_PASSWORD=yPyZH1DYMJhrVQgr
+REDIS_CLUSTER_HOST=43.135.4.137:6379
+REDIS_CLUSTER_PASSWORD=yPyZH1DYMJhrVQgr
 [JWT]
 SECRET=hilo1632
 ISSUER_API=hiloApi

main.go

@@ -2,18 +2,17 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
+	"github.com/golang/protobuf/proto"
 	"gorm.io/gorm/schema"
 	"net"
-	"net/http"
 	"net/url"
-	"os"
 	"strconv"
 	"time"
 
 	"github.com/go-redis/redis/v8"
-	consulapi "github.com/hashicorp/consul/api"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/keepalive"
 	"gorm.io/driver/mysql"
@@ -40,12 +39,14 @@ const (
 	kickChanSize      = 500
 	broadcastChanSize = 3500
 	areacastChanSize  = 3500
+	levelcastChanSize = 3500
 )
 
 var (
 	kickChan      chan KickChanMsg
 	broadcastChan chan BroadcastChanMsg
 	areacastChan  chan AreaChanMsg
+	levelcastChan chan LevelChanMsg
 )
 
 type KickChanMsg struct {
@@ -65,6 +66,12 @@ type AreaChanMsg struct {
 	in        *userCenter.AreaMessage
 }
 
+type LevelChanMsg struct {
+	ProxyAddr string
+	UserIds   []uint64
+	in        *userCenter.LevelMessage
+}
+
 var (
 	userManager *manager.UserManager     = nil
 	termManager *manager.TerminalManager = nil
@@ -84,7 +91,7 @@ var kasp = keepalive.ServerParameters{
 }
 
 func (s *server) Login(ctx context.Context, in *userCenter.LoginMessage) (*userCenter.LoginMessageRsp, error) {
-	mylogrus.MyLog.Infof("Received loginMsg: %s, from proxy %s, client %s\n", in.Token, in.ProxyAddr, in.ClientAddr)
+	//mylogrus.MyLog.Infof("Received loginMsg: %s, from proxy %s, client %s\n", in.Token, in.ProxyAddr, in.ClientAddr)
 
 	var loginStatus uint32 = common.Login_success
 	claim, err := common.ParseToken(in.GetToken())
@@ -101,7 +108,7 @@ func (s *server) Login(ctx context.Context, in *userCenter.LoginMessage) (*userC
 		// FIXME: 发现用户已经登录，要踢走旧连接
 		proxyAddr := userManager.GetUser(claim.UserId)
 		if proxyAddr != nil {
-			mylogrus.MyLog.Infof("%d has existing value %s", claim.UserId, *proxyAddr)
+			//mylogrus.MyLog.Infof("%d has existing value %s", claim.UserId, *proxyAddr)
 			kickChan <- KickChanMsg{
 				userId:    claim.UserId,
 				proxyAddr: *proxyAddr,
@@ -122,7 +129,7 @@ func (s *server) Login(ctx context.Context, in *userCenter.LoginMessage) (*userC
 		} else {
 			mylogrus.MyLog.Errorf("wrong user %d", claim.UserId)
 		}
-		mylogrus.MyLog.Infof("adding user %d", claim.UserId)
+		//mylogrus.MyLog.Infof("adding user %d", claim.UserId)
 
 		// save to redis
 		userManager.AddUser(claim.UserId, in.ProxyAddr)
@@ -185,13 +192,13 @@ func (s *server) Multicast(ctx context.Context, in *userCenter.MulticastMessage)
 			failed = append(failed, uid)
 		}
 	}
-	if len(failed) > 0 {
-		mylogrus.MyLog.Infof("Multicast failed for %v\n", failed)
-	}
+	//if len(failed) > 0 {
+	//mylogrus.MyLog.Infof("Multicast failed for %v\n", failed)
+	//}
 	return &userCenter.MulticastMessageRsp{FailedUids: failed}, nil
 }
 
-func (s *server) Broadcast(ctx context.Context, in *userCenter.BroadcastMessage) (*userCenter.BroadcastMessageRsp, error) {
+func (s *server) BroadcastOld(ctx context.Context, in *userCenter.BroadcastMessage) (*userCenter.BroadcastMessageRsp, error) {
 	//mylogrus.MyLog.Infof("Broadcasting msgType = %d, size = %d\n", in.MsgType, len(in.PayLoad))
 
 	failed := []uint64{}
@@ -244,6 +251,32 @@ func (s *server) Broadcast(ctx context.Context, in *userCenter.BroadcastMessage)
 	return &userCenter.BroadcastMessageRsp{FailedUids: failed}, nil
 }
 
+func (s *server) Broadcast(ctx context.Context, in *userCenter.BroadcastMessage) (*userCenter.BroadcastMessageRsp, error) {
+	redisKey := "service:userSocket"
+	ipPorts, err := rdbCluster.ZRangeByScore(context.Background(), redisKey, &redis.ZRangeBy{
+		Min: fmt.Sprintf("%d", time.Now().Add(-time.Second*15).Unix()), // 3倍心跳
+		Max: "+inf",
+	}).Result()
+	if err != nil {
+		failMsg := fmt.Sprintf("get service fail,svc:%v,err:%v", "userSocket", err)
+		mylogrus.MyLog.Errorf(failMsg)
+		_ = dingding.SendDingRobot(dingding.ROBOTWEBHOOK, failMsg, true)
+		return nil, err
+	}
+	if len(ipPorts) <= 0 {
+		failMsg := fmt.Sprintf("get service empty,svc:%v,err:%v", "userSocket", err)
+		mylogrus.MyLog.Errorf(failMsg)
+		_ = dingding.SendDingRobot(dingding.ROBOTWEBHOOK, failMsg, true)
+		return nil, errors.New(failMsg)
+	}
+	data, _ := proto.Marshal(in)
+	for _, ip := range ipPorts {
+		queue := "broadcast:" + ip
+		rdbCluster.RPush(context.Background(), queue, data)
+	}
+	return &userCenter.BroadcastMessageRsp{FailedUids: nil}, nil
+}
+
 func (s *server) Areacast(ctx context.Context, in *userCenter.AreaMessage) (*userCenter.AreaMessageRsp, error) {
 	var failed []uint64
 	terminals := termManager.GetAll()
@@ -294,6 +327,63 @@ func (s *server) Areacast(ctx context.Context, in *userCenter.AreaMessage) (*use
 	return &userCenter.AreaMessageRsp{FailedUids: failed}, nil
 }
 
+func (s *server) Levelcast(ctx context.Context, in *userCenter.LevelMessage) (*userCenter.LevelMessageRsp, error) {
+	var failed []uint64
+	terminals := termManager.GetAll()
+	if terminals != nil {
+		var uids []uint64
+		for uidStr := range *terminals {
+			if uid, _ := strconv.ParseUint(uidStr, 10, 64); uid > 0 {
+				uids = append(uids, uid)
+			}
+		}
+		// 处理等级用户
+		levelUserIds, userIds := userManager.GetLevelUsers(uids, in.Level)
+		if len(levelUserIds) <= 0 {
+			return &userCenter.LevelMessageRsp{FailedUids: failed}, nil
+		}
+		if in.Area > 0 {
+			// 处理分区用户
+			levelUserIds = userManager.GetAreaUsers(userIds, int8(in.Area))
+			if len(levelUserIds) <= 0 {
+				return &userCenter.LevelMessageRsp{FailedUids: failed}, nil
+			}
+		}
+		m := make(map[string][]uint64, 0)
+		for uid := range levelUserIds {
+			ok := false
+			addr := userManager.GetUser(uid)
+			if addr != nil {
+				if _, ok := m[*addr]; !ok {
+					m[*addr] = make([]uint64, 0)
+				}
+				m[*addr] = append(m[*addr], uid)
+				ok = true
+			} else {
+				mylogrus.MyLog.Errorf("Unknown user %d\n", uid)
+			}
+			if !ok {
+				failed = append(failed, uid)
+			}
+		}
+		for addr, users := range m {
+			const sendBatchSize = 5
+			for i := 0; i < len(users); i += sendBatchSize {
+				end := i + sendBatchSize
+				if end > len(users) {
+					end = len(users)
+				}
+				levelcastChan <- LevelChanMsg{
+					ProxyAddr: addr,
+					UserIds:   users[i:end],
+					in:        in,
+				}
+			}
+		}
+	}
+	return &userCenter.LevelMessageRsp{FailedUids: failed}, nil
+}
+
 func (s *server) Transmit(ctx context.Context, in *userCenter.BizMessage) (*userCenter.BizMessageRsp, error) {
 	mylogrus.MyLog.Infof("Transmiting msgType = %d, uid = %d, payLoad: %s\n", in.MsgType, in.Uid, in.PayLoad)
 
@@ -384,6 +474,22 @@ func realAreacast(addr string, uids []uint64, msg *userCenter.AreaMessage) {
 	}
 }
 
+func realLevelcast(addr string, uids []uint64, msg *userCenter.LevelMessage) {
+	for _, uid := range uids {
+		client := manager.UserProxyMgr.MakeClient(addr)
+		if client == nil {
+			mylogrus.MyLog.Errorf("Failed in making client for %d, %s\n", uid, addr)
+		} else {
+
+			toRouterClient := userCenter.NewRouterClient(client)
+			status, err := routeMessage(toRouterClient, uid, msg.MsgType, msg.PayLoad)
+			if err != nil {
+				mylogrus.MyLog.Errorf("routeMessage uid = %d, msgType = %d, status = %d, %v", uid, msg.MsgType, status, err)
+			}
+		}
+	}
+}
+
 func routeMessage(c userCenter.RouterClient, uid uint64, msgType uint32, data []byte) (uint32, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
 	defer cancel()
@@ -418,7 +524,7 @@ func transmitMessage(c biz.TransmitterClient, msgType uint32, data string) (uint
 }
 
 func sendKickMessage(c userCenter.RouterClient, msg *userCenter.KickMessage) error {
-	mylogrus.MyLog.Infof("sendKickMessage %s", msg.String())
+	//mylogrus.MyLog.Infof("sendKickMessage %s", msg.String())
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
 	defer cancel()
 	r, err := c.KickUser(ctx, msg)
@@ -428,84 +534,50 @@ func sendKickMessage(c userCenter.RouterClient, msg *userCenter.KickMessage) err
 	return err
 }
 
-func consulCheck(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintln(w, "consulCheck")
-}
-
 const (
 	RegisterName = "userCenter"
-	RegisterTag  = "用户中心"
 )
 
-func registerToConsul(client *consulapi.Client, retry bool) {
-	checkPort := port + 1000
-	registration := new(consulapi.AgentServiceRegistration)
-	hostName, _ := os.Hostname()
-	registration.ID = fmt.Sprintf("%s-%s", RegisterName, hostName)
-	registration.Name = RegisterName
-	registration.Port = port
-	registration.Tags = []string{RegisterTag}
-
-	myIp, myNodeName := "", ""
-	if localIp, err := common.GetClientIpV2(); err != nil {
-		mylogrus.MyLog.Fatalln("local ip not found", err)
-	} else {
-		myIp = localIp
+func RegisterToRedis(RedisClusterClient *redis.Client, port int, init bool) {
+	// 本地不注册
+	if appConfig.AppIsLocal() {
+		return
 	}
-	mylogrus.MyLog.Infof("My ip is %s, nodeName: %s\n", myIp, myNodeName)
-
-	registration.Address = myIp
-	registration.Check = &consulapi.AgentServiceCheck{
-		HTTP:                           fmt.Sprintf("http://localhost:%d%s", checkPort, "/check"),
-		Timeout:                        "3s",
-		Interval:                       "5s",
-		DeregisterCriticalServiceAfter: "30s", //check失败后30秒删除本服务
+	if RedisClusterClient == nil {
+		failMsg := fmt.Sprintf("RegisterToRedis fail,redisClusterNotInit,serviceName:%v", RegisterName)
+		_ = dingding.SendDingRobot(dingding.ROBOTWEBHOOK, failMsg, true)
+		mylogrus.MyLog.Errorf(failMsg)
+		return
 	}
-	err := client.Agent().ServiceRegister(registration)
+	redisKey := "service:" + RegisterName
+	ip, err := common.GetClientIpV2()
 	if err != nil {
-		mylogrus.MyLog.Fatal("register server error : ", err)
-	}
-	if !retry {
-		http.HandleFunc("/check", consulCheck)
-		http.ListenAndServe(fmt.Sprintf(":%d", checkPort), nil)
-	}
-}
-
-// 自愈检查
-// 启动后每一分钟检查一次
-// 首次启动不执行
-func selfCheck() {
-	ticker := time.NewTicker(time.Minute)
+		failMsg := fmt.Sprintf("RegisterToRedis fail,ip fail,err:%v,serviceName:%v", err, RegisterName)
+		mylogrus.MyLog.Errorf(failMsg)
+		_ = dingding.SendDingRobot(dingding.ROBOTWEBHOOK, failMsg, true)
+		return
+	}
+	ipPort := fmt.Sprintf("%s:%d", ip, port)
+	if err := RedisClusterClient.ZAdd(context.Background(), redisKey, &redis.Z{
+		Score:  float64(time.Now().Unix()),
+		Member: ipPort,
+	}).Err(); err != nil {
+		failMsg := fmt.Sprintf("RegisterToRedis fail,redis fail,err:%v,serviceName:%v", err, RegisterName)
+		mylogrus.MyLog.Errorf(failMsg)
+		_ = dingding.SendDingRobot(dingding.ROBOTWEBHOOK, failMsg, true)
+	}
+	// 初始化注册自我检查 selfCheck
+	if init {
+		go func() {
+			ticker := time.NewTicker(time.Second * 5)
 			defer ticker.Stop()
 			for {
 				select {
 				case <-ticker.C:
-			client, err := consulapi.NewClient(consulapi.DefaultConfig()) //非默认情况下需要设置实际的参数
-			if err != nil {
-				mylogrus.MyLog.Errorf("RegisterToConsul Fail:%v", err)
-				break
-			}
-			if client == nil {
-				mylogrus.MyLog.Errorf("Fail to get consul client.")
-				break
-			}
-			cataLog := client.Catalog()
-			if cataLog == nil {
-				mylogrus.MyLog.Errorf("No catalog.")
-				break
-			}
-			services, _, err := cataLog.Service(RegisterName, "", nil)
-			if err != nil {
-				mylogrus.MyLog.Errorf("%v", err)
-				break
-			}
-			if len(services) == 0 {
-				mylogrus.MyLog.Errorf("%s not found.", RegisterName)
-				go registerToConsul(client, true) // 重新注册
-			} else {
-				mylogrus.MyLog.Infof("%s check success %v", RegisterName, services[0])
+					RegisterToRedis(RedisClusterClient, port, false) // 刷新注册
 				}
 			}
+		}()
 	}
 }
 
@@ -514,17 +586,18 @@ type HiloConfigs struct {
 	Value string
 }
 
+var rdbCluster *redis.Client
+
 func main() {
 	flag.Parse()
 
-	config := consulapi.DefaultConfig()
-
-	client, err := consulapi.NewClient(config)
-	if err != nil {
-		mylogrus.MyLog.Fatal("consul client error : ", err)
-	}
-	go registerToConsul(client, false)
-	go selfCheck()
+	// init redis cluster
+	rdbCluster = redis.NewClient(&redis.Options{
+		Addr:     appConfig.GetConfigRedis().REDIS_CLUSTER_HOST,
+		Password: appConfig.GetConfigRedis().REDIS_CLUSTER_PASSWORD,
+	})
+	// 注册到redis
+	RegisterToRedis(rdbCluster, port, true)
 
 	// init redis
 	rdb := redis.NewClient(&redis.Options{
@@ -594,8 +667,8 @@ func main() {
 
 		for {
 			select {
-			case a := <-ticker.C:
-				mylogrus.MyLog.Infof("Tick at %s", a.String())
+			case <-ticker.C:
+				//mylogrus.MyLog.Infof("Tick at %s", a.String())
 				terminals := termManager.GetAll()
 				if terminals != nil {
 					if len(*terminals) <= 100 {
@@ -613,6 +686,7 @@ func main() {
 	kickChan = make(chan KickChanMsg, kickChanSize)
 	broadcastChan = make(chan BroadcastChanMsg, broadcastChanSize)
 	areacastChan = make(chan AreaChanMsg, areacastChanSize)
+	levelcastChan = make(chan LevelChanMsg, levelcastChanSize)
 	go check() // 检查长度
 	for i := 0; i < kickChanSize; i++ {
 		go func(n int) {
@@ -629,6 +703,11 @@ func main() {
 			areacast(n)
 		}(i)
 	}
+	for i := 0; i < levelcastChanSize; i++ {
+		go func(n int) {
+			levelcast(n)
+		}(i)
+	}
 
 	fmt.Println("Go RPC listening on ", port)
 	lis, err := net.Listen("tcp4", ":"+strconv.Itoa(port))
@@ -644,10 +723,10 @@ func main() {
 
 func kick(n int) {
 	for msg := range kickChan {
-		mylogrus.MyLog.Infof("handling kick in:%d,msg:%+v", n, msg)
+		//mylogrus.MyLog.Infof("handling kick in:%d,msg:%+v", n, msg)
 		clientAddr := termManager.GetTerminal(msg.userId)
 		if clientAddr == nil {
-			mylogrus.MyLog.Errorf("No terminal found for %d", msg.userId)
+			//mylogrus.MyLog.Errorf("No terminal found for %d", msg.userId)
 		} else {
 			client := manager.UserProxyMgr.GetClient(msg.proxyAddr)
 			if client == nil {
@@ -677,6 +756,12 @@ func areacast(n int) {
 	}
 }
 
+func levelcast(n int) {
+	for msg := range levelcastChan {
+		realLevelcast(msg.ProxyAddr, msg.UserIds, msg.in)
+	}
+}
+
 var lastDingTime time.Time
 var dingIntervalMin float64 = 5 // 5min 告警间隔
 
@@ -687,11 +772,12 @@ func check() {
 	for {
 		select {
 		case <-tick.C:
-			l, l2, l3 := len(kickChan), len(broadcastChan), len(areacastChan)
-			if l >= monitorLength || l2 >= monitorLength || l3 >= monitorLength {
+			l, l2, l3, l4 := len(kickChan), len(broadcastChan), len(areacastChan), len(levelcastChan)
+			if l >= monitorLength || l2 >= monitorLength || l3 >= monitorLength || l4 >= monitorLength {
 				if time.Now().Sub(lastDingTime).Minutes() > dingIntervalMin {
 					go func() {
-						if sErr := dingding.SendDingRobot(dingding.ROBOTWEBHOOK, fmt.Sprintf("userCenter通知延迟,队列长度:kickChan:%d,broadcastChan:%d,areacastChan:%d", l, l2, l3), true); sErr != nil {
+						if sErr := dingding.SendDingRobot(dingding.ROBOTWEBHOOK, fmt.Sprintf("userCenter通知延迟,队列长度:kickChan:%d,broadcastChan:%d,areacastChan:%d,levelcastChan:%d",
+							l, l2, l3, l4), true); sErr != nil {
 							mylogrus.MyLog.Errorf("dingding msg fail:%v", sErr)
 						} else {
 							lastDingTime = time.Now()

manager/userManager.go

@@ -135,3 +135,34 @@ func (m *UserManager) GetAreaUsers(userIds []uint64, area int8) map[uint64]UserT
 	}
 	return res
 }
+
+// 获取财富等级大于某等级的用户
+// 开区间
+func (m *UserManager) GetLevelUsers(userIds []uint64, wealthLevel int32) (map[uint64]UserTinyArea, []uint64) {
+	res := make(map[uint64]UserTinyArea)
+	var resIds []uint64
+	// 从db中读,暂时不缓存(几千个)
+	var users []UserTinyArea
+	if err := m.MysqlDB.Table("user").Joins("JOIN match_wealth_user_score ON match_wealth_user_score.user_id = user.id").
+		Select("user.id,external_id,sex,code,country,avatar").
+		Where("user.id IN (?)", userIds).
+		Where("match_wealth_user_score.grade > ?", wealthLevel).
+		Find(&users).Error; err != nil {
+		mylogrus.MyLog.Errorf("GetLevelUsers fail:%v", err)
+		return res, resIds
+	}
+	for _, u := range users {
+		a := m.GetArea(u.Country)
+		res[u.ID] = UserTinyArea{
+			ID:         u.ID,
+			ExternalId: u.ExternalId,
+			Sex:        u.Sex,
+			Code:       u.Code,
+			Country:    u.Country,
+			Area:       a,
+			Avatar:     u.Avatar,
+		}
+		resIds = append(resIds, u.ID)
+	}
+	return res, resIds
+}

protocol/userCenter.proto

@@ -132,6 +132,17 @@ message AreaMessageRsp {
   repeated uint64 failedUids = 1;
 }
 
+message LevelMessage {
+  int32 level = 1;
+  uint32 msgType = 2;
+  bytes payLoad = 3;
+  int32 area = 4;
+}
+
+message LevelMessageRsp {
+  repeated uint64 failedUids = 1;
+}
+
 service Router {
   rpc route(RouteMessage) returns (RouteMessageRsp) {}
   rpc kickUser(KickMessage) returns (KickMessageRsp) {}
@@ -143,6 +154,7 @@ service User {
   rpc multicast(MulticastMessage) returns (MulticastMessageRsp) {}
   rpc broadcast(BroadcastMessage) returns (BroadcastMessageRsp) {}
   rpc areacast(AreaMessage) returns (AreaMessageRsp) {}
+  rpc levelcast(LevelMessage) returns (LevelMessageRsp) {}
   rpc transmit(BizMessage) returns (BizMessageRsp) {}
   rpc enterRoom(EnterRoomMessage) returns (EnterRoomMessageRsp) {}
   rpc leaveRoom(LeaveRoomMessage) returns (LeaveRoomMessageRsp) {}

protocol/userProxy.proto

@@ -86,7 +86,6 @@ message MatchConfirm {
     uint32 remoteAgoraId = 6;
     uint32 callDuration = 7;
     uint32 localAgoraId = 8;
-    uint32 diamondBalance = 9;
     string matchUniqueId = 10;
     uint32 failType = 11;
 }
@@ -97,62 +96,6 @@ message CallReady {
     uint64 endTimestamp = 2;
     uint64 callDuration = 3;
     string channelId = 4;
-    uint64 remainDiamond = 5;
-}
-
-/* id == 103 礼物加时 */
-message AddTimeGift {
-    uint32 giftId = 1;
-    string token = 2;
-    uint32 duration = 3;
-    uint64 endTimestamp = 4;
-    string channelId = 5;
-    bool isSender = 6;
-    uint32 giftNum = 7;
-    string iconUrl = 8;
-    string svgaUrl = 9;
-    string senderAvatar = 10;
-    string receiverAvatar = 11;
-}
-
-/* id == 104 免费加时 */
-message AddTimeFree {
-    string token = 1;
-    uint32 duration = 2;
-    uint64 endTimestamp = 3;
-    string channelId = 4;
-    uint32 senderAgoraId = 5;
-}
-
-/* id == 105 退出 */
-message ConnectsQuit {
-    uint64 from_user_id = 1;
-}
-
-/* id == 106 连接状态 */
-message ConnectStatus {
-    uint64 from_user_id = 1;
-    float user_diamonds = 2;
-    bool diamonds_enough = 3;
-}
-
-/* id == 107 ??? */
-message ConnectsCall {
-    uint64 from_user_id = 1;
-    string rong_room_name = 2;
-    bool is_join = 3;
-}
-
-/* id == 108 */
-message ConnectCommon {
-    string rong_room_name = 1;
-    uint64 from_user_id = 2;
-    string extra = 3;
-    string message = 4;
-}
-
-/* id == 109 召回授权弹框 */
-message RecallWindow {
 }
 
 /* id == 110 | 132 视频发送 status:(1:接收到邀请, 2:接收到对方同意, 3:双方拒绝（还没接通）, 4：对方挂断（接通后）diamondBalance 只有status=2,才出现)*/
@@ -165,17 +108,19 @@ message Video {
     string sendUserId = 6;
     string receiveUserId = 7;
     uint32 status = 8;
-    uint32 diamondBalance = 9;
     User sendUser = 10;
 }
 
+/* id == 109 召回授权弹框 */
+message RecallWindow {
+}
+
 /* id == 111 视频通话准备 */
 message VideoCallReady {
     uint64 startTimestamp = 1;
     uint64 endTimestamp = 2;
     uint64 callDuration = 3;
     string channelId = 4;
-    uint64 remainDiamond = 5;
 }
 
 /* id == 112 互相喜欢 */
@@ -213,6 +158,7 @@ message GlobalGiftBanner {
     uint32 bannerType = 14; // 类型：0.普通礼物 1.cp直接送礼 2.cp告白礼物
     uint32 cpLevel = 15; // cp等级
     string receiveUserAvatar = 16;
+    uint32 nobleLevel = 17; // 贵族等级
 }
 
 /* id == 116 横幅的回应，用来测量RTT */
@@ -289,6 +235,7 @@ message GlobalBroadcast {
     string msg = 6;
     string groupId = 7;
     uint32 senderNobleLevel = 8;
+    bool isPinned = 9;
 }
 
 /* id == 124 全球消息 */
@@ -322,13 +269,11 @@ message VideoTimeMinuteSuccess {
     uint32 senderAgoraId = 5;
     string videoUniqueId = 6;
     bool isSend = 7;
-    uint32 sendRemainDiamond = 8;
 }
 
 /* id == 129 1对1视频1分钟加时询问检查 */
 message VideoTimeMinuteCheck {
     string videoUniqueId = 1;
-    uint32 diamond = 2;
     string uuid = 3;
 }
 
@@ -369,6 +314,7 @@ message GlobalGameBanner {
     uint64 diamond = 4;
     string bannerUrl = 5;
     uint64 gameId = 6; // 1.ludo 2.uno 3.dice 4.lucky wheel 5.lucky box 6.fruit 7.slot
+    bool isPink = 7; // 是否粉钻
 }
 
 /* id == 147 羊羊匹配成功 */
@@ -377,6 +323,11 @@ message SheepMatchSuccess {
     User user = 2;
     User otherUser = 3;
     uint64 game_id = 4;
+    string channelId = 5;
+    string token = 6;
+    uint32 agoraId = 7;
+    uint32 provider = 8;
+    uint32 otherAgoraId = 9;
 }
 
 message SheepGamePlayer {
@@ -464,3 +415,33 @@ message MicUserData {
     string headwearIcon = 15;
     Svip svip = 16;
 }
+
+/* id == 157 游戏大厅匹配成功 */
+message LobbyMatchSuccess {
+    uint64 game_id = 1;
+    uint64 mode = 2;
+    string group_id = 3;
+    User user = 4;
+    User otherUser = 5;
+    string gameCode = 6;
+}
+
+/* id == 158 H5游戏静音 */
+message H5GameVoiceMute {
+}
+
+/* id == 159 H5游戏打开语音 */
+message H5GameVoiceUnMute {
+}
+
+/* id == 160 退出房间 */
+message QuitRoom {
+    uint32 reason = 1; // 原因1.被拉黑；2.被踢出
+    string group_id = 2;
+}
+
+/* id == 161 国家管理员横幅 */
+message GlobalCountryMgrBanner {
+    string country = 1; // 国家
+    User user = 2; // 用户信息
+}
\ No newline at end of file

release.ini

 [DATABASE]
-MYSQL_HOST=ua4papc3hmgqf351pbej-rw4rm.rwlb.dubai.rds.aliyuncs.com
-MYSQL_USERNAME=nextvideo
-MYSQL_PASSWORD=ihlUwI4nhi9W88MI
+MYSQL_HOST=172.28.16.44
+MYSQL_USERNAME=hilo_master
+MYSQL_PASSWORD=o8NNd8F7e6On2RqIgOhsy1PsiSxROT3n
 MYSQL_DB=hilo
 [DATABASECODE]
-MYSQL_HOST=ua4papc3hmgqf351pbej-rw4rm.rwlb.dubai.rds.aliyuncs.com
-MYSQL_USERNAME=nextvideo
-MYSQL_PASSWORD=ihlUwI4nhi9W88MI
+MYSQL_HOST=172.28.16.44
+MYSQL_USERNAME=hilo_master
+MYSQL_PASSWORD=o8NNd8F7e6On2RqIgOhsy1PsiSxROT3n
 MYSQL_DB=hilo_code
 [REDIS]
-REDIS_HOST=r-eb3btxn8vfdsuwdbuf.redis.dubai.rds.aliyuncs.com:6379
+REDIS_HOST=172.28.16.31:6379
 REDIS_PASSWORD=
-REDIS_CLUSTER_HOST=r-eb3yt6k8zgxs62kjjs.redis.dubai.rds.aliyuncs.com:6379
+REDIS_CLUSTER_HOST=172.28.16.47:6379
 REDIS_CLUSTER_PASSWORD=
 [JWT]
 SECRET=hilo1504