Merge pull request #24 from ninja-at-work/master

Fix aliyun OSS issues
fog · Mar 11, 2019 · 919dd13 · 919dd13
2 parents 60f9dd7 + 2d3c386
commit 919dd13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/fog/aliyun/requests/storage/get_object_http_url.rb b/lib/fog/aliyun/requests/storage/get_object_http_url.rb
@@ -22,7 +22,7 @@ def get_object_http_url_public(object, expires, options = {})
           location = get_bucket_location(bucket)
 
           if acl == 'private'
-            expires_time = (Time.now.to_i + expires).to_s
+            expires_time = (Time.now.to_i + (expires.nil? ? 0 : expires.to_i)).to_s
             resource = bucket + '/' + object
             signature = sign('GET', expires_time, nil, resource)
             'http://' + bucket + '.' + location + '.aliyuncs.com/' + object +

diff --git a/lib/fog/aliyun/requests/storage/get_object_https_url.rb b/lib/fog/aliyun/requests/storage/get_object_https_url.rb
@@ -22,7 +22,7 @@ def get_object_https_url_public(object, expires, options = {})
           location = get_bucket_location(bucket)
 
           if acl == 'private'
-            expires_time = (Time.now.to_i + expires).to_s
+            expires_time = (Time.now.to_i + (expires.nil? ? 0 : expires.to_i)).to_s
             resource = bucket + '/' + object
             signature = sign('GET', expires_time, nil, resource)
             'https://' + bucket + '.' + location + '.aliyuncs.com/' + object +