s3

pkg/common/db/controller/storage.go

@@ -2,9 +2,11 @@ package controller
 
 import "C"
 import (
+	"OpenIM/pkg/common/config"
 	"OpenIM/pkg/common/db/obj"
 	"OpenIM/pkg/common/db/table/relation"
 	"OpenIM/pkg/common/tracelog"
+	"OpenIM/pkg/errs"
 	"OpenIM/pkg/proto/third"
 	"OpenIM/pkg/utils"
 	"context"
@@ -22,6 +24,7 @@ type S3Database interface {
 	ApplyPut(ctx context.Context, req *third.ApplyPutReq) (*third.ApplyPutResp, error)
 	GetPut(ctx context.Context, req *third.GetPutReq) (*third.GetPutResp, error)
 	ConfirmPut(ctx context.Context, req *third.ConfirmPutReq) (*third.ConfirmPutResp, error)
+	GetUrl(ctx context.Context, req *third.GetUrlReq) (*third.GetUrlResp, error)
 	CleanExpirationObject(ctx context.Context, t time.Time)
 }
 
@@ -82,10 +85,12 @@ func (c *s3Database) CheckHash(hash string) error {
 }
 
 func (c *s3Database) urlName(name string) string {
-	if name[0] != '/' {
-		name = "/" + name
-	}
-	return "http://127.0.0.1:8080" + name
+	//if name[0] != '/' {
+	//	name = "/" + name
+	//}
+	//config.Config.Credential.ObjectURL + name
+	//return "http://127.0.0.1:8080" + name
+	return config.Config.Credential.ObjectURL + name
 }
 
 func (c *s3Database) UUID() string {
@@ -356,6 +361,25 @@ func (c *s3Database) ConfirmPut(ctx context.Context, req *third.ConfirmPutReq) (
 	}, nil
 }
 
+func (c *s3Database) GetUrl(ctx context.Context, req *third.GetUrlReq) (*third.GetUrlResp, error) {
+	info, err := c.info.Take(ctx, req.Name)
+	if err != nil {
+		return nil, err
+	}
+	if info.ExpirationTime != nil && info.ExpirationTime.Before(time.Now()) {
+		return nil, errs.ErrRecordNotFound.Wrap("object expired")
+	}
+	hash, err := c.hash.Take(ctx, info.Hash, c.obj.Name())
+	if err != nil {
+		return nil, err
+	}
+	return &third.GetUrlResp{
+		Url:  c.obj.GetURL(hash.Bucket, hash.Name),
+		Size: hash.Size,
+		Hash: hash.Hash,
+	}, nil
+}
+
 func (c *s3Database) CleanExpirationObject(ctx context.Context, t time.Time) {
 	// 清理上传产生的临时文件
 	c.cleanPutTemp(ctx, t, 10)

pkg/common/db/obj/minio.go

@@ -1,12 +1,15 @@
 package obj
 
 import (
+	"OpenIM/pkg/common/config"
 	"context"
 	"errors"
 	"fmt"
 	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/minio/minio-go/v7/pkg/s3utils"
 	"net/http"
+	"net/url"
 	"time"
 )
 
@@ -15,12 +18,29 @@ func NewMinioClient() {
 }
 
 func NewMinioInterface() (Interface, error) {
-	//client, err := minio.New("127.0.0.1:9000", &minio.Options{
-	//	Creds:  credentials.NewStaticV4("minioadmin", "minioadmin", ""),
-	//	Secure: false,
-	//})
+	if true {
+		return &minioImpl{}, nil // todo
+	}
+	conf := config.Config.Object.Minio
+	u, err := url.Parse(conf.Endpoint)
+	if err != nil {
+		return nil, fmt.Errorf("minio endpoint parse %w", err)
+	}
+	if u.Scheme != "http" && u.Scheme != "https" {
+		return nil, fmt.Errorf("invalid minio endpoint scheme %s", u.Scheme)
+	}
+	client, err := minio.New(u.Host, &minio.Options{
+		Creds:  credentials.NewStaticV4(conf.AccessKeyID, conf.SecretAccessKey, ""),
+		Secure: false,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("minio new client %w", err)
+	}
 	// todo 初始化连接和桶
-	return &minioImpl{}, nil
+	return &minioImpl{
+		client: client,
+		//tempBucket: conf.Bucket,
+	}, nil
 }
 
 type minioImpl struct {