jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

修复bug 44248 https图片问题

Browse Source
uat-temp-castle-250211-44248
臧学普 3 months ago
parent eb5df895d2
commit 22948b56fb
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File

59
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java
Unescape Escape View File

@ -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<MesMediaFileCfg
@Override
public void afterInsert(MesMediaFileCfg mesMediaFileCfg) {
//1.如果localFileUrl不为空，需要下发到本地url
if (!StringUtils.isBlank(mesMediaFileCfg.getLocalFileUrl())){
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)){
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);
}
}
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<String, Object> 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();
}
}
// });
}

Write Preview
Loading…
Cancel
Save