From 1a34572a4bf585c2d3e1e889b7bdeacf4fb45d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 20 Sep 2024 15:02:27 +0800 Subject: [PATCH] 'commit' --- ds-base/pom.xml | 8 ++-- .../com/dsideal/gw/Handler/RouterHandler.java | 48 +++++++++++-------- 操作文档/7、DataEase.md | 10 ++++ 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/ds-base/pom.xml b/ds-base/pom.xml index ddae4753..f7a12180 100644 --- a/ds-base/pom.xml +++ b/ds-base/pom.xml @@ -34,10 +34,10 @@ com.aspose diff --git a/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java index 5514f694..43b9382a 100644 --- a/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java +++ b/ds-gw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java @@ -4,6 +4,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.dsideal.gw.GwApplication; import com.jfinal.handler.Handler; +import com.jfinal.upload.UploadFile; import okhttp3.*; import javax.servlet.http.HttpServletRequest; @@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.Enumeration; +import java.util.List; public class RouterHandler extends Handler { @@ -145,32 +147,36 @@ public class RouterHandler extends Handler { renderJson(res, jo); } } else //上传文件 - //TODO if (req.getContentType().startsWith("multipart/form-data")) { // 指定文件类型 MediaType mediaType = MediaType.parse("multipart/form-data"); // 创建RequestBody - File file = new File("/path/to/your/file.jpg"); - RequestBody requestBody = RequestBody.create(mediaType, file); - // 构建MultipartBody - MultipartBody body = new MultipartBody.Builder() - .setType(MultipartBody.FORM) - .addFormDataPart("file", file.getName(), requestBody) - .build(); + // 从JFinal请求中获取上传的文件 + List uploadFiles = ctx.getFiles(); + if (!uploadFiles.isEmpty()) { + UploadFile uploadFile = uploadFiles.get(0); // 假设只有一个文件被上传 + File file = uploadFile.getFile(); // 获取上传的文件 + RequestBody requestBody = RequestBody.create(mediaType, file); + // 构建MultipartBody + MultipartBody body = new MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart("file", file.getName(), requestBody) + .build(); - // 构建Request - Request request = new Request.Builder() - .url("http://your.upload.url/post") - .post(body) - .build(); - } else { - // MinIO - 服务端签名直传（前端 + 后端 + 效果演示） - //https://blog.csdn.net/CYK_byte/article/details/140254412 - JSONObject jo = new JSONObject(); - jo.put("success", false); - jo.put("message", "系统只支持GET,POST，其它的OPTIONS不支持！文件上传请使用S3协议进行直传，不通过JAVA处理，JAVA只处理授权！"); - renderJson(res, jo); - } + // 构建Request + Request request = new Request.Builder() + .url("http://your.upload.url/post") + .post(body) + .build(); + } + } else { + // MinIO - 服务端签名直传（前端 + 后端 + 效果演示） + //https://blog.csdn.net/CYK_byte/article/details/140254412 + JSONObject jo = new JSONObject(); + jo.put("success", false); + jo.put("message", "系统只支持GET,POST，其它的OPTIONS不支持！文件上传请使用S3协议进行直传，不通过JAVA处理，JAVA只处理授权！"); + renderJson(res, jo); + } } } else { JSONObject jo = new JSONObject(); diff --git a/操作文档/7、DataEase.md b/操作文档/7、DataEase.md index 38d389ab..4daaee10 100644 --- a/操作文档/7、DataEase.md +++ b/操作文档/7、DataEase.md @@ -75,6 +75,16 @@ http { #server_name dataease.test.com; location / { + client_max_body_size 600m; + client_body_buffer_size 128k; + proxy_connect_timeout 600; + proxy_read_timeout 600; + proxy_send_timeout 600; + proxy_buffer_size 64k; + proxy_buffers 4 32k; + proxy_busy_buffers_size 64k; + proxy_temp_file_write_size 64k; + proxy_pass http://dataease; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $http_host;