From eb5df895d2dd7cc1ca66f3ece78ee96e285362b9 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Wed, 12 Feb 2025 17:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=2044248=20https=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/base/MesMediaFileCfgController.java     | 18 +++++++++++++++---
 .../serviceimpl/base/MesMediaFileCfgService.java       |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java
index 18e9044..1c59c71 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java
@@ -7,8 +7,10 @@ import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud;
 import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg;
 import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository;
 import cn.estsh.impp.framework.boot.fileservice.ImppFileService;
+import cn.hutool.core.codec.Base64;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONUtil;
 import io.swagger.annotations.Api;
 import jodd.io.FileUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -59,14 +61,24 @@ public class MesMediaFileCfgController extends BaseMesController<MesMediaFileCfg
     public void afterInsert(MesMediaFileCfg mesMediaFileCfg) {
         //1.如果localFileUrl不为空，需要下发到本地url
         if (!StringUtils.isBlank(mesMediaFileCfg.getLocalFileUrl())){
-            File file = new File(mesMediaFileCfg.getFileUrl());
-            HttpRequest httpRequest = HttpRequest.get(mesMediaFileCfg.getFileUrl());
+            String fileUrl = mesMediaFileCfg.getFileUrl();
+            HttpRequest httpRequest = HttpRequest.get(mesMediaFileCfg.getFileUrl()).timeout(60000);
+            byte[] bytes = httpRequest.execute().bodyBytes();
+
+            int index = fileUrl.lastIndexOf("/");
+            String fileName = fileUrl.substring(index + 1);
             //获取pcn的地址
             String localUrl = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "LOCAL_PCN_URL");
             String localUrlPort = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "LOCAL_PCN_URL_PORT");
             String localPcnUrlInterface = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "LOCAL_PCN_URL_INTERFACE");
             if (!StringUtils.isBlank(localUrl) && !StringUtils.isBlank(localUrlPort) && !StringUtils.isBlank(localPcnUrlInterface)){
-                HttpResponse response = HttpRequest.post(localUrl + ":" + localUrlPort + localPcnUrlInterface).form("file", file).execute();
+                Map<String, Object> params = new HashMap<>();
+                params.put("file",  Base64.encode(bytes));
+                params.put("fileName", fileName);
+                params.put("organizeCode",mesMediaFileCfg.getOrganizeCode());
+                HttpResponse response = HttpRequest.post(localUrl + ":" + localUrlPort + localPcnUrlInterface).body(JSONUtil.toJsonStr(params)).timeout(60000).execute();
+                String body1 = response.body();
+                System.out.println(body1);
             }
         }
     }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMediaFileCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMediaFileCfgService.java
index 80b068e..1f0e03e 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMediaFileCfgService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMediaFileCfgService.java
@@ -28,6 +28,6 @@ public class MesMediaFileCfgService extends BaseMesService<MesMediaFileCfg> impl
         String fileUrl = item.getFileUrl();
         int index = fileUrl.lastIndexOf("/");
         String fileName = fileUrl.substring(index + 1);
-        item.setLocalFileUrl(localAddr + "/"+ fileName);
+        item.setLocalFileUrl(localAddr + fileName);
     }
 }