diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index 60baba171..8295a91cd 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -186,6 +186,6 @@ renren: epdc: - # 便捷通行接口 + # 党建e家接口 urls: - - /*/epdc-app/** + - /api/** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index cda275d0d..f62e301a9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java @@ -77,7 +77,6 @@ public class ApiNewsController { */ @GetMapping("news/list") public Result> listNews(@LoginUser TokenDto userDetail, EpdcNewsListFromDTO epdcNewsFromDTO) { - return newsService.listNews(userDetail, epdcNewsFromDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index e52c8b323..a62449ce8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @email yujintao@elink-cn.com * @date 2019/9/7 9:27 */ -@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://127.0.0.1:9068") public interface UserFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/resolver/LoginUserHandlerMethodArgumentResolver.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/resolver/LoginUserHandlerMethodArgumentResolver.java index 6e999b148..9c898240c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -36,7 +36,7 @@ public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgu @Override public boolean supportsParameter(MethodParameter parameter) { - return parameter.getParameterType().isAssignableFrom(CpUserDetail.class) && parameter.hasParameterAnnotation(LoginUser.class); + return parameter.getParameterType().isAssignableFrom(TokenDto.class) && parameter.hasParameterAnnotation(LoginUser.class); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index 57dfba28b..8c4518ae3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -31,6 +31,6 @@ public class AdminServiceImpl implements AdminService { .concat(completeDept.getStreet()).concat("/") .concat(completeDept.getCommunity()).concat("/") .concat(completeDept.getGrid()); - return new Result().error(deptName); + return new Result().ok(deptName); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java index 9bf4a0aa2..3f072a7be 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java @@ -34,7 +34,7 @@ public class UserTest { @Test public void test(){ TokenDto tokenDto = new TokenDto(); - tokenDto.setUserId("userId:ttteeesssttt"); + tokenDto.setUserId("userId_ttteeesssttt"); tokenDto.setFaceImg("http://b-ssl.duitang.com/uploads/item/201707/19/20170719211350_4PnBt.jpeg"); tokenDto.setGridId(1169158285790900226L); tokenDto.setMobile("15555555555");