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

# Conflicts:
#	flask_app/general/截取pdf通用函数.py
This commit is contained in:
zy123 2025-02-11 16:30:01 +08:00
commit 7b930e311f
3 changed files with 3 additions and 3 deletions

View File

@ -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*$', r'(?<!对应\s*)(?<!根据\s*)(?<!按照\s*)(?<!见\s*)(?<!与\s*)(?<!同\s*)(?<!"\s*)(?<!“\s*)(?<!”\s*)(?:投标人?|磋商|谈判|供应商|应答人|比选申请人).*须知前附表\s*$',
regex.MULTILINE 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: 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) return perform_extraction_and_save(start_page, mid_page, end_page)
else: else:

View File

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

View File

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