From 37989306988802280e18298cfb01d4f4b288d33e Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Tue, 3 Jun 2025 11:24:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wfc-common/wfc-common-core/pom.xml                |  5 +++++
 .../core/utils/file}/MultipartFileUtil.java       | 15 ++++++++++-----
 wfc-modules/wfc-payment/pom.xml                   |  5 -----
 .../pay/wxpay/service/impl/WxPayServiceImpl.java  |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)
 rename {wfc-modules/wfc-payment/src/main/java/org/wfc/payment/utils => wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file}/MultipartFileUtil.java (93%)

diff --git a/wfc-common/wfc-common-core/pom.xml b/wfc-common/wfc-common-core/pom.xml
index c0b4af8..cc759e5 100644
--- a/wfc-common/wfc-common-core/pom.xml
+++ b/wfc-common/wfc-common-core/pom.xml
@@ -128,6 +128,11 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/utils/MultipartFileUtil.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/MultipartFileUtil.java
similarity index 93%
rename from wfc-modules/wfc-payment/src/main/java/org/wfc/payment/utils/MultipartFileUtil.java
rename to wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/MultipartFileUtil.java
index 7293f7a..17633a9 100644
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/utils/MultipartFileUtil.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/MultipartFileUtil.java
@@ -1,13 +1,18 @@
-package org.wfc.payment.utils;
- 
+package org.wfc.common.core.utils.file;
+
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import org.apache.http.entity.ContentType;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
- 
-import java.io.*;
- 
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 /**
  * MultipartFile和File互转工具类
  */
diff --git a/wfc-modules/wfc-payment/pom.xml b/wfc-modules/wfc-payment/pom.xml
index badae65..2beaead 100644
--- a/wfc-modules/wfc-payment/pom.xml
+++ b/wfc-modules/wfc-payment/pom.xml
@@ -122,11 +122,6 @@
             <groupId>javax.persistence</groupId>
             <artifactId>javax.persistence-api</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
         
     </dependencies>
 
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/service/impl/WxPayServiceImpl.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/service/impl/WxPayServiceImpl.java
index fc879b6..844ac2d 100644
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/service/impl/WxPayServiceImpl.java
+++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/service/impl/WxPayServiceImpl.java
@@ -19,8 +19,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.wfc.common.core.domain.R;
 import org.wfc.common.core.exception.ServiceException;
+import org.wfc.common.core.utils.file.MultipartFileUtil;
 import org.wfc.payment.pay.wxpay.service.IWxPayService;
-import org.wfc.payment.utils.MultipartFileUtil;
 import org.wfc.system.api.RemoteFileService;
 import org.wfc.system.api.domain.SysFile;
 import org.wfc.user.api.RemoteUUserService;