refractor the code of create anti leech url

Author: jemygraw

examples/cdn_manager.py

@@ -89,14 +89,18 @@ def print_result(result):
 print('构建时间戳防盗链')
 
 # 时间戳防盗链密钥，后台获取
-encrypt_key = '...'
+encrypt_key = 'xxx'
 
 # 原始文件名，必须是utf8编码
 test_file_name1 = '基本概括.mp4'
 test_file_name2 = '2017/01/07/test.png'
 
 # 查询参数列表
-query_string = 'name=七牛&year=2017'
+query_string_dict = {
+    'name': '七牛',
+    'year': 2017,
+    '年龄': 28,
+}
 
 # 带访问协议的域名
 host = 'http://video.example.com'
@@ -105,17 +109,17 @@ def print_result(result):
 deadline = int(time.time()) + 3600
 
 # 带查询参数，中文文件名
-signed_url1 = create_timestamp_anti_leech_url(host, test_file_name1, query_string, encrypt_key, deadline)
+signed_url1 = create_timestamp_anti_leech_url(host, test_file_name1, query_string_dict, encrypt_key, deadline)
 print(signed_url1)
 
 # 带查询参数，英文文件名
-signed_url2 = create_timestamp_anti_leech_url(host, test_file_name2, query_string, encrypt_key, deadline)
+signed_url2 = create_timestamp_anti_leech_url(host, test_file_name2, query_string_dict, encrypt_key, deadline)
 print(signed_url2)
 
 # 不带查询参数，中文文件名
-signed_url3 = create_timestamp_anti_leech_url(host, test_file_name1, '', encrypt_key, deadline)
+signed_url3 = create_timestamp_anti_leech_url(host, test_file_name1, None, encrypt_key, deadline)
 print(signed_url3)
 
 # 不带查询参数，英文文件名
-signed_url4 = create_timestamp_anti_leech_url(host, test_file_name2, '', encrypt_key, deadline)
+signed_url4 = create_timestamp_anti_leech_url(host, test_file_name2, None, encrypt_key, deadline)
 print(signed_url4)

qiniu/services/cdn/manager.py

@@ -162,22 +162,26 @@ def __post(self, url, data=None):
         return http._post_with_auth_and_headers(url, data, self.auth, headers)
 
 
-def create_timestamp_anti_leech_url(host, file_name, query_string, encrypt_key, deadline):
+def create_timestamp_anti_leech_url(host, file_name, query_string_dict, encrypt_key, deadline):
     """
     创建时间戳防盗链
 
     Args:
-        host:         带访问协议的域名
-        file_name:    原始文件名，不需要urlencode
-        query_string: 查询参数，不需要urlencode
-        encrypt_key:  时间戳防盗链密钥
-        deadline:     链接有效期时间戳（以秒为单位）
+        host:              带访问协议的域名
+        file_name:         原始文件名，不需要urlencode
+        query_string_dict: 查询参数，不需要urlencode
+        encrypt_key:       时间戳防盗链密钥
+        deadline:          链接有效期时间戳（以秒为单位）
 
     Returns:
         带时间戳防盗链鉴权访问链接
     """
-    if len(query_string) > 0:
-        url_to_sign = '{0}/{1}?{2}'.format(host, urlencode(file_name), urlencode(query_string))
+    if query_string_dict is not None and len(query_string_dict) > 0:
+        query_string_items = []
+        for k, v in query_string_dict.items():
+            query_string_items.append('{0}={1}'.format(urlencode(str(k)), urlencode(str(v))))
+        query_string = '&'.join(query_string_items)
+        url_to_sign = '{0}/{1}?{2}'.format(host, urlencode(file_name), query_string)
     else:
         url_to_sign = '{0}/{1}'.format(host, urlencode(file_name))
 
@@ -186,7 +190,7 @@ def create_timestamp_anti_leech_url(host, file_name, query_string, encrypt_key,
     str_to_sign = '{0}{1}{2}'.format(encrypt_key, path, expire_hex).encode()
     sign_str = hashlib.md5(str_to_sign).hexdigest()
 
-    if len(query_string) > 0:
+    if query_string_dict is not None and len(query_string_dict) > 0:
         signed_url = '{0}&sign={1}&t={2}'.format(url_to_sign, sign_str, expire_hex)
     else:
         signed_url = '{0}?sign={1}&t={2}'.format(url_to_sign, sign_str, expire_hex)