39c5df53 by 周伟奇

modify requirements

1 parent ad161125
1 -r github.txt
2
1 aiohttp==3.6.2 3 aiohttp==3.6.2
2 async-timeout==3.0.1 4 async-timeout==3.0.1
3 attrs==19.3.0 5 attrs==19.3.0
4 certifi==2016.2.28 6 certifi==2016.2.28
5 chardet==3.0.4 7 chardet==3.0.4
6 Django==2.1 8 Django==2.1
7 # django-mysqlpool @ https://github.com/smartfile/django-mysqlpool/archive/master.zip
8 djangorestframework==3.9.0 9 djangorestframework==3.9.0
9 djangorestframework-jwt==1.11.0 10 djangorestframework-jwt==1.11.0
10 idna==2.9 11 idna==2.9
...@@ -18,10 +19,7 @@ PyJWT==1.7.1 ...@@ -18,10 +19,7 @@ PyJWT==1.7.1
18 PyMuPDF==1.17.0 19 PyMuPDF==1.17.0
19 PyMySQL==0.9.3 20 PyMySQL==0.9.3
20 pytz==2020.1 21 pytz==2020.1
21 PyYAML==5.3.1
22 redis==3.4.1 22 redis==3.4.1
23 # simple-config @ http://gitlab.situdata.com/zhouweiqi/simple_config/repository/archive.tar.gz?ref=master
24 # situlogger @ http://gitlab.situdata.com/zhouweiqi/situlogger/repository/archive.tar.gz?ref=master
25 six==1.14.0 23 six==1.14.0
26 SQLAlchemy==0.9.10 24 SQLAlchemy==0.9.10
27 typing-extensions==3.7.4.2 25 typing-extensions==3.7.4.2
......
1 -r base.txt
2
3 PyYAML==5.3.1
...\ No newline at end of file ...\ No newline at end of file
1 -r base.txt
2
3 supervisor==4.2.0
4 gunicorn==20.0.4
...@@ -53,7 +53,7 @@ class Command(BaseCommand, LoggerMixin): ...@@ -53,7 +53,7 @@ class Command(BaseCommand, LoggerMixin):
53 doc_id = int(doc_id_str) 53 doc_id = int(doc_id_str)
54 doc_class = HILDoc if business_type == consts.HIL_PREFIX else AFCDoc 54 doc_class = HILDoc if business_type == consts.HIL_PREFIX else AFCDoc
55 doc_info = doc_class.objects.filter(id=doc_id, status=DocStatus.INIT.value).values( 55 doc_info = doc_class.objects.filter(id=doc_id, status=DocStatus.INIT.value).values(
56 'id', 'metadata_version_id', 'document_name').first() # TODO 查不到时是否为None 56 'id', 'metadata_version_id', 'document_name').first()
57 if doc_info is None: 57 if doc_info is None:
58 self.cronjob_log.warn('{0} [get_doc_info] [doc completed] [task_str={1}] [is_priority={2}]'.format( 58 self.cronjob_log.warn('{0} [get_doc_info] [doc completed] [task_str={1}] [is_priority={2}]'.format(
59 self.log_base, task_str, is_priority)) 59 self.log_base, task_str, is_priority))
...@@ -281,7 +281,8 @@ class Command(BaseCommand, LoggerMixin): ...@@ -281,7 +281,8 @@ class Command(BaseCommand, LoggerMixin):
281 loop.run_until_complete(asyncio.wait(tasks)) 281 loop.run_until_complete(asyncio.wait(tasks))
282 # loop.close() 282 # loop.close()
283 wb.save(excel_path) # TODO no sheet (res always []) 283 wb.save(excel_path) # TODO no sheet (res always [])
284 # 整合excel文件上传至EDMS 284 # 整合excel文件
285 # 上传至EDMS
285 except Exception as e: 286 except Exception as e:
286 doc_class.objects.filter(id=doc_id).update(status=DocStatus.PROCESS_FAILED.value) 287 doc_class.objects.filter(id=doc_id).update(status=DocStatus.PROCESS_FAILED.value)
287 self.cronjob_log.error('{0} [process failed] [doc_id={1}] [err={2}]'.format(self.log_base, doc_id, e)) 288 self.cronjob_log.error('{0} [process failed] [doc_id={1}] [err={2}]'.format(self.log_base, doc_id, e))
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!