From f128674b367ef8f2eb9b9edc38b117144ba2f81a Mon Sep 17 00:00:00 2001 From: TaoYu <332309254@qq.com> Date: Thu, 12 Oct 2023 10:55:19 +0800 Subject: [PATCH] up --- README.md | 6 ++++-- pom.xml | 2 +- springboot3-sample/pom.xml | 4 ++-- .../quartz-sample/src/main/resources/application.yml | 2 +- third-part-samples/shardingsphere-sample/pom.xml | 4 ++-- .../shardingsphere-jdbc-4.x-spring-sample/pom.xml | 4 ++-- .../shardingsphere-jdbc-5.x-core-sample/pom.xml | 4 ++-- .../shardingsphere-jdbc-5.x-spring-sample/pom.xml | 4 ++-- .../samples/seata/service/impl/AccountServiceImpl.java | 2 -- .../samples/seata/service/impl/OrderServiceImpl.java | 1 - .../samples/seata/service/impl/ProductServiceImpl.java | 2 -- 11 files changed, 16 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 7dd0d16..362cd57 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,11 @@ - name-pattern-sample 自定义切面的使用示例 - nest-sample 嵌套切换数据源使用示例 - quartz-sample 多数据源集成quartz示例 -- shardingsphere-jdbc-4.x-spring-sample 集成 ShardingSphere JDBC Spring Boot Starter 4.1.1 使用示例, 不再维护, 参考 https://github.com/apache/shardingsphere/releases/tag/5.0.0-alpha +- shardingsphere-jdbc-4.x-spring-sample 集成 ShardingSphere JDBC Spring Boot Starter 4.1.1 使用示例, 不再维护, + 参考 https://github.com/apache/shardingsphere/releases/tag/5.0.0-alpha - shardingsphere-jdbc-5.x-core-sample 集成 ShardingSphere JDBC Driver 5.4.0 使用示例 -- shardingsphere-jdbc-5.x-spring-sample 集成 ShardingSphere JDBC Spring Boot Starter 5.2.1 使用示例, 不再维护, 参考 https://github.com/apache/shardingsphere/issues/22469 +- shardingsphere-jdbc-5.x-spring-sample 集成 ShardingSphere JDBC Spring Boot Starter 5.2.1 使用示例, 不再维护, + 参考 https://github.com/apache/shardingsphere/issues/22469 - spel-sample 动态从外部参数spel来切换数据源的使用示例 - tx-local-sample 本地事务示例项目★★★★★★必看★★★★★★ - tx-seata-sample 基于seata的分布式事务集成使用示例 diff --git a/pom.xml b/pom.xml index 07dcd3c..641b049 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 1.2.18 3.9.1 2.2.220 - 2.7.13 + 2.7.16 1.18.30 diff --git a/springboot3-sample/pom.xml b/springboot3-sample/pom.xml index 84edb24..0d0bc84 100644 --- a/springboot3-sample/pom.xml +++ b/springboot3-sample/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 diff --git a/third-part-samples/quartz-sample/src/main/resources/application.yml b/third-part-samples/quartz-sample/src/main/resources/application.yml index 8d55bda..006dd1b 100644 --- a/third-part-samples/quartz-sample/src/main/resources/application.yml +++ b/third-part-samples/quartz-sample/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: url: jdbc:mysql://110.40.253.205:3306/quartz driver-class-name: com.mysql.cj.jdbc.Driver dynamic: -# enabled: false 如果没有建表可以先打开这个配置禁用多数据源,自动建quartz表 + # enabled: false 如果没有建表可以先打开这个配置禁用多数据源,自动建quartz表 datasource: master: username: sa diff --git a/third-part-samples/shardingsphere-sample/pom.xml b/third-part-samples/shardingsphere-sample/pom.xml index 7845cd2..83cdecc 100644 --- a/third-part-samples/shardingsphere-sample/pom.xml +++ b/third-part-samples/shardingsphere-sample/pom.xml @@ -1,6 +1,6 @@ - third-part-samples diff --git a/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-4.x-spring-sample/pom.xml b/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-4.x-spring-sample/pom.xml index 7599a9d..29c9128 100644 --- a/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-4.x-spring-sample/pom.xml +++ b/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-4.x-spring-sample/pom.xml @@ -1,6 +1,6 @@ - shardingsphere-sample diff --git a/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-core-sample/pom.xml b/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-core-sample/pom.xml index 0ee41b7..19ea52d 100644 --- a/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-core-sample/pom.xml +++ b/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-core-sample/pom.xml @@ -1,6 +1,6 @@ - shardingsphere-sample diff --git a/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-spring-sample/pom.xml b/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-spring-sample/pom.xml index e378922..6035792 100644 --- a/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-spring-sample/pom.xml +++ b/third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-spring-sample/pom.xml @@ -1,6 +1,6 @@ - shardingsphere-sample diff --git a/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/AccountServiceImpl.java b/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/AccountServiceImpl.java index dec28ad..df0b08f 100644 --- a/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/AccountServiceImpl.java +++ b/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/AccountServiceImpl.java @@ -23,8 +23,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; @Slf4j diff --git a/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/OrderServiceImpl.java b/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/OrderServiceImpl.java index bd085cf..a6414ea 100644 --- a/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/OrderServiceImpl.java +++ b/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/OrderServiceImpl.java @@ -28,7 +28,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Slf4j @Service diff --git a/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/ProductServiceImpl.java b/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/ProductServiceImpl.java index fa48c9f..cda9c0d 100644 --- a/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/ProductServiceImpl.java +++ b/tx-samples/tx-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/ProductServiceImpl.java @@ -24,8 +24,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; @Slf4j