From c0bf767293033542766bda2cf1fe1b89a0030c5f Mon Sep 17 00:00:00 2001
From: jiangyong <yong27@163.com>
Date: Tue, 23 Jul 2024 00:00:43 +0800
Subject: [PATCH] qiniu

---
 go.mod           | 16 ++++++++++------
 storage/minio.go | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 42b7212..bc691ea 100644
--- a/go.mod
+++ b/go.mod
@@ -9,17 +9,19 @@ require (
 	github.com/gomodule/redigo v1.8.9
 	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c
 	github.com/minio/minio-go v6.0.14+incompatible
-	github.com/qiniu/go-sdk/v7 v7.19.0
+	github.com/qiniu/go-sdk/v7 v7.21.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/smbrave/goutil v0.0.0-20240105134047-64fe0dfafba2
 	github.com/spf13/cast v1.6.0
 	github.com/tidwall/gjson v1.17.1
 	github.com/wechatpay-apiv3/wechatpay-go v0.2.18
-	golang.org/x/crypto v0.9.0
+	golang.org/x/crypto v0.25.0
 	gorm.io/gorm v1.25.6
 )
 
 require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
@@ -29,12 +31,14 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/matishsiao/goInfo v0.0.0-20210923090445-da2e3fa8d45f // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -45,10 +49,10 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/storage/minio.go b/storage/minio.go
index 7c947e4..420b349 100644
--- a/storage/minio.go
+++ b/storage/minio.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/minio/minio-go"
+	"net/url"
 	"path"
 	"strings"
 	"time"
@@ -27,6 +28,10 @@ type Minio struct {
 }
 
 func NewMinio(cfg *MinioConfig) Storage {
+	if cfg.Endpoint == "" {
+		u, _ := url.Parse(cfg.BaseUrl)
+		cfg.Endpoint = u.Host
+	}
 	return &Minio{
 		config: cfg,
 		inited: false,
@@ -104,7 +109,17 @@ func (s *Minio) List(objectPrefix string) ([]string, error) {
 }
 
 func (s *Minio) Url(objectName string, expire time.Duration) string {
-	return fmt.Sprintf("%s/%s/%s", s.config.BaseUrl, s.config.Bucket, objectName)
+	if err := s.Init(); err != nil {
+		return err.Error()
+	}
+	var params url.Values
+	u, err := s.client.PresignedGetObject(s.config.Bucket, objectName, expire, params)
+	if err != nil {
+		return fmt.Sprintf("%s/%s/%s", s.config.BaseUrl, s.config.Bucket, objectName)
+	}
+
+	return u.String()
+
 }
 
 func (s *Minio) Stat(objectName string) (*ObjectInfo, error) {