From 5ac1485f32a4a6f775f119acfe26c1649d7349f9 Mon Sep 17 00:00:00 2001 From: zhangsan <646228430@qq.com> Date: Thu, 7 Aug 2025 21:03:42 +0800 Subject: [PATCH] =?UTF-8?q?8.7=20=E9=83=A8=E7=BD=B2-3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docker-compose-app-v1.0.yml | 0 .../docker-compose-app-v2.0.yml | 0 .../src/main/resources/application-dev.yml | 1 + .../src/main/resources/application-prod.yml | 18 ++++++++++++++++-- pay-mall-infrastructure/pom.xml | 4 ++++ .../adapter/port/ProductPort.java | 10 +++++----- .../whut/trigger/http/AliPayController.java | 2 +- 7 files changed, 27 insertions(+), 8 deletions(-) rename docs/tag/{v1.0 => pay-mall-v1.0}/docker-compose-app-v1.0.yml (100%) rename docs/tag/{v2.0 => pay-mall-v2.0}/docker-compose-app-v2.0.yml (100%) diff --git a/docs/tag/v1.0/docker-compose-app-v1.0.yml b/docs/tag/pay-mall-v1.0/docker-compose-app-v1.0.yml similarity index 100% rename from docs/tag/v1.0/docker-compose-app-v1.0.yml rename to docs/tag/pay-mall-v1.0/docker-compose-app-v1.0.yml diff --git a/docs/tag/v2.0/docker-compose-app-v2.0.yml b/docs/tag/pay-mall-v2.0/docker-compose-app-v2.0.yml similarity index 100% rename from docs/tag/v2.0/docker-compose-app-v2.0.yml rename to docs/tag/pay-mall-v2.0/docker-compose-app-v2.0.yml diff --git a/pay-mall-app/src/main/resources/application-dev.yml b/pay-mall-app/src/main/resources/application-dev.yml index 5ff8093..2efe020 100644 --- a/pay-mall-app/src/main/resources/application-dev.yml +++ b/pay-mall-app/src/main/resources/application-dev.yml @@ -17,6 +17,7 @@ app: chanel: c01 rpc: mode: DUBBO + # 线程池配置 thread: pool: diff --git a/pay-mall-app/src/main/resources/application-prod.yml b/pay-mall-app/src/main/resources/application-prod.yml index 08634fe..f4038e3 100644 --- a/pay-mall-app/src/main/resources/application-prod.yml +++ b/pay-mall-app/src/main/resources/application-prod.yml @@ -11,9 +11,23 @@ app: api-url: http://group-buying-sys:8091 # 回调给自己，通常要是公网可访问的域名或网关地址 # 如果 pay-mall 服务外部也同 host:8092，可以写： - notify-url: http://124.71.159.195:8092/api/v1/alipay/group_buy_notify + notify-url: http://group-buying-sys/api/v1/alipay/group_buy_notify + notify-type: MQ source: s01 - chanel: c01 + channel: c01 + rpc: + mode: DUBBO + +# 线程池配置 +thread: + pool: + executor: + config: + core-pool-size: 20 + max-pool-size: 50 + keep-alive-time: 5000 + block-queue-size: 5000 + policy: CallerRunsPolicy spring: datasource: diff --git a/pay-mall-infrastructure/pom.xml b/pay-mall-infrastructure/pom.xml index 83a0a18..ced1555 100644 --- a/pay-mall-infrastructure/pom.xml +++ b/pay-mall-infrastructure/pom.xml @@ -52,6 +52,10 @@ org.apache.dubbo dubbo-registry-nacos + + org.springframework.boot + spring-boot-configuration-processor + edu.whut diff --git a/pay-mall-infrastructure/src/main/java/edu/whut/infrastructure/adapter/port/ProductPort.java b/pay-mall-infrastructure/src/main/java/edu/whut/infrastructure/adapter/port/ProductPort.java index a7468e6..c2f7dfc 100644 --- a/pay-mall-infrastructure/src/main/java/edu/whut/infrastructure/adapter/port/ProductPort.java +++ b/pay-mall-infrastructure/src/main/java/edu/whut/infrastructure/adapter/port/ProductPort.java @@ -36,8 +36,8 @@ public class ProductPort implements IProductPort { /* -------------------- 公共配置 -------------------- */ @Value("${app.config.group-buy-market.source}") private String source; - @Value("${app.config.group-buy-market.chanel}") - private String chanel; + @Value("${app.config.group-buy-market.channel}") + private String channel; @Value("${app.config.group-buy-market.notify-url}") private String notifyUrl; @Value("${app.config.group-buy-market.notify-type}") @@ -97,7 +97,7 @@ public class ProductPort implements IProductPort { public void settlementMarketPayOrder(String userId, String orderId, Date orderTime) { SettlementMarketPayOrderRequestDTO req = new SettlementMarketPayOrderRequestDTO(); req.setSource(source); - req.setChannel(chanel); + req.setChannel(channel); req.setUserId(userId); req.setOutTradeNo(orderId); req.setOutTradeTime(orderTime); @@ -111,7 +111,7 @@ public class ProductPort implements IProductPort { public void refundMarketPayOrder(String userId, String orderId) { RefundMarketPayOrderRequestDTO req = new RefundMarketPayOrderRequestDTO(); req.setSource(source); - req.setChannel(chanel); + req.setChannel(channel); req.setUserId(userId); req.setOutTradeNo(orderId); invoke("refundMarketPayOrder", req); @@ -202,7 +202,7 @@ public class ProductPort implements IProductPort { dto.setGoodsId(goodsId); dto.setActivityId(activityId); dto.setSource(source); - dto.setChannel(chanel); + dto.setChannel(channel); dto.setOutTradeNo(orderId); if ("HTTP".equalsIgnoreCase(notifyType)) { dto.setNotifyUrl(notifyUrl); diff --git a/pay-mall-trigger/src/main/java/edu/whut/trigger/http/AliPayController.java b/pay-mall-trigger/src/main/java/edu/whut/trigger/http/AliPayController.java index 706965a..ba65e5d 100644 --- a/pay-mall-trigger/src/main/java/edu/whut/trigger/http/AliPayController.java +++ b/pay-mall-trigger/src/main/java/edu/whut/trigger/http/AliPayController.java @@ -72,7 +72,7 @@ public class AliPayController implements IPayService { .data(payOrderEntity.getPayUrl()) .build(); } catch (Exception e) { - log.error("商品下单，根据商品ID创建支付单失败 userId:{} productId:{}", createPayRequestDTO.getUserId(), createPayRequestDTO.getUserId(), e); + log.error("商品下单，根据商品ID创建支付单失败 userId:{} productId:{}", createPayRequestDTO.getUserId(), createPayRequestDTO.getProductId(), e); return Response.builder() .code(Constants.ResponseCode.UN_ERROR.getCode()) .info(Constants.ResponseCode.UN_ERROR.getInfo())