From 7ad19c63f84e869e3caea3cf7bf9e2135fd20eab Mon Sep 17 00:00:00 2001
From: o2null <zhourui@o2oa.net>
Date: Tue, 14 Sep 2021 16:17:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B06.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2server/pom.xml                              | 122 ++++++------------
 .../x_attendance_assemble_control/pom.xml     |   2 +-
 o2server/x_attendance_core_entity/pom.xml     |   2 +-
 o2server/x_base_core_project/pom.xml          |   2 +-
 o2server/x_bbs_assemble_control/pom.xml       |   2 +-
 o2server/x_bbs_core_entity/pom.xml            |   2 +-
 o2server/x_calendar_assemble_control/pom.xml  |   2 +-
 o2server/x_calendar_core_entity/pom.xml       |   2 +-
 o2server/x_cms_assemble_control/pom.xml       |   2 +-
 o2server/x_cms_core_entity/pom.xml            |   2 +-
 o2server/x_cms_core_express/pom.xml           |   2 +-
 o2server/x_component_assemble_control/pom.xml |   2 +-
 o2server/x_component_core_entity/pom.xml      |   2 +-
 o2server/x_console/pom.xml                    |   2 +-
 o2server/x_file_assemble_control/pom.xml      |   2 +-
 o2server/x_file_core_entity/pom.xml           |   2 +-
 o2server/x_general_assemble_control/pom.xml   |   2 +-
 o2server/x_general_core_entity/pom.xml        |   2 +-
 o2server/x_hotpic_assemble_control/pom.xml    |   2 +-
 o2server/x_hotpic_core_entity/pom.xml         |   2 +-
 o2server/x_jpush_assemble_control/pom.xml     |   2 +-
 o2server/x_jpush_core_entity/pom.xml          |   2 +-
 o2server/x_meeting_assemble_control/pom.xml   |   2 +-
 o2server/x_meeting_core_entity/pom.xml        |   2 +-
 .../x_message_assemble_communicate/pom.xml    |   2 +-
 o2server/x_message_core_entity/pom.xml        |   2 +-
 o2server/x_mind_assemble_control/pom.xml      |   2 +-
 o2server/x_mind_core_entity/pom.xml           |   2 +-
 .../pom.xml                                   |   2 +-
 .../x_organization_assemble_control/pom.xml   |   2 +-
 .../x_organization_assemble_express/pom.xml   |   2 +-
 .../x_organization_assemble_personal/pom.xml  |   2 +-
 o2server/x_organization_core_entity/pom.xml   |   2 +-
 o2server/x_organization_core_express/pom.xml  |   2 +-
 o2server/x_portal_assemble_designer/pom.xml   |   2 +-
 o2server/x_portal_assemble_surface/pom.xml    |   2 +-
 o2server/x_portal_core_entity/pom.xml         |   2 +-
 .../x_processplatform_assemble_bam/pom.xml    |   2 +-
 .../pom.xml                                   |   2 +-
 .../pom.xml                                   |   2 +-
 .../x_processplatform_core_entity/pom.xml     |   2 +-
 .../x_processplatform_core_express/pom.xml    |   2 +-
 .../pom.xml                                   |   2 +-
 o2server/x_program_center/pom.xml             |   2 +-
 o2server/x_program_center_core_entity/pom.xml |   2 +-
 o2server/x_query_assemble_designer/pom.xml    |   2 +-
 o2server/x_query_assemble_surface/pom.xml     |   2 +-
 o2server/x_query_core_entity/pom.xml          |   2 +-
 o2server/x_query_core_express/pom.xml         |   2 +-
 o2server/x_query_service_processing/pom.xml   |   2 +-
 50 files changed, 91 insertions(+), 129 deletions(-)

diff --git a/o2server/pom.xml b/o2server/pom.xml
index 3a646ce997..0377d94f14 100644
--- a/o2server/pom.xml
+++ b/o2server/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>o2oa</groupId>
 	<artifactId>o2server</artifactId>
-	<version>6.3</version>
+	<version>6.4</version>
 	<packaging>pom</packaging>
 	<properties>
 		<maven.compiler.source>11</maven.compiler.source>
@@ -371,10 +371,6 @@
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-client</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-iostreams</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
@@ -383,6 +379,10 @@
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<finalName>${project.artifactId}</finalName>
@@ -426,8 +426,6 @@
 						</compilerArgs>
 					</configuration>
 				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -495,13 +493,6 @@
 					</excludes>
 				</configuration>
 			</plugin>
-			<!-- plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> 
-				<version>3.13.0</version> <configuration> <linkXRef>true</linkXRef> <sourceEncoding>utf-8</sourceEncoding> 
-				<minimumTokens>100</minimumTokens> <targetJdk>1.8</targetJdk> <failOnViolation>false</failOnViolation> 
-				<outputDirectory>${basedir}</outputDirectory> </configuration> <executions> 
-				<execution> <id>pmd-check</id> <phase>verify</phase> <goals> <goal>check</goal> 
-				</goals> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
-				<artifactId>maven-jxr-plugin</artifactId> <version>2.3</version> </plugin -->
 		</plugins>
 	</build>
 	<dependencyManagement>
@@ -851,8 +842,6 @@
 				<artifactId>javapoet</artifactId>
 				<version>1.11.1</version>
 			</dependency>
-			<!--dependency> <groupId>javax.visrec</groupId> <artifactId>visrec-api</artifactId> 
-				<version>20200316</version> </dependency -->
 			<dependency>
 				<groupId>com.github.neuroph</groupId>
 				<artifactId>neuroph-core</artifactId>
@@ -873,34 +862,7 @@
 				<artifactId>neuroph-contrib</artifactId>
 				<version>2.98</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-web</artifactId>
-				<version>2.14.1</version>
-			</dependency>
-			<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-iostreams -->
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-iostreams</artifactId>
-				<version>2.14.1</version>
-			</dependency>
-			<!--用于与slf4j保持桥接 -->
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-slf4j-impl</artifactId>
-				<version>2.14.1</version>
-			</dependency>
-			<!-- slf4j核心包 -->
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.7.32</version>
-			</dependency>
-			<!-- dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> 
-				<version>1.7.25</version> </dependency> <dependency> <groupId>org.slf4j</groupId> 
-				<artifactId>slf4j-api</artifactId> <version>1.7.25</version> </dependency- -->
-			<!-- dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> 
-				<version>3.2.0</version> </dependency -->
+
 			<dependency>
 				<groupId>com.alibaba</groupId>
 				<artifactId>druid</artifactId>
@@ -961,145 +923,145 @@
 				<artifactId>log4j-core</artifactId>
 				<version>2.14.1</version>
 			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>1.7.32</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-slf4j-impl</artifactId>
+				<version>2.14.1</version>
+			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_base_core_project</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_attendance_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_bbs_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_calendar_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_cms_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_cms_core_express</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_component_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_file_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_general_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_hotpic_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_meeting_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_message_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_mind_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_organization_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_jpush_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_organization_core_express</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_portal_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_processplatform_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_processplatform_core_express</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_query_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_query_core_express</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_report_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_strategydeploy_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_strategydeploy_assemble_control</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_program_center</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_program_center_core_entity</artifactId>
-				<version>6.3</version>
-			</dependency>
-			<dependency>
-				<groupId>o2oa</groupId>
-				<artifactId>x_teamwork_core_entity</artifactId>
-				<version>6.3</version>
-			</dependency>
-			<dependency>
-				<groupId>o2oa</groupId>
-				<artifactId>x_workschedu_core_entity</artifactId>
-				<version>6.3</version>
+				<version>6.4</version>
 			</dependency>
 			<dependency>
 				<groupId>net.lingala.zip4j</groupId>
diff --git a/o2server/x_attendance_assemble_control/pom.xml b/o2server/x_attendance_assemble_control/pom.xml
index 16e8fbb10b..9c2e655c6c 100644
--- a/o2server/x_attendance_assemble_control/pom.xml
+++ b/o2server/x_attendance_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_attendance_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_attendance_core_entity/pom.xml b/o2server/x_attendance_core_entity/pom.xml
index 105804e5cc..7c071ca722 100644
--- a/o2server/x_attendance_core_entity/pom.xml
+++ b/o2server/x_attendance_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_attendance_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_base_core_project/pom.xml b/o2server/x_base_core_project/pom.xml
index e1fbd8584b..e89dac0544 100644
--- a/o2server/x_base_core_project/pom.xml
+++ b/o2server/x_base_core_project/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_base_core_project</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_bbs_assemble_control/pom.xml b/o2server/x_bbs_assemble_control/pom.xml
index 81eac8bc72..2ebcd06494 100644
--- a/o2server/x_bbs_assemble_control/pom.xml
+++ b/o2server/x_bbs_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_bbs_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_bbs_core_entity/pom.xml b/o2server/x_bbs_core_entity/pom.xml
index 6a2e1fe4e6..15f7f25dce 100644
--- a/o2server/x_bbs_core_entity/pom.xml
+++ b/o2server/x_bbs_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_bbs_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_calendar_assemble_control/pom.xml b/o2server/x_calendar_assemble_control/pom.xml
index 205b4e8f89..1ee851052b 100644
--- a/o2server/x_calendar_assemble_control/pom.xml
+++ b/o2server/x_calendar_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_calendar_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_calendar_core_entity/pom.xml b/o2server/x_calendar_core_entity/pom.xml
index db601a15c0..0ab9ea65c0 100644
--- a/o2server/x_calendar_core_entity/pom.xml
+++ b/o2server/x_calendar_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_calendar_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_cms_assemble_control/pom.xml b/o2server/x_cms_assemble_control/pom.xml
index 60433fd580..72aa2071dc 100644
--- a/o2server/x_cms_assemble_control/pom.xml
+++ b/o2server/x_cms_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_cms_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_cms_core_entity/pom.xml b/o2server/x_cms_core_entity/pom.xml
index 6903f7fd65..ebc85e906d 100644
--- a/o2server/x_cms_core_entity/pom.xml
+++ b/o2server/x_cms_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_cms_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_cms_core_express/pom.xml b/o2server/x_cms_core_express/pom.xml
index 4aa80bf9f0..e879000b25 100644
--- a/o2server/x_cms_core_express/pom.xml
+++ b/o2server/x_cms_core_express/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_cms_core_express</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_component_assemble_control/pom.xml b/o2server/x_component_assemble_control/pom.xml
index fedfd4afce..2a3ea13c73 100644
--- a/o2server/x_component_assemble_control/pom.xml
+++ b/o2server/x_component_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_component_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_component_core_entity/pom.xml b/o2server/x_component_core_entity/pom.xml
index b5cc0fabf6..c9032ddffa 100644
--- a/o2server/x_component_core_entity/pom.xml
+++ b/o2server/x_component_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_component_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_console/pom.xml b/o2server/x_console/pom.xml
index e1f94d3e52..1ed07cab65 100644
--- a/o2server/x_console/pom.xml
+++ b/o2server/x_console/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_console</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_file_assemble_control/pom.xml b/o2server/x_file_assemble_control/pom.xml
index 4050adf98a..018c42db9d 100644
--- a/o2server/x_file_assemble_control/pom.xml
+++ b/o2server/x_file_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_file_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_file_core_entity/pom.xml b/o2server/x_file_core_entity/pom.xml
index 7e5e667fe8..82ff0b4315 100644
--- a/o2server/x_file_core_entity/pom.xml
+++ b/o2server/x_file_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_file_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_general_assemble_control/pom.xml b/o2server/x_general_assemble_control/pom.xml
index f40b834bfb..b5855decf0 100644
--- a/o2server/x_general_assemble_control/pom.xml
+++ b/o2server/x_general_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_general_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_general_core_entity/pom.xml b/o2server/x_general_core_entity/pom.xml
index d0166888a1..46ecec954d 100644
--- a/o2server/x_general_core_entity/pom.xml
+++ b/o2server/x_general_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_general_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_hotpic_assemble_control/pom.xml b/o2server/x_hotpic_assemble_control/pom.xml
index d18d6acb46..4cac6986e7 100644
--- a/o2server/x_hotpic_assemble_control/pom.xml
+++ b/o2server/x_hotpic_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_hotpic_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_hotpic_core_entity/pom.xml b/o2server/x_hotpic_core_entity/pom.xml
index eaee01bf50..24fab3d59a 100644
--- a/o2server/x_hotpic_core_entity/pom.xml
+++ b/o2server/x_hotpic_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_hotpic_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_jpush_assemble_control/pom.xml b/o2server/x_jpush_assemble_control/pom.xml
index 10d90c5784..7896349529 100644
--- a/o2server/x_jpush_assemble_control/pom.xml
+++ b/o2server/x_jpush_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_jpush_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_jpush_core_entity/pom.xml b/o2server/x_jpush_core_entity/pom.xml
index 4431bf8ee4..3b5cfe2281 100644
--- a/o2server/x_jpush_core_entity/pom.xml
+++ b/o2server/x_jpush_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_jpush_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_meeting_assemble_control/pom.xml b/o2server/x_meeting_assemble_control/pom.xml
index 3ede10a142..f9b5b8b7c9 100644
--- a/o2server/x_meeting_assemble_control/pom.xml
+++ b/o2server/x_meeting_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_meeting_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_meeting_core_entity/pom.xml b/o2server/x_meeting_core_entity/pom.xml
index 506b06dbb1..0e0d56f2bb 100644
--- a/o2server/x_meeting_core_entity/pom.xml
+++ b/o2server/x_meeting_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_meeting_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_message_assemble_communicate/pom.xml b/o2server/x_message_assemble_communicate/pom.xml
index 87053c772b..b9acdbc92a 100644
--- a/o2server/x_message_assemble_communicate/pom.xml
+++ b/o2server/x_message_assemble_communicate/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_message_assemble_communicate</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_message_core_entity/pom.xml b/o2server/x_message_core_entity/pom.xml
index f3493c7697..9560c162b7 100644
--- a/o2server/x_message_core_entity/pom.xml
+++ b/o2server/x_message_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_message_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_mind_assemble_control/pom.xml b/o2server/x_mind_assemble_control/pom.xml
index 46dafb5aa2..609473692c 100644
--- a/o2server/x_mind_assemble_control/pom.xml
+++ b/o2server/x_mind_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_mind_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_mind_core_entity/pom.xml b/o2server/x_mind_core_entity/pom.xml
index d9f8bbb908..aedfe1395e 100644
--- a/o2server/x_mind_core_entity/pom.xml
+++ b/o2server/x_mind_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_mind_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_organization_assemble_authentication/pom.xml b/o2server/x_organization_assemble_authentication/pom.xml
index 048d865b54..48a92e82e6 100644
--- a/o2server/x_organization_assemble_authentication/pom.xml
+++ b/o2server/x_organization_assemble_authentication/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_organization_assemble_authentication</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_organization_assemble_control/pom.xml b/o2server/x_organization_assemble_control/pom.xml
index 7951c25862..b34b5dc065 100644
--- a/o2server/x_organization_assemble_control/pom.xml
+++ b/o2server/x_organization_assemble_control/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_organization_assemble_control</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_organization_assemble_express/pom.xml b/o2server/x_organization_assemble_express/pom.xml
index c53f3fcc75..d136b61a49 100644
--- a/o2server/x_organization_assemble_express/pom.xml
+++ b/o2server/x_organization_assemble_express/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_organization_assemble_express</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_organization_assemble_personal/pom.xml b/o2server/x_organization_assemble_personal/pom.xml
index 726cf61964..eff19e53fb 100644
--- a/o2server/x_organization_assemble_personal/pom.xml
+++ b/o2server/x_organization_assemble_personal/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_organization_assemble_personal</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_organization_core_entity/pom.xml b/o2server/x_organization_core_entity/pom.xml
index afe21b04b9..81511ac5af 100644
--- a/o2server/x_organization_core_entity/pom.xml
+++ b/o2server/x_organization_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_organization_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_organization_core_express/pom.xml b/o2server/x_organization_core_express/pom.xml
index c389ac66fb..ea11f0443c 100644
--- a/o2server/x_organization_core_express/pom.xml
+++ b/o2server/x_organization_core_express/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_organization_core_express</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_portal_assemble_designer/pom.xml b/o2server/x_portal_assemble_designer/pom.xml
index 3a68fb51b1..6b667d462c 100644
--- a/o2server/x_portal_assemble_designer/pom.xml
+++ b/o2server/x_portal_assemble_designer/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_portal_assemble_designer</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_portal_assemble_surface/pom.xml b/o2server/x_portal_assemble_surface/pom.xml
index 882c3f879c..188b10e471 100644
--- a/o2server/x_portal_assemble_surface/pom.xml
+++ b/o2server/x_portal_assemble_surface/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_portal_assemble_surface</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_portal_core_entity/pom.xml b/o2server/x_portal_core_entity/pom.xml
index c3936beb1d..27850429c1 100644
--- a/o2server/x_portal_core_entity/pom.xml
+++ b/o2server/x_portal_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_portal_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_processplatform_assemble_bam/pom.xml b/o2server/x_processplatform_assemble_bam/pom.xml
index 3eb9f4d08e..091c8e4ba7 100644
--- a/o2server/x_processplatform_assemble_bam/pom.xml
+++ b/o2server/x_processplatform_assemble_bam/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_processplatform_assemble_bam</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_processplatform_assemble_designer/pom.xml b/o2server/x_processplatform_assemble_designer/pom.xml
index 8c49fb0623..9a84328227 100644
--- a/o2server/x_processplatform_assemble_designer/pom.xml
+++ b/o2server/x_processplatform_assemble_designer/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_processplatform_assemble_designer</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_processplatform_assemble_surface/pom.xml b/o2server/x_processplatform_assemble_surface/pom.xml
index 97a13edfb9..c62a9d6fa3 100644
--- a/o2server/x_processplatform_assemble_surface/pom.xml
+++ b/o2server/x_processplatform_assemble_surface/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_processplatform_assemble_surface</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_processplatform_core_entity/pom.xml b/o2server/x_processplatform_core_entity/pom.xml
index 667ebcf857..e0bb36368f 100644
--- a/o2server/x_processplatform_core_entity/pom.xml
+++ b/o2server/x_processplatform_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_processplatform_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_processplatform_core_express/pom.xml b/o2server/x_processplatform_core_express/pom.xml
index cda4846858..fdb975b40c 100644
--- a/o2server/x_processplatform_core_express/pom.xml
+++ b/o2server/x_processplatform_core_express/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_processplatform_core_express</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_processplatform_service_processing/pom.xml b/o2server/x_processplatform_service_processing/pom.xml
index 21488dd0eb..d3430b8cba 100644
--- a/o2server/x_processplatform_service_processing/pom.xml
+++ b/o2server/x_processplatform_service_processing/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_processplatform_service_processing</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_program_center/pom.xml b/o2server/x_program_center/pom.xml
index cbd7dfe712..bf21c663a1 100644
--- a/o2server/x_program_center/pom.xml
+++ b/o2server/x_program_center/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_program_center</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_program_center_core_entity/pom.xml b/o2server/x_program_center_core_entity/pom.xml
index 79a3480a74..40738a8551 100644
--- a/o2server/x_program_center_core_entity/pom.xml
+++ b/o2server/x_program_center_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_program_center_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_query_assemble_designer/pom.xml b/o2server/x_query_assemble_designer/pom.xml
index ff9cc42f35..558d8fc07b 100644
--- a/o2server/x_query_assemble_designer/pom.xml
+++ b/o2server/x_query_assemble_designer/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_query_assemble_designer</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_query_assemble_surface/pom.xml b/o2server/x_query_assemble_surface/pom.xml
index 7f7436012b..a644f78964 100644
--- a/o2server/x_query_assemble_surface/pom.xml
+++ b/o2server/x_query_assemble_surface/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_query_assemble_surface</artifactId>
 	<packaging>war</packaging>
diff --git a/o2server/x_query_core_entity/pom.xml b/o2server/x_query_core_entity/pom.xml
index f6c2204d74..37f0eef1e4 100644
--- a/o2server/x_query_core_entity/pom.xml
+++ b/o2server/x_query_core_entity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_query_core_entity</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_query_core_express/pom.xml b/o2server/x_query_core_express/pom.xml
index 0ff2193299..7692f05da6 100644
--- a/o2server/x_query_core_express/pom.xml
+++ b/o2server/x_query_core_express/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_query_core_express</artifactId>
 	<packaging>jar</packaging>
diff --git a/o2server/x_query_service_processing/pom.xml b/o2server/x_query_service_processing/pom.xml
index d6836838b2..47f5328ec7 100644
--- a/o2server/x_query_service_processing/pom.xml
+++ b/o2server/x_query_service_processing/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>6.3</version>
+		<version>6.4</version>
 	</parent>
 	<artifactId>x_query_service_processing</artifactId>
 	<packaging>war</packaging>
-- 
GitLab