From 060fc40424d694a691e623c7ae6dce808514063c Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Sat, 12 Jul 2025 22:46:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E5=85=A8=E9=9D=A2?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=AE=B9=E5=99=A8=E5=88=B0=20undertow?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=B8=85=E7=90=86=E4=BA=86=20servle?= =?UTF-8?q?t=20=E5=92=8C=20reactive=20=E5=BA=93=E7=9A=84=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 12 ++++++++++ mall-account/pom.xml | 16 +++++++++++++ .../src/main/resources/application.yml | 12 ++++++++++ .../src/main/resources/bootstrap-prod.yml | 2 +- mall-admin/pom.xml | 16 +++++++++++++ mall-admin/src/main/resources/application.yml | 14 ++++++++++- mall-auth/pom.xml | 19 +++++++++++---- mall-auth/src/main/resources/application.yml | 12 ++++++++++ mall-cms/pom.xml | 15 ++++++++++++ mall-cms/src/main/resources/application.yml | 12 ++++++++++ mall-gateway/pom.xml | 9 ++++---- mall-im/pom.xml | 15 ++++++++++++ mall-im/src/main/resources/application.yml | 12 ++++++++++ mall-pay/pom.xml | 15 ++++++++++++ mall-pay/src/main/resources/application.yml | 12 ++++++++++ mall-search/pom.xml | 19 +++++++++++---- .../src/main/resources/application.yml | 12 ++++++++++ mall-shop/pom.xml | 16 +++++++++++++ .../impl/ShopOrderReturnServiceImpl.java | 23 ++++++++++--------- mall-shop/src/main/resources/application.yml | 12 ++++++++++ mall-sns/pom.xml | 16 +++++++++++++ mall-sns/src/main/resources/application.yml | 12 ++++++++++ pom.xml | 1 - 23 files changed, 278 insertions(+), 26 deletions(-) diff --git a/README.MD b/README.MD index 3c26795d..db6d0d74 100644 --- a/README.MD +++ b/README.MD @@ -10,6 +10,18 @@ mall-cms mall-search mall-im +cd /data/sh +./mall-gateway.sh +./mall-auth.sh +./mall-account.sh +./mall-admin.sh +./mall-shop.sh +./mall-sns.sh +./mall-pay.sh +./mall-cms.sh +./mall-search.sh +./mall-im.sh + 微信支付配置 { "mchid": 商户ID, diff --git a/mall-account/pom.xml b/mall-account/pom.xml index ee53d5fd..fc147c8f 100644 --- a/mall-account/pom.xml +++ b/mall-account/pom.xml @@ -18,6 +18,22 @@ + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + org.springframework.boot + spring-boot-starter-undertow + + com.alibaba.cloud spring-cloud-starter-alibaba-seata diff --git a/mall-account/src/main/resources/application.yml b/mall-account/src/main/resources/application.yml index e843e358..3b630e4a 100644 --- a/mall-account/src/main/resources/application.yml +++ b/mall-account/src/main/resources/application.yml @@ -1,5 +1,17 @@ server: port: 8088 + server: + undertow: + io-threads: 2 + worker-threads: 200 + buffer-size: 16384 + direct-buffers: true + max-connections: 2000 + queue-size: 100 + no-request-timeout: 60000 + connection-timeout: 60000 + max-http-header-size: 8192 + max-http-post-size: 200MB mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/mall-account/src/main/resources/bootstrap-prod.yml b/mall-account/src/main/resources/bootstrap-prod.yml index 823935f2..12cf1e73 100644 --- a/mall-account/src/main/resources/bootstrap-prod.yml +++ b/mall-account/src/main/resources/bootstrap-prod.yml @@ -107,7 +107,7 @@ logging: netflix: error org: error io: error - reactor: error springfox: error + reactor: error logstash: host: @logstash.host@ \ No newline at end of file diff --git a/mall-admin/pom.xml b/mall-admin/pom.xml index 197528fb..eb543eef 100644 --- a/mall-admin/pom.xml +++ b/mall-admin/pom.xml @@ -17,6 +17,22 @@ + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + org.springframework.boot + spring-boot-starter-undertow + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/mall-admin/src/main/resources/application.yml b/mall-admin/src/main/resources/application.yml index 7532d28a..8d91e579 100644 --- a/mall-admin/src/main/resources/application.yml +++ b/mall-admin/src/main/resources/application.yml @@ -1,5 +1,17 @@ server: port: 8080 + server: + undertow: + io-threads: 2 + worker-threads: 200 + buffer-size: 16384 + direct-buffers: true + max-connections: 2000 + queue-size: 100 + no-request-timeout: 60000 + connection-timeout: 60000 + max-http-header-size: 8192 + max-http-post-size: 200MB spring: servlet: multipart: @@ -35,7 +47,7 @@ aliyun: maxSize: 10 # 上传文件大小(M) callback: http://464d-221-239-130-64.ngrok.io:8201/aliyun/oss/callback # 文件上传成功后的回调地址 dir: -# prefix: shop/data/upload # 上传文件夹路径前缀 + # prefix: shop/data/upload # 上传文件夹路径前缀 prefix: mall/images # 上传文件夹路径前缀 feign: okhttp: diff --git a/mall-auth/pom.xml b/mall-auth/pom.xml index f26683a9..383b50d0 100644 --- a/mall-auth/pom.xml +++ b/mall-auth/pom.xml @@ -19,6 +19,21 @@ + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + com.suisung.mall mall-common @@ -49,10 +64,6 @@ - - org.springframework.boot - spring-boot-starter-web - com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/mall-auth/src/main/resources/application.yml b/mall-auth/src/main/resources/application.yml index e4a7bea3..5edbb323 100644 --- a/mall-auth/src/main/resources/application.yml +++ b/mall-auth/src/main/resources/application.yml @@ -1,5 +1,17 @@ server: port: 8401 + server: + undertow: + io-threads: 2 + worker-threads: 200 + buffer-size: 16384 + direct-buffers: true + max-connections: 2000 + queue-size: 100 + no-request-timeout: 60000 + connection-timeout: 60000 + max-http-header-size: 8192 + max-http-post-size: 200MB management: #开启SpringBoot Admin的监控 endpoints: web: diff --git a/mall-cms/pom.xml b/mall-cms/pom.xml index 23f2e881..234137c6 100644 --- a/mall-cms/pom.xml +++ b/mall-cms/pom.xml @@ -18,6 +18,21 @@ + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/mall-cms/src/main/resources/application.yml b/mall-cms/src/main/resources/application.yml index 3c0f361d..f616ef5e 100644 --- a/mall-cms/src/main/resources/application.yml +++ b/mall-cms/src/main/resources/application.yml @@ -1,5 +1,17 @@ server: port: 8087 + server: + undertow: + io-threads: 2 + worker-threads: 200 + buffer-size: 16384 + direct-buffers: true + max-connections: 2000 + queue-size: 100 + no-request-timeout: 60000 + connection-timeout: 60000 + max-http-header-size: 8192 + max-http-post-size: 200MB management: #开启SpringBoot Admin的监控 endpoints: web: diff --git a/mall-gateway/pom.xml b/mall-gateway/pom.xml index 7d5a0d94..4f8d618d 100644 --- a/mall-gateway/pom.xml +++ b/mall-gateway/pom.xml @@ -16,6 +16,10 @@ + + org.springframework.cloud + spring-cloud-starter-gateway + com.suisung.mall mall-common @@ -46,10 +50,7 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - - org.springframework.cloud - spring-cloud-starter-gateway - + com.github.xiaoymin knife4j-spring-boot-starter diff --git a/mall-im/pom.xml b/mall-im/pom.xml index e0b41d55..e34748b6 100644 --- a/mall-im/pom.xml +++ b/mall-im/pom.xml @@ -18,6 +18,21 @@ + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + com.alibaba.cloud spring-cloud-starter-alibaba-seata diff --git a/mall-im/src/main/resources/application.yml b/mall-im/src/main/resources/application.yml index 0f086d10..a12fe50e 100644 --- a/mall-im/src/main/resources/application.yml +++ b/mall-im/src/main/resources/application.yml @@ -1,5 +1,17 @@ server: port: 8099 + server: + undertow: + io-threads: 2 + worker-threads: 200 + buffer-size: 16384 + direct-buffers: true + max-connections: 2000 + queue-size: 100 + no-request-timeout: 60000 + connection-timeout: 60000 + max-http-header-size: 8192 + max-http-post-size: 200MB mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/mall-pay/pom.xml b/mall-pay/pom.xml index c363461c..7ae353e8 100644 --- a/mall-pay/pom.xml +++ b/mall-pay/pom.xml @@ -18,6 +18,21 @@ Demo project for Spring Boot + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + com.alibaba.cloud spring-cloud-starter-alibaba-seata diff --git a/mall-pay/src/main/resources/application.yml b/mall-pay/src/main/resources/application.yml index d77ce061..84a5dca9 100644 --- a/mall-pay/src/main/resources/application.yml +++ b/mall-pay/src/main/resources/application.yml @@ -1,5 +1,17 @@ server: port: 8086 + server: + undertow: + io-threads: 2 + worker-threads: 200 + buffer-size: 16384 + direct-buffers: true + max-connections: 2000 + queue-size: 100 + no-request-timeout: 60000 + connection-timeout: 60000 + max-http-header-size: 8192 + max-http-post-size: 200MB management: #开启SpringBoot Admin的监控 endpoints: web: diff --git a/mall-search/pom.xml b/mall-search/pom.xml index 2aadaea9..77eff9be 100644 --- a/mall-search/pom.xml +++ b/mall-search/pom.xml @@ -14,6 +14,21 @@ + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + com.suisung.mall mall-common @@ -36,10 +51,6 @@ - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot spring-boot-starter-data-elasticsearch diff --git a/mall-search/src/main/resources/application.yml b/mall-search/src/main/resources/application.yml index 4f2b8a12..069fcaf4 100644 --- a/mall-search/src/main/resources/application.yml +++ b/mall-search/src/main/resources/application.yml @@ -1,5 +1,17 @@ server: port: 8081 + server: + undertow: + io-threads: 2 + worker-threads: 200 + buffer-size: 16384 + direct-buffers: true + max-connections: 2000 + queue-size: 100 + no-request-timeout: 60000 + connection-timeout: 60000 + max-http-header-size: 8192 + max-http-post-size: 200MB management: #开启SpringBoot Admin的监控 endpoints: web: diff --git a/mall-shop/pom.xml b/mall-shop/pom.xml index d09326d8..96cf2bdc 100644 --- a/mall-shop/pom.xml +++ b/mall-shop/pom.xml @@ -19,6 +19,22 @@ + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + org diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java index 61a3cdef..798cea6c 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java @@ -2234,7 +2234,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl().eq("order_id", orderId)); if (refundOrder == null) { return CommonResult.failed("退货单创建失败"); @@ -2309,14 +2311,13 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl().eq("order_id", orderId)); refundOrder.setReturn_flag(0); - String reason = StrUtil.isBlank(requestParams.getStr("reason")) ? - (isPartialRefund ? "商家部分商品退货" : "商家整单退货") : - requestParams.getStr("reason"); refundOrder.setReturn_store_message(reason); refundOrder.setReturn_buyer_message(reason); + logger.info("商家退款订单：{}", refundOrder); + if (!processReviewList(refundOrder, 0)) { - return CommonResult.failed("退货处理失败"); + return CommonResult.failed("退款处理失败"); } // === 7. 特殊场景：同城配送订单取消 === @@ -2332,8 +2333,8 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImplDemo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + io.seata seata-spring-boot-starter diff --git a/mall-sns/src/main/resources/application.yml b/mall-sns/src/main/resources/application.yml index 071ed7b7..40356e0b 100644 --- a/mall-sns/src/main/resources/application.yml +++ b/mall-sns/src/main/resources/application.yml @@ -1,5 +1,17 @@ server: port: 8085 + server: + undertow: + io-threads: 2 + worker-threads: 200 + buffer-size: 16384 + direct-buffers: true + max-connections: 2000 + queue-size: 100 + no-request-timeout: 60000 + connection-timeout: 60000 + max-http-header-size: 8192 + max-http-post-size: 200MB management: #开启SpringBoot Admin的监控 endpoints: web: diff --git a/pom.xml b/pom.xml index 4f2ad89f..93084dc0 100644 --- a/pom.xml +++ b/pom.xml @@ -538,7 +538,6 @@ ["java", "-jar", "-Xms128m", "-Xmx512m", "-XX:PermSize=64M", "-XX:MaxPermSize=512M", "-Dspring.profiles.active=${spring.profile}", "-Duser.timezone=Asia/Shanghai", "/${project.build.finalName}.jar"] - ${docker.ca}