lianghanqiang 4 лет назад
Родитель
Сommit
7ffe9740bd

+ 19 - 3
ldt-core/src/main/java/org/springblade/yeePay/controller/YeepayController.java

@@ -6,6 +6,8 @@ import com.yeepay.yop.sdk.service.common.response.YopResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.common.cache.PlatformCache;
+import org.springblade.common.config.yeepay.OpenProduct;
 import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.api.R;
@@ -23,6 +25,11 @@ import org.springblade.yeePay.entity.saas.trade.TradeOrderQueryDto;
 import org.springblade.yeePay.service.YeepayCommonService;
 import org.springblade.yeePay.service.YeepaySaasService;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author: lianghanqiang
@@ -99,10 +106,10 @@ public class YeepayController {
 		return R.data(yeepayCommonService.queryApp(parentMerchantNo,merchantNo,appIdType));
 	}
 
-	@GetMapping("/upload")
+	@PostMapping("/upload")
 	@ApiOperation("上传文件")
-	public R upload(String multipartFile){
-		return R.data(yeepayCommonService.addFileToYeepay(multipartFile));
+	public R upload( MultipartFile file){
+ 		return R.data(yeepayCommonService.addFileToYeepay(file));
 	}
 
 	@GetMapping("/queryBalance")
@@ -193,4 +200,13 @@ public class YeepayController {
 		return R.success("s");
 	}
 
+	public static void main(String[] args) {
+		List<InvitationDto.ProductInfo> productInfos = new ArrayList<>(32);
+		Arrays.stream(OpenProduct.MICRO_PRODUCTS).forEach(item -> {
+			InvitationDto.ProductInfo productInfo = PlatformCache.productInfo(item);
+			productInfo.setProductName(null);
+			productInfos.add(productInfo);
+		});
+
+	}
 }

+ 1 - 0
ldt-core/src/main/resources/application.yml

@@ -256,6 +256,7 @@ blade:
 crypto:
   key: uAY9ugkHQpvozZeA
   whiteList:
+    - /yeepay
     - /put-file
     - /payment/callback/
     - /payment/csurl/