|
@@ -4,7 +4,7 @@ from .__load__ import *
|
|
class Convert(object):
|
|
class Convert(object):
|
|
|
|
|
|
def getKey(self, site_key, file):
|
|
def getKey(self, site_key, file):
|
|
- return Demeter.md5(str(site_key) + '_' + file)
|
|
|
|
|
|
+ return Demeter.sha1(str(site_key) + '_' + file)
|
|
|
|
|
|
def get(self, site, site_key, file):
|
|
def get(self, site, site_key, file):
|
|
convert = Demeter.model('convert')
|
|
convert = Demeter.model('convert')
|
|
@@ -231,24 +231,29 @@ class Convert(object):
|
|
api = site['api']
|
|
api = site['api']
|
|
key = site['key']
|
|
key = site['key']
|
|
token = site['token']
|
|
token = site['token']
|
|
- file = info['file']
|
|
|
|
|
|
+ file = info['key']
|
|
file_id = info['file_id']
|
|
file_id = info['file_id']
|
|
|
|
+ uid = info['uid']
|
|
|
|
+ file_size = info['file_size']
|
|
|
|
|
|
- url = info['url']
|
|
|
|
|
|
+ url = 'main/view'
|
|
page = info['page']
|
|
page = info['page']
|
|
ext = info['ext']
|
|
ext = info['ext']
|
|
|
|
|
|
nonce = Demeter.time()
|
|
nonce = Demeter.time()
|
|
- sign = Demeter.md5(key + '&' + token + '&' + nonce + '&' + file_id + '&' + url);
|
|
|
|
|
|
+ sign = Demeter.sha1(key + '&' + token + '&' + nonce + '&' + file + '&' + uid);
|
|
|
|
|
|
param = {}
|
|
param = {}
|
|
param['signature'] = sign
|
|
param['signature'] = sign
|
|
param['key'] = key
|
|
param['key'] = key
|
|
param['nonce'] = nonce
|
|
param['nonce'] = nonce
|
|
|
|
+ param['file'] = file
|
|
param['file_id'] = file_id
|
|
param['file_id'] = file_id
|
|
|
|
+ param['uid'] = uid
|
|
param['url'] = url
|
|
param['url'] = url
|
|
param['page'] = page
|
|
param['page'] = page
|
|
param['ext'] = ext
|
|
param['ext'] = ext
|
|
|
|
+ param['file_size'] = file_size
|
|
|
|
|
|
Demeter.curl(api, param, 'post')
|
|
Demeter.curl(api, param, 'post')
|
|
|
|
|