Merge remote-tracking branch 'origin/develop-1.24' into develop-1.24

# Conflicts:
#	flask_app/general/截取pdf通用函数.py

flask_app/general/截取pdf通用函数.py

@@ -667,7 +667,7 @@ def extract_pages_tobidders_notice(pdf_path, output_folder, begin_page, common_h
         r'(?<!对应\s*)(?<!根据\s*)(?<!按照\s*)(?<!见\s*)(?<!与\s*)(?<!同\s*)(?<!"\s*)(?<!“\s*)(?<!”\s*)(?:投标人?|磋商|谈判|供应商|应答人|比选申请人).*须知前附表\s*$',
         regex.MULTILINE
     )
-    start_page, mid_page, end_page = run_extraction(pdf_document,new_begin_pattern, extraction_stage='third')
+    start_page, mid_page, end_page = run_extraction(pdf_document, new_begin_pattern, extraction_stage='third')
     if start_page is not None and mid_page is not None and end_page is not None:
         return perform_extraction_and_save(start_page, mid_page, end_page)
     else:

flask_app/routes/get_deviation.py

@@ -12,7 +12,7 @@ get_deviation_bp = Blueprint('get_deviation', __name__)
 
 @get_deviation_bp.route('/get_deviation', methods=['POST'])
 @validate_and_setup_logger
-@require_connection_limit(timeout=720)
+@require_connection_limit(timeout=1800)
 def get_deviation():
     logger = g.logger
     unique_id = g.unique_id

flask_app/routes/upload.py

@@ -14,7 +14,7 @@ from flask_app.ConnectionLimiter import require_connection_limit
 upload_bp = Blueprint('upload', __name__)
 @upload_bp.route('/upload', methods=['POST'])
 @validate_and_setup_logger
-@require_connection_limit(timeout=720)
+@require_connection_limit(timeout=1800)
 def zbparse():
     logger = g.logger
     try: