From 29acbd6e19b5d676de2f039973240b4acf1f3ebb Mon Sep 17 00:00:00 2001
From: Dftre <3066417822@qq.com>
Date: Fri, 3 May 2024 22:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0reademe=20=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                | 20 ++++++++++++----
 pom.xml                                  | 29 +++++++++++++++++++++++-
 ruoyi-common/pom.xml                     |  1 -
 ruoyi-framework/pom.xml                  |  3 +--
 ruoyi-oauth/pom.xml                      |  9 ++++----
 ruoyi-oauth/ruoyi-oauth-justauth/pom.xml |  5 ++--
 6 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 8ab179d..53d5579 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,24 @@
-<div style="display: flex;justify-content: center;align-items: center;">
-	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
-    <span style="font-weight: bolder;font-size: 30px;">+</span>
-    <img alt="logo" src="./doc/image/logo.png">
-</div>
+
+
+
+<p align="center">
+    <span>
+        <img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
+    </span>
+    <span>+</span>
+    <span>
+        <img alt="logo" src="./doc/image/logo.png">
+    </span>
+</p>
 <h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Geek v3.8.7.3.2</h1>
 <h4 align="center">基于SpringBoot3+Vue3前后端分离的Java快速开发框架</h4>
 <p align="center">
 	<img src="https://img.shields.io/github/license/mashape/apistatus.svg">
 </p>
 
+
+
+
 # 当前版本是3.8.7.3.2
 
 本人的其他两个推荐搭配的项目
diff --git a/pom.xml b/pom.xml
index e6f980f..50a9243 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,8 @@
         <druid.version>1.2.21</druid.version>
         <shardingsphere.version>4.1.1</shardingsphere.version>
         <dynamic.version>3.5.2</dynamic.version>
+        <transactions.version>6.0.0</transactions.version>
+        <jta.version>1.1</jta.version>
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
         <kaptcha.version>2.3.3</kaptcha.version>
@@ -38,7 +40,8 @@
         <mybatis-spring-boot.version>3.0.3</mybatis-spring-boot.version>
         <mybatis-plus-boot-starter.version>3.5.5</mybatis-plus-boot-starter.version>
         <mysql.version>8.2.0</mysql.version>
-        <jaxb.version>2.3.1</jaxb.version>
+        <jaxb-api.version>2.3.1</jaxb-api.version>
+        <jaxb.version>4.0.5</jaxb.version>
         <springdoc.version>2.1.0</springdoc.version>
         <jakarta.version>6.0.0</jakarta.version>
     </properties>
@@ -80,8 +83,19 @@
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
+                <version>${jaxb-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
                 <version>${jaxb.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-core</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+
 
             <!-- Mysql驱动包 -->
             <dependency>
@@ -112,6 +126,19 @@
                 <version>${dynamic.version}</version>
             </dependency>
 
+            <!-- atomikos分布式事务 -->
+            <dependency>
+                <groupId>com.atomikos</groupId>
+                <artifactId>transactions-spring-boot3-starter</artifactId>
+                <version>${transactions.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.transaction</groupId>
+                <artifactId>jta</artifactId>
+                <version>${jta.version}</version>
+            </dependency>
+
             <!-- 解析客户端操作系统、浏览器等 -->
             <dependency>
                 <groupId>eu.bitwalker</groupId>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 8a2f2e2..b711112 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -108,7 +108,6 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
-            <version>2.3.0.1</version>
         </dependency>
 
         <!-- pool 对象池 -->
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 4d14a1a..ce063b2 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -40,16 +40,15 @@
             <artifactId>sharding-jdbc-core</artifactId>
         </dependency>
 
+        <!-- atomikos分布式事务 -->
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-spring-boot3-starter</artifactId>
-            <version>6.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
-            <version>1.1</version>
         </dependency>
 
         <!-- 验证码 -->
diff --git a/ruoyi-oauth/pom.xml b/ruoyi-oauth/pom.xml
index 29a7e42..ae8e7a1 100644
--- a/ruoyi-oauth/pom.xml
+++ b/ruoyi-oauth/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"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    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">
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
@@ -13,6 +12,8 @@
 
     <properties>
         <ruoyi.version>3.8.7.3.2</ruoyi.version>
+        <justauth.version>1.16.6</justauth.version>
+        <alipay.version>3.7.4.ALL</alipay.version>
     </properties>
 
     <description>
@@ -30,12 +31,12 @@
             <dependency>
                 <groupId>me.zhyd.oauth</groupId>
                 <artifactId>JustAuth</artifactId>
-                <version>1.16.6</version>
+                <version>${justauth.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sdk</groupId>
                 <artifactId>alipay-sdk-java</artifactId>
-                <version>3.7.4.ALL</version>
+                <version>${alipay.version}</version>
             </dependency>
 
             <!-- justauth通用认证 -->
diff --git a/ruoyi-oauth/ruoyi-oauth-justauth/pom.xml b/ruoyi-oauth/ruoyi-oauth-justauth/pom.xml
index 0183a1b..7b0d5a3 100644
--- a/ruoyi-oauth/ruoyi-oauth-justauth/pom.xml
+++ b/ruoyi-oauth/ruoyi-oauth-justauth/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"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    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">
     <parent>
         <artifactId>ruoyi-oauth</artifactId>
         <groupId>com.ruoyi</groupId>
@@ -26,8 +25,8 @@
         <dependency>
             <groupId>me.zhyd.oauth</groupId>
             <artifactId>JustAuth</artifactId>
-            <version>1.16.6</version>
         </dependency>
+
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>