diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml index 050fe83..9eb4616 100644 --- a/payment-base-app/pom.xml +++ b/payment-base-app/pom.xml @@ -116,6 +116,31 @@ 1.2.47 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.cloud + spring-cloud-starter-feign + 1.4.7.RELEASE + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + io.github.openfeign.form + feign-form-spring + 3.2.2 + + + io.github.openfeign.form + feign-form + 3.2.2 + + org.apache.httpcomponents httpclient diff --git a/payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java b/payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java new file mode 100644 index 0000000..f8df011 --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java @@ -0,0 +1,14 @@ +package com.base.springcloud.client; + +import com.base.springcloud.base.CommonResult; +import com.base.springcloud.dto.MerchantConfigReqDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(value = "payment-service-client") +public interface PaymentClient { + + @PostMapping(value = "/merchant/merchantConfig") + CommonResult paymentConfigure(@RequestBody MerchantConfigReqDTO merchantConfigDTO); +} \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java index 678fac9..272a8de 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java +++ b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java @@ -27,7 +27,7 @@ public class MerchantController { @ApiOperation(value = "商户支付信息配置", notes = "商户信息配置新增接口") @PostMapping("/merchantConfig") - public CommonResult paymentConfigure(@RequestBody MerchantConfigReqDTO merchantConfigDTO) { + public CommonResult paymentConfigure(MerchantConfigReqDTO merchantConfigDTO) { MerchantConfigBO merchantConfigBO = new MerchantConfigBO(); BeanUtils.copyProperties(merchantConfigDTO, merchantConfigBO); merchantService.paymentConfigure(merchantConfigBO); diff --git a/payment-base-app/src/main/java/com/base/springcloud/dto/MerchantConfigReqDTO.java b/payment-base-app/src/main/java/com/base/springcloud/dto/MerchantConfigReqDTO.java index 0da7850..bd0df59 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/dto/MerchantConfigReqDTO.java +++ b/payment-base-app/src/main/java/com/base/springcloud/dto/MerchantConfigReqDTO.java @@ -1,8 +1,7 @@ package com.base.springcloud.dto; import lombok.Data; - -import java.io.File; +import org.springframework.web.multipart.MultipartFile; @Data public class MerchantConfigReqDTO { @@ -10,7 +9,7 @@ public class MerchantConfigReqDTO { /** * 微信支付证书文件 */ - private File certFile; + private MultipartFile certFile; /** * 公众号 diff --git a/payment-base-app/src/main/resources/application.yml b/payment-base-app/src/main/resources/application.yml index 93e1510..34f0332 100644 --- a/payment-base-app/src/main/resources/application.yml +++ b/payment-base-app/src/main/resources/application.yml @@ -50,6 +50,10 @@ spring: max-active: 8 # #连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: -1ms + servlet: + multipart : + max-request-size : 10MB + max-file-size : 10MB #mybatis:配置 mybatis: type-aliases-package: com.base.springcloud.dao #实体类包路径 diff --git a/payment-base-app/target/classes/application.yml b/payment-base-app/target/classes/application.yml index 93e1510..34f0332 100644 --- a/payment-base-app/target/classes/application.yml +++ b/payment-base-app/target/classes/application.yml @@ -50,6 +50,10 @@ spring: max-active: 8 # #连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: -1ms + servlet: + multipart : + max-request-size : 10MB + max-file-size : 10MB #mybatis:配置 mybatis: type-aliases-package: com.base.springcloud.dao #实体类包路径