Merge branch 'wrdp' into 'release'

Wrdp

See merge request o2oa/o2oa!2311

o2server/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>o2oa</groupId>
 	<artifactId>o2server</artifactId>
-	<version>${revision}</version>
+	<version>5.3</version>
 	<packaging>pom</packaging>
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -12,7 +12,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8
 		</project.reporting.outputEncoding>
-		<revision>5.3</revision>
 	</properties>
 	<modules>
 		<module>x_base_core_project</module>
@@ -866,142 +865,142 @@
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_base_core_project</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_attendance_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_bbs_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_calendar_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_cms_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_cms_core_express</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_component_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_file_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_general_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_hotpic_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_meeting_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_message_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_mind_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_organization_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_jpush_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_organization_core_express</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_portal_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_processplatform_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_processplatform_core_express</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_query_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_query_core_express</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_report_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_strategydeploy_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_strategydeploy_assemble_control</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_program_center</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_program_center_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_teamwork_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>o2oa</groupId>
 				<artifactId>x_workschedu_core_entity</artifactId>
-				<version>${revision}</version>
+				<version>5.3</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

o2server/x_attendance_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_attendance_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_attendance_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_attendance_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_base_core_project/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_base_core_project</artifactId>
 	<packaging>jar</packaging>

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/tools/MetaModelBuilder.java

@@ -1,6 +1,7 @@
 package com.x.base.core.entity.tools;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -40,7 +41,7 @@ public class MetaModelBuilder {
 			File sourcedir = new File(args[1]);
 			File outputdir = new File(args[2]);
 
-			File o2oadir = basedir.getParentFile().getParentFile();
+			File o2oadir = basedir.getParentFile();
 
 			JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
 			StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, Charset.forName("UTF-8"));
@@ -72,12 +73,17 @@ public class MetaModelBuilder {
 	}
 
 	private static List<File> classpath(File o2oadir, File outputdir) {
+
 		List<File> cp = new ArrayList<>();
 
 		cp.add(outputdir);
 
 		IOFileFilter filter = new WildcardFileFilter("x_base_core_project.jar");
-		for (File o : FileUtils.listFiles(new File(o2oadir, "o2server/store/jars"), filter, null)) {
+		File storeDir = new File(o2oadir, "store/jars");
+		if(!storeDir.exists() || !storeDir.isDirectory()){
+			storeDir = new File(o2oadir.getParent(), "o2server/store/jars");
+		}
+		for (File o : FileUtils.listFiles(storeDir, filter, null)) {
 			cp.add(o);
 		}
 

o2server/x_bbs_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_bbs_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_bbs_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_bbs_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_calendar_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_calendar_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_calendar_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_calendar_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_cms_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_cms_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_cms_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_cms_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_cms_core_express/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_cms_core_express</artifactId>
 	<packaging>jar</packaging>

o2server/x_component_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_component_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_component_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_component_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_console/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_console</artifactId>
 	<packaging>jar</packaging>

o2server/x_file_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_file_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_file_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_file_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_general_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_general_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_general_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_general_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_hotpic_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_hotpic_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_hotpic_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_hotpic_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_jpush_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_jpush_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_jpush_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_jpush_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_meeting_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_meeting_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_meeting_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_meeting_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_message_assemble_communicate/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_message_assemble_communicate</artifactId>
 	<packaging>war</packaging>

o2server/x_message_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_message_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_mind_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_mind_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_mind_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_mind_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_organization_assemble_authentication/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_organization_assemble_authentication</artifactId>
 	<packaging>war</packaging>

o2server/x_organization_assemble_control/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_organization_assemble_control</artifactId>
 	<packaging>war</packaging>

o2server/x_organization_assemble_express/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_organization_assemble_express</artifactId>
 	<packaging>war</packaging>

o2server/x_organization_assemble_personal/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_organization_assemble_personal</artifactId>
 	<packaging>war</packaging>

o2server/x_organization_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_organization_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_organization_core_express/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_organization_core_express</artifactId>
 	<packaging>jar</packaging>

o2server/x_portal_assemble_designer/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_portal_assemble_designer</artifactId>
 	<packaging>war</packaging>

o2server/x_portal_assemble_surface/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_portal_assemble_surface</artifactId>
 	<packaging>war</packaging>

o2server/x_portal_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_portal_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_processplatform_assemble_bam/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_processplatform_assemble_bam</artifactId>
 	<packaging>war</packaging>

o2server/x_processplatform_assemble_designer/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_processplatform_assemble_designer</artifactId>
 	<packaging>war</packaging>

o2server/x_processplatform_assemble_surface/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_processplatform_assemble_surface</artifactId>
 	<packaging>war</packaging>

o2server/x_processplatform_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_processplatform_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_processplatform_core_express/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_processplatform_core_express</artifactId>
 	<packaging>jar</packaging>

o2server/x_processplatform_service_processing/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_processplatform_service_processing</artifactId>
 	<packaging>war</packaging>

o2server/x_program_center/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_program_center</artifactId>
 	<packaging>war</packaging>

o2server/x_program_center_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_program_center_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_query_assemble_designer/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_query_assemble_designer</artifactId>
 	<packaging>war</packaging>

o2server/x_query_assemble_surface/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_query_assemble_surface</artifactId>
 	<packaging>war</packaging>

o2server/x_query_core_entity/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_query_core_entity</artifactId>
 	<packaging>jar</packaging>

o2server/x_query_core_express/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_query_core_express</artifactId>
 	<packaging>jar</packaging>

o2server/x_query_service_processing/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>o2oa</groupId>
 		<artifactId>o2server</artifactId>
-		<version>${revision}</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>x_query_service_processing</artifactId>
 	<packaging>war</packaging>

o2web/source/x_component_cms_FormDesigner/Module/Comment/comment.html

@@ -25,11 +25,18 @@
 			</tr>
 			<tr>
 				<td class="editTableValue" colspan="2">
-					<b>发布后允许修改:</b>
-					<input class="editTableRadio" name="isAllowModified" text{($.isAllowModified==true)?'checked':''} type="radio" value="true"/>是
+					<b>发表后允许修改:</b>
+					<input class="editTableRadio" name="isAllowModified" text{($.isAllowModified!=false)?'checked':''} type="radio" value="true"/>是
 					<input class="editTableRadio" name="isAllowModified" text{($.isAllowModified==false)?'checked':''} type="radio" value="false"/>否
 				</td>
 			</tr>
+			<tr>
+				<td class="editTableValue" colspan="2">
+					<b>允许发表评论:</b>
+					<input class="editTableRadio" name="isAllowPublish" text{($.isAllowPublish!=false)?'checked':''} type="radio" value="true"/>是
+					<input class="editTableRadio" name="isAllowPublish" text{($.isAllowPublish==false)?'checked':''} type="radio" value="false"/>否
+				</td>
+			</tr>
 		</table>
 
 		<!--<div class="MWFMaplist" name="styles" title="样式"></div>-->

o2web/source/x_component_cms_FormDesigner/Module/Common.js

@@ -41,6 +41,7 @@ MWF.xApplication.cms.FormDesigner.Module.Common = MWF.CMSFCCommon = new Class({
                 }else if (value.indexOf("x_cms_assemble_control")!==-1){
                     value = value.replace("x_cms_assemble_control", host3+"/x_cms_assemble_control");
                 }
+                value = o2.filterUrl(value);
             }
 
             var reg = /^border\w*/ig;

o2web/source/x_component_cms_FormDesigner/Module/Form.js

@@ -385,6 +385,7 @@ MWF.xApplication.cms.FormDesigner.Module.Form = MWF.CMSFCForm = new Class({
                 }else if (pic.indexOf("x_portal_assemble_surface")!==-1){
                     pic = pic.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+				pic = o2.filterUrl(pic);
             }
             pic = "url('"+pic+"')";
             var len2 = pic.length;

o2web/source/x_component_cms_Xform/Comment.js

@@ -25,6 +25,7 @@ MWF.xApplication.cms.Xform.Comment = MWF.CMSComment =  new Class({
             "documentId" : this.form.businessData.document.id,
             "countPerPage" : this.json.countPerPage || 10,
             "isAllowModified" : this.json.isAllowModified,
+            "isAllowPublish" : this.json.isAllowPublish,
             "isAdmin" : this.form.app.isAdmin,
             "editorProperties" : config
         });

o2web/source/x_component_cms_Xform/Package.js

@@ -56,6 +56,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage =  new Class({
 				}else if (value.indexOf("x_cms_assemble_control")!==-1){
 					value = value.replace("x_cms_assemble_control", host3+"/x_cms_assemble_control");
 				}
+                value = o2.filterUrl(value);
             }
             try{
                 this.node.set("src", value);
@@ -64,6 +65,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage =  new Class({
             value = this.json.srcfile;
             if (typeOf(value)==="object"){
                 var url = (value.portal) ? MWF.xDesktop.getPortalFileUr(value.id, value.portal) : MWF.xDesktop.getProcessFileUr(value.id, value.application);
+                url = o2.filterUrl(url);
                 this.node.set("src", url);
             }else{
                 var host = MWF.Actions.getHost("x_portal_assemble_surface");
@@ -72,6 +74,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage =  new Class({
                 uri = uri.replace("{flag}", value);
                 uri = uri.replace("{applicationFlag}", this.form.json.application);
                 value = host+"/x_portal_assemble_surface"+uri;
+                value = o2.filterUrl(value);
                 this.node.set("src", value);
             }
         }else if (typeOf(this.json.src)=="object"){

o2web/source/x_component_cms_Xform/widget/Comment.js

@@ -8,7 +8,8 @@ var O2CMSComment = MWF.xApplication.cms.Xform.widget.Comment = new Class({
         "style": "simple",
         "documentId" : "",
         "anonymousAccess" : false,
-        "countPerPage" : 10
+        "countPerPage" : 10,
+        "isAllowPublish" : true
     },
     initialize: function (app, node, options) {
         this.setOptions(options);
@@ -44,7 +45,9 @@ var O2CMSComment = MWF.xApplication.cms.Xform.widget.Comment = new Class({
         this.loadContent();
         //this.loadElementList();
         //this.loadBottom();
-        this.loadEditor();
+        if( this.options.isAllowPublish !== false ){
+            this.loadEditor();
+        }
     },
     loadTitle : function(){
         this.titleNode = new Element("div", {"styles": this.css.titleNode, "text": this.lp.commentTitle}).inject(this.container);

o2web/source/x_component_portal_PageDesigner/Module/Common.js

@@ -139,6 +139,7 @@ MWF.xApplication.portal.PageDesigner.Module.Common = MWF.PCCommon = new Class({
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+                value = o2.filterUrl(value);
             }
 
             var reg = /^border\w*/ig;

o2web/source/x_component_portal_PageDesigner/Module/Image.js

@@ -40,6 +40,7 @@ MWF.xApplication.portal.PageDesigner.Module.Image = MWF.PCImage = new Class({
             if (value){
                 if (typeOf(value)==="object"){
                     var url = MWF.xDesktop.getPortalFileUr(value.id, value.portal);
+                    url = o2.filterUrl(url);
                     try{
                         this.node.set("src", url);
                     }catch(e){}
@@ -50,7 +51,7 @@ MWF.xApplication.portal.PageDesigner.Module.Image = MWF.PCImage = new Class({
                     uri = uri.replace("{flag}", value);
                     uri = uri.replace("{applicationFlag}", this.form.json.application);
                     value = host+"/x_portal_assemble_surface"+uri;
-
+                    value = o2.filterUrl(value);
                     try{
                         this.node.set("src", value);
                     }catch(e){}

o2web/source/x_component_portal_PageDesigner/Module/Page.js

@@ -891,6 +891,7 @@ MWF.xApplication.portal.PageDesigner.Module.Page = MWF.PCPage = new Class({
                 }else if (pic.indexOf("x_portal_assemble_surface")!==-1){
                     pic = pic.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+				pic = o2.filterUrl(pic);
             }
             pic = "url('"+pic+"')";
             var len2 = pic.length;

o2web/source/x_component_process_FormDesigner/Module/$Input.js

@@ -209,6 +209,7 @@ MWF.xApplication.process.FormDesigner.Module.$Input = MWF.FC$Input = new Class({
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+                value = o2.filterUrl(value);
             }
 
             var reg = /^border\w*/ig;
@@ -250,6 +251,7 @@ MWF.xApplication.process.FormDesigner.Module.$Input = MWF.FC$Input = new Class({
                     }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                         value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                     }
+                    value = o2.filterUrl(value);
                 }
 
                 var reg = /^border\w*/ig;

o2web/source/x_component_process_FormDesigner/Module/$Module.js

@@ -989,6 +989,7 @@ MWF.xApplication.process.FormDesigner.Module.$Module = MWF.FC$Module = new Class
 				}else if (value.indexOf("x_portal_assemble_surface")!==-1){
 					value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
 				}
+				value = o2.filterUrl(value);
 			}
 
 			var reg = /^border\w*/ig;

o2web/source/x_component_process_FormDesigner/Module/Button.js

@@ -150,6 +150,7 @@ MWF.xApplication.process.FormDesigner.Module.Button = MWF.FCButton = new Class({
 				}else if (value.indexOf("x_portal_assemble_surface")!==-1){
 					value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
 				}
+				value = o2.filterUrl(value);
 			}
 
 			var reg = /^border\w*/ig;

o2web/source/x_component_process_FormDesigner/Module/Common.js

@@ -141,6 +141,7 @@ MWF.xApplication.process.FormDesigner.Module.Common = MWF.FCCommon = new Class({
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+                value = o2.filterUrl(value);
             }
 
             var reg = /^border\w*/ig;

o2web/source/x_component_process_FormDesigner/Module/Form.js

@@ -1265,6 +1265,7 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
                 }else if (pic.indexOf("x_portal_assemble_surface")!==-1){
                     pic = pic.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+				pic = o2.filterUrl(pic);
             }
             pic = "url('"+pic+"')";
             var len2 = pic.length;
@@ -1275,7 +1276,7 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
         return css;
     },
     reloadCss: function(){
-        cssText = (this.json.css) ? this.json.css.code : "";
+        var cssText = (this.json.css) ? this.json.css.code : "";
         //var head = (document.head || document.getElementsByTagName("head")[0] || document.documentElement);
 
         var styleNode = $("style"+this.json.id);

o2web/source/x_component_process_FormDesigner/Module/Image.js

@@ -116,6 +116,7 @@ MWF.xApplication.process.FormDesigner.Module.Image = MWF.FCImage = new Class({
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+                value = o2.filterUrl(value);
             }
             if (value){
                 this.node.set("src", value);

o2web/source/x_component_process_FormDesigner/Module/Table$Td.js

@@ -274,6 +274,7 @@ MWF.xApplication.process.FormDesigner.Module.Table$Td = MWF.FCTable$Td = new Cla
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+				value = o2.filterUrl(value);
             }
 
             var reg = /^border\w*/ig;
@@ -307,6 +308,7 @@ MWF.xApplication.process.FormDesigner.Module.Table$Td = MWF.FCTable$Td = new Cla
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+				value = o2.filterUrl(value);
             }
             var reg = /^border\w*/ig;
             if (!key.test(reg)){

o2web/source/x_component_process_Xform/$Module.js

@@ -73,6 +73,7 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module =  new Class({
                 }else if (value.indexOf("x_cms_assemble_control")!==-1){
                     value = value.replace("x_cms_assemble_control", host3+"/x_cms_assemble_control");
                 }
+                value = o2.filterUrl(value);
             }
             this.node.setStyle(key, value);
         }.bind(this));

o2web/source/x_component_process_Xform/Form.js

@@ -84,6 +84,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
                 } else if (pic.indexOf("x_portal_assemble_surface") !== -1) {
                     pic = pic.replace("x_portal_assemble_surface", host2 + "/x_portal_assemble_surface");
                 }
+                pic = o2.filterUrl(pic);
             }
             pic = "url('" + pic + "')";
             var len2 = pic.length;
@@ -824,6 +825,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
                     value = value.replace("x_portal_assemble_surface", host2 + "/x_portal_assemble_surface");
                 }
             }
+            value = o2.filterUrl(value);
             this.node.setStyle(key, value);
         }.bind(this));
         //this.node.setStyles(this.json.styles);

o2web/source/x_component_process_Xform/Image.js

@@ -23,6 +23,7 @@ MWF.xApplication.process.Xform.Image = MWF.APPImage =  new Class({
                 }else if (value.indexOf("x_cms_assemble_control")!==-1){
                     value = value.replace("x_cms_assemble_control", host3+"/x_cms_assemble_control");
                 }
+                value = o2.filterUrl(value);
             }
             try{
                 this.node.set("src", value);
@@ -31,6 +32,7 @@ MWF.xApplication.process.Xform.Image = MWF.APPImage =  new Class({
             value = this.json.srcfile;
             if (typeOf(value)==="object"){
                 var url = (value.portal) ? MWF.xDesktop.getPortalFileUr(value.id, value.portal) : MWF.xDesktop.getProcessFileUr(value.id, value.application);
+                url = o2.filterUrl(url);
                 this.node.set("src", url);
             }else{
                 var host = MWF.Actions.getHost("x_portal_assemble_surface");
@@ -39,6 +41,7 @@ MWF.xApplication.process.Xform.Image = MWF.APPImage =  new Class({
                 uri = uri.replace("{flag}", value);
                 uri = uri.replace("{applicationFlag}", this.form.json.application);
                 value = host+"/x_portal_assemble_surface"+uri;
+                value = o2.filterUrl(value);
                 this.node.set("src", value);
             }
         }else if (typeOf(this.json.src)=="object"){

o2web/source/x_component_process_Xform/Table.js

@@ -114,6 +114,7 @@ MWF.xApplication.process.Xform.Table$Td = MWF.APPTable$Td =  new Class({
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+                value = o2.filterUrl(value);
                 this.node.setStyle(key, value);
             }else{
                 if (!this.json.preprocessing) this.node.setStyle(key, value);
@@ -135,6 +136,7 @@ MWF.xApplication.process.Xform.Table$Td = MWF.APPTable$Td =  new Class({
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+                value = o2.filterUrl(value);
             }
             this.node.setStyle(key, value);
         }.bind(this));

o2web/source/x_component_query_Query/Viewer.js

@@ -2379,6 +2379,7 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
                 }else if (value.indexOf("x_cms_assemble_control")!==-1){
                     value = value.replace("x_cms_assemble_control", host3+"/x_cms_assemble_control");
                 }
+                value = o2.filterUrl(value);
             }
             this.node.setStyle(key, value);
         }.bind(this));
@@ -2653,6 +2654,7 @@ MWF.xApplication.query.Query.Viewer.Paging = new Class({
                 }else if (value.indexOf("x_cms_assemble_control")!==-1){
                     value = value.replace("x_cms_assemble_control", host3+"/x_cms_assemble_control");
                 }
+                value = o2.filterUrl(value);
             }
             this.node.setStyle(key, value);
         }.bind(this));

o2web/source/x_component_query_ViewDesigner/View.js

@@ -1215,6 +1215,7 @@ MWF.xApplication.query.ViewDesigner.View.$Module = MWF.QV$Module = new Class({
                 }else if (value.indexOf("x_portal_assemble_surface")!==-1){
                     value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface");
                 }
+                value = o2.filterUrl(value);
             }
 
             var reg = /^border\w*/ig;