up

dynamic-datasource · Oct 12, 2023 · f128674 · f128674
1 parent ae12447
commit f128674
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 19 deletions.
diff --git 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
@@ -19,7 +19,7 @@
         <druid.version>1.2.18</druid.version>
         <p6spy.version>3.9.1</p6spy.version>
         <h2.version>2.2.220</h2.version>
-        <spring-boot-dependencies.version>2.7.13</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.7.16</spring-boot-dependencies.version>
         <lombok.version>1.18.30</lombok.version>
     </properties>
 

diff --git a/springboot3-sample/pom.xml b/springboot3-sample/pom.xml
@@ -1,6 +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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

diff --git 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
@@ -1,6 +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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>third-part-samples</artifactId>

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
@@ -1,6 +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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>shardingsphere-sample</artifactId>

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
@@ -1,6 +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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>shardingsphere-sample</artifactId>

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
@@ -1,6 +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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>shardingsphere-sample</artifactId>

diff --git a/...eata-sample/src/main/java/com/baomidou/samples/seata/service/impl/AccountServiceImpl.java b/...eata-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/...-seata-sample/src/main/java/com/baomidou/samples/seata/service/impl/OrderServiceImpl.java b/...-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/...eata-sample/src/main/java/com/baomidou/samples/seata/service/impl/ProductServiceImpl.java b/...eata-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