From 0e12cf0ad492e16d08444ed600164cd1dd8a5292 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 21 Jun 2023 15:04:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java index 2cb4070a..78883b45 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/OnlyofficePdfUtil.java @@ -108,7 +108,9 @@ public class OnlyofficePdfUtil { map.put("key",key); map.put("outputtype","pdf"); map.put("title",titleName+".pdf"); - map.put("url","https://10.100.5.111:3306/file/"+onlineFilePath); + map.put("url","https://srms.foton.com.cn/file/"+onlineFilePath); + logger.info("=======================================https://srms.foton.com.cn/file/"+onlineFilePath); + logger.info("=======================================服务器路径"+url); //map.put("url","https://srms.foton.com.cn/file/model/task_768330d8/task_768330d8_top_768330d8_node.docx"); JSONObject requestJson = new JSONObject(map); // 创建HttpClientBuilder From 607eb0fa0c325dd98147499f13b7116e85a22227 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 21 Jun 2023 15:25:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/att/controller/AttFileEOController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index c608dc04..b3d3665f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.io.*; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.text.SimpleDateFormat; import java.util.*; @@ -310,6 +311,7 @@ public class AttFileEOController { response.reset(); try { String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); From f73bfdf8e2e9e5fde85e3bfbd0f9c22e839a01ae Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 21 Jun 2023 15:48:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E7=BC=96=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/att/controller/AttFileEOController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index b3d3665f..1b094c90 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -311,7 +311,6 @@ public class AttFileEOController { response.reset(); try { String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); - response.setCharacterEncoding(StandardCharsets.UTF_8.name()); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); @@ -348,6 +347,7 @@ public class AttFileEOController { response.reset(); try { String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); From d33d1f769ac7c196f5e4e5bf11b7ddada764021d Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 29 Jun 2023 17:00:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?test:=E6=B5=8B=E8=AF=95=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91=E6=96=87=E4=BB=B6=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 9 +-- .../adc/da/utils/util/OnlyofficePdfUtil.java | 62 +++++++------------ 2 files changed, 29 insertions(+), 42 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 0e7452ff..adf333a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -4927,7 +4927,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); - if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){ + if(sarBussStandFilesList.size() == 0){ //存储的名称，key 路径 QueryWrapper onlineFileLogWrapper = new QueryWrapper<>(); onlineFileLogWrapper.eq("ATT_FILE_ID",sarBussStandFiles.get(0).getOriAttId()); @@ -4936,11 +4936,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl map = new HashMap<>(); @@ -108,16 +119,18 @@ public class OnlyofficePdfUtil { map.put("key",key); map.put("outputtype","pdf"); map.put("title",titleName+".pdf"); +// map.put("url","https://10.100.5.111:3306/file/"+onlineFilePath); map.put("url","https://srms.foton.com.cn/file/"+onlineFilePath); logger.info("=======================================https://srms.foton.com.cn/file/"+onlineFilePath); - logger.info("=======================================服务器路径"+url); //map.put("url","https://srms.foton.com.cn/file/model/task_768330d8/task_768330d8_top_768330d8_node.docx"); + logger.info("=========================map:{}",map); JSONObject requestJson = new JSONObject(map); // 创建HttpClientBuilder HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); // HttpClient CloseableHttpClient closeableHttpClient = httpClientBuilder.build(); - HttpPost httpPost = new HttpPost(url); + logger.info("=======================================服务器路径"+onlyOfficeUrl); + HttpPost httpPost = new HttpPost(onlyOfficeUrl); // 设置请求和传输超时时间 RequestConfig requestConfig = RequestConfig.custom() .setSocketTimeout(60000) @@ -159,40 +172,13 @@ public class OnlyofficePdfUtil { if (response != null) { response.close(); } - if (closeableHttpClient != null) { closeableHttpClient.close(); } - } catch (IOException e) { - e.printStackTrace(); - } - } - return null; - - } - - public static byte[] readInputStream(InputStream inputStream) throws IOException { - - byte[] buffer = new byte[1024]; - - int len = 0; - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - - while((len = inputStream.read(buffer)) != -1) { - - bos.write(buffer, 0, len); - - } - - bos.close(); - - return bos.toByteArray(); - } }