合并分支 'dxy' 到 'master'

pom.xml

@@ -25,7 +25,7 @@
         <spring-boot-starter.version>2.4.2</spring-boot-starter.version>
         <lombok.version>1.18.16</lombok.version>
         <junit.version>4.13.1</junit.version>
-        <druid.version>1.0.29</druid.version>
+        <druid.version>1.2.23</druid.version>
         <mysql-connector-java>8.0.33</mysql-connector-java>
         <mybatis-plus-java>3.4.0</mybatis-plus-java>
         <fastjson.version>2.0.44</fastjson.version>
@@ -46,6 +46,7 @@
         <jjwt.version>0.9.1</jjwt.version>
         <aliyun.oss.version>3.17.4</aliyun.oss.version>
         <aliyun.sts.version>1.1.6</aliyun.sts.version>
+        <dynamic-ds.version>4.2.0</dynamic-ds.version>
     </properties>
 
     <dependencyManagement>
@@ -292,6 +293,12 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!-- Dynamic DataSource -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+                <version>${dynamic-ds.version}</version>
+            </dependency>