From 06f7ae6e90f9abf59005bd8aeefeeef983056a34 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 28 Apr 2023 14:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=20=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=20=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++-- .../com/adc/da/workFlow/controller/WorkFlowController.java | 4 ++-- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 9d231bc3..e33eb14c 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -501,5 +501,5 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/getSarBussionStandPageNo",method = RequestMethod.POST) List getSarBussionStandPageNo(@RequestBody List rows); @RequestMapping(value = "/bat-wkflow/busProcessModel/recieveFile",method = RequestMethod.POST) - void recieveFile(@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("pid") String pid,@RequestParam("taskId") String taskId); + void recieveFile(HttpServletRequest request, HttpServletResponse response ,@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 08682335..ae9f9044 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -466,7 +466,7 @@ public class workFlowFeignClientImpl { return workFlowFeignClient.getSarBussionStandPageNo(rows); } - public void recieveFile(@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("pid") String pid,@RequestParam("taskId") String taskId) { - workFlowFeignClient.recieveFile(fileNm,standNo,pid,taskId); + public void recieveFile(HttpServletRequest request, HttpServletResponse response ,@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId) { + workFlowFeignClient.recieveFile(request,response,fileNm,standNo,fileId); } } 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 04dd91eb..e3afa6ac 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 @@ -1322,8 +1322,8 @@ public class WorkFlowController extends BaseController { @ApiOperation(value = "|onlyOffice接收文件") @PostMapping("/recieveFile") - public void recieveFile(HttpServletRequest request, HttpServletResponse response,@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ - workFlowFeignClient.recieveFile(fileNm,standNo,pid,taskId); + public void recieveFile(HttpServletRequest request, HttpServletResponse response,@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId){ + workFlowFeignClient.recieveFile(request,response,fileNm,standNo,fileId); } } diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index f218e08e..1d6ba4c7 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -177,8 +177,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //// //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); - - + //在线编辑 + addInterceptor.excludePathPatterns("/api/lawss/activiti/recieveFile"); // // 添加自定义拦截器，并拦截对应 url