diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 6bf8e934f8..3e4795a590 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -57,6 +57,12 @@ kaptcha ${kaptcha.version} + + + io.github.openfeign + feign-httpclient + 10.3.0 + com.epmet epmet-common-clienttoken @@ -80,13 +86,6 @@ 2.0.0 compile - - - io.github.openfeign - feign-httpclient - 10.3.0 - - diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index e39b8d01d3..09fe3a2d76 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -124,6 +124,12 @@ + + + io.github.openfeign + feign-httpclient + 10.3.0 + diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 957a3d250d..40fa935c52 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -55,18 +55,18 @@ 2.0.0 compile - - com.epmet - gov-org-client - 2.0.0 - compile - io.github.openfeign feign-httpclient 10.3.0 + + com.epmet + gov-org-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java index 799c768701..5ad9d87f8f 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java @@ -33,6 +33,7 @@ import com.epmet.dto.form.SaveCustomerFormDTO; import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.excel.DemoExcel; import com.epmet.service.DemoService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -101,18 +102,57 @@ public class DemoController { return demoService.insertEpmetDemo(); } + /** + * @param + * @return com.epmet.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 测试:无参get请求feign示例 + * @Date 2020/3/18 9:10 + **/ @GetMapping("getValidCustomerlist") - public Result> getValidCustomerList(){ + public Result> getValidCustomerList() { return demoService.getValidCustomerList(); } + /** + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:有参get请求feign@PathVariable + * @Date 2020/3/18 9:11 + **/ @GetMapping("/queryCustomInfo/{customerId}") - public Result queryCustomInfo(@PathVariable("customerId") String customerId){ + public Result queryCustomInfo(@PathVariable("customerId") String customerId) { + if (StringUtils.isBlank(customerId)) { + return new Result().error("customerId不能为空"); + } return demoService.queryCustomerInfo(customerId); } + /** + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:有参get请求feign@RequestParam + * @Date 2020/3/18 9:32 + **/ + @GetMapping("/queryCustomInfoByCustomerId") + public Result queryCustomInfoByCustomerId(@RequestParam("customerId") String customerId) { + if (StringUtils.isBlank(customerId)) { + return new Result().error("customerId不能为空"); + } + return demoService.queryCustomInfoByCustomerId(customerId); + } + + /** + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:有参post请求示例,并返回插入主键 + * @Date 2020/3/18 9:11 + **/ @PostMapping("/saveCustomerInfo") - public Result saveCustomerInfo(@RequestBody SaveCustomerFormDTO dto){ + public Result saveCustomerInfo(@RequestBody SaveCustomerFormDTO dto) { ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); return demoService.saveCustomerInfo(dto); } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java index e2c52f4039..77bcac25aa 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java @@ -7,10 +7,7 @@ import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.feign.fallback.OperCrmFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,7 +22,7 @@ public interface OperCrmFeignClient { * @param * @return com.epmet.commons.tools.utils.Result> * @Author yinzuomei - * @Description 查询有效客户列表 + * @Description 测试:查询有效客户列表 * @Date 2020/3/11 23:28 **/ @GetMapping("/oper/crm/customer/getvalidcustomerlist") @@ -35,7 +32,7 @@ public interface OperCrmFeignClient { * @param id * @return com.epmet.commons.tools.utils.Result> * @Author yinzuomei - * @Description 根据id查看客户详情 + * @Description 测试:根据id查看客户详情 * @Date 2020/3/11 23:28 **/ @GetMapping("/oper/crm/customer/{id}") @@ -45,9 +42,19 @@ public interface OperCrmFeignClient { * @param dto * @return com.epmet.commons.tools.utils.Result * @Author yinzuomei - * @Description 保存客户信息 + * @Description 测试:保存客户信息 * @Date 2020/3/11 23:32 **/ - @PostMapping(value = "/oper/crm/customer/save", consumes = MediaType.APPLICATION_JSON_VALUE) - Result saveCustomerInfo(@RequestBody CustomerDTO dto); + @PostMapping(value = "/oper/crm/customer/saveCustomerInfo", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result saveCustomerInfo(@RequestBody CustomerDTO dto); + + /** + * @return com.epmet.commons.tools.utils.Result + * @param customerId + * @Author yinzuomei + * @Description 测试:根据id查看客户详情 + * @Date 2020/3/18 9:47 + **/ + @GetMapping("/oper/crm/customer/queryCustomInfoByCustomerId") + Result queryCustomInfoByCustomerId(@RequestParam("customerId") String customerId); } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java index 55374aa025..3c79473590 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java @@ -28,7 +28,12 @@ public class OperCrmFeignClientFallBack implements OperCrmFeignClient { } @Override - public Result saveCustomerInfo(CustomerDTO dto) { - return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "save",dto); + public Result saveCustomerInfo(CustomerDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "saveCustomerInfo",dto); + } + + @Override + public Result queryCustomInfoByCustomerId(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "queryCustomInfoByCustomerId",customerId); } } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java index 2a69c04bd5..ed31425ca6 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java @@ -101,10 +101,41 @@ public interface DemoService extends BaseService { Result insertEpmetDemo(); + /** + * @param + * @return com.epmet.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 测试:无参get请求feign示例 + * @Date 2020/3/18 9:51 + **/ Result> getValidCustomerList(); - Result queryCustomerInfo(String customerId); + /** + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:有参get请求feign@PathVariable + * @Date 2020/3/18 9:51 + **/ + Result queryCustomerInfo(String customerId); + + /** + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:有参get请求feign@RequestParam + * @Date 2020/3/18 9:51 + **/ + Result queryCustomInfoByCustomerId(String customerId); + /** + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:有参post请求示例,并返回插入主键 + * @Date 2020/3/18 9:51 + **/ + Result saveCustomerInfo(SaveCustomerFormDTO dto); Result saveCustomerInfo(SaveCustomerFormDTO dto); Result getcustomergrid(String id); diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java index cbe78d61ca..666bfb533b 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java @@ -143,7 +143,7 @@ public class DemoServiceImpl extends BaseServiceImpl implem } @Override - public Result saveCustomerInfo(SaveCustomerFormDTO formDTO) { + public Result saveCustomerInfo(SaveCustomerFormDTO formDTO) { CustomerDTO dto =ConvertUtils.sourceToTarget(formDTO, CustomerDTO.class); SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd"); try { @@ -154,6 +154,11 @@ public class DemoServiceImpl extends BaseServiceImpl implem return operCrmFeignClient.saveCustomerInfo(dto); } + @Override + public Result queryCustomInfoByCustomerId(String customerId) { + return operCrmFeignClient.queryCustomInfoByCustomerId(customerId); + } + @Override public Result getcustomergrid(String id) { return govOrgFeignClient.getcustomergrid(id); diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index ef57a02b28..e56877b3fb 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -84,6 +84,12 @@ freemarker ${freemarker.version} + + + io.github.openfeign + feign-httpclient + 10.3.0 + diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 33685672d3..b8d7899541 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -92,6 +92,12 @@ fastdfs-client ${fastdfs.version} + + + io.github.openfeign + feign-httpclient + 10.3.0 + diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java index 81335804f8..4a9bbd1119 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java @@ -98,6 +98,33 @@ public class CustomerController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerExcel.class); } + /** + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:测试demo模块通过feign调用opercrm + * @Date 2020/3/18 9:43 + **/ + @GetMapping("queryCustomInfoByCustomerId") + public Result queryCustomInfoByCustomerId(@RequestParam("customerId") String customerId) { + CustomerDTO data = customerService.get(customerId); + return new Result().ok(data); + } + + /** + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:测试demo模块通过feign调用opercrm + * @Date 2020/3/18 9:43 + **/ + @PostMapping("saveCustomerInfo") + public Result saveCustomerInfo(@RequestBody CustomerDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + return customerService.saveCustomerInfo(dto); + } + /** * @param * @return com.epmet.commons.tools.utils.Result diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java index 7801d469f2..1ef60f3762 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java @@ -104,4 +104,13 @@ public interface CustomerService extends BaseService { * @date 2020-03-11 */ Result> getValidCustomerList(); + + /** + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 保存客户信息并返回主键 + * @Date 2020/3/18 9:44 + **/ + Result saveCustomerInfo(CustomerDTO dto); } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 079c552fc5..512eb55d40 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -115,4 +115,18 @@ public class CustomerServiceImpl extends BaseServiceImpl>().ok(baseDao.selectListValidCustomerResultDTO()); } + /** + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:保存客户信息并返回主键 + * @Date 2020/3/18 9:48 + **/ + @Override + public Result saveCustomerInfo(CustomerDTO dto) { + CustomerEntity entity = ConvertUtils.sourceToTarget(dto, CustomerEntity.class); + insert(entity); + return new Result().ok(entity.getId()); + } + } diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index efa6207093..020b93702c 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -48,6 +48,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + io.github.openfeign + feign-httpclient + 10.3.0 + com.epmet epmet-common-clienttoken @@ -58,12 +64,6 @@ io.github.openfeign feign-httpclient - - - io.github.openfeign - feign-httpclient - 10.3.0 - diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index ba78aed131..6674d13dfd 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -106,6 +106,7 @@ feign: httpclient: enabled: true + hystrix: command: default: