diff --git a/internal/logic/domain/friend/friend_service.go b/internal/logic/domain/friend/friend_service.go index aa23610..ab79ce1 100644 --- a/internal/logic/domain/friend/friend_service.go +++ b/internal/logic/domain/friend/friend_service.go @@ -131,13 +131,10 @@ func (*friendService) AgreeAddFriend(ctx context.Context, userId, friendId int64 return err } - newFriend, err := FriendRepo.Get(friendId, userId) + newFriend, err := FriendRepo.Get(userId, friendId) if newFriend != nil && newFriend.Status != FriendStatusAgree { newFriend.Status = FriendStatusAgree err = FriendRepo.Save(newFriend) - if err != nil { - return err - } } else { now := time.Now() err = FriendRepo.Save(&Friend{ diff --git a/test/tcp_conn/main.go b/test/tcp_conn/main.go index 427eb68..2ac287d 100644 --- a/test/tcp_conn/main.go +++ b/test/tcp_conn/main.go @@ -67,7 +67,7 @@ func (c *TcpClient) Output(pt pb.PackageType, requestId int64, message proto.Mes func (c *TcpClient) Start() { //connect, err := net.Dial("tcp", "111.229.238.28:8080") - connect, err := net.Dial("tcp", "im-tcp-connect.zhiyingos.com:8001") + connect, err := net.Dial("tcp", "im-tcp-connect.izhyin.com:8001") if err != nil { log.Println(err) return @@ -87,7 +87,7 @@ func (c *TcpClient) SignIn() { signIn := pb.SignInInput{ UserId: c.UserId, DeviceId: c.DeviceId, - Token: "HBMHCHQOVQDTPUVSBBCDEWGGOVPKFRAAZGQXKJNA", + Token: "ZDNMWLHJYMDYHKBWESEVHQWXFPCLAGMIUWFOHWNI", } c.Output(pb.PackageType_PT_SIGN_IN, time.Now().UnixNano(), &signIn) }