diff --git a/o2server/pom.xml b/o2server/pom.xml
index aad4b447e9e9510caf80a9802c6abc61a8fea317..999aef9defba2026219c4ebbd484645af2209b58 100644
--- a/o2server/pom.xml
+++ b/o2server/pom.xml
@@ -474,12 +474,6 @@
 					<packagingExcludes>persistence.xml,WEB-INF/lib/**,META-INF
 					</packagingExcludes>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<webResources>
-						<resource>
-							<directory>ext</directory>
-							<targetPath>WEB-INF/ext</targetPath>
-						</resource>
-					</webResources>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -612,57 +606,57 @@
 			<dependency>
 				<groupId>org.apache.ftpserver</groupId>
 				<artifactId>ftpserver-core</artifactId>
-				<version>1.1.1</version>
+				<version>1.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.ftpserver</groupId>
 				<artifactId>ftplet-api</artifactId>
-				<version>1.1.1</version>
+				<version>1.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-core</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-frontend-jaxws</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-frontend-simple</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-wsdl</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-databinding-jaxb</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-transports-http</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-bindings-soap</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-bindings-xml</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-ws-addr</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 
 			<dependency>
diff --git a/o2server/start_aix.sh b/o2server/start_aix.sh
index f5745f3e034a24112eb33251fab36687c8da9cbd..c08704200cccd4d8d01de15c2214007ac90a6490 100755
--- a/o2server/start_aix.sh
+++ b/o2server/start_aix.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_aix_debug.sh b/o2server/start_aix_debug.sh
index cc95dfc25930c5cb5b280c8bfaaf18b4d276e023..05be73203c1606b7715771064f060c9bc18510b2 100755
--- a/o2server/start_aix_debug.sh
+++ b/o2server/start_aix_debug.sh
@@ -32,7 +32,7 @@ then
 		done
 		for A in "start" "stop" "restart" "console" "service"
 		do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"
 			do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
diff --git a/o2server/start_arm.sh b/o2server/start_arm.sh
index cc4fad66e7e37cdea949d136b5675ab02434bbf5..c842d0aebe1dcbb206247918f8c06328955ca6be 100755
--- a/o2server/start_arm.sh
+++ b/o2server/start_arm.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_arm_debug.sh b/o2server/start_arm_debug.sh
index 203acb948aa94724e1528980f638b74aba8bbc3c..0c8eb11877b206eba36d7d6fe8822831aaf4b621 100755
--- a/o2server/start_arm_debug.sh
+++ b/o2server/start_arm_debug.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_linux.sh b/o2server/start_linux.sh
index 619aa7a01506b4938e8334aa33d100131a174226..ca3e5dafe3333cfcde65a05d9750121da0ed93c1 100755
--- a/o2server/start_linux.sh
+++ b/o2server/start_linux.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_linux_debug.sh b/o2server/start_linux_debug.sh
index 3337ad2f661f339131e3ae22deb35f66b94e34f7..aaf70d6fd6282a913288b0e1a09b1aa3e450736d 100755
--- a/o2server/start_linux_debug.sh
+++ b/o2server/start_linux_debug.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_linux_min.sh b/o2server/start_linux_min.sh
index da0c5fbe03a120266334c4414e78175dffdbec9d..a883dcb7802f2175284df390c2881d43b4ae9b77 100755
--- a/o2server/start_linux_min.sh
+++ b/o2server/start_linux_min.sh
@@ -32,7 +32,7 @@ then
 		done
 		for A in "start" "stop" "restart" "console" "service"
 		do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"
 			do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
diff --git a/o2server/start_macos.sh b/o2server/start_macos.sh
index 7811c95f9515facd256e1e9450273c4fafeb7580..7f7dccf38dbb00850e2c6e8a4695e883941eceb1 100755
--- a/o2server/start_macos.sh
+++ b/o2server/start_macos.sh
@@ -27,7 +27,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_macos_debug.sh b/o2server/start_macos_debug.sh
index 60ae229c2bc5ee14fe3a791c544f21ba54eb1133..bcc7fd8b06ce82baf9aaab685ade11a8a492b3a3 100755
--- a/o2server/start_macos_debug.sh
+++ b/o2server/start_macos_debug.sh
@@ -27,7 +27,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_mips.sh b/o2server/start_mips.sh
index 145d5ead677dc43f8116948712256c14a075cbb1..3d81773106526e90504d107e83611d40a0fcffa0 100755
--- a/o2server/start_mips.sh
+++ b/o2server/start_mips.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_mips_debug.sh b/o2server/start_mips_debug.sh
index 9da8955b3d06152b059c845ef4ca06c304d2526b..f73b0b01e86e1a0fbd4f6987e889bdd433e2d41f 100755
--- a/o2server/start_mips_debug.sh
+++ b/o2server/start_mips_debug.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_raspi.sh b/o2server/start_raspi.sh
index 34ed280af0b0912a458c0f6de02e48e646154735..ad2e0919e132647ed8baadb13fa168270d162c05 100755
--- a/o2server/start_raspi.sh
+++ b/o2server/start_raspi.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_raspi_debug.sh b/o2server/start_raspi_debug.sh
index f56b911ba9a1e8f263fbc02f42b4d2f5ce447e4b..73de366c3674ba14d53c643c451f0f29c1199bfb 100755
--- a/o2server/start_raspi_debug.sh
+++ b/o2server/start_raspi_debug.sh
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/
diff --git a/o2server/start_windows.bat b/o2server/start_windows.bat
index f8920a3b4c606055a4609ada0db9737e8abf4d89..0f5017c511cd633bc3e865cf482b2a6510d8f052 100755
--- a/o2server/start_windows.bat
+++ b/o2server/start_windows.bat
@@ -21,7 +21,7 @@ if exist "%~dp0local\update" (
 			)	
 		)
 		for  %%A in (start,stop,restart,console,service) do (
-			for  %%B in (_windows.bat,_linux.sh,_macos.sh,_arm.sh,_mips.sh,_raspi.sh,_aix.sh) do (
+			for  %%B in (_windows.bat,_linux.sh,_linux_docker.sh,_macos.sh,_arm.sh,_mips.sh,_raspi.sh,_aix.sh) do (
 				if exist "%~dp0local\update\o2server\%%A%%B" (
 					echo update %~dp0%%A%%B
 					copy "%~dp0local\update\o2server\%%A%%B" "%~dp0"
diff --git a/o2server/start_windows_debug.bat b/o2server/start_windows_debug.bat
index 5e12c4359a01d704220c4f04ad1433e0ef5d8b11..aa5cef2e7259427f5bce98a0dedc926e2fae6088 100755
--- a/o2server/start_windows_debug.bat
+++ b/o2server/start_windows_debug.bat
@@ -21,7 +21,7 @@ if exist "%~dp0local\update" (
 			)	
 		)
 		for  %%A in (start,stop,restart,console,service) do (
-			for  %%B in (_windows.bat,_linux.sh,_macos.sh,_arm.sh,_mips.sh,_raspi.sh,_aix.sh) do (
+			for  %%B in (_windows.bat,_linux.sh,_linux_docker.sh,_macos.sh,_arm.sh,_mips.sh,_raspi.sh,_aix.sh) do (
 				if exist "%~dp0local\update\o2server\%%A%%B" (
 					echo update %~dp0%%A%%B
 					copy "%~dp0local\update\o2server\%%A%%B" "%~dp0"
diff --git a/o2server/x_jpush_assemble_control/pom.xml b/o2server/x_jpush_assemble_control/pom.xml
index d6e7d02e184543b68c2466735910f735fd4132e5..e71e133bfa355330b574af283bf87acb92527a9f 100644
--- a/o2server/x_jpush_assemble_control/pom.xml
+++ b/o2server/x_jpush_assemble_control/pom.xml
@@ -131,6 +131,18 @@
 						</configuration>
 					</execution>
 				</executions>
+			</plugin>
+				<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<webResources>
+						<resource>
+							<directory>ext</directory>
+							<targetPath>WEB-INF/ext</targetPath>
+						</resource>
+					</webResources>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>