Merge remote-tracking branch 'origin/develop-1.24' into develop-1.24
# Conflicts: # flask_app/general/截取pdf通用函数.py
This commit is contained in:
commit
7b930e311f
@ -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
|
||||||
|
@ -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:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user