Browse Source

调整s3接口目录

gitlink
JeshuaRen 1 year ago
parent
commit
b760aa072f
6 changed files with 2 additions and 121 deletions
  1. +1
    -1
      pkgs/mq/mq_test.go
  2. +1
    -0
      pkgs/mq/server.go
  3. +0
    -25
      sdks/cloudstorage/client.go
  4. +0
    -16
      sdks/cloudstorage/models.go
  5. +0
    -24
      sdks/cloudstorage/obs.go
  6. +0
    -55
      sdks/cloudstorage/oss.go

+ 1
- 1
pkgs/mq/mq_test.go View File

@@ -27,7 +27,7 @@ func Test_ServerClient(t *testing.T) {
})
So(err, ShouldBeNil)

go svr.Serve()
//go svr.Start()

cli, err := NewRabbitMQTransport(rabbitURL, testQueue, "")
So(err, ShouldBeNil)


+ 1
- 0
pkgs/mq/server.go View File

@@ -141,6 +141,7 @@ func (s *RabbitMQServer) Start() *sync2.UnboundChannel[RabbitMQLogEvent] {

time.Sleep(time.Duration(s.config.RetryInterval) * time.Millisecond)
channel = s.openChannel(ch)
continue
}

reqMsg, err := Deserialize(rawReq.Body)


+ 0
- 25
sdks/cloudstorage/client.go View File

@@ -1,25 +0,0 @@
package cloudstorage

import "fmt"

//type ObjectStorageInfo interface {
// NewClient() (ObjectStorageClient, error)
//}

type ObjectStorageClient interface {
InitiateMultipartUpload(objectName string) (string, error)
UploadPart()
CompleteMultipartUpload() (string, error)
AbortMultipartUpload()
Close()
}

func NewObjectStorageClient(info ObjectStorage) (ObjectStorageClient, error) {
switch info.Manufacturer {
case AliCloud:
return NewOSSClient(info), nil
case HuaweiCloud:
return &OBSClient{}, nil
}
return nil, fmt.Errorf("unknown cloud storage manufacturer %s", info.Manufacturer)
}

+ 0
- 16
sdks/cloudstorage/models.go View File

@@ -1,16 +0,0 @@
package cloudstorage

type ObjectStorage struct {
Manufacturer string `json:"manufacturer"`
Region string `json:"region"`
AK string `json:"access_key_id"`
SK string `json:"secret_access_key"`
Endpoint string `json:"endpoint"`
Bucket string `json:"bucket"`
}

const (
HuaweiCloud = "HuaweiCloud"
AliCloud = "AliCloud"
SugonCloud = "SugonCloud"
)

+ 0
- 24
sdks/cloudstorage/obs.go View File

@@ -1,24 +0,0 @@
package cloudstorage

type OBSClient struct {
}

func (c *OBSClient) InitiateMultipartUpload(objectName string) (string, error) {
return "", nil
}

func (c *OBSClient) UploadPart() {

}

func (c *OBSClient) CompleteMultipartUpload() (string, error) {
return "", nil
}

func (c *OBSClient) AbortMultipartUpload() {

}

func (c *OBSClient) Close() {

}

+ 0
- 55
sdks/cloudstorage/oss.go View File

@@ -1,55 +0,0 @@
package cloudstorage

import (
"fmt"
"github.com/aliyun/aliyun-oss-go-sdk/oss"
"log"
)

type OSSClient struct {
client *oss.Client
bucket *oss.Bucket
}

func (c *OSSClient) InitiateMultipartUpload(objectName string) (string, error) {
imur, err := c.bucket.InitiateMultipartUpload(objectName)
if err != nil {
return "", fmt.Errorf("failed to initiate multipart upload: %w", err)
}
return imur.UploadID, nil
}

func NewOSSClient(obs ObjectStorage) *OSSClient {
// 创建OSSClient实例。
client, err := oss.New(obs.Endpoint, obs.AK, obs.SK)
if err != nil {
log.Fatalf("Error: %v", err)
}

bucket, err := client.Bucket(obs.Bucket)
if err != nil {
log.Fatalf("Error: %v", err)
}

return &OSSClient{
client: client,
bucket: bucket,
}
}

func (c *OSSClient) UploadPart() {

}

func (c *OSSClient) CompleteMultipartUpload() (string, error) {
return "", nil
}

func (c *OSSClient) AbortMultipartUpload() {

}

func (c *OSSClient) Close() {
// 关闭client

}

Loading…
Cancel
Save