Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
7cfe55f66b
@ -4,7 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"go_dreamfactory/comm"
|
"go_dreamfactory/comm"
|
||||||
"go_dreamfactory/lego/core"
|
"go_dreamfactory/lego/core"
|
||||||
"go_dreamfactory/lego/sys/log"
|
|
||||||
"go_dreamfactory/lego/sys/redis"
|
"go_dreamfactory/lego/sys/redis"
|
||||||
"go_dreamfactory/modules"
|
"go_dreamfactory/modules"
|
||||||
"go_dreamfactory/pb"
|
"go_dreamfactory/pb"
|
||||||
@ -48,7 +47,7 @@ func (this *ModelFriend) GetFriend(uid string) *pb.DBFriend {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.Error("未获得好友数据", log.Fields{"uid": uid})
|
// log.Error("未获得好友数据", log.Fields{"uid": uid})
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
friend := &pb.DBFriend{}
|
friend := &pb.DBFriend{}
|
||||||
|
@ -122,7 +122,7 @@ func (this *Friend) RpcFriendDB(ctx context.Context, req *pb.RPCGeneralReqA1, re
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Error("未获得好友数据", log.Fields{"uid": req.Param1, "err": err})
|
// log.Error("未获得好友数据", log.Fields{"uid": req.Param1, "err": err})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*reply = *friend
|
*reply = *friend
|
||||||
|
Loading…
Reference in New Issue
Block a user