Merge remote-tracking branch 'origin/master' into feature/admin-auth-satoken

# Conflicts:
#	pom.xml
#	src/main/java/cn/xf/basedemo/controller/business/UserController.java
#	src/main/java/cn/xf/basedemo/service/impl/UserServiceImpl.java

pom.xml

@@ -14,7 +14,7 @@
     <name>xf-boot-base</name>
     <description>拿来即用springboot单体脚手架项目</description>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <mysql.version>8.1.0</mysql.version>
         <mybatis-plus.version>3.5.8</mybatis-plus.version>
         <dynamic-datasource.version>4.3.1</dynamic-datasource.version>
@@ -25,7 +25,6 @@
         <logstash.version>5.3</logstash.version>
         <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
         <spring-cloud.version>2023.0.1</spring-cloud.version>
-        <elasticsearch.version>8.16.0</elasticsearch.version>
         <sverlet.version>4.0.1</sverlet.version>
         <sa-token.version>1.44.0</sa-token.version>
     </properties>
@@ -48,6 +47,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -123,18 +126,6 @@
             <version>${sverlet.version}</version> <!-- 根据需要选择合适的版本 -->
             <scope>provided</scope> <!-- 在Web服务器环境中由服务器提供 -->
         </dependency>
-        <!-- elasticsearch8.x 搜索引擎 -->
-        <dependency>
-            <groupId>co.elastic.clients</groupId>
-            <artifactId>elasticsearch-java</artifactId>
-            <version>${elasticsearch.version}</version>
-        </dependency>
-        <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
-        <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot3-starter</artifactId>
-            <version>${sa-token.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -154,10 +145,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>14</source>
-                    <target>14</target>
+                    <release>17</release>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-compiler-javac</artifactId>
+                        <version>2.15.0</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>