From d1745a2fd378df2fa037428128f7d69f5744af6e 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 19:49:57 +0800 Subject: [PATCH] 'commit' --- dsGw/src/main/java/com/dsideal/gw/GwApplication.java | 4 ++++ dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java | 2 ++ dsGw/src/main/resources/application_dev.yaml | 4 ++++ dsGw/src/main/resources/application_pro.yaml | 4 ++++ dsGw/target/classes/application_dev.yaml | 4 ++++ dsGw/target/classes/application_pro.yaml | 4 ++++ 6 files changed, 22 insertions(+) diff --git a/dsGw/src/main/java/com/dsideal/gw/GwApplication.java b/dsGw/src/main/java/com/dsideal/gw/GwApplication.java index 0f4abeef..1ec62616 100644 --- a/dsGw/src/main/java/com/dsideal/gw/GwApplication.java +++ b/dsGw/src/main/java/com/dsideal/gw/GwApplication.java @@ -7,6 +7,7 @@ import com.dsideal.gw.Plugin.YamlProp; import com.dsideal.gw.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.kit.Prop; +import com.jfinal.kit.PropKit; import com.jfinal.server.undertow.UndertowServer; import com.jfinal.template.Engine; import org.yaml.snakeyaml.Yaml; @@ -47,6 +48,9 @@ public class GwApplication extends JFinalConfig { //加载配置文件 String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix()); Prop PropKit = new YamlProp(configFile); + // 设置静态根目录为上传根目录 + me.setBaseUploadPath(PropKit.get("uploadTempPath")); + // 获取所有配置项,得到路由表 for (Map.Entry entry : PropKit.getProperties().entrySet()) { if (entry.getKey().toString().startsWith("route")) { diff --git a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java index b412fa42..463a94a5 100644 --- a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java +++ b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java @@ -143,7 +143,9 @@ public class RouterHandler extends Handler { return; } + UploadFile fu = files.getFirst(); + // 获取文件流 RequestBody requestBody = RequestBody.create(fu.getFile(), mediaType); // 构建MultipartBody diff --git a/dsGw/src/main/resources/application_dev.yaml b/dsGw/src/main/resources/application_dev.yaml index 5bc0a12b..dad278dc 100644 --- a/dsGw/src/main/resources/application_dev.yaml +++ b/dsGw/src/main/resources/application_dev.yaml @@ -1,3 +1,6 @@ +# 上传文件的临时路径 +uploadTempPath: c:/Windows/Temp + # 路由 route: # 基础数据 @@ -7,6 +10,7 @@ route: dsResource: url: http://dsResouce:8002 + # 白名单 whitelist: - /dsBase/doLogin diff --git a/dsGw/src/main/resources/application_pro.yaml b/dsGw/src/main/resources/application_pro.yaml index 704fdc3e..310e2cf5 100644 --- a/dsGw/src/main/resources/application_pro.yaml +++ b/dsGw/src/main/resources/application_pro.yaml @@ -1,3 +1,5 @@ +# 上传文件的临时路径 +uploadTempPath: /tmp # 路由 route: # 基础数据 @@ -7,6 +9,8 @@ route: dsResource: url: http://ds-resouce:8002 + + # 白名单 whitelist: - /dsBase/doLogin diff --git a/dsGw/target/classes/application_dev.yaml b/dsGw/target/classes/application_dev.yaml index 5bc0a12b..dad278dc 100644 --- a/dsGw/target/classes/application_dev.yaml +++ b/dsGw/target/classes/application_dev.yaml @@ -1,3 +1,6 @@ +# 上传文件的临时路径 +uploadTempPath: c:/Windows/Temp + # 路由 route: # 基础数据 @@ -7,6 +10,7 @@ route: dsResource: url: http://dsResouce:8002 + # 白名单 whitelist: - /dsBase/doLogin diff --git a/dsGw/target/classes/application_pro.yaml b/dsGw/target/classes/application_pro.yaml index 704fdc3e..310e2cf5 100644 --- a/dsGw/target/classes/application_pro.yaml +++ b/dsGw/target/classes/application_pro.yaml @@ -1,3 +1,5 @@ +# 上传文件的临时路径 +uploadTempPath: /tmp # 路由 route: # 基础数据 @@ -7,6 +9,8 @@ route: dsResource: url: http://ds-resouce:8002 + + # 白名单 whitelist: - /dsBase/doLogin