chendian
/
dy_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
master
chendian 1 year ago
parent 94628174c3
commit 365504913a
7 changed files with 78 additions and 37 deletions
Show Stats Download Patch File Download Diff File

14
.run/go build main.go.run.xml
Unescape Escape View File

@ -0,0 +1,14 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="go build main.go" type="GoApplicationRunConfiguration" factoryName="Go Application" nameIsGenerated="true">
<module name="sumo_server" />
<working_directory value="$PROJECT_DIR$" />
<envs>
<env name="REDIS_URL" value="redis://:adhd@123@101.35.201.220:6381/2?protocol=3" />
</envs>
<kind value="FILE" />
<package value="app/cmd/main" />
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/cmd/main/main.go" />
<method v="2" />
</configuration>
</component>

10
proto/common.proto
Unescape Escape View File

@ -96,11 +96,11 @@ message ReportInfo
//观众信息 //观众信息
message Audience message Audience
{ {
string OpenId = 1; string OpenId = 1;
string NickName = 2; string NickName = 2;
string AvatarUrl = 3; string AvatarUrl = 3;
int32 Rank = 4; //排名 int32 Rank = 4; //排名
int32 WinningStreak = 5; //连胜 int32 WinningStreak = 5; //连胜
} }
//排名信息 //排名信息

4
proto/protoGen.bat
Unescape Escape View File

@ -1,8 +1,8 @@
@ echo off @ echo off
cd ./protoc/bin cd ./protoc/bin
set protoPath="../../" set protoPath="../../"
set clientPath="D:/sumo_art/douyin_prj/Assets/Script/GameLogic/Proto" set clientPath="D:/white_snake/douyin_prj/Assets/Script/GameLogic/Proto"
set serverPath="D:/dy_server/src/app/service/main/message" set serverPath="D:/dy_server/service/main/message"
protoc.exe -I=%protoPath% --csharp_out=%clientPath% --go_out=%serverPath% %protoPath%/*.proto protoc.exe -I=%protoPath% --csharp_out=%clientPath% --go_out=%serverPath% %protoPath%/*.proto
clang-format.exe -i -style="{AlignConsecutiveAssignments: true,AlignConsecutiveDeclarations: true,AllowShortFunctionsOnASingleLine: None,BreakBeforeBraces: GNU,ColumnLimit: 0,IndentWidth: 4,Language: Proto}" %protoPath%/*.proto clang-format.exe -i -style="{AlignConsecutiveAssignments: true,AlignConsecutiveDeclarations: true,AllowShortFunctionsOnASingleLine: None,BreakBeforeBraces: GNU,ColumnLimit: 0,IndentWidth: 4,Language: Proto}" %protoPath%/*.proto
pause pause

9
service/main/game_mgr/handler_http.go
Unescape Escape View File

@ -6,6 +6,7 @@ import (
"crypto/md5" "crypto/md5"
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"io" "io"
"sort" "sort"
@ -20,10 +21,14 @@ func RunHttp() error {
} }
func OnDataPush(c *gin.Context) { func OnDataPush(c *gin.Context) {
var err error
defer func() { defer func() {
c.JSON(200, gin.H{ c.JSON(200, gin.H{
"message": "ok", "message": "ok",
}) })
if err != nil {
fmt.Println("OnDataPush err", err)
}
return return
}() }()
appId := c.Param("appId") appId := c.Param("appId")
@ -45,7 +50,7 @@ func OnDataPush(c *gin.Context) {
} }
signatureRemote := c.GetHeader("x-signature") signatureRemote := c.GetHeader("x-signature")
signatureLocal := signature(headerCheck, string(bodyData), appSecret) signatureLocal := signature(headerCheck, string(bodyData), appSecret)
if signatureRemote != signatureLocal { if false && signatureRemote != signatureLocal {
return return
} }
@ -135,7 +140,7 @@ func OnDataPush(c *gin.Context) {
} }
for _, audience := range audienceData { for _, audience := range audienceData {
redis.SetAudience(audience) redis.SetAudience(appId, audience)
} }
for _, notify := range notifyData { for _, notify := range notifyData {
redis.Publish(appId, roomId, notify) redis.Publish(appId, roomId, notify)

63
service/main/message/pb/common.pb.go
Unescape Escape View File

@ -1072,9 +1072,11 @@ type Audience struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
OpenId string `protobuf:"bytes,1,opt,name=OpenId,json=openId,proto3" json:"OpenId,omitempty"` OpenId string `protobuf:"bytes,1,opt,name=OpenId,json=openId,proto3" json:"OpenId,omitempty"`
NickName string `protobuf:"bytes,2,opt,name=NickName,json=nickName,proto3" json:"NickName,omitempty"` NickName string `protobuf:"bytes,2,opt,name=NickName,json=nickName,proto3" json:"NickName,omitempty"`
AvatarUrl string `protobuf:"bytes,3,opt,name=AvatarUrl,json=avatarUrl,proto3" json:"AvatarUrl,omitempty"` AvatarUrl string `protobuf:"bytes,3,opt,name=AvatarUrl,json=avatarUrl,proto3" json:"AvatarUrl,omitempty"`
Rank int32 `protobuf:"varint,4,opt,name=Rank,json=rank,proto3" json:"Rank,omitempty"` //排名
WinningStreak int32 `protobuf:"varint,5,opt,name=WinningStreak,json=winningStreak,proto3" json:"WinningStreak,omitempty"` //连胜
} }
func (x *Audience) Reset() { func (x *Audience) Reset() {
@ -1138,6 +1140,20 @@ func (x *Audience) GetAvatarUrl() string {
return "" return ""
} }
func (x *Audience) GetRank() int32 {
if x != nil {
return x.Rank
}
return 0
}
func (x *Audience) GetWinningStreak() int32 {
if x != nil {
return x.WinningStreak
}
return 0
}
func (x *Audience) SetOpenId(val string) { func (x *Audience) SetOpenId(val string) {
if x != nil { if x != nil {
x.OpenId = val x.OpenId = val
@ -1153,6 +1169,16 @@ func (x *Audience) SetAvatarUrl(val string) {
x.AvatarUrl = val x.AvatarUrl = val
} }
} }
func (x *Audience) SetRank(val int32) {
if x != nil {
x.Rank = val
}
}
func (x *Audience) SetWinningStreak(val int32) {
if x != nil {
x.WinningStreak = val
}
}
//排名信息 //排名信息
type RankInfo struct { type RankInfo struct {
@ -1310,20 +1336,23 @@ var file_common_proto_rawDesc = []byte{
0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x18, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a,
0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63,
0x6f, 0x72, 0x65, 0x22, 0x5c, 0x0a, 0x08, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x6f, 0x72, 0x65, 0x22, 0x96, 0x01, 0x0a, 0x08, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65,
0x16, 0x0a, 0x06, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x06, 0x6f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x52, 0x06, 0x6f, 0x70, 0x65, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b,
0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b,
0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72,
0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55,
0x6c, 0x22, 0x63, 0x0a, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x52, 0x61, 0x6e, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
0x08, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x57, 0x69, 0x6e, 0x6e, 0x69, 0x6e,
0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x77,
0x63, 0x65, 0x52, 0x08, 0x61, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x22, 0x63, 0x0a, 0x08,
0x52, 0x61, 0x6e, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x08, 0x41, 0x75, 0x64, 0x69,
0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x65, 0x73,
0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x05, 0x5a, 0x03, 0x70, 0x62, 0x2f, 0x62, 0x06, 0x70, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x61,
0x72, 0x6f, 0x74, 0x6f, 0x33, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x52, 0x61, 0x6e, 0x6b, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x53,
0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72,
0x65, 0x42, 0x05, 0x5a, 0x03, 0x70, 0x62, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

13
service/main/redis/redis.go
Unescape Escape View File

@ -54,9 +54,9 @@ func GetRank(appId string, topCount int32) ([]*RankInfo, error) {
return rankList, nil return rankList, nil
} }
func SetAudience(data *pb.Audience) { func SetAudience(appId string, data *pb.Audience) {
ctx := context.Background() ctx := context.Background()
key := fmt.Sprintf("UserData_%s", data.OpenId) key := fmt.Sprintf("UserData_%s_%s", appId, data.OpenId)
exist, err := client.Exists(ctx, key).Result() exist, err := client.Exists(ctx, key).Result()
if err != nil { if err != nil {
return return
@ -74,7 +74,7 @@ func SetAudience(data *pb.Audience) {
func GetAudience(appId string, openId string) *pb.Audience { func GetAudience(appId string, openId string) *pb.Audience {
ctx := context.Background() ctx := context.Background()
key := fmt.Sprintf("UserData_%s", openId) key := fmt.Sprintf("UserData_%s_%s", appId, openId)
result, err := client.Get(ctx, key).Result() result, err := client.Get(ctx, key).Result()
if err != nil { if err != nil {
return nil return nil
@ -84,13 +84,6 @@ func GetAudience(appId string, openId string) *pb.Audience {
if err != nil { if err != nil {
return nil return nil
} }
scoreKey := fmt.Sprintf("Score_%s", appId)
cmd := client.HGet(ctx, scoreKey, openId)
result, err = cmd.Result()
if err == nil {
}
return data return data
} }

2
service/main/user/user.go
Unescape Escape View File

@ -92,7 +92,7 @@ func (s *User) OnRecvPush(data string) {
return return
} }
if _, ok := s.audienceSet.Load(msg.OpenId); !ok { if _, ok := s.audienceSet.Load(msg.OpenId); !ok {
audienceData := redis.GetAudience(msg.OpenId) audienceData := redis.GetAudience(s.appId, msg.OpenId)
if audienceData != nil { if audienceData != nil {
s.audienceSet.Store(msg.OpenId, 1) s.audienceSet.Store(msg.OpenId, 1)
audienceMsg := &pb.NotifyNewAudience{ audienceMsg := &pb.NotifyNewAudience{

Write Preview
Loading…
Cancel
Save