refactor: extract hasHttpScheme method for URL scheme checks in Client

Signed-off-by: tbxark <[email protected]>

Author: TBXark

storage/qiniu/qiniu.go

@@ -47,11 +47,15 @@ func NewClient(config *Config) *Client {
 	}
 }
 
+func (n *Client) hasHttpScheme(uri string) bool {
+	return strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://")
+}
+
 func (n *Client) GenerateURL(key string) string {
 	if key == "" {
 		return ""
 	}
-	if strings.HasPrefix(key, "http://") || strings.HasPrefix(key, "https://") {
+	if n.hasHttpScheme(key) {
 		return key
 	}
 	buf := strings.Builder{}
@@ -86,7 +90,7 @@ func (n *Client) ExtractKeyFromURLWithMode(uri string, strict bool) (string, err
 		return "", nil
 	}
 	// 不是 http 或者 https 开头的直接返回
-	if !(strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://")) {
+	if !n.hasHttpScheme(uri) {
 		return strings.TrimPrefix(uri, "/"), nil
 	}
 	// 解析URL

storage/s3/s3.go

@@ -44,14 +44,27 @@ func NewClient(config *Config) (*Client, error) {
 	}, nil
 }
 
+func (s *Client) hasHttpScheme(uri string) bool {
+	return strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://")
+}
+
 func (s *Client) GenerateURL(key string) string {
 	if key == "" {
 		return ""
 	}
-	if strings.HasPrefix(key, "http://") || strings.HasPrefix(key, "https://") {
+	if s.hasHttpScheme(key) {
 		return key
 	}
-	return fmt.Sprintf("%s/%s/%s", s.config.Endpoint, s.config.Bucket, strings.TrimPrefix(key, "/"))
+	uri := fmt.Sprintf("%s/%s/%s", s.config.Endpoint, s.config.Bucket, strings.TrimPrefix(key, "/"))
+	if s.hasHttpScheme(uri) {
+		return uri
+	}
+	if s.config.UseSSL {
+		uri = "https://" + uri
+	} else {
+		uri = "http://" + uri
+	}
+	return uri
 }
 
 func (s *Client) GenerateURLs(keys []string) []string {
@@ -76,7 +89,7 @@ func (s *Client) ExtractKeyFromURLWithMode(uri string, strict bool) (string, err
 	if uri == "" {
 		return "", nil
 	}
-	if !(strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://")) {
+	if !s.hasHttpScheme(uri) {
 		return strings.TrimPrefix(uri, "/"), nil
 	}
 	u, err := url.Parse(uri)