From 6c51f1b2e2fc882dffb4b0d7100c3da48b2c0521 Mon Sep 17 00:00:00 2001
From: liyuxin <1579178744@qq.com>
Date: Tue, 3 Sep 2024 17:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9git=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20=E6=9D=8E=E9=9B=A8=E6=AC=A3=20202409031711?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/muyu/market/server/config/AliPayConfig.java | 4 ----
 .../com/muyu/market/server/controller/AliPayController.java   | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java b/cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java
index 47c60d6..2fb99f1 100644
--- a/cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java
+++ b/cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java
@@ -15,11 +15,7 @@ import javax.annotation.PostConstruct;
 //读取yml文件中alipay 开头的配置
 @ConfigurationProperties(prefix = "alipay")
 public class AliPayConfig {
-<<<<<<< HEAD
 
-
-=======
->>>>>>> origin/master
     private String appId;
     private String appPrivateKey;
     private String alipayPublicKey;
diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
index 8e1e7ef..406b504 100644
--- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
+++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
@@ -42,15 +42,12 @@ public class AliPayController {
         AlipayClient alipayClient = new DefaultAlipayClient(GATEWAY_URL, aliPayConfig.getAppId(),
                 aliPayConfig.getAppPrivateKey(), FORMAT, CHARSET, aliPayConfig.getAlipayPublicKey(), SIGN_TYPE);
         AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
-<<<<<<< HEAD
 
         request.setNotifyUrl(aliPayConfig.getNotifyUrl());
         request.setReturnUrl(aliPayConfig.getReturnUrl());
 
-=======
         request.setNotifyUrl(aliPayConfig.getNotifyUrl());
         request.setReturnUrl(aliPayConfig.getReturnUrl());
->>>>>>> origin/master
         request.setBizContent("{\"out_trade_no\":\"" + aliPay.getTraceNo() + "\","
                 + "\"total_amount\":\"" + aliPay.getTotalAmount() + "\","
                 + "\"subject\":\"" + aliPay.getSubject() + "\","