From 37ebba2310616ca389fa9d51f50c91cf4360cd04 Mon Sep 17 00:00:00 2001 From: liyuxin <1579178744@qq.com> Date: Tue, 3 Sep 2024 17:07:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20=E4=B8=8A=E4=BC=A0=20=20?= =?UTF-8?q?=E6=9D=8E=E9=9B=A8=E6=AC=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-market2-common/src/main/java/com/muyu/data/AliPay.java | 3 +++ .../java/com/muyu/market/server/config/AliPayConfig.java | 3 +++ .../com/muyu/market/server/controller/AliPayController.java | 5 +++++ cloud-market2-server/src/main/resources/bootstrap.yml | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cloud-market2-common/src/main/java/com/muyu/data/AliPay.java b/cloud-market2-common/src/main/java/com/muyu/data/AliPay.java index 1e44e80..3d009bb 100644 --- a/cloud-market2-common/src/main/java/com/muyu/data/AliPay.java +++ b/cloud-market2-common/src/main/java/com/muyu/data/AliPay.java @@ -10,7 +10,10 @@ public class AliPay { private double totalAmount; //商品名称 private String subject; +<<<<<<< HEAD +======= +>>>>>>> origin/master //订单追踪号，商户自己生成，可已不使用 private String alipayTraceNo; } 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 52235f3..47c60d6 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,8 +15,11 @@ 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 a0aa2f3..8e1e7ef 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,10 +42,15 @@ 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() + "\"," diff --git a/cloud-market2-server/src/main/resources/bootstrap.yml b/cloud-market2-server/src/main/resources/bootstrap.yml index 184aff1..54a3bd7 100644 --- a/cloud-market2-server/src/main/resources/bootstrap.yml +++ b/cloud-market2-server/src/main/resources/bootstrap.yml @@ -60,4 +60,4 @@ alipay: appPrivateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCWxZholdxU/C9Vh+4hjD4yWH5MUn3ZK7zkFKB09KY1Kz5k6t0fhcdMRbTaJulyQVL21wneb83f+5hhAzk9+j6RLrvIbE1YZyvt9uoUIpljMkEFyVL2L97/m/Bc+D+PMXMor0DxWMgdkGvmm/1Phjaoxr+HZn6WI1ZFXjKNdIUMNs8H5oLXkBpfTVDS8GLXfDxrUT2gx9g2AH8NJMLlWObHwG3ZPQenRg5szhjLHxuuNgcfJXyoW0agSnRqzn8QeYyq5H0XVElrtF+JbBsnvuUgJn/+h/oVoKeFekEYjfqogzx/1oROereXdEk3OxmzrlW0+EUYBEMViv7EGi0z8/jLAgMBAAECggEAYDm+OsmidK76+silZ83dCD7IZKelYEx04tBzVBGsXnS5/qiS9gJonzpB4ZVCGsSsUZQO3WNX7uLhbtEi4HZtJjXAbXsJpik6tUaIQM+QO+of67SA+VS2K0b4Ei3ySs6Ro96uQRqbpZq98tGNywpqqi8moCD/G410CxPCidta6t64jgMigJr1llhzUDNa6KnEZTTof0D9E4HPYm+zQelRa3xDSYojw3VGUr+Ar0gopsyYLUlUgJJLTA4nzKfL7CP0d2+9qrP7OvcpNexe9/PsXTh2rJPKqttYJjXTEzi4+a6GfpX/XF8E9mCAg1QyIl+wZtKhhJDdlwvFf58cddvgoQKBgQDU8znRH+/d253tFPhlqJcUpaNFPzv7r1R3WWt9e5QsHHy60r6CnDpHeu2Q+0xYfeqEonUstM8qCkNqFx68MghYp79SKSEXrPhELdV25GNvF1XjrNB8BNBgd+NO1FiSJjiwXHmZ9f+Sw967lVABZhCvykkKEORN/UVLEvxo+ppGMQKBgQC1QHfiQpmhmQ0mnok+s9VQtkdWl5SvYn0Urpghe31hjnUa30pGEPIlYhpJWpyN1kL77HHr9+NRDfR1pN1TDHf+P3Ru2Kue5C70vLqIWhVJxs6RKVAWAgnrfnBJsM4TVAR93uWHv8Livdj+wf3D/ZLb8FVeOa76pYeu4okAm8ojuwKBgA5AYOQwAPuWERGmz6DuEX5eP3kI7FjBuSNrppf1R0tUdLyEEh/nmLbj8TY8uzVI6AMMZE8joqGroitddL8fkhNs1o8HFaHh/5OAhcK5MjZjF2pvTFygbdmm7F2ANJVDXZPf/HtjTUFjPmrLaVlOnVtGbHDyBHV7t8F4edAExYJhAoGAUUKT/OarBh4eHUBae7gYXNU76oCO8oqPVWRpZCl/Luu1aNTO8dbLGSOAcX6kTZrP8S4ybP539XDyNoQxjfg7G8vLIZ8WYmge/S5X2qW4gZkWJ1KESzmixOes4/zWhyfV07DI6zF36DwBO0YxxVq8Ksr3GwV1g34O9MMvdQxjdd0CgYBu00EaXBQaxANpO+6oH3KECxvxspKZvk4exI72OFbZ1mZayHNG7BVyfuAMNNp/SRoFXGC4/dVq+tycIOQutvRHrBSRRsv1db8No1j8oEYHvQ5br7OxjS941S/KWeIZefBAyajyCzUjIDZBRTBMGVyJ2p2c/SdUmPs2XTMQnG+mUg== alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvAodOIG6vaqMsl5DXjcRYPRro+C/SeTswVo5gqQdikK3qy118GWkVwL9gvEovq23EMCTmSV+KAFsHz8f0UxLEK9FZcfRuM5E7GfnP7sdY0ctjfmUhQ7fWVOTGLuH0h5DiQ+4voO/2Hi6SElvtLXAUBSqMKw6J0PsJ0uUY9CBZCQnZkFJWAAroUWw5ARUMy62KPZSAW2s8Qg4gacdhSk7SBACNGBFcJZHCS09xQJi5SxCHaTRLhhIckLBvuKEWhBsh+jU75BKYAC4ovoWhMAFnIWKwCmubhXqmYjuJ4egUQTQBbD1hasK99I1YzdXRH8OKwKD4Lufb42B9buZ/2hOywIDAQAB notifyUrl: http://12.2.1.1:8080/market2/alipay/notify - returnUrl: http://12.2.1.1:8080/market2/apitype +