From 593224a478a6fbaf32f412956ce9eab01285e363 Mon Sep 17 00:00:00 2001 From: GoCo Date: Wed, 20 Aug 2025 11:23:47 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=F0=9F=8E=A1=20=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/exception/JeecgBootExceptionHandler.java | 2 +- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application-docker.yml | 4 ++-- .../src/main/resources/application-prod.yml | 5 +++-- .../src/main/resources/application-test.yml | 5 +++-- jeecgboot-vue3/Dockerfile | 12 ++++++++++++ 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java index d13f58b8..5af898b9 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java @@ -165,7 +165,7 @@ public class JeecgBootExceptionHandler { public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { log.error(e.getMessage(), e); addSysLog(e); - return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); + return Result.error("文件大小超出限制, 请压缩或降低文件质量! "); } /** diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 22c0869f..2384f2a1 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -32,8 +32,8 @@ spring: clean-disabled: true servlet: multipart: - max-file-size: 10MB - max-request-size: 10MB + max-file-size: 10000MB + max-request-size: 10000MB mail: # 定时任务发送邮件 timeJobSend: false diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml index 4c3df6b8..df4ccbec 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml @@ -32,8 +32,8 @@ spring: clean-disabled: true servlet: multipart: - max-file-size: 10MB - max-request-size: 10MB + max-file-size: 100000MB + max-request-size: 100000MB mail: # 定时任务发送邮件 timeJobSend: false diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index bcdcedd0..7d703532 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -2,6 +2,7 @@ server: port: 8080 undertow: decode-url: true # 启用URL解码 + max-http-post-size: 100000MB # 设置HTTP POST请求最大大小 worker-threads: 16 buffers: websocket: 8192 @@ -31,8 +32,8 @@ spring: clean-disabled: true servlet: multipart: - max-file-size: 10MB - max-request-size: 10MB + max-file-size: 100000MB + max-request-size: 100000MB mail: # 定时任务发送邮件 timeJobSend: false diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index 49992116..272ad3a0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -2,6 +2,7 @@ server: port: 8080 undertow: decode-url: true # 启用URL解码 + max-http-post-size: 100000MB # 设置HTTP POST请求最大大小 # 4核CPU标准配置 worker-threads: 16 buffers: @@ -34,8 +35,8 @@ spring: clean-disabled: true servlet: multipart: - max-file-size: 10MB - max-request-size: 10MB + max-file-size: 100000MB + max-request-size: 100000MB mail: # 定时任务发送邮件 timeJobSend: false diff --git a/jeecgboot-vue3/Dockerfile b/jeecgboot-vue3/Dockerfile index b8d473f8..39fa5fd3 100644 --- a/jeecgboot-vue3/Dockerfile +++ b/jeecgboot-vue3/Dockerfile @@ -6,6 +6,12 @@ ENV LANG en_US.UTF-8 # 配置Nginx并创建目录 RUN echo "server { \ listen 80; \ + # 设置文件上传大小限制 \ + client_max_body_size 100000MB; \ + # 设置超时时间 \ + proxy_connect_timeout 300s; \ + proxy_send_timeout 300s; \ + proxy_read_timeout 300s; \ location /jeecgboot/ { \ proxy_pass http://jeecg-boot-system:8080/jeecg-boot/; \ proxy_redirect off; \ @@ -13,6 +19,12 @@ RUN echo "server { \ proxy_set_header X-Real-IP \$remote_addr; \ proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; \ proxy_set_header X-Access-Token \$http_x_access_token; \ + # 针对文件上传的特殊配置 \ + client_max_body_size 100000MB; \ + proxy_connect_timeout 300s; \ + proxy_send_timeout 300s; \ + proxy_read_timeout 300s; \ + proxy_request_buffering off; \ } \ #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \ location / { \