diff --git a/pom.xml b/pom.xml index 5082a34..0c35382 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ UTF-8 17 3.1.1 - 3.2.5 + 3.3.0 1.2.21 3.5.2 6.0.0 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AtomikosConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AtomikosConfig.java index b7d3dcc..46d87ef 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AtomikosConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AtomikosConfig.java @@ -23,15 +23,17 @@ public class AtomikosConfig @Bean(name = "userTransaction") public UserTransaction userTransaction() throws Throwable { - UserTransactionImp userTransactionImp = new UserTransactionImp(); - userTransactionImp.setTransactionTimeout(10000); - return userTransactionImp; + UserTransaction userTransaction = new UserTransactionImp(); + // 设置事务超时时间为10000毫秒 + userTransaction.setTransactionTimeout(10000); + return userTransaction; } @Bean(name = "atomikosTransactionManager", initMethod = "init", destroyMethod = "close") public TransactionManager atomikosTransactionManager() throws Throwable { UserTransactionManager userTransactionManager = new UserTransactionManager(); + // 设置是否强制关闭事务管理器为false userTransactionManager.setForceShutdown(false); return userTransactionManager; } diff --git a/ruoyi-middleware/pom.xml b/ruoyi-middleware/pom.xml index 52236b7..c662a62 100644 --- a/ruoyi-middleware/pom.xml +++ b/ruoyi-middleware/pom.xml @@ -11,15 +11,13 @@ ruoyi-middleware - 3.8.7.3.4 8.2.1 - 3.2.5 中间件 - + diff --git a/ruoyi-oauth/pom.xml b/ruoyi-oauth/pom.xml index fc4c4f8..7b60558 100644 --- a/ruoyi-oauth/pom.xml +++ b/ruoyi-oauth/pom.xml @@ -11,9 +11,9 @@ ruoyi-oauth - 3.8.7.3.4 1.16.6 3.7.4.ALL + 2.0.24 @@ -28,17 +28,27 @@ ${ruoyi.version} + me.zhyd.oauth JustAuth ${justauth.version} + + com.alipay.sdk alipay-sdk-java ${alipay.version} + + + com.aliyun + dysmsapi20170525 + ${dysmsapi.version} + + com.ruoyi diff --git a/ruoyi-oauth/ruoyi-oauth-common/pom.xml b/ruoyi-oauth/ruoyi-oauth-common/pom.xml index 4dd69a6..37b7001 100644 --- a/ruoyi-oauth/ruoyi-oauth-common/pom.xml +++ b/ruoyi-oauth/ruoyi-oauth-common/pom.xml @@ -1,7 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> ruoyi-oauth com.ruoyi @@ -21,7 +20,6 @@ com.ruoyi ruoyi-framework - ${ruoyi.version} diff --git a/ruoyi-oauth/ruoyi-oauth-phone/pom.xml b/ruoyi-oauth/ruoyi-oauth-phone/pom.xml index f9ab473..b35701c 100644 --- a/ruoyi-oauth/ruoyi-oauth-phone/pom.xml +++ b/ruoyi-oauth/ruoyi-oauth-phone/pom.xml @@ -26,7 +26,6 @@ com.aliyun dysmsapi20170525 - 2.0.24 diff --git a/ruoyi-pay/pom.xml b/ruoyi-pay/pom.xml index ccf1d09..89bb1d1 100644 --- a/ruoyi-pay/pom.xml +++ b/ruoyi-pay/pom.xml @@ -1,7 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> ruoyi com.ruoyi @@ -12,7 +11,8 @@ ruoyi-pay - 3.8.7.3.4 + 0.2.12 + 2.2.0 @@ -20,6 +20,19 @@ + + + com.github.wechatpay-apiv3 + wechatpay-java + ${wechatpay.version} + + + + com.alipay.sdk + alipay-easysdk + ${alipay.version} + + com.ruoyi diff --git a/ruoyi-pay/ruoyi-pay-alipay/pom.xml b/ruoyi-pay/ruoyi-pay-alipay/pom.xml index d32ec67..c5b1503 100644 --- a/ruoyi-pay/ruoyi-pay-alipay/pom.xml +++ b/ruoyi-pay/ruoyi-pay-alipay/pom.xml @@ -1,7 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> ruoyi-pay com.ruoyi @@ -25,13 +24,8 @@ com.alipay.sdk alipay-easysdk - 2.2.0 - - - com.alipay.sdk - alipay-sdk-java - 4.22.110.ALL + \ No newline at end of file diff --git a/ruoyi-pay/ruoyi-pay-wx/pom.xml b/ruoyi-pay/ruoyi-pay-wx/pom.xml index 1664bf5..ae5a6e4 100644 --- a/ruoyi-pay/ruoyi-pay-wx/pom.xml +++ b/ruoyi-pay/ruoyi-pay-wx/pom.xml @@ -24,7 +24,6 @@ com.github.wechatpay-apiv3 wechatpay-java - 0.2.12 diff --git a/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxAppPayController.java b/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxAppPayController.java index db11ea8..efc553a 100644 --- a/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxAppPayController.java +++ b/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxAppPayController.java @@ -1,38 +1,29 @@ package com.ruoyi.pay.wx.controller; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.pay.domain.PayOrder; import com.ruoyi.pay.service.IPayOrderService; import com.ruoyi.pay.wx.config.WxPayAppConfig; import com.wechat.pay.java.core.Config; import com.wechat.pay.java.core.RSAAutoCertificateConfig; -import com.wechat.pay.java.core.exception.ValidationException; -import com.wechat.pay.java.core.notification.NotificationConfig; -import com.wechat.pay.java.core.notification.NotificationParser; -import com.wechat.pay.java.core.notification.RequestParam; -import com.wechat.pay.java.service.payments.nativepay.model.QueryOrderByIdRequest; -import com.wechat.pay.java.service.wexinpayscoreparking.model.Transaction; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ruoyi.common.core.controller.BaseController; import com.wechat.pay.java.service.payments.nativepay.NativePayService; import com.wechat.pay.java.service.payments.nativepay.model.Amount; import com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest; import com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse; -import lombok.extern.slf4j.Slf4j; + +import io.swagger.v3.oas.annotations.Operation; /** * @author zlh */ -@Slf4j @RestController @RequestMapping("/wxPay") public class WxAppPayController extends BaseController {