haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

Merge branch '8.0' into master

Browse Source
This commit is contained in:
lian
2021-05-20 10:59:14 +08:00
parent ba4d1d95e5 390672c0e9
commit 38aa812fc9
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -2,7 +2,7 @@ Django==2.2.14
future
captcha
django-statici18n
django-webpack_loader
django-webpack_loader==0.7.0
gunicorn
mysqlclient
django-picklefield==2.1.1

2
seahub/onlyoffice/utils.py
View File

@@ -107,7 +107,7 @@ def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='',
'can_download': can_download,
'username': username,
'onlyoffice_force_save': ONLYOFFICE_FORCE_SAVE,
'enable_watermark': ENABLE_WATERMARK and not can_edit,
'enable_watermark': ENABLE_WATERMARK,
}
if ONLYOFFICE_JWT_SECRET:

2
seahub/templates/view_file_wopi.html
View File

@@ -45,7 +45,9 @@
document.getElementById('office_form').submit();
document.getElementById('office_frame').className = '';
</script>
{% if enable_watermark %}
<script type="text/javascript" src="{{ MEDIA_URL }}js/watermark.js"></script>
<script type="text/javascript">{% include "snippets/add_watermark.html" %}</script>
{% endif %}
</body>
</html>

6
seahub/utils/__init__.py
View File

@@ -1127,7 +1127,7 @@ if HAS_OFFICE_CONVERTER:
def add_office_convert_task(file_id, doctype, raw_path):
payload = {'exp': int(time.time()) + 300, }
token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256')
headers = {"Authorization": "Token %s" % token.decode()}
headers = {"Authorization": "Token %s" % token}
params = {'file_id': file_id, 'doctype': doctype, 'raw_path': raw_path}
url = urljoin(OFFICE_CONVERTOR_ROOT, '/add-task')
requests.get(url, params, headers=headers)
@@ -1136,7 +1136,7 @@ if HAS_OFFICE_CONVERTER:
def query_office_convert_status(file_id, doctype):
payload = {'exp': int(time.time()) + 300, }
token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256')
headers = {"Authorization": "Token %s" % token.decode()}
headers = {"Authorization": "Token %s" % token}
params = {'file_id': file_id, 'doctype': doctype}
url = urljoin(OFFICE_CONVERTOR_ROOT, '/query-status')
d = requests.get(url, params, headers=headers)
@@ -1164,7 +1164,7 @@ if HAS_OFFICE_CONVERTER:
url = urljoin(OFFICE_CONVERTOR_ROOT, '/get-converted-page')
payload = {'exp': int(time.time()) + 300, }
token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256')
headers = {"Authorization": "Token %s" % token.decode()}
headers = {"Authorization": "Token %s" % token}
params = {'static_filename': static_filename, 'file_id': file_id}
try:
ret = requests.get(url, params, headers=headers)