From 1f29f48bc7502ef6f0d1ecc5ad797f4bfb0ec36e Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 15 Jul 2022 17:09:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20#564?= =?UTF-8?q?03=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92-=E6=9F=A5=E7=9C=8B=20?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EsRevisePlanServiceImpl.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 7f41aa0e..4ba8b212 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -116,16 +116,27 @@ public class EsRevisePlanServiceImpl extends ServiceImpl Date: Fri, 15 Jul 2022 22:23:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/workFlow/controller/WorkFlowController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 0276132c..0f548117 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -57,6 +57,12 @@ public class WorkFlowController { @Value("${stand.edit.file.path}") private String standEditFilePath; + /** + * 文件下载路径 + */ + @Value("${file.downloadUrl}") + private String downloadUrl; + @Autowired private JwtUtils jwtUtils; @@ -78,7 +84,7 @@ public class WorkFlowController { String fileOldName = fileNameEncoding(oldFileName,request); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); - File file = new File(standEditFilePath+modelHisOne.getEditFilePath()); + File file = new File(downloadUrl+modelHisOne.getEditFilePath()); is = new FileInputStream(file); os = response.getOutputStream(); org.apache.commons.io.IOUtils.copy(is, os); From fa9284fe8b0bc5eb1542d26774fd29b864288750 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Sat, 16 Jul 2022 00:23:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 67 ++++++++++++++----- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 0f548117..b41f3c0b 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -38,6 +38,7 @@ import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; @@ -77,23 +78,59 @@ public class WorkFlowController { // @RequiresPermissions("sys:file:downloadFileForSar") public void downloadFileForSar(String fileId, String oldFileName, HttpServletResponse response, HttpServletRequest request) throws Exception { BusProcessModelHis modelHisOne = workFlowFeignClient.processEditFile(fileId); - InputStream is = null; OutputStream os = null; + // fileUrl为http或https链接 + InputStream inputStream = null; + HttpURLConnection conn = null; response.reset(); - try { - String fileOldName = fileNameEncoding(oldFileName,request); - response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); - response.setContentType("application/octet-stream"); - File file = new File(downloadUrl+modelHisOne.getEditFilePath()); - is = new FileInputStream(file); - os = response.getOutputStream(); - org.apache.commons.io.IOUtils.copy(is, os); - os.flush(); - } catch (IOException e) { - logger.error(e.getMessage(), e); - } finally { - org.apache.commons.io.IOUtils.closeQuietly(is); - org.apache.commons.io.IOUtils.closeQuietly(os); + File file = new File(downloadUrl+modelHisOne.getEditFilePath()); + + if(file.exists()){ + try { + String fileOldName = fileNameEncoding(oldFileName,request); + response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + response.setContentType("application/octet-stream"); + inputStream = new FileInputStream(file); + os = response.getOutputStream(); + org.apache.commons.io.IOUtils.copy(inputStream, os); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + org.apache.commons.io.IOUtils.closeQuietly(inputStream); + org.apache.commons.io.IOUtils.closeQuietly(os); + } + }else { + URL url; + try { + String fileOldName = fileNameEncoding(oldFileName,request); + response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + response.setContentType("application/octet-stream"); + url = new URL(downloadUrl+modelHisOne.getEditFilePath()); + conn = (HttpURLConnection) url.openConnection(); + // 设置超时间为5秒 + conn.setConnectTimeout(3 * 1000); + // 得到输入流 + inputStream = conn.getInputStream(); + os = response.getOutputStream(); + IOUtils.copy(inputStream, os); + os.flush(); + //生成本地文件之类的省略了 + } catch (Exception e) { + logger.error(e.getMessage(), e); + } finally { + if (conn != null) { + conn.disconnect(); + } + try { + if (inputStream != null) { + inputStream.close(); + } + IOUtils.closeQuietly(os); + } catch (IOException e) { + e.printStackTrace(); + } + } } } From 1effa2bbf7449b4bd91d3101058fe1966bc28087 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Sat, 16 Jul 2022 00:30:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/workFlow/controller/WorkFlowController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index b41f3c0b..a7b91966 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -128,7 +128,7 @@ public class WorkFlowController { } IOUtils.closeQuietly(os); } catch (IOException e) { - e.printStackTrace(); + logger.error(e.getMessage(), e); } } } From ebd6b7fd26fc7657228b2a2ff41bfa734f191c1e Mon Sep 17 00:00:00 2001 From: zyd Date: Mon, 18 Jul 2022 00:03:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?add:=20=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=91=E6=96=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/20220717_国内海外标准新增译文字段.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sql/20220717_国内海外标准新增译文字段.sql diff --git a/doc/sql/20220717_国内海外标准新增译文字段.sql b/doc/sql/20220717_国内海外标准新增译文字段.sql new file mode 100644 index 00000000..b686e411 --- /dev/null +++ b/doc/sql/20220717_国内海外标准新增译文字段.sql @@ -0,0 +1 @@ +INSERT INTO `sar_stand_attr_details`(`ID`, `ATTR_FIELD`, `ATTR_NAME`, `ATTR_TYPE`, `ATTR_LEN`, `ORDER_NUM`, `IS_EDIT`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `IS_MUST`, `IS_SHOW_IMP`, `SHOW_REGION_ID`, `SEL_VAL`, `SAR_TYPE`, `IS_SEARCH`, `IS_WARN`, `IS_JANSUO`) VALUES ('vh9ywh0cs2kryho209lb', 'FBGYWBD', '发布稿(译文)', 'FILE', 2000, 4, '0', 'admin', '0', '2022-07-16 16:00:00', '2022-07-17 14:29:59', '1', '0', 'L378EYP5HL28KE7NSZ68', '', 'STAND', '1', '1', NULL);