整理pom，添加部分注释

pom.xml

@@ -17,7 +17,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <spring-boot.version>3.2.5</spring-boot.version>
+        <spring-boot.version>3.3.0</spring-boot.version>
         <druid.version>1.2.21</druid.version>
         <dynamic.version>3.5.2</dynamic.version>
         <transactions.version>6.0.0</transactions.version>

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();
+        UserTransaction userTransaction = new UserTransactionImp();
-        userTransactionImp.setTransactionTimeout(10000);
+        // 设置事务超时时间为10000毫秒
-        return userTransactionImp;
+        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;
     }

ruoyi-middleware/pom.xml

@@ -11,9 +11,7 @@
     <artifactId>ruoyi-middleware</artifactId>
 
     <properties>
-        <ruoyi.version>3.8.7.3.4</ruoyi.version>
         <minio.version>8.2.1</minio.version>
-        <spring-boot.version>3.2.5</spring-boot.version>
     </properties>
 
     <description>

ruoyi-oauth/pom.xml

@@ -11,9 +11,9 @@
     <artifactId>ruoyi-oauth</artifactId>
 
     <properties>
-        <ruoyi.version>3.8.7.3.4</ruoyi.version>
         <justauth.version>1.16.6</justauth.version>
         <alipay.version>3.7.4.ALL</alipay.version>
+        <dysmsapi.version>2.0.24</dysmsapi.version>
     </properties>
 
     <description>
@@ -28,17 +28,27 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!-- justauth第三方认证框架 -->
             <dependency>
                 <groupId>me.zhyd.oauth</groupId>
                 <artifactId>JustAuth</artifactId>
                 <version>${justauth.version}</version>
             </dependency>
+
+            <!-- 支付宝开发者sdk -->
             <dependency>
                 <groupId>com.alipay.sdk</groupId>
                 <artifactId>alipay-sdk-java</artifactId>
                 <version>${alipay.version}</version>
             </dependency>
 
+            <!-- 阿里云短信认证 -->
+            <dependency>
+                <groupId>com.aliyun</groupId>
+                <artifactId>dysmsapi20170525</artifactId>
+                <version>${dysmsapi.version}</version>
+            </dependency>
+
             <!-- justauth通用认证 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>

ruoyi-oauth/ruoyi-oauth-common/pom.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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">
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>ruoyi-oauth</artifactId>
         <groupId>com.ruoyi</groupId>
@@ -21,7 +20,6 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-framework</artifactId>
-            <version>${ruoyi.version}</version>
         </dependency>
 
         <!--httpclient-->

ruoyi-oauth/ruoyi-oauth-phone/pom.xml

@@ -26,7 +26,6 @@
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>dysmsapi20170525</artifactId>
-            <version>2.0.24</version>
         </dependency>
 
     </dependencies>

ruoyi-pay/pom.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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">
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
@@ -12,7 +11,8 @@
     <artifactId>ruoyi-pay</artifactId>
 
     <properties>
-        <ruoyi.version>3.8.7.3.4</ruoyi.version>
+        <wechatpay.version>0.2.12</wechatpay.version>
+        <alipay.version>2.2.0</alipay.version>
     </properties>
 
     <description>
@@ -20,6 +20,19 @@
     </description>
     <dependencyManagement>
         <dependencies>
+            <!-- 微信支付的api -->
+            <dependency>
+                <groupId>com.github.wechatpay-apiv3</groupId>
+                <artifactId>wechatpay-java</artifactId>
+                <version>${wechatpay.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alipay.sdk</groupId>
+                <artifactId>alipay-easysdk</artifactId>
+                <version>${alipay.version}</version>
+            </dependency>
+
             <!-- 支付基础模块 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>

ruoyi-pay/ruoyi-pay-alipay/pom.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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">
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>ruoyi-pay</artifactId>
         <groupId>com.ruoyi</groupId>
@@ -25,13 +24,8 @@
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-easysdk</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alipay.sdk</groupId>
-            <artifactId>alipay-sdk-java</artifactId>
-            <version>4.22.110.ALL</version>
         </dependency>
+
     </dependencies>
 
 </project>

ruoyi-pay/ruoyi-pay-wx/pom.xml

@@ -24,7 +24,6 @@
         <dependency>
             <groupId>com.github.wechatpay-apiv3</groupId>
             <artifactId>wechatpay-java</artifactId>
-            <version>0.2.12</version>
         </dependency>
 
     </dependencies>

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 {