fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>

pkg/rpcclient/msg.go

@@ -17,6 +17,7 @@ package rpcclient
 import (
 	"context"
 	"encoding/json"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/user"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
@@ -264,3 +265,16 @@ func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, s
 func (s *NotificationSender) Notification(ctx context.Context, sendID, recvID string, contentType int32, m proto.Message, opts ...NotificationOptions) error {
 	return s.NotificationWithSesstionType(ctx, sendID, recvID, contentType, s.sessionTypeConf[contentType], m, opts...)
 }
+
+func (m *Message) GetAllUserID(ctx context.Context, req *user.GetAllUserIDReq) (*user.GetAllUserIDResp, error) {
+	conn, err := m.discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImMsgName)
+	if err != nil {
+		panic(err)
+	}
+	client := user.NewUserClient(conn)
+	resp, err := client.GetAllUserID(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

pkg/rpcclient/third.go

@@ -16,6 +16,9 @@ package rpcclient
 
 import (
 	"context"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
+	"net/url"
 
 	"google.golang.org/grpc"
 
@@ -25,9 +28,10 @@ import (
 )
 
 type Third struct {
-	conn   grpc.ClientConnInterface
-	Client third.ThirdClient
-	discov discoveryregistry.SvcDiscoveryRegistry
+	conn        grpc.ClientConnInterface
+	Client      third.ThirdClient
+	discov      discoveryregistry.SvcDiscoveryRegistry
+	MinioClient *minio.Client
 }
 
 func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third {
@@ -36,5 +40,30 @@ func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third {
 		panic(err)
 	}
 	client := third.NewThirdClient(conn)
-	return &Third{discov: discov, Client: client, conn: conn}
+	minioClient, err := minioInit()
+	return &Third{discov: discov, Client: client, conn: conn, MinioClient: minioClient}
+}
+
+func minioInit() (*minio.Client, error) {
+	minioClient := &minio.Client{}
+	var initUrl string
+	initUrl = config.Config.Object.Minio.Endpoint
+	minioUrl, err := url.Parse(initUrl)
+	if err != nil {
+		return nil, err
+	}
+	opts := &minio.Options{
+		Creds: credentials.NewStaticV4(config.Config.Object.Minio.AccessKeyID, config.Config.Object.Minio.SecretAccessKey, ""),
+		//Region: config.Config.Credential.Minio.Location,
+	}
+	if minioUrl.Scheme == "http" {
+		opts.Secure = false
+	} else if minioUrl.Scheme == "https" {
+		opts.Secure = true
+	}
+	minioClient, err = minio.New(minioUrl.Host, opts)
+	if err != nil {
+		return nil, err
+	}
+	return minioClient, nil
 }