diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 511fbf1c76..fe4e0c2c1f 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -48,6 +48,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + io.github.openfeign + feign-httpclient + 10.3.0 + diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index 912cc56d91..cb86a7e684 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -101,8 +101,6 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 hystrix: command: diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 60da2cf0de..1fa7546efe 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 + diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index c8cf9d6c75..c467033451 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -72,8 +72,6 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 hystrix: command: diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 4644b5a062..da86f7dfe7 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -196,8 +196,6 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 hystrix: command: 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-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml index cfe4802edf..06496153f4 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml @@ -80,8 +80,6 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 hystrix: command: diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 8e5d67e67c..40fa935c52 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -55,6 +55,12 @@ 2.0.0 compile + + + io.github.openfeign + feign-httpclient + 10.3.0 + com.epmet gov-org-client 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 8ea90173df..a3d6bc7643 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 @@ -31,6 +31,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.*; @@ -99,18 +100,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 a83fc7a5ef..a66d034f8e 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.impl.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_UTF8_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/impl/OperCrmFeignClientFallBack.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/impl/OperCrmFeignClientFallBack.java index 52215b48d4..dd82f90351 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/impl/OperCrmFeignClientFallBack.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/impl/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 a9331a78e7..b503541ded 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 @@ -99,11 +99,40 @@ 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); - Result saveCustomerInfo(SaveCustomerFormDTO dto); + /** + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试:有参post请求示例,并返回插入主键 + * @Date 2020/3/18 9:51 + **/ + Result saveCustomerInfo(SaveCustomerFormDTO dto); - String testDemo2Gov(); } 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 a75132488b..fd03d19782 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 @@ -26,12 +26,10 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.DemoDao; import com.epmet.dto.CustomerDTO; -import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.DemoDTO; import com.epmet.dto.form.SaveCustomerFormDTO; import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.entity.DemoEntity; -import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OperCrmFeignClient; import com.epmet.redis.DemoRedis; import com.epmet.service.DemoService; @@ -60,8 +58,6 @@ public class DemoServiceImpl extends BaseServiceImpl implem private DemoRedis demoRedis; @Autowired private OperCrmFeignClient operCrmFeignClient; - @Autowired - private GovOrgFeignClient govOrgFeignClient; @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -140,7 +136,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 { @@ -152,15 +148,8 @@ public class DemoServiceImpl extends BaseServiceImpl implem } @Override - public String testDemo2Gov() { - Result> testResult = - govOrgFeignClient.page(); - if(testResult.success()){ - return "成功了"; - }else{ - return "失败了"; - } - + public Result queryCustomInfoByCustomerId(String customerId) { + return operCrmFeignClient.queryCustomInfoByCustomerId(customerId); } } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml index 0b86c8a474..6774795607 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml @@ -78,8 +78,6 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 hystrix: command: diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 5f4ecc2f56..a4268477af 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -63,6 +63,12 @@ + + + io.github.openfeign + feign-httpclient + 10.3.0 + diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index d6ef1a906c..56c78c7015 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-job/epmet-job-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-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-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml index 8153670de3..00794fff65 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-message/epmet-message-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-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/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml index 827b0ac300..e30cc30a50 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml @@ -97,8 +97,6 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 hystrix: command: diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java new file mode 100644 index 0000000000..79816d1714 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java @@ -0,0 +1,12 @@ +package com.epmet.dto.result;/** + * Created by 11 on 2020/3/19. + */ + +/** + * @Description + * @ClassName CustomerGridForStangerResultDTO + * @Author wangc + * @date 2020.03.19 00:38 + */ +public class CustomerGridForStangerResultDTO { +} diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index d750db2d37..dbdded2ad2 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -48,6 +48,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + io.github.openfeign + feign-httpclient + 10.3.0 + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java new file mode 100644 index 0000000000..51f1d2cd38 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java @@ -0,0 +1,7 @@ +package com.epmet.exception; + +/** + * Created by 11 on 2020/3/19. + */ +public interface ModuleErrorCode { +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 49bac0aa3d..b33d976571 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -101,8 +101,6 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 hystrix: command: diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index d2dc07523c..9695bb43b3 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -52,6 +52,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + 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 4ec04148d3..cb4005b7a3 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 @@ -92,6 +92,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-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml index 704b56e8d2..f6fb34e1a9 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-crm/oper-crm-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-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 177f0e4c92..96ef6bb929 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -52,6 +52,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + io.github.openfeign + feign-httpclient + 10.3.0 + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index e3d84640a4..0e097da7ed 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-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-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index f50ad1cf6d..d51420a810 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -52,6 +52,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + io.github.openfeign + feign-httpclient + 10.3.0 + diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml index 7127b7a6c2..6c5a00a25e 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-guide/resi-guide-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/pom.xml b/epmet-user/epmet-user-server/pom.xml index 80043ebabe..4b950069d1 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 + 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 f7070de4b7..aa1383abca 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -101,8 +101,7 @@ feign: loggerLevel: BASIC httpclient: enabled: true - max-connections: 200 - max-connections-per-route: 50 + hystrix: command: