From b8d93b8c935137a109ccdd8d9bb8c9ec3f56ccf9 Mon Sep 17 00:00:00 2001
From: yang_shj <yang_shj@hisuntech.com>
Date: Mon, 28 Feb 2022 10:02:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:0=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 payment-base-app/pom.xml                      | 25 +++++++++++++++++++
 .../springcloud/client/PaymentClient.java     | 14 +++++++++++
 .../controller/MerchantController.java        |  2 +-
 .../springcloud/dto/MerchantConfigReqDTO.java |  5 ++--
 .../src/main/resources/application.yml        |  4 +++
 .../target/classes/application.yml            |  4 +++
 6 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 payment-base-app/src/main/java/com/base/springcloud/client/PaymentClient.java

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 @@
             <version>1.2.47</version>
         </dependency>
 
+        <!-- feign MultipartFile -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+            <version>1.4.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form-spring</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign.form</groupId>
+            <artifactId>feign-form</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
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 #实体类包路径