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

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