From dfc459269c48788c0efc7fd3f9e3a0f6fbc15926 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Thu, 19 Mar 2020 16:15:57 +0800 Subject: [PATCH] =?UTF-8?q?operaccess=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9f?= =?UTF-8?q?eign?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-access/oper-access-server/pom.xml | 8 +++++++- ...Application.java => OperAccessApplication.java} | 4 ++-- .../java/com/epmet/config/ModuleConfigImpl.java | 2 +- .../java/com/epmet/feign/EpmetUserFeignClient.java | 11 ++++------- .../src/main/resources/bootstrap.yml | 2 -- .../com/epmet/controller/OperUserController.java | 14 +++++++------- 6 files changed, 21 insertions(+), 20 deletions(-) rename epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/{AccessApplication.java => OperAccessApplication.java} (82%) diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index f21c4ae64c..18362708dc 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -59,6 +59,12 @@ 2.0.0 compile + + + io.github.openfeign + feign-httpclient + 10.3.0 + @@ -147,4 +153,4 @@ - \ No newline at end of file + diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/AccessApplication.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/OperAccessApplication.java similarity index 82% rename from epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/AccessApplication.java rename to epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/OperAccessApplication.java index 5b61001f1f..6656d79909 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/AccessApplication.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/OperAccessApplication.java @@ -14,8 +14,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients -public class AccessApplication { +public class OperAccessApplication { public static void main(String[] args) { - SpringApplication.run(AccessApplication.class, args); + SpringApplication.run(OperAccessApplication.class, args); } } diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/ModuleConfigImpl.java index 5415a86538..c48da20571 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/ModuleConfigImpl.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -21,6 +21,6 @@ import org.springframework.stereotype.Service; public class ModuleConfigImpl implements ModuleConfig { @Override public String getName() { - return "access"; + return "operaccess"; } } diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index f84f6002a6..c3f44bbc57 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -5,10 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.OperUserDTO; import com.epmet.feign.fallback.EpmetUserFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; /** * @author zhaoqifeng @@ -22,11 +19,11 @@ public interface EpmetUserFeignClient { * * 根据id查询运营人员详情 * - * @param id ID + * @param operUserId oper_user表主键 * @return com.epmet.commons.tools.utils.Result> * @author zhaoqifeng * @date 2020/3/19 09:28 **/ - @PostMapping("/user/info/") - Result info(@RequestBody String id); + @GetMapping("/operuser/queryOperUserDtoById/{operUserId}") + Result info(@PathVariable("operUserId") String operUserId); } diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml index 81856afde2..72fde2670b 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml @@ -86,8 +86,6 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 hystrix: command: diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java index d1a4f8a88e..de8948656b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java @@ -46,9 +46,9 @@ import java.util.Map; * @since v1.0.0 2020-03-18 */ @RestController -@RequestMapping("user") +@RequestMapping("operuser") public class OperUserController { - + @Autowired private OperUserService operUserService; @@ -96,14 +96,14 @@ public class OperUserController { /** * 获取运营人员信息 - * @param id 主键 + * @param operUserId oper_user表主键 * @return OperUserDTO * @author zhaoqifeng */ - @PostMapping("info") - public Result info(@RequestBody String id){ - OperUserDTO data = operUserService.getOperUserInfoById(id); + @GetMapping("queryOperUserDtoById/{operUserId}") + public Result queryOperUserDtoById(@PathVariable("operUserId") String operUserId){ + OperUserDTO data = operUserService.getOperUserInfoById(operUserId); return new Result().ok(data); } -} \ No newline at end of file +}