diff --git a/pkg/common/db/relation/friend_model.go b/pkg/common/db/relation/friend_model.go index e65c21250..f06bd945a 100644 --- a/pkg/common/db/relation/friend_model.go +++ b/pkg/common/db/relation/friend_model.go @@ -2,6 +2,7 @@ package relation import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "gorm.io/gorm" @@ -77,7 +78,7 @@ func (f *FriendGorm) FindOwnerFriends(ctx context.Context, ownerUserID string, p if err != nil { return nil, 0, utils.Wrap(err, "") } - err = utils.Wrap(f.db(ctx).Where("owner_user_id = ? ", ownerUserID).Limit(int(showNumber)).Offset(int(pageNumber*showNumber)).Find(&friends).Error, "") + err = utils.Wrap(f.db(ctx).Where("owner_user_id = ? ", ownerUserID).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Find(&friends).Error, "") return } @@ -87,7 +88,7 @@ func (f *FriendGorm) FindInWhoseFriends(ctx context.Context, friendUserID string if err != nil { return nil, 0, utils.Wrap(err, "") } - err = utils.Wrap(f.db(ctx).Where("friend_user_id = ? ", friendUserID).Limit(int(showNumber)).Offset(int(pageNumber*showNumber)).Find(&friends).Error, "") + err = utils.Wrap(f.db(ctx).Where("friend_user_id = ? ", friendUserID).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Find(&friends).Error, "") return } diff --git a/pkg/common/db/relation/user_model.go b/pkg/common/db/relation/user_model.go index e147a91f0..0acef2b0d 100644 --- a/pkg/common/db/relation/user_model.go +++ b/pkg/common/db/relation/user_model.go @@ -50,7 +50,7 @@ func (u *UserGorm) Page(ctx context.Context, pageNumber, showNumber int32) (user if err != nil { return } - err = utils.Wrap(u.db(ctx).Limit(int(showNumber)).Offset(int(pageNumber*showNumber)).Find(&users).Order("create_time DESC").Error, "") + err = utils.Wrap(u.db(ctx).Limit(int(showNumber)).Offset(int((pageNumber-1)*showNumber)).Find(&users).Order("create_time DESC").Error, "") return } diff --git a/pkg/discoveryregistry/dns.go b/pkg/discoveryregistry/dns.go index e049d0088..bf25b6568 100644 --- a/pkg/discoveryregistry/dns.go +++ b/pkg/discoveryregistry/dns.go @@ -34,7 +34,7 @@ func (d DnsDiscoveryRegistry) GetConns(serviceName string, opts ...grpc.DialOpti for _, subset := range endpoints.Subsets { for _, address := range subset.Addresses { for _, port := range subset.Ports { - conn, err := grpc.Dial(net.JoinHostPort(address.IP, string(port.Port)), opts...) + conn, err := grpc.Dial(net.JoinHostPort(address.IP, string(port.Port)), append(d.opts, opts...)...) if err != nil { return nil, err } @@ -46,7 +46,7 @@ func (d DnsDiscoveryRegistry) GetConns(serviceName string, opts ...grpc.DialOpti } func (d DnsDiscoveryRegistry) GetConn(serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { - return grpc.Dial(fmt.Sprintf("%s.%s.svc.cluster.local", serviceName, d.namespace), opts...) + return grpc.Dial(fmt.Sprintf("%s.%s.svc.cluster.local", serviceName, d.namespace), append(d.opts, opts...)...) } func (d *DnsDiscoveryRegistry) AddOption(opts ...grpc.DialOption) {