Merge pull request #114 from cagegong/key_with_query

longbai · longbai · commit c4d68c240133 · 2014-08-28T15:43:42.000+08:00
support key with query
diff --git a/qiniu/rs.js b/qiniu/rs.js
@@ -230,8 +230,8 @@ GetPolicy.prototype.makeRequest = function(baseUrl, mac) {
 
   return baseUrl + '&token=' + downloadToken;
 }
-
-function makeBaseUrl(domain, key) {
+// query like '-thumbnail', '?imageMogr2/thumbnail/960x' and so on
+function makeBaseUrl(domain, key, query) {
   key = new Buffer(key);
-  return 'http://' + domain + '/' + querystring.escape(key);
+  return 'http://' + domain + '/' + querystring.escape(key) + (query||'');
 }

Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,8 @@ GetPolicy.prototype.makeRequest = function(baseUrl, mac) {`
`230`	`230`
`231`	`231`	`return baseUrl + '&token=' + downloadToken;`
`232`	`232`	`}`
`233`		`-`
`234`		`-function makeBaseUrl(domain, key) {`
	`233`	`+// query like '-thumbnail', '?imageMogr2/thumbnail/960x' and so on`
	`234`	`+function makeBaseUrl(domain, key, query) {`
`235`	`235`	`key = new Buffer(key);`
`236`		`- return 'http://' + domain + '/' + querystring.escape(key);`
	`236`	`+ return 'http://' + domain + '/' + querystring.escape(key) + (query\|\|'');`
`237`	`237`	`}`