merge v3dev into main (#504)

* statistics user register * refactor: router change * minio init * UserRegisterCount * push use local conn * refactor: user pb update * remove online push close grpc conn * refactor: user pb update * refactor:pb file * msgs statistics * msgs statistics * revoke userID * refactor: errcode update * active user * active user * active user * refactor: errcode update * feat: conn update token * active user * active user * feat: conn update token * active user * feat: conn update token * feat: conn update token * feat: conn update token * add tx_oss cos * active user * active user * group create * group create * feat: group notification show to conversation * feat: group notification show to conversation * group active * user active * sendNotificationWithName * withname * privateChat * a2r call option * grpc with detail return error * change log error * chain unary interceptor * api nil slice map * fix sync has read * fix: text update * fix: update add model * set conversations update * set privateChat * fix: content update * remove unuse rpc * msgDestruct * cron use rpc mw * set IsMsgDestruct * msg destruct * msgDestruct * s3 minio, cos, oss support * feat: add implement of GetUsersOnlineStatus, #472 (#477) * s3 minio, cos, oss support * s3 route * remove extendMsg code * s3 route * remove unuse code * s3 pb * s3 pb * s3 pb * s3 presigned put * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * Update .gitignore (#482) * s3 debug log * s3 debug log * cron add log and fix cron * add log * cron * s3 config * fix kick user bug * s3 cos * add kick log * s3 cos test * s3 cos test * s3 cos test * kick user log * kickuserlog * s3 cos copy * s3 cos copy * s3 url * s3 url * s3 AccessURL * log * s3 InitiateMultipartUpload add ExpireTime --------- Co-authored-by: withchao <993506633@qq.com> Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com> Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com> Co-authored-by: withchao <48119764+withchao@users.noreply.github.com> Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>
2026-05-02 08:05:58 +08:00 · 2023-07-12 15:31:24 +08:00
parent 5467887e1c
commit 454bf97e3f
123 changed files with 7377 additions and 10288 deletions
@@ -0,0 +1,76 @@
+package controller
+
+import "C"
+import (
+	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/cont"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	"path/filepath"
+	"time"
+)
+
+type S3Database interface {
+	PartLimit() *s3.PartLimit
+	PartSize(ctx context.Context, size int64) (int64, error)
+	AuthSign(ctx context.Context, uploadID string, partNumbers []int) (*s3.AuthSignResult, error)
+	InitiateMultipartUpload(ctx context.Context, hash string, size int64, expire time.Duration, maxParts int) (*cont.InitiateUploadResult, error)
+	CompleteMultipartUpload(ctx context.Context, uploadID string, parts []string) (*cont.UploadResult, error)
+	AccessURL(ctx context.Context, name string, expire time.Duration) (time.Time, string, error)
+	SetObject(ctx context.Context, info *relation.ObjectModel) error
+}
+
+func NewS3Database(s3 s3.Interface, obj relation.ObjectInfoModelInterface) S3Database {
+	return &s3Database{
+		s3:  cont.New(s3),
+		obj: obj,
+	}
+}
+
+type s3Database struct {
+	s3  *cont.Controller
+	obj relation.ObjectInfoModelInterface
+}
+
+func (s *s3Database) PartSize(ctx context.Context, size int64) (int64, error) {
+	return s.s3.PartSize(ctx, size)
+}
+
+func (s *s3Database) PartLimit() *s3.PartLimit {
+	return s.s3.PartLimit()
+}
+
+func (s *s3Database) AuthSign(ctx context.Context, uploadID string, partNumbers []int) (*s3.AuthSignResult, error) {
+	return s.s3.AuthSign(ctx, uploadID, partNumbers)
+}
+
+func (s *s3Database) InitiateMultipartUpload(ctx context.Context, hash string, size int64, expire time.Duration, maxParts int) (*cont.InitiateUploadResult, error) {
+	return s.s3.InitiateUpload(ctx, hash, size, expire, maxParts)
+}
+
+func (s *s3Database) CompleteMultipartUpload(ctx context.Context, uploadID string, parts []string) (*cont.UploadResult, error) {
+	return s.s3.CompleteUpload(ctx, uploadID, parts)
+}
+
+func (s *s3Database) SetObject(ctx context.Context, info *relation.ObjectModel) error {
+	return s.obj.SetObject(ctx, info)
+}
+
+func (s *s3Database) AccessURL(ctx context.Context, name string, expire time.Duration) (time.Time, string, error) {
+	obj, err := s.obj.Take(ctx, name)
+	if err != nil {
+		return time.Time{}, "", err
+	}
+	opt := &s3.AccessURLOption{
+		ContentType: obj.ContentType,
+	}
+	if filename := filepath.Base(obj.Name); filename != "" {
+		opt.ContentDisposition = `attachment; filename=` + filename
+	}
+	expireTime := time.Now().Add(expire)
+	rawURL, err := s.s3.AccessURL(ctx, obj.Key, expire, opt)
+	if err != nil {
+		return time.Time{}, "", err
+	}
+	return expireTime, rawURL, nil
+}