From 22948b56fbfc4f008a087db5989bb24c76e6b690 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 13 Feb 2025 18:12:20 +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 | 59 +++++++++++++--------- 1 file changed, 34 insertions(+), 25 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 1c59c71..b288e1a 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 @@ -12,7 +12,6 @@ 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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,10 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.io.File; -import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.CompletableFuture; /** * @Description: 媒体文件维护 @@ -59,33 +57,44 @@ public class MesMediaFileCfgController extends BaseMesController 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); - } - } + uploadPng(mesMediaFileCfg); } @Override public void afterUpdate(MesMediaFileCfg mesMediaFileCfg) { //1.如果localFileUrl不为空，需要下发到本地url + uploadPng(mesMediaFileCfg); + } + + private void uploadPng(MesMediaFileCfg mesMediaFileCfg){ +// CompletableFuture.runAsync(()->{ + //1.如果localFileUrl不为空，需要下发到本地url + if (!StringUtils.isBlank(mesMediaFileCfg.getLocalFileUrl())){ + String fileUrl = mesMediaFileCfg.getFileUrl(); + HttpRequest httpRequest = HttpRequest.get(mesMediaFileCfg.getFileUrl()).timeout(10000); + 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"); + String remoteNginxUrl = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "REMOTE_NGINX_URL"); + String remoteUserName = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "REMOTE_USER_NAME"); + String remotePort = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "REMOTE_PORT"); + if (!StringUtils.isBlank(localUrl) && !StringUtils.isBlank(localUrlPort) && !StringUtils.isBlank(localPcnUrlInterface)){ + Map params = new HashMap<>(); + params.put("file", Base64.encode(bytes)); + params.put("fileName", fileName); + params.put("organizeCode",mesMediaFileCfg.getOrganizeCode()); + params.put("remoteNginxUrl",remoteNginxUrl); + params.put("remoteUserName",remoteUserName); + params.put("remotePort",remotePort); + HttpResponse response = HttpRequest.post(localUrl + ":" + localUrlPort + localPcnUrlInterface).body(JSONUtil.toJsonStr(params)).timeout(10000).execute(); + } + } +// }); }