diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java index 71c650c6a..5d568e4df 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java @@ -114,6 +114,8 @@ public class TaskController { @ApiOperation(value="已办流程", notes="已办流程") @PostMapping("/doneProcess") public Page doneProcess(@RequestBody TaskCommonQuery taskCommonQuery){ + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + taskCommonQuery.setUserId(sysUser.getId()); return taskFeignClient.doneProcess(taskCommonQuery); } diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 00f2d4069..3c9560d0e 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -361,6 +361,17 @@ eureka: fetch-registry: true service-url: defaultZone: http://127.0.0.1:8123/eureka/ + #解决eureka注册的时候使用ip 而不是hostName问题(使用hostName,可能调用延迟 甚至调用失败) + instance: + prefer-ip-address: true + +# feign调用超时时间配置 +feign: + client: + config: + default: + connectTimeout: 10000 + readTimeout: 600000 ## people 2.0 people: appId: 100679