Merge branch 'master' into dev/springBoot3

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/MediaController.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java

pom.xml

@@ -364,6 +364,27 @@
             <version>32.1.3-jre</version>
         </dependency>
 
+        <!--ftp server-->
+        <dependency>
+            <groupId>org.apache.ftpserver</groupId>
+            <artifactId>ftpserver-core</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ftpserver</groupId>
+            <artifactId>ftplet-api</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
+        <!-- 自动化生成代码工具 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- 自动化生成代码工具 -->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -383,6 +404,7 @@
             <artifactId>log-viewer-spring-boot</artifactId>
             <version>1.0.10</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>