update gRPC Implement.

internal/msggateway/hub_server.go

@@ -56,6 +56,7 @@ func (s *Server) Start(ctx context.Context, index int, conf *Config) error {
 }
 
 type Server struct {
+	msggateway.UnimplementedMsgGatewayServer
 	rpcPort        int
 	LongConnServer LongConnServer
 	config         *Config

internal/push/push.go

@@ -14,6 +14,7 @@ import (
 )
 
 type pushServer struct {
+	pbpush.UnimplementedPushMsgServiceServer
 	database      controller.PushDatabase
 	disCov        discovery.SvcDiscoveryRegistry
 	offlinePusher offlinepush.OfflinePusher

internal/rpc/auth/auth.go

@@ -40,6 +40,7 @@ import (
 )
 
 type authServer struct {
+	pbauth.UnimplementedAuthServer
 	authDatabase   controller.AuthDatabase
 	userRpcClient  *rpcclient.UserRpcClient
 	RegisterCenter discovery.SvcDiscoveryRegistry

internal/rpc/conversation/conversation.go

@@ -43,6 +43,7 @@ import (
 )
 
 type conversationServer struct {
+	pbconversation.UnimplementedConversationServer
 	msgRpcClient         *rpcclient.MessageRpcClient
 	user                 *rpcclient.UserRpcClient
 	groupRpcClient       *rpcclient.GroupRpcClient

internal/rpc/group/group.go

@@ -57,6 +57,7 @@ import (
 )
 
 type groupServer struct {
+	pbgroup.UnimplementedGroupServer
 	db                    controller.GroupDatabase
 	user                  rpcclient.UserRpcClient
 	notification          *GroupNotificationSender

internal/rpc/msg/server.go

@@ -55,6 +55,7 @@ type (
 		msgNotificationSender  *MsgNotificationSender           // RPC client for sending msg notifications.
 		config                 *Config                          // Global configuration settings.
 		webhookClient          *webhook.Client
+		msg.UnimplementedMsgServer
 	}
 
 	Config struct {

internal/rpc/relation/friend.go

@@ -43,6 +43,7 @@ import (
 )
 
 type friendServer struct {
+	relation.UnimplementedFriendServer
 	db                    controller.FriendDatabase
 	blackDatabase         controller.BlackDatabase
 	userRpcClient         *rpcclient.UserRpcClient

internal/rpc/third/s3.go

@@ -290,20 +290,25 @@ func (t *thirdServer) apiAddress(prefix, name string) string {
 func (t *thirdServer) DeleteOutdatedData(ctx context.Context, req *third.DeleteOutdatedDataReq) (*third.DeleteOutdatedDataResp, error) {
 	var conf config.Third
 	expireTime := time.UnixMilli(req.ExpireTime)
-	var deltotal int
-	excuteNum := 5
 
 	findPagination := &sdkws.RequestPagination{
 		PageNumber: 1,
-		ShowNumber: 1000,
+		ShowNumber: 500,
 	}
 
-	for i := 0; i < excuteNum; i++ {
+	log.ZDebug(ctx, "del type is ", "needDelType", req.ObjectGroup)
+
 	// Find all expired data in S3 database
-		total, models, err := t.s3dataBase.FindByExpires(ctx, expireTime, findPagination)
+	total, models, err := t.s3dataBase.FindNeedDeleteObjectByDB(ctx, expireTime, req.ObjectGroup, findPagination)
 	if err != nil && errs.Unwrap(err) != mongo.ErrNoDocuments {
 		return nil, errs.Wrap(err)
 	}
+
+	if total == 0 {
+		log.ZDebug(ctx, "Not have OutdatedData", "delete Total", total)
+		return &third.DeleteOutdatedDataResp{Count: int32(total)}, nil
+	}
+
 	needDelObjectKeys := make([]string, len(models))
 	for _, model := range models {
 		needDelObjectKeys = append(needDelObjectKeys, model.Key)
@@ -321,9 +326,9 @@ func (t *thirdServer) DeleteOutdatedData(ctx context.Context, req *third.DeleteO
 
 		// check keyModels, if all keyModels.
 		needDelKey := true // Default can delete
-			for _, model := range keyModels {
+		for _, keymodel := range keyModels {
 			// If group is empty or CreateTime is after expireTime, can't delete this key
-				if model.Group == "" || model.CreateTime.After(expireTime) {
+			if keymodel.Group == "" || keymodel.CreateTime.After(expireTime) {
 				needDelKey = false
 				break
 			}
@@ -331,15 +336,30 @@ func (t *thirdServer) DeleteOutdatedData(ctx context.Context, req *third.DeleteO
 
 		// If this object is not referenced by not expire data, delete it
 		if needDelKey && t.minio != nil {
+			// If have a thumbnail, delete it
 			thumbnailKey, _ := t.getMinioImageThumbnailKey(ctx, key)
-
-				t.s3dataBase.DeleteObject(ctx, thumbnailKey)
-				t.s3dataBase.DeleteObject(ctx, key)
-
-				t.s3dataBase.DelS3Key(ctx, conf.Object.Enable, key)
+			if thumbnailKey != "" {
+				err := t.s3dataBase.DeleteObject(ctx, thumbnailKey)
+				if err != nil {
+					log.ZWarn(ctx, "Delete thumbnail object is error:", errs.Wrap(err), "thumbnailKey", thumbnailKey)
 				}
 			}
 
+			// Delete object
+			err = t.s3dataBase.DeleteObject(ctx, key)
+			if err != nil {
+				log.ZWarn(ctx, "Delete object is error", errs.Wrap(err), "object key", key)
+			}
+
+			// Delete cache key
+			err = t.s3dataBase.DelS3Key(ctx, conf.Object.Enable, key)
+			if err != nil {
+				log.ZWarn(ctx, "Delete cache key is error:", errs.Wrap(err), "cache S3 key:", key)
+			}
+		}
+	}
+
+	// handle delete data in S3 database
 	for _, model := range models {
 		// Delete all expired data row in S3 database
 		err := t.s3dataBase.DeleteSpecifiedData(ctx, model.Engine, model.Name)
@@ -348,16 +368,9 @@ func (t *thirdServer) DeleteOutdatedData(ctx context.Context, req *third.DeleteO
 		}
 	}
 
-		if total < int64(findPagination.ShowNumber) {
-			break
-		}
+	log.ZDebug(ctx, "DeleteOutdatedData", "delete Total", total)
 
-		deltotal += int(total)
-	}
-
-	log.ZDebug(ctx, "DeleteOutdatedData", "delete Total", deltotal)
-
-	return &third.DeleteOutdatedDataResp{}, nil
+	return &third.DeleteOutdatedDataResp{Count: int32(total)}, nil
 }
 
 type FormDataMate struct {

internal/rpc/third/third.go

@@ -38,6 +38,7 @@ import (
 )
 
 type thirdServer struct {
+	third.UnimplementedThirdServer
 	thirdDatabase controller.ThirdDatabase
 	s3dataBase    controller.S3Database
 	userRpcClient rpcclient.UserRpcClient

internal/rpc/user/user.go

@@ -52,6 +52,7 @@ import (
 )
 
 type userServer struct {
+	pbuser.UnimplementedUserServer
 	online                   cache.OnlineCache
 	db                       controller.UserDatabase
 	friendNotificationSender *relation.FriendNotificationSender