diff --git a/pkgs/mq/mq_test.go b/pkgs/mq/mq_test.go index 209bd33..45357a1 100644 --- a/pkgs/mq/mq_test.go +++ b/pkgs/mq/mq_test.go @@ -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) diff --git a/pkgs/mq/server.go b/pkgs/mq/server.go index 614b73f..01fcdb8 100644 --- a/pkgs/mq/server.go +++ b/pkgs/mq/server.go @@ -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) diff --git a/sdks/cloudstorage/client.go b/sdks/cloudstorage/client.go deleted file mode 100644 index 878b474..0000000 --- a/sdks/cloudstorage/client.go +++ /dev/null @@ -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) -} diff --git a/sdks/cloudstorage/models.go b/sdks/cloudstorage/models.go deleted file mode 100644 index ecba552..0000000 --- a/sdks/cloudstorage/models.go +++ /dev/null @@ -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" -) diff --git a/sdks/cloudstorage/obs.go b/sdks/cloudstorage/obs.go deleted file mode 100644 index 7f38e2d..0000000 --- a/sdks/cloudstorage/obs.go +++ /dev/null @@ -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() { - -} diff --git a/sdks/cloudstorage/oss.go b/sdks/cloudstorage/oss.go deleted file mode 100644 index cfe5e14..0000000 --- a/sdks/cloudstorage/oss.go +++ /dev/null @@ -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 - -}