修改auto start默认值

.gitignore

@@ -1,5 +1,5 @@
 /o2cloud/
-/.settings/
+**/.settings/
 .classpath
 .project
 /target/
@@ -65,4 +65,5 @@ version.o2
 /config/
 /store/
 /servers/
-/describe/
+/describe/
+.factorypath

o2server/x_attendance_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_attendance_assemble_control/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_attendance_assemble_control/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_attendance_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_attendance_core_entity/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_attendance_core_entity/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_base_core_project/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_base_core_project/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_base_core_project/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Node.java

@@ -31,6 +31,7 @@ public class Node extends ConfigObject {
 		o.nodeAgentEncrypt = true;
 		o.nodeAgentPort = default_nodeAgentPort;
 		o.quickStartWebApp = false;
+		o.autoStart = true;
 		return o;
 	}
 
@@ -82,7 +83,7 @@ public class Node extends ConfigObject {
 	/* 20191009兼容centerServer end */
 
 	public Boolean autoStart() {
-		return BooleanUtils.isTrue(autoStart);
+		return BooleanUtils.isNotFalse(autoStart);
 	}
 
 	public Boolean getEnable() {

o2server/x_bbs_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_bbs_assemble_control/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_bbs_assemble_control/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_bbs_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_bbs_core_entity/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_bbs_core_entity/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_calendar_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_calendar_assemble_control/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_calendar_assemble_control/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_calendar_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_calendar_core_entity/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_calendar_core_entity/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_cms_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_cms_assemble_control/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_cms_assemble_control/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_cms_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_cms_core_entity/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_cms_core_entity/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_cms_core_express/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_cms_core_express/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_cms_core_express/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_component_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_component_assemble_control/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_component_assemble_control/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_component_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_component_core_entity/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_component_core_entity/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_console/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_console/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_console/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_file_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_file_assemble_control/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_file_assemble_control/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_file_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_file_core_entity/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_file_core_entity/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_general_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

o2server/x_general_assemble_control/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

o2server/x_general_assemble_control/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

o2server/x_general_assemble_control/pom.xml

@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>o2oa</groupId>
-		<artifactId>o2server</artifactId>
-		<version>4.0.5</version>
-	</parent>
-	<artifactId>x_general_assemble_control</artifactId>
-	<packaging>war</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_base_core_project</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_organization_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_organization_core_express</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_general_core_entity</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>describeBuilder</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>java</goal>
-						</goals>
-						<configuration>
-							<addOutputToClasspath>true</addOutputToClasspath>
-							<includePluginDependencies>true</includePluginDependencies>
-							<includeProjectDependencies>true</includeProjectDependencies>
-							<mainClass>com.x.base.core.project.annotation.DescribeBuilder</mainClass>
-							<arguments>
-								<argument>${basedir}</argument>
-								<argument>${project.build.sourceDirectory}</argument>
-							</arguments>
-						</configuration>
-					</execution>
-					<execution>
-						<id>apiBuilder</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>java</goal>
-						</goals>
-						<configuration>
-							<addOutputToClasspath>true</addOutputToClasspath>
-							<includePluginDependencies>true</includePluginDependencies>
-							<includeProjectDependencies>true</includeProjectDependencies>
-							<mainClass>com.x.base.core.project.annotation.ApiBuilder</mainClass>
-							<arguments>
-								<argument>${basedir}</argument>
-								<argument>${project.build.sourceDirectory}</argument>
-							</arguments>
-						</configuration>
-					</execution>
-					<execution>
-						<id>checkAssemble</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>java</goal>
-						</goals>
-						<configuration>
-							<addOutputToClasspath>true</addOutputToClasspath>
-							<includePluginDependencies>true</includePluginDependencies>
-							<includeProjectDependencies>true</includeProjectDependencies>
-							<mainClass>com.x.base.core.project.build.CheckAssemble</mainClass>
-						</configuration>
-					</execution>
-					<execution>
-						<id>createWebXml</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>java</goal>
-						</goals>
-						<configuration>
-							<addOutputToClasspath>true</addOutputToClasspath>
-							<includePluginDependencies>true</includePluginDependencies>
-							<includeProjectDependencies>true</includeProjectDependencies>
-							<mainClass>com.x.base.core.project.build.CreateWebXml</mainClass>
-							<arguments>
-								<argument>${basedir}</argument>
-								<argument>${project.artifactId}</argument>
-							</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-war</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>../store</outputDirectory>
-							<resources>
-								<resource>
-									<directory>target</directory>
-									<includes>
-										<include>${project.artifactId}.war</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/AbstractFactory.java

@@ -1,24 +0,0 @@
-package com.x.general.assemble.control;
-
-import com.x.base.core.container.EntityManagerContainer;
-
-public abstract class AbstractFactory {
-
-	private Business business;
-
-	public AbstractFactory(Business business) throws Exception {
-		try {
-			if (null == business) {
-				throw new Exception("business can not be null.");
-			}
-			this.business = business;
-		} catch (Exception e) {
-			throw new Exception("can not instantiating factory.");
-		}
-	}
-
-	public EntityManagerContainer entityManagerContainer() throws Exception {
-		return this.business.entityManagerContainer();
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/ApplicationServletContextListener.java

@@ -1,33 +0,0 @@
-package com.x.general.assemble.control;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
-
-import com.x.base.core.project.Context;
-
-@WebListener
-public class ApplicationServletContextListener implements ServletContextListener {
-
-	@Override
-	public void contextInitialized(ServletContextEvent servletContextEvent) {
-		try {
-			ThisApplication.context = Context.concrete(servletContextEvent);
-			ThisApplication.init();
-			ThisApplication.context().regist();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent servletContextEvent) {
-		try {
-			ThisApplication.destroy();
-			ThisApplication.context.destrory(servletContextEvent);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/Business.java

@@ -1,27 +0,0 @@
-package com.x.general.assemble.control;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.organization.core.express.Organization;
-
-public class Business {
-
-	private EntityManagerContainer emc;
-
-	public Business(EntityManagerContainer emc) throws Exception {
-		this.emc = emc;
-	}
-
-	public EntityManagerContainer entityManagerContainer() {
-		return this.emc;
-	}
-
-	private Organization organization;
-
-	public Organization organization() throws Exception {
-		if (null == this.organization) {
-			this.organization = new Organization(ThisApplication.context());
-		}
-		return organization;
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/ThisApplication.java

@@ -1,30 +0,0 @@
-package com.x.general.assemble.control;
-
-import com.x.base.core.project.Context;
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class ThisApplication {
-
-	protected static Context context;
-
-	public static Context context() {
-		return context;
-	}
-
-	public static void init() {
-		try {
-			LoggerFactory.setLevel(Config.logLevel().x_general_assemble_control());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static void destroy() {
-		try {
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/ActionApplication.java

@@ -1,22 +0,0 @@
-package com.x.general.assemble.control.jaxrs;
-
-import java.util.Set;
-
-import javax.ws.rs.ApplicationPath;
-
-import com.x.base.core.project.jaxrs.AbstractActionApplication;
-import com.x.general.assemble.control.jaxrs.area.AreaAction;
-import com.x.general.assemble.control.jaxrs.ecnet.EcnetAction;
-import com.x.general.assemble.control.jaxrs.office.OfficeAction;
-
-@ApplicationPath("jaxrs")
-public class ActionApplication extends AbstractActionApplication {
-
-	public Set<Class<?>> getClasses() {
-		classes.add(AreaAction.class);
-		classes.add(EcnetAction.class);
-		classes.add(OfficeAction.class);
-		return classes;
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/AreaJaxrsFilter.java

@@ -1,10 +0,0 @@
-package com.x.general.assemble.control.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = "/jaxrs/area/*", asyncSupported = true)
-public class AreaJaxrsFilter extends AnonymousCipherManagerUserJaxrsFilter {
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/EcnetJaxrsFilter.java

@@ -1,10 +0,0 @@
-package com.x.general.assemble.control.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = "/jaxrs/ecnet/*", asyncSupported = true)
-public class EcnetJaxrsFilter extends AnonymousCipherManagerUserJaxrsFilter {
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/OfficeJaxrsFilter.java

@@ -1,10 +0,0 @@
-package com.x.general.assemble.control.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = "/jaxrs/office/*", asyncSupported = true)
-public class OfficeJaxrsFilter extends AnonymousCipherManagerUserJaxrsFilter {
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/area/ActionListCity.java

@@ -1,52 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.bean.WrapCopier;
-import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.ListTools;
-import com.x.general.assemble.control.Business;
-import com.x.general.core.entity.area.District;
-
-import net.sf.ehcache.Element;
-
-public class ActionListCity extends BaseAction {
-
-	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, String province) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<List<Wo>> result = new ActionResult<>();
-			List<Wo> wos = new ArrayList<>();
-			String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), province);
-			Element element = cache.get(cacheKey);
-			if ((null != element) && (null != element.getObjectValue())) {
-				wos = (List<Wo>) element.getObjectValue();
-			} else {
-				Business business = new Business(emc);
-				District districtProvince = this.getProvince(business, province);
-				if (null == districtProvince) {
-					throw new ExceptionDistrictNotExist(province);
-				}
-				wos = Wo.copier.copy(this.listCity(business, districtProvince));
-				cache.put(new Element(cacheKey, wos));
-			}
-			result.setData(wos);
-			return result;
-		}
-	}
-
-	public static class Wo extends District {
-
-		private static final long serialVersionUID = -6068531258644538959L;
-		static WrapCopier<District, Wo> copier = WrapCopierFactory.wo(District.class, Wo.class,
-				ListTools.toList(District.zipCode_FIELDNAME, District.center_FIELDNAME, District.name_FIELDNAME,
-						District.level_FIELDNAME),
-				null);
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/area/ActionListDistrict.java

@@ -1,56 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.bean.WrapCopier;
-import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.ListTools;
-import com.x.general.assemble.control.Business;
-import com.x.general.core.entity.area.District;
-
-import net.sf.ehcache.Element;
-
-public class ActionListDistrict extends BaseAction {
-
-	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, String province, String city) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<List<Wo>> result = new ActionResult<>();
-			List<Wo> wos = new ArrayList<>();
-			String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), province, city);
-			Element element = cache.get(cacheKey);
-			if ((null != element) && (null != element.getObjectValue())) {
-				wos = (List<Wo>) element.getObjectValue();
-			} else {
-				Business business = new Business(emc);
-				District districtProvince = this.getProvince(business, province);
-				if (null == districtProvince) {
-					throw new ExceptionDistrictNotExist(province);
-				}
-				District districtCity = this.getCity(business, districtProvince, city);
-				if (null == districtCity) {
-					throw new ExceptionDistrictNotExist(city);
-				}
-				wos = Wo.copier.copy(this.listDistrict(business, districtCity));
-				cache.put(new Element(cacheKey, wos));
-			}
-			result.setData(wos);
-			return result;
-		}
-	}
-
-	public static class Wo extends District {
-
-		private static final long serialVersionUID = -6068531258644538959L;
-		static WrapCopier<District, Wo> copier = WrapCopierFactory.wo(District.class, Wo.class,
-				ListTools.toList(District.zipCode_FIELDNAME, District.center_FIELDNAME, District.name_FIELDNAME,
-						District.level_FIELDNAME),
-				null);
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/area/ActionListProvince.java

@@ -1,47 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.bean.WrapCopier;
-import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.ListTools;
-import com.x.general.core.entity.area.District;
-
-import net.sf.ehcache.Element;
-
-public class ActionListProvince extends BaseAction {
-
-	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<List<Wo>> result = new ActionResult<>();
-			List<Wo> wos = new ArrayList<>();
-			String cacheKey = ApplicationCache.concreteCacheKey(this.getClass());
-			Element element = cache.get(cacheKey);
-			if ((null != element) && (null != element.getObjectValue())) {
-				wos = (List<Wo>) element.getObjectValue();
-			} else {
-				List<District> os = emc.listEqual(District.class, District.level_FIELDNAME, District.LEVEL_PROVINCE);
-				wos = Wo.copier.copy(os);
-				cache.put(new Element(cacheKey, wos));
-			}
-			result.setData(wos);
-			return result;
-		}
-	}
-
-	public static class Wo extends District {
-
-		private static final long serialVersionUID = -6068531258644538959L;
-		static WrapCopier<District, Wo> copier = WrapCopierFactory.wo(District.class, Wo.class,
-				ListTools.toList(District.zipCode_FIELDNAME, District.center_FIELDNAME, District.name_FIELDNAME,
-						District.level_FIELDNAME, District.sha_FIELDNAME),
-				null);
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/area/ActionListStreet.java

@@ -1,60 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.bean.WrapCopier;
-import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.ListTools;
-import com.x.general.assemble.control.Business;
-import com.x.general.core.entity.area.District;
-
-import net.sf.ehcache.Element;
-
-public class ActionListStreet extends BaseAction {
-
-	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, String province, String city, String district)
-			throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<List<Wo>> result = new ActionResult<>();
-			List<Wo> wos = new ArrayList<>();
-			String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), province, city, district);
-			Element element = cache.get(cacheKey);
-			if ((null != element) && (null != element.getObjectValue())) {
-				wos = (List<Wo>) element.getObjectValue();
-			} else {
-				Business business = new Business(emc);
-				District districtProvince = this.getProvince(business, province);
-				if (null == districtProvince) {
-					throw new ExceptionDistrictNotExist(province);
-				}
-				District districtCity = this.getCity(business, districtProvince, city);
-				if (null == districtCity) {
-					throw new ExceptionDistrictNotExist(city);
-				}
-				District districtDistrict = this.getDistrict(business, districtCity, district);
-				if (null == districtDistrict) {
-					throw new ExceptionDistrictNotExist(district);
-				}
-				wos = Wo.copier.copy(this.listStreet(business, districtDistrict));
-			}
-			result.setData(wos);
-			return result;
-		}
-	}
-
-	public static class Wo extends District {
-
-		private static final long serialVersionUID = -6068531258644538959L;
-		static WrapCopier<District, Wo> copier = WrapCopierFactory.wo(District.class, Wo.class,
-				ListTools.toList(District.zipCode_FIELDNAME, District.center_FIELDNAME, District.name_FIELDNAME,
-						District.level_FIELDNAME),
-				null);
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/area/AreaAction.java

@@ -1,106 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import com.x.base.core.project.annotation.JaxrsDescribe;
-import com.x.base.core.project.annotation.JaxrsMethodDescribe;
-import com.x.base.core.project.annotation.JaxrsParameterDescribe;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.http.HttpMediaType;
-import com.x.base.core.project.jaxrs.ResponseFactory;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-@Path("area")
-@JaxrsDescribe("行政区域")
-public class AreaAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(AreaAction.class);
-
-	@JaxrsMethodDescribe(value = "获取指定的Attachment信息.", action = ActionListProvince.class)
-	@GET
-	@Path("list")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void listProvince(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
-		ActionResult<List<ActionListProvince.Wo>> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionListProvince().execute(effectivePerson);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-	@JaxrsMethodDescribe(value = "列示指定省下属市", action = ActionListCity.class)
-	@GET
-	@Path("list/province/{province}")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void listCity(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			@JaxrsParameterDescribe("省") @PathParam("province") String province) {
-		ActionResult<List<ActionListCity.Wo>> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionListCity().execute(effectivePerson, province);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-	@JaxrsMethodDescribe(value = "列示指定省/市下属区", action = ActionListStreet.class)
-	@GET
-	@Path("list/province/{province}/city/{city}")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void listDistrict(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			@JaxrsParameterDescribe("省") @PathParam("province") String province,
-			@JaxrsParameterDescribe("市") @PathParam("city") String city) {
-		ActionResult<List<ActionListDistrict.Wo>> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionListDistrict().execute(effectivePerson, province, city);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-	@JaxrsMethodDescribe(value = "列示指定省/市/区的下属街道", action = ActionListStreet.class)
-	@GET
-	@Path("list/province/{province}/city/{city}/district/{district}")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void listStreet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			@JaxrsParameterDescribe("省") @PathParam("province") String province,
-			@JaxrsParameterDescribe("市") @PathParam("city") String city,
-			@JaxrsParameterDescribe("区") @PathParam("district") String district) {
-		ActionResult<List<ActionListStreet.Wo>> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionListStreet().execute(effectivePerson, province, city, district);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/area/BaseAction.java

@@ -1,82 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.general.assemble.control.Business;
-import com.x.general.core.entity.area.District;
-import com.x.general.core.entity.area.District_;
-
-import net.sf.ehcache.Ehcache;
-
-abstract class BaseAction extends StandardJaxrsAction {
-
-	protected static Ehcache cache = ApplicationCache.instance().getCache(District.class);
-
-	protected District getProvince(Business business, String name) throws Exception {
-		List<District> os = business.entityManagerContainer().listEqualAndEqual(District.class,
-				District.level_FIELDNAME, District.LEVEL_PROVINCE, District.name_FIELDNAME, name);
-		if (os.size() == 1) {
-			return os.get(0);
-		}
-		return null;
-	}
-
-	protected District getCity(Business business, District province, String name) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(District.class);
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<District> cq = cb.createQuery(District.class);
-		Root<District> root = cq.from(District.class);
-		Predicate p = cb.equal(root.get(District_.name), name);
-		p = cb.and(p, cb.equal(root.get(District_.level), District.LEVEL_CITY));
-		p = cb.and(p, cb.equal(root.get(District_.province), province.getId()));
-		cq.select(root).where(p);
-		List<District> os = em.createQuery(cq).getResultList();
-		if (os.size() == 1) {
-			return os.get(0);
-		}
-		return null;
-	}
-
-	protected District getDistrict(Business business, District city, String name) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(District.class);
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<District> cq = cb.createQuery(District.class);
-		Root<District> root = cq.from(District.class);
-		Predicate p = cb.equal(root.get(District_.name), name);
-		p = cb.and(p, cb.equal(root.get(District_.level), District.LEVEL_DISTRICT));
-		p = cb.and(p, cb.equal(root.get(District_.city), city.getId()));
-		cq.select(root).where(p);
-		List<District> os = em.createQuery(cq).getResultList();
-		if (os.size() == 1) {
-			return os.get(0);
-		}
-		return null;
-	}
-
-	protected List<District> listCity(Business business, District province) throws Exception {
-		List<District> os = business.entityManagerContainer().listEqualAndEqual(District.class,
-				District.level_FIELDNAME, District.LEVEL_CITY, District.province_FIELDNAME, province.getId());
-		return os;
-	}
-
-	protected List<District> listDistrict(Business business, District city) throws Exception {
-		List<District> os = business.entityManagerContainer().listEqualAndEqual(District.class,
-				District.level_FIELDNAME, District.LEVEL_DISTRICT, District.city_FIELDNAME, city.getId());
-		return os;
-	}
-
-	protected List<District> listStreet(Business business, District district) throws Exception {
-		List<District> os = business.entityManagerContainer().listEqualAndEqual(District.class,
-				District.level_FIELDNAME, District.LEVEL_STREET, District.district_FIELDNAME, district.getId());
-		return os;
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/area/ExceptionDistrictNotExist.java

@@ -1,12 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import com.x.base.core.project.exception.PromptException;
-
-class ExceptionDistrictNotExist extends PromptException {
-
-	private static final long serialVersionUID = 7237855733312562652L;
-
-	ExceptionDistrictNotExist(String name) {
-		super("指定的区域不存在:{}.", name);
-	}
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/ecnet/ActionCheck.java

@@ -1,123 +0,0 @@
-package com.x.general.assemble.control.jaxrs.ecnet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.connection.ActionResponse;
-import com.x.base.core.project.connection.ConnectionAction;
-import com.x.base.core.project.gson.GsonPropertyObject;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.jaxrs.WrapString;
-
-public class ActionCheck extends BaseAction {
-
-	private static final String ADDRESS = "/o2_collect_assemble/jaxrs/ecnet/check";
-
-	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<Wo> result = new ActionResult<>();
-			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
-			ActionResponse response = ConnectionAction.post(Config.collect().url(ADDRESS), null, wi);
-			Wo wo = response.getData(Wo.class);
-			result.setData(wo);
-			return result;
-		}
-	}
-
-	public static class Wi extends WrapString {
-	}
-
-	public static class Wo extends GsonPropertyObject {
-
-		private Integer pos = 0;
-
-		private String origin = "";
-
-		private String correct = "";
-
-		private List<WoItem> itemList = new ArrayList<>();
-
-		public String getOrigin() {
-			return origin;
-		}
-
-		public void setOrigin(String origin) {
-			this.origin = origin;
-		}
-
-		public String getCorrect() {
-			return correct;
-		}
-
-		public void setCorrect(String correct) {
-			this.correct = correct;
-		}
-
-		public List<WoItem> getItemList() {
-			return itemList;
-		}
-
-		public void setItemList(List<WoItem> itemList) {
-			this.itemList = itemList;
-		}
-
-		public Integer getPos() {
-			return pos;
-		}
-
-		public void setPos(Integer pos) {
-			this.pos = pos;
-		}
-
-	}
-
-	public static class WoItem extends GsonPropertyObject {
-
-		private String origin;
-
-		private String correct;
-
-		private Integer begin;
-
-		private Integer end;
-
-		public String getOrigin() {
-			return origin;
-		}
-
-		public void setOrigin(String origin) {
-			this.origin = origin;
-		}
-
-		public String getCorrect() {
-			return correct;
-		}
-
-		public void setCorrect(String correct) {
-			this.correct = correct;
-		}
-
-		public Integer getBegin() {
-			return begin;
-		}
-
-		public void setBegin(Integer begin) {
-			this.begin = begin;
-		}
-
-		public Integer getEnd() {
-			return end;
-		}
-
-		public void setEnd(Integer end) {
-			this.end = end;
-		}
-
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/ecnet/BaseAction.java

@@ -1,7 +0,0 @@
-package com.x.general.assemble.control.jaxrs.ecnet;
-
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-
-abstract class BaseAction extends StandardJaxrsAction {
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/ecnet/EcnetAction.java

@@ -1,48 +0,0 @@
-package com.x.general.assemble.control.jaxrs.ecnet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.annotation.JaxrsDescribe;
-import com.x.base.core.project.annotation.JaxrsMethodDescribe;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.http.HttpMediaType;
-import com.x.base.core.project.jaxrs.ResponseFactory;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-@Path("ecnet")
-@JaxrsDescribe("文本纠错")
-public class EcnetAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(EcnetAction.class);
-
-	@JaxrsMethodDescribe(value = "文本纠错.", action = ActionCheck.class)
-	@POST
-	@Path("check")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void check(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			JsonElement jsonElement) {
-		ActionResult<ActionCheck.Wo> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionCheck().execute(effectivePerson, jsonElement);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/ecnet/ExceptionDistrictNotExist.java

@@ -1,12 +0,0 @@
-package com.x.general.assemble.control.jaxrs.ecnet;
-
-import com.x.base.core.project.exception.PromptException;
-
-class ExceptionDistrictNotExist extends PromptException {
-
-	private static final long serialVersionUID = 7237855733312562652L;
-
-	ExceptionDistrictNotExist(String name) {
-		super("指定的区域不存在:{}.", name);
-	}
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/office/ActionHtmlToWord.java

@@ -1,79 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.annotation.FieldDescribe;
-import com.x.base.core.project.gson.GsonPropertyObject;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.jaxrs.WoId;
-import com.x.base.core.project.tools.StringTools;
-
-import net.sf.ehcache.Element;
-
-class ActionHtmlToWord extends BaseAction {
-
-	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
-		ActionResult<Wo> result = new ActionResult<>();
-		Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
-		byte[] bytes = this.local(wi);
-		HtmlToWordResultObject resultObject = new HtmlToWordResultObject();
-
-		resultObject.setBytes(bytes);
-		resultObject.setName(wi.getFileName());
-		resultObject.setPerson(effectivePerson.getDistinguishedName());
-
-		String flag = StringTools.uniqueToken();
-		cache.put(new Element(flag, resultObject));
-		Wo wo = new Wo();
-		wo.setId(flag);
-		result.setData(wo);
-		return result;
-	}
-
-	private byte[] local(Wi wi) throws Exception {
-		String content = "<html><head></head><body>" + wi.getContent() + "</body></html>";
-		try (POIFSFileSystem fs = new POIFSFileSystem();
-				InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
-				ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-			fs.createDocument(is, "WordDocument");
-			fs.writeFilesystem(out);
-			return out.toByteArray();
-		}
-	}
-
-	public static class Wo extends WoId {
-	}
-
-	public static class Wi extends GsonPropertyObject {
-
-		@FieldDescribe("转换文件名.")
-		private String fileName;
-		@FieldDescribe("内容.")
-		private String content;
-
-		public String getFileName() throws Exception {
-			return StringUtils.isEmpty(fileName) ? StringTools.uniqueToken() + ".doc" : fileName;
-		}
-
-		public void setFileName(String fileName) {
-			this.fileName = fileName;
-		}
-
-		public String getContent() {
-			return content;
-		}
-
-		public void setContent(String content) {
-			this.content = content;
-		}
-
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/office/ActionHtmlToWordResult.java

@@ -1,46 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.exception.ExceptionAccessDenied;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.jaxrs.WoFile;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-import net.sf.ehcache.Element;
-
-class ActionHtmlToWordResult extends BaseAction {
-
-	private static Logger logger = LoggerFactory.getLogger(ActionHtmlToWordResult.class);
-
-	ActionResult<Wo> execute(EffectivePerson effectivePerson, String flag) throws Exception {
-		logger.info("{}", flag);
-		ActionResult<Wo> result = new ActionResult<>();
-		String cacheKey = ApplicationCache.concreteCacheKey(flag);
-		Element element = cache.get(cacheKey);
-		if (null != element && null != element.getObjectValue()) {
-			HtmlToWordResultObject obj = (HtmlToWordResultObject) element.getObjectValue();
-			if (!StringUtils.equals(effectivePerson.getDistinguishedName(), obj.getPerson())) {
-				throw new ExceptionAccessDenied(effectivePerson);
-			}
-			Wo wo = new Wo(obj.getBytes(), this.contentType(true, obj.getName()),
-					this.contentDisposition(true, obj.getName()));
-			result.setData(wo);
-		} else {
-			throw new ExceptionHtmlToWordResultObject(flag);
-		}
-		return result;
-	}
-
-	public static class Wo extends WoFile {
-
-		public Wo(byte[] bytes, String contentType, String contentDisposition) {
-			super(bytes, contentType, contentDisposition);
-		}
-
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/office/ActionToHtml.java

@@ -1,96 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.converter.PicturesManager;
-import org.apache.poi.hwpf.converter.WordToHtmlConverter;
-import org.apache.poi.hwpf.usermodel.PictureType;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.tika.Tika;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.w3c.dom.Document;
-
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.jaxrs.WrapString;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-import fr.opensagres.poi.xwpf.converter.xhtml.XHTMLConverter;
-import fr.opensagres.poi.xwpf.converter.xhtml.XHTMLOptions;
-
-public class ActionToHtml extends BaseAction {
-
-	private static Logger logger = LoggerFactory.getLogger(ActionToHtml.class);
-
-	ActionResult<Wo> execute(EffectivePerson effectivePerson, byte[] bytes, FormDataContentDisposition disposition)
-			throws Exception {
-		ActionResult<Wo> result = new ActionResult<>();
-		Tika tika = new Tika();
-		String type = tika.detect(bytes);
-		Wo wo = new Wo();
-		switch (type) {
-		case ("application/msword"):
-			wo.setValue(this.doc(bytes));
-			break;
-		case ("application/vnd.openxmlformats-officedocument.wordprocessingml.document"):
-			wo.setValue(this.docx(bytes));
-			break;
-		default:
-			throw new ExceptionUnsupportType(type);
-		}
-		result.setData(wo);
-		return result;
-	}
-
-	private String doc(byte[] bytes) throws Exception {
-		WordToHtmlConverter wordToHtmlConverter = new WordToHtmlConverter(
-				DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument());
-		wordToHtmlConverter.setPicturesManager(new PicturesManager() {
-			public String savePicture(byte[] content, PictureType pictureType, String suggestedName, float widthInches,
-					float heightInches) {
-				return suggestedName;
-			}
-		});
-		try (ByteArrayInputStream in = new ByteArrayInputStream(bytes);
-				ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-			HWPFDocument wordDocument = new HWPFDocument(in);
-			wordToHtmlConverter.processDocument(wordDocument);
-			Document htmlDocument = wordToHtmlConverter.getDocument();
-			DOMSource domSource = new DOMSource(htmlDocument);
-			StreamResult streamResult = new StreamResult(out);
-			TransformerFactory tf = TransformerFactory.newInstance();
-			Transformer serializer = tf.newTransformer();
-			serializer.setOutputProperty(OutputKeys.ENCODING, "GB2312");// 编码格式
-			serializer.setOutputProperty(OutputKeys.INDENT, "yes");// 是否用空白分割
-			serializer.setOutputProperty(OutputKeys.METHOD, "html");// 输出类型
-			serializer.transform(domSource, streamResult);
-			String content = new String(out.toByteArray());
-			return content;
-		}
-	}
-
-	private String docx(byte[] bytes) throws Exception {
-		try (ByteArrayInputStream in = new ByteArrayInputStream(bytes);
-				ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-			XWPFDocument document = new XWPFDocument(in);
-			XHTMLOptions options = XHTMLOptions.create();
-			XHTMLConverter.getInstance().convert(document, out, options);
-			return new String(out.toByteArray());
-		}
-	}
-
-	public static class Wo extends WrapString {
-
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/office/BaseAction.java

@@ -1,44 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.gson.GsonPropertyObject;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-
-import net.sf.ehcache.Ehcache;
-
-abstract class BaseAction extends StandardJaxrsAction {
-
-	protected static Ehcache cache = ApplicationCache.instance().getCache(BaseAction.class);
-
-	public static class HtmlToWordResultObject extends GsonPropertyObject {
-
-		private byte[] bytes;
-		private String name;
-		private String person;
-
-		public byte[] getBytes() {
-			return bytes;
-		}
-
-		public void setBytes(byte[] bytes) {
-			this.bytes = bytes;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public String getPerson() {
-			return person;
-		}
-
-		public void setPerson(String person) {
-			this.person = person;
-		}
-
-	}
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/office/ExceptionHtmlToWordResultObject.java

@@ -1,13 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import com.x.base.core.project.exception.PromptException;
-
-class ExceptionHtmlToWordResultObject extends PromptException {
-
-	private static final long serialVersionUID = -4908883340253465376L;
-
-	ExceptionHtmlToWordResultObject(String flag) {
-		super("指定的Word结果不存在:{}.", flag);
-	}
-
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/office/ExceptionUnsupportType.java

@@ -1,12 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import com.x.base.core.project.exception.PromptException;
-
-class ExceptionUnsupportType extends PromptException {
-
-	private static final long serialVersionUID = 7237855733312562652L;
-
-	ExceptionUnsupportType(String type) {
-		super("不支持的文件格式: {}.", type);
-	}
-}

o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/office/OfficeAction.java

@@ -1,89 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.annotation.JaxrsDescribe;
-import com.x.base.core.project.annotation.JaxrsMethodDescribe;
-import com.x.base.core.project.annotation.JaxrsParameterDescribe;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.http.HttpMediaType;
-import com.x.base.core.project.jaxrs.ResponseFactory;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-@Path("office")
-@JaxrsDescribe("office文件转换")
-public class OfficeAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(OfficeAction.class);
-
-	@JaxrsMethodDescribe(value = "转换成html.", action = ActionToHtml.class)
-	@POST
-	@Consumes(MediaType.MULTIPART_FORM_DATA)
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	public void input(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			@FormDataParam(FILE_FIELD) final byte[] bytes,
-			@JaxrsParameterDescribe("office文件") @FormDataParam(FILE_FIELD) final FormDataContentDisposition disposition) {
-		ActionResult<ActionToHtml.Wo> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionToHtml().execute(effectivePerson, bytes, disposition);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-	@JaxrsMethodDescribe(value = "html转换成word.", action = ActionHtmlToWord.class)
-	@POST
-	@Path("html/to/word")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void htmlToWord(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			JsonElement jsonElement) {
-		ActionResult<ActionHtmlToWord.Wo> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionHtmlToWord().execute(effectivePerson, jsonElement);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, jsonElement);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-	@JaxrsMethodDescribe(value = "html转换成word结果流文件.", action = ActionHtmlToWordResult.class)
-	@GET
-	@Path("html/to/word/result/{flag}")
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void htmlToWordResult(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			@JaxrsParameterDescribe("标识") @PathParam("flag") String flag) {
-		ActionResult<ActionHtmlToWordResult.Wo> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionHtmlToWordResult().execute(effectivePerson, flag);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/WEB-INF/web.xml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><web-app id="x_general_assemble_control" metadata-complete="false" version="3.0"><display-name>x_general_assemble_control</display-name><context-param><param-name>project</param-name><param-value>com.x.base.core.project.x_general_assemble_control</param-value></context-param></web-app>

o2server/x_general_assemble_control/src/main/webapp/describe/describe.json

@@ -1,700 +0,0 @@
-{
-  "jaxrs": [
-    {
-      "name": "AreaAction",
-      "className": "com.x.general.assemble.control.jaxrs.area.AreaAction",
-      "description": "行政区域",
-      "methods": [
-        {
-          "name": "listCity",
-          "className": "com.x.general.assemble.control.jaxrs.area.ActionListCity",
-          "description": "列示指定省下属市",
-          "type": "GET",
-          "path": "jaxrs/area/list/province/{province}",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [
-            {
-              "name": "province",
-              "type": "String",
-              "description": "省"
-            }
-          ],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "name",
-              "type": "String",
-              "isCollection": false,
-              "description": "名称."
-            },
-            {
-              "name": "zipCode",
-              "type": "String",
-              "isCollection": false,
-              "description": "邮编."
-            },
-            {
-              "name": "level",
-              "type": "String",
-              "isCollection": false,
-              "description": "级别."
-            },
-            {
-              "name": "center",
-              "type": "String",
-              "isCollection": false,
-              "description": "中心坐标."
-            }
-          ]
-        },
-        {
-          "name": "listDistrict",
-          "className": "com.x.general.assemble.control.jaxrs.area.ActionListStreet",
-          "description": "列示指定省/市下属区",
-          "type": "GET",
-          "path": "jaxrs/area/list/province/{province}/city/{city}",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [
-            {
-              "name": "province",
-              "type": "String",
-              "description": "省"
-            },
-            {
-              "name": "city",
-              "type": "String",
-              "description": "市"
-            }
-          ],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "name",
-              "type": "String",
-              "isCollection": false,
-              "description": "名称."
-            },
-            {
-              "name": "zipCode",
-              "type": "String",
-              "isCollection": false,
-              "description": "邮编."
-            },
-            {
-              "name": "level",
-              "type": "String",
-              "isCollection": false,
-              "description": "级别."
-            },
-            {
-              "name": "center",
-              "type": "String",
-              "isCollection": false,
-              "description": "中心坐标."
-            }
-          ]
-        },
-        {
-          "name": "listProvince",
-          "className": "com.x.general.assemble.control.jaxrs.area.ActionListProvince",
-          "description": "获取指定的Attachment信息.",
-          "type": "GET",
-          "path": "jaxrs/area/list",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "name",
-              "type": "String",
-              "isCollection": false,
-              "description": "名称."
-            },
-            {
-              "name": "zipCode",
-              "type": "String",
-              "isCollection": false,
-              "description": "邮编."
-            },
-            {
-              "name": "level",
-              "type": "String",
-              "isCollection": false,
-              "description": "级别."
-            },
-            {
-              "name": "center",
-              "type": "String",
-              "isCollection": false,
-              "description": "中心坐标."
-            },
-            {
-              "name": "sha",
-              "type": "String",
-              "isCollection": false,
-              "description": "md5校验码."
-            }
-          ]
-        },
-        {
-          "name": "listStreet",
-          "className": "com.x.general.assemble.control.jaxrs.area.ActionListStreet",
-          "description": "列示指定省/市/区的下属街道",
-          "type": "GET",
-          "path": "jaxrs/area/list/province/{province}/city/{city}/district/{district}",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [
-            {
-              "name": "province",
-              "type": "String",
-              "description": "省"
-            },
-            {
-              "name": "city",
-              "type": "String",
-              "description": "市"
-            },
-            {
-              "name": "district",
-              "type": "String",
-              "description": "区"
-            }
-          ],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "name",
-              "type": "String",
-              "isCollection": false,
-              "description": "名称."
-            },
-            {
-              "name": "zipCode",
-              "type": "String",
-              "isCollection": false,
-              "description": "邮编."
-            },
-            {
-              "name": "level",
-              "type": "String",
-              "isCollection": false,
-              "description": "级别."
-            },
-            {
-              "name": "center",
-              "type": "String",
-              "isCollection": false,
-              "description": "中心坐标."
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "CacheAction",
-      "className": "com.x.base.core.project.jaxrs.cache.CacheAction",
-      "description": "缓存操作",
-      "methods": [
-        {
-          "name": "configFlush",
-          "className": "com.x.base.core.project.jaxrs.cache.ActionConfigFlush",
-          "description": "接收config flush 信号.",
-          "type": "GET",
-          "path": "jaxrs/cache/config/flush",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "Boolean",
-              "isCollection": false,
-              "description": "布尔值."
-            }
-          ]
-        },
-        {
-          "name": "receive",
-          "className": "com.x.base.core.project.jaxrs.cache.ActionReceive",
-          "description": "接收Cache刷新信息.",
-          "type": "PUT",
-          "path": "jaxrs/cache",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [
-            {
-              "name": "nodeName",
-              "type": "String",
-              "isCollection": false,
-              "description": "节点名",
-              "isBaseType": true
-            },
-            {
-              "name": "className",
-              "type": "String",
-              "isCollection": false,
-              "description": "类名",
-              "isBaseType": true
-            },
-            {
-              "name": "keys",
-              "type": "List\u003cObject\u003e",
-              "isCollection": true,
-              "description": "关键字",
-              "isBaseType": false
-            }
-          ],
-          "outs": [
-            {
-              "name": "value",
-              "type": "String",
-              "isCollection": false,
-              "description": "字符串值"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "EchoAction",
-      "className": "com.x.base.core.project.jaxrs.echo.EchoAction",
-      "description": "响应",
-      "methods": [
-        {
-          "name": "get",
-          "className": "com.x.base.core.project.jaxrs.echo.ActionGet",
-          "description": "获取应答.",
-          "type": "GET",
-          "path": "jaxrs/echo",
-          "contentType": "application/json",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "servletContextName",
-              "type": "String",
-              "isCollection": false,
-              "description": "上下文根"
-            },
-            {
-              "name": "serverTime",
-              "type": "Date",
-              "isCollection": false,
-              "description": "服务器时间"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "EcnetAction",
-      "className": "com.x.general.assemble.control.jaxrs.ecnet.EcnetAction",
-      "description": "文本纠错",
-      "methods": [
-        {
-          "name": "check",
-          "className": "com.x.general.assemble.control.jaxrs.ecnet.ActionCheck",
-          "description": "文本纠错.",
-          "type": "POST",
-          "path": "jaxrs/ecnet/check",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [
-            {
-              "name": "value",
-              "type": "String",
-              "isCollection": false,
-              "description": "字符串值",
-              "isBaseType": true
-            }
-          ],
-          "outs": []
-        }
-      ]
-    },
-    {
-      "name": "FireScheduleAction",
-      "className": "com.x.base.core.project.jaxrs.fireschedule.FireScheduleAction",
-      "description": "触发任务",
-      "methods": [
-        {
-          "name": "execute",
-          "className": "com.x.base.core.project.jaxrs.fireschedule.ActionExecute",
-          "description": "接受x_program_center发送过来的运行schedule.",
-          "type": "GET",
-          "path": "jaxrs/fireschedule/classname/{className}",
-          "contentType": "application/json",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [
-            {
-              "name": "className",
-              "type": "String",
-              "description": "运行类"
-            }
-          ],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "Boolean",
-              "isCollection": false,
-              "description": "布尔值."
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "LoggerAction",
-      "className": "com.x.base.core.project.jaxrs.logger.LoggerAction",
-      "description": "日志操作",
-      "methods": [
-        {
-          "name": "debug",
-          "className": "com.x.base.core.project.jaxrs.logger.ActionDebug",
-          "description": "设置日志级别为DEBUG.",
-          "type": "GET",
-          "path": "jaxrs/logger/debug",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "Boolean",
-              "isCollection": false,
-              "description": "布尔值."
-            }
-          ]
-        },
-        {
-          "name": "get",
-          "className": "com.x.base.core.project.jaxrs.logger.ActionGet",
-          "description": "获取当前日志级别.",
-          "type": "GET",
-          "path": "jaxrs/logger",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "String",
-              "isCollection": false,
-              "description": "字符串值"
-            }
-          ]
-        },
-        {
-          "name": "info",
-          "className": "com.x.base.core.project.jaxrs.logger.ActionInfo",
-          "description": "设置日志级别为INFO",
-          "type": "GET",
-          "path": "jaxrs/logger/info",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "Boolean",
-              "isCollection": false,
-              "description": "布尔值."
-            }
-          ]
-        },
-        {
-          "name": "trace",
-          "className": "com.x.base.core.project.jaxrs.logger.ActionTrace",
-          "description": "设置日志级别为TRACE.",
-          "type": "GET",
-          "path": "jaxrs/logger/trace",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "Boolean",
-              "isCollection": false,
-              "description": "布尔值."
-            }
-          ]
-        },
-        {
-          "name": "warn",
-          "className": "com.x.base.core.project.jaxrs.logger.ActionWarn",
-          "description": "设置日志级别为WARN",
-          "type": "GET",
-          "path": "jaxrs/logger/warn",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "Boolean",
-              "isCollection": false,
-              "description": "布尔值."
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "OfficeAction",
-      "className": "com.x.general.assemble.control.jaxrs.office.OfficeAction",
-      "description": "office文件转换",
-      "methods": [
-        {
-          "name": "htmlToWord",
-          "className": "com.x.general.assemble.control.jaxrs.office.ActionHtmlToWord",
-          "description": "html转换成word.",
-          "type": "POST",
-          "path": "jaxrs/office/html/to/word",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [
-            {
-              "name": "fileName",
-              "type": "String",
-              "isCollection": false,
-              "description": "转换文件名.",
-              "isBaseType": true
-            },
-            {
-              "name": "content",
-              "type": "String",
-              "isCollection": false,
-              "description": "内容.",
-              "isBaseType": true
-            }
-          ],
-          "outs": [
-            {
-              "name": "id",
-              "type": "String",
-              "isCollection": false,
-              "description": "id"
-            }
-          ]
-        },
-        {
-          "name": "htmlToWordResult",
-          "className": "com.x.general.assemble.control.jaxrs.office.ActionHtmlToWordResult",
-          "description": "html转换成word结果流文件.",
-          "type": "GET",
-          "path": "jaxrs/office/html/to/word/result/{flag}",
-          "contentType": "application/json",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [
-            {
-              "name": "flag",
-              "type": "String",
-              "description": "标识"
-            }
-          ],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "contentDisposition",
-              "type": "String",
-              "isCollection": false,
-              "description": "说明"
-            },
-            {
-              "name": "contentType",
-              "type": "String",
-              "isCollection": false,
-              "description": "类型"
-            },
-            {
-              "name": "bytes",
-              "type": "byte[]",
-              "isCollection": false,
-              "description": "字节内容."
-            }
-          ]
-        },
-        {
-          "name": "input",
-          "className": "com.x.general.assemble.control.jaxrs.office.ActionToHtml",
-          "description": "转换成html.",
-          "type": "POST",
-          "path": "jaxrs/office",
-          "contentType": "multipart/form-data",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": true,
-          "pathParameters": [],
-          "formParameters": [
-            {
-              "name": "file",
-              "type": "File",
-              "description": "office文件"
-            }
-          ],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "String",
-              "isCollection": false,
-              "description": "字符串值"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "SysResourceAction",
-      "className": "com.x.base.core.project.jaxrs.sysresource.SysResourceAction",
-      "description": "系统资源",
-      "methods": [
-        {
-          "name": "listResource",
-          "className": "com.x.base.core.project.jaxrs.sysresource.ActionListResource",
-          "description": "获取静态资源信息.",
-          "type": "GET",
-          "path": "jaxrs/sysresource/filePath/{filePath}",
-          "contentType": "application/json",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": false,
-          "pathParameters": [
-            {
-              "name": "filePath",
-              "type": "String",
-              "description": "查找路径(根路径:(0))"
-            }
-          ],
-          "formParameters": [],
-          "queryParameters": [],
-          "ins": [],
-          "outs": []
-        },
-        {
-          "name": "uploadResource",
-          "className": "com.x.base.core.project.jaxrs.sysresource.ActionUploadResource",
-          "description": "上传静态资源(仅上传到当前服务器)",
-          "type": "POST",
-          "path": "jaxrs/sysresource/upload/resource/as/new/{asNew}",
-          "contentType": "multipart/form-data",
-          "resultContentType": "application/json; charset\u003dUTF-8",
-          "useJsonElementParameter": false,
-          "useStringParameter": true,
-          "pathParameters": [
-            {
-              "name": "asNew",
-              "type": "Boolean",
-              "description": "覆盖类型：true删除原文件然后上传，false覆盖原文件"
-            }
-          ],
-          "formParameters": [
-            {
-              "name": "file",
-              "type": "File",
-              "description": "上传文件"
-            },
-            {
-              "name": "fileName",
-              "type": "String",
-              "description": "附件名称"
-            },
-            {
-              "name": "filePath",
-              "type": "String",
-              "description": "附件存放目录(可以为空)"
-            }
-          ],
-          "queryParameters": [],
-          "ins": [],
-          "outs": [
-            {
-              "name": "value",
-              "type": "Boolean",
-              "isCollection": false,
-              "description": "布尔值."
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/AbstractFactory.java

@@ -1,24 +0,0 @@
-package com.x.general.assemble.control;
-
-import com.x.base.core.container.EntityManagerContainer;
-
-public abstract class AbstractFactory {
-
-	private Business business;
-
-	public AbstractFactory(Business business) throws Exception {
-		try {
-			if (null == business) {
-				throw new Exception("business can not be null.");
-			}
-			this.business = business;
-		} catch (Exception e) {
-			throw new Exception("can not instantiating factory.");
-		}
-	}
-
-	public EntityManagerContainer entityManagerContainer() throws Exception {
-		return this.business.entityManagerContainer();
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/ApplicationServletContextListener.java

@@ -1,33 +0,0 @@
-package com.x.general.assemble.control;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
-
-import com.x.base.core.project.Context;
-
-@WebListener
-public class ApplicationServletContextListener implements ServletContextListener {
-
-	@Override
-	public void contextInitialized(ServletContextEvent servletContextEvent) {
-		try {
-			ThisApplication.context = Context.concrete(servletContextEvent);
-			ThisApplication.init();
-			ThisApplication.context().regist();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent servletContextEvent) {
-		try {
-			ThisApplication.destroy();
-			ThisApplication.context.destrory(servletContextEvent);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/Business.java

@@ -1,27 +0,0 @@
-package com.x.general.assemble.control;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.organization.core.express.Organization;
-
-public class Business {
-
-	private EntityManagerContainer emc;
-
-	public Business(EntityManagerContainer emc) throws Exception {
-		this.emc = emc;
-	}
-
-	public EntityManagerContainer entityManagerContainer() {
-		return this.emc;
-	}
-
-	private Organization organization;
-
-	public Organization organization() throws Exception {
-		if (null == this.organization) {
-			this.organization = new Organization(ThisApplication.context());
-		}
-		return organization;
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/ThisApplication.java

@@ -1,30 +0,0 @@
-package com.x.general.assemble.control;
-
-import com.x.base.core.project.Context;
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class ThisApplication {
-
-	protected static Context context;
-
-	public static Context context() {
-		return context;
-	}
-
-	public static void init() {
-		try {
-			LoggerFactory.setLevel(Config.logLevel().x_general_assemble_control());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static void destroy() {
-		try {
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/ActionApplication.java

@@ -1,22 +0,0 @@
-package com.x.general.assemble.control.jaxrs;
-
-import java.util.Set;
-
-import javax.ws.rs.ApplicationPath;
-
-import com.x.base.core.project.jaxrs.AbstractActionApplication;
-import com.x.general.assemble.control.jaxrs.area.AreaAction;
-import com.x.general.assemble.control.jaxrs.ecnet.EcnetAction;
-import com.x.general.assemble.control.jaxrs.office.OfficeAction;
-
-@ApplicationPath("jaxrs")
-public class ActionApplication extends AbstractActionApplication {
-
-	public Set<Class<?>> getClasses() {
-		classes.add(AreaAction.class);
-		classes.add(EcnetAction.class);
-		classes.add(OfficeAction.class);
-		return classes;
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/AreaJaxrsFilter.java

@@ -1,10 +0,0 @@
-package com.x.general.assemble.control.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = "/jaxrs/area/*", asyncSupported = true)
-public class AreaJaxrsFilter extends AnonymousCipherManagerUserJaxrsFilter {
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/EcnetJaxrsFilter.java

@@ -1,10 +0,0 @@
-package com.x.general.assemble.control.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = "/jaxrs/ecnet/*", asyncSupported = true)
-public class EcnetJaxrsFilter extends AnonymousCipherManagerUserJaxrsFilter {
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/OfficeJaxrsFilter.java

@@ -1,10 +0,0 @@
-package com.x.general.assemble.control.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = "/jaxrs/office/*", asyncSupported = true)
-public class OfficeJaxrsFilter extends AnonymousCipherManagerUserJaxrsFilter {
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/area/ActionListCity.java

@@ -1,52 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.bean.WrapCopier;
-import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.ListTools;
-import com.x.general.assemble.control.Business;
-import com.x.general.core.entity.area.District;
-
-import net.sf.ehcache.Element;
-
-public class ActionListCity extends BaseAction {
-
-	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, String province) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<List<Wo>> result = new ActionResult<>();
-			List<Wo> wos = new ArrayList<>();
-			String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), province);
-			Element element = cache.get(cacheKey);
-			if ((null != element) && (null != element.getObjectValue())) {
-				wos = (List<Wo>) element.getObjectValue();
-			} else {
-				Business business = new Business(emc);
-				District districtProvince = this.getProvince(business, province);
-				if (null == districtProvince) {
-					throw new ExceptionDistrictNotExist(province);
-				}
-				wos = Wo.copier.copy(this.listCity(business, districtProvince));
-				cache.put(new Element(cacheKey, wos));
-			}
-			result.setData(wos);
-			return result;
-		}
-	}
-
-	public static class Wo extends District {
-
-		private static final long serialVersionUID = -6068531258644538959L;
-		static WrapCopier<District, Wo> copier = WrapCopierFactory.wo(District.class, Wo.class,
-				ListTools.toList(District.zipCode_FIELDNAME, District.center_FIELDNAME, District.name_FIELDNAME,
-						District.level_FIELDNAME),
-				null);
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/area/ActionListDistrict.java

@@ -1,56 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.bean.WrapCopier;
-import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.ListTools;
-import com.x.general.assemble.control.Business;
-import com.x.general.core.entity.area.District;
-
-import net.sf.ehcache.Element;
-
-public class ActionListDistrict extends BaseAction {
-
-	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, String province, String city) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<List<Wo>> result = new ActionResult<>();
-			List<Wo> wos = new ArrayList<>();
-			String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), province, city);
-			Element element = cache.get(cacheKey);
-			if ((null != element) && (null != element.getObjectValue())) {
-				wos = (List<Wo>) element.getObjectValue();
-			} else {
-				Business business = new Business(emc);
-				District districtProvince = this.getProvince(business, province);
-				if (null == districtProvince) {
-					throw new ExceptionDistrictNotExist(province);
-				}
-				District districtCity = this.getCity(business, districtProvince, city);
-				if (null == districtCity) {
-					throw new ExceptionDistrictNotExist(city);
-				}
-				wos = Wo.copier.copy(this.listDistrict(business, districtCity));
-				cache.put(new Element(cacheKey, wos));
-			}
-			result.setData(wos);
-			return result;
-		}
-	}
-
-	public static class Wo extends District {
-
-		private static final long serialVersionUID = -6068531258644538959L;
-		static WrapCopier<District, Wo> copier = WrapCopierFactory.wo(District.class, Wo.class,
-				ListTools.toList(District.zipCode_FIELDNAME, District.center_FIELDNAME, District.name_FIELDNAME,
-						District.level_FIELDNAME),
-				null);
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/area/ActionListProvince.java

@@ -1,47 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.bean.WrapCopier;
-import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.ListTools;
-import com.x.general.core.entity.area.District;
-
-import net.sf.ehcache.Element;
-
-public class ActionListProvince extends BaseAction {
-
-	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<List<Wo>> result = new ActionResult<>();
-			List<Wo> wos = new ArrayList<>();
-			String cacheKey = ApplicationCache.concreteCacheKey(this.getClass());
-			Element element = cache.get(cacheKey);
-			if ((null != element) && (null != element.getObjectValue())) {
-				wos = (List<Wo>) element.getObjectValue();
-			} else {
-				List<District> os = emc.listEqual(District.class, District.level_FIELDNAME, District.LEVEL_PROVINCE);
-				wos = Wo.copier.copy(os);
-				cache.put(new Element(cacheKey, wos));
-			}
-			result.setData(wos);
-			return result;
-		}
-	}
-
-	public static class Wo extends District {
-
-		private static final long serialVersionUID = -6068531258644538959L;
-		static WrapCopier<District, Wo> copier = WrapCopierFactory.wo(District.class, Wo.class,
-				ListTools.toList(District.zipCode_FIELDNAME, District.center_FIELDNAME, District.name_FIELDNAME,
-						District.level_FIELDNAME, District.sha_FIELDNAME),
-				null);
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/area/ActionListStreet.java

@@ -1,60 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.bean.WrapCopier;
-import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.ListTools;
-import com.x.general.assemble.control.Business;
-import com.x.general.core.entity.area.District;
-
-import net.sf.ehcache.Element;
-
-public class ActionListStreet extends BaseAction {
-
-	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, String province, String city, String district)
-			throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<List<Wo>> result = new ActionResult<>();
-			List<Wo> wos = new ArrayList<>();
-			String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), province, city, district);
-			Element element = cache.get(cacheKey);
-			if ((null != element) && (null != element.getObjectValue())) {
-				wos = (List<Wo>) element.getObjectValue();
-			} else {
-				Business business = new Business(emc);
-				District districtProvince = this.getProvince(business, province);
-				if (null == districtProvince) {
-					throw new ExceptionDistrictNotExist(province);
-				}
-				District districtCity = this.getCity(business, districtProvince, city);
-				if (null == districtCity) {
-					throw new ExceptionDistrictNotExist(city);
-				}
-				District districtDistrict = this.getDistrict(business, districtCity, district);
-				if (null == districtDistrict) {
-					throw new ExceptionDistrictNotExist(district);
-				}
-				wos = Wo.copier.copy(this.listStreet(business, districtDistrict));
-			}
-			result.setData(wos);
-			return result;
-		}
-	}
-
-	public static class Wo extends District {
-
-		private static final long serialVersionUID = -6068531258644538959L;
-		static WrapCopier<District, Wo> copier = WrapCopierFactory.wo(District.class, Wo.class,
-				ListTools.toList(District.zipCode_FIELDNAME, District.center_FIELDNAME, District.name_FIELDNAME,
-						District.level_FIELDNAME),
-				null);
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/area/AreaAction.java

@@ -1,106 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import com.x.base.core.project.annotation.JaxrsDescribe;
-import com.x.base.core.project.annotation.JaxrsMethodDescribe;
-import com.x.base.core.project.annotation.JaxrsParameterDescribe;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.http.HttpMediaType;
-import com.x.base.core.project.jaxrs.ResponseFactory;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-@Path("area")
-@JaxrsDescribe("行政区域")
-public class AreaAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(AreaAction.class);
-
-	@JaxrsMethodDescribe(value = "获取指定的Attachment信息.", action = ActionListProvince.class)
-	@GET
-	@Path("list")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void listProvince(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
-		ActionResult<List<ActionListProvince.Wo>> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionListProvince().execute(effectivePerson);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-	@JaxrsMethodDescribe(value = "列示指定省下属市", action = ActionListCity.class)
-	@GET
-	@Path("list/province/{province}")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void listCity(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			@JaxrsParameterDescribe("省") @PathParam("province") String province) {
-		ActionResult<List<ActionListCity.Wo>> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionListCity().execute(effectivePerson, province);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-	@JaxrsMethodDescribe(value = "列示指定省/市下属区", action = ActionListStreet.class)
-	@GET
-	@Path("list/province/{province}/city/{city}")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void listDistrict(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			@JaxrsParameterDescribe("省") @PathParam("province") String province,
-			@JaxrsParameterDescribe("市") @PathParam("city") String city) {
-		ActionResult<List<ActionListDistrict.Wo>> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionListDistrict().execute(effectivePerson, province, city);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-	@JaxrsMethodDescribe(value = "列示指定省/市/区的下属街道", action = ActionListStreet.class)
-	@GET
-	@Path("list/province/{province}/city/{city}/district/{district}")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void listStreet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			@JaxrsParameterDescribe("省") @PathParam("province") String province,
-			@JaxrsParameterDescribe("市") @PathParam("city") String city,
-			@JaxrsParameterDescribe("区") @PathParam("district") String district) {
-		ActionResult<List<ActionListStreet.Wo>> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionListStreet().execute(effectivePerson, province, city, district);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/area/BaseAction.java

@@ -1,82 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.general.assemble.control.Business;
-import com.x.general.core.entity.area.District;
-import com.x.general.core.entity.area.District_;
-
-import net.sf.ehcache.Ehcache;
-
-abstract class BaseAction extends StandardJaxrsAction {
-
-	protected static Ehcache cache = ApplicationCache.instance().getCache(District.class);
-
-	protected District getProvince(Business business, String name) throws Exception {
-		List<District> os = business.entityManagerContainer().listEqualAndEqual(District.class,
-				District.level_FIELDNAME, District.LEVEL_PROVINCE, District.name_FIELDNAME, name);
-		if (os.size() == 1) {
-			return os.get(0);
-		}
-		return null;
-	}
-
-	protected District getCity(Business business, District province, String name) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(District.class);
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<District> cq = cb.createQuery(District.class);
-		Root<District> root = cq.from(District.class);
-		Predicate p = cb.equal(root.get(District_.name), name);
-		p = cb.and(p, cb.equal(root.get(District_.level), District.LEVEL_CITY));
-		p = cb.and(p, cb.equal(root.get(District_.province), province.getId()));
-		cq.select(root).where(p);
-		List<District> os = em.createQuery(cq).getResultList();
-		if (os.size() == 1) {
-			return os.get(0);
-		}
-		return null;
-	}
-
-	protected District getDistrict(Business business, District city, String name) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(District.class);
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<District> cq = cb.createQuery(District.class);
-		Root<District> root = cq.from(District.class);
-		Predicate p = cb.equal(root.get(District_.name), name);
-		p = cb.and(p, cb.equal(root.get(District_.level), District.LEVEL_DISTRICT));
-		p = cb.and(p, cb.equal(root.get(District_.city), city.getId()));
-		cq.select(root).where(p);
-		List<District> os = em.createQuery(cq).getResultList();
-		if (os.size() == 1) {
-			return os.get(0);
-		}
-		return null;
-	}
-
-	protected List<District> listCity(Business business, District province) throws Exception {
-		List<District> os = business.entityManagerContainer().listEqualAndEqual(District.class,
-				District.level_FIELDNAME, District.LEVEL_CITY, District.province_FIELDNAME, province.getId());
-		return os;
-	}
-
-	protected List<District> listDistrict(Business business, District city) throws Exception {
-		List<District> os = business.entityManagerContainer().listEqualAndEqual(District.class,
-				District.level_FIELDNAME, District.LEVEL_DISTRICT, District.city_FIELDNAME, city.getId());
-		return os;
-	}
-
-	protected List<District> listStreet(Business business, District district) throws Exception {
-		List<District> os = business.entityManagerContainer().listEqualAndEqual(District.class,
-				District.level_FIELDNAME, District.LEVEL_STREET, District.district_FIELDNAME, district.getId());
-		return os;
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/area/ExceptionDistrictNotExist.java

@@ -1,12 +0,0 @@
-package com.x.general.assemble.control.jaxrs.area;
-
-import com.x.base.core.project.exception.PromptException;
-
-class ExceptionDistrictNotExist extends PromptException {
-
-	private static final long serialVersionUID = 7237855733312562652L;
-
-	ExceptionDistrictNotExist(String name) {
-		super("指定的区域不存在:{}.", name);
-	}
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/ecnet/ActionCheck.java

@@ -1,123 +0,0 @@
-package com.x.general.assemble.control.jaxrs.ecnet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.connection.ActionResponse;
-import com.x.base.core.project.connection.ConnectionAction;
-import com.x.base.core.project.gson.GsonPropertyObject;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.jaxrs.WrapString;
-
-public class ActionCheck extends BaseAction {
-
-	private static final String ADDRESS = "/o2_collect_assemble/jaxrs/ecnet/check";
-
-	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<Wo> result = new ActionResult<>();
-			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
-			ActionResponse response = ConnectionAction.post(Config.collect().url(ADDRESS), null, wi);
-			Wo wo = response.getData(Wo.class);
-			result.setData(wo);
-			return result;
-		}
-	}
-
-	public static class Wi extends WrapString {
-	}
-
-	public static class Wo extends GsonPropertyObject {
-
-		private Integer pos = 0;
-
-		private String origin = "";
-
-		private String correct = "";
-
-		private List<WoItem> itemList = new ArrayList<>();
-
-		public String getOrigin() {
-			return origin;
-		}
-
-		public void setOrigin(String origin) {
-			this.origin = origin;
-		}
-
-		public String getCorrect() {
-			return correct;
-		}
-
-		public void setCorrect(String correct) {
-			this.correct = correct;
-		}
-
-		public List<WoItem> getItemList() {
-			return itemList;
-		}
-
-		public void setItemList(List<WoItem> itemList) {
-			this.itemList = itemList;
-		}
-
-		public Integer getPos() {
-			return pos;
-		}
-
-		public void setPos(Integer pos) {
-			this.pos = pos;
-		}
-
-	}
-
-	public static class WoItem extends GsonPropertyObject {
-
-		private String origin;
-
-		private String correct;
-
-		private Integer begin;
-
-		private Integer end;
-
-		public String getOrigin() {
-			return origin;
-		}
-
-		public void setOrigin(String origin) {
-			this.origin = origin;
-		}
-
-		public String getCorrect() {
-			return correct;
-		}
-
-		public void setCorrect(String correct) {
-			this.correct = correct;
-		}
-
-		public Integer getBegin() {
-			return begin;
-		}
-
-		public void setBegin(Integer begin) {
-			this.begin = begin;
-		}
-
-		public Integer getEnd() {
-			return end;
-		}
-
-		public void setEnd(Integer end) {
-			this.end = end;
-		}
-
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/ecnet/BaseAction.java

@@ -1,7 +0,0 @@
-package com.x.general.assemble.control.jaxrs.ecnet;
-
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-
-abstract class BaseAction extends StandardJaxrsAction {
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/ecnet/EcnetAction.java

@@ -1,48 +0,0 @@
-package com.x.general.assemble.control.jaxrs.ecnet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.annotation.JaxrsDescribe;
-import com.x.base.core.project.annotation.JaxrsMethodDescribe;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.http.HttpMediaType;
-import com.x.base.core.project.jaxrs.ResponseFactory;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-@Path("ecnet")
-@JaxrsDescribe("文本纠错")
-public class EcnetAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(EcnetAction.class);
-
-	@JaxrsMethodDescribe(value = "文本纠错.", action = ActionCheck.class)
-	@POST
-	@Path("check")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void check(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			JsonElement jsonElement) {
-		ActionResult<ActionCheck.Wo> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionCheck().execute(effectivePerson, jsonElement);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, null);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/ecnet/ExceptionDistrictNotExist.java

@@ -1,12 +0,0 @@
-package com.x.general.assemble.control.jaxrs.ecnet;
-
-import com.x.base.core.project.exception.PromptException;
-
-class ExceptionDistrictNotExist extends PromptException {
-
-	private static final long serialVersionUID = 7237855733312562652L;
-
-	ExceptionDistrictNotExist(String name) {
-		super("指定的区域不存在:{}.", name);
-	}
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/office/ActionHtmlToWord.java

@@ -1,79 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.annotation.FieldDescribe;
-import com.x.base.core.project.gson.GsonPropertyObject;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.jaxrs.WoId;
-import com.x.base.core.project.tools.StringTools;
-
-import net.sf.ehcache.Element;
-
-class ActionHtmlToWord extends BaseAction {
-
-	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
-		ActionResult<Wo> result = new ActionResult<>();
-		Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
-		byte[] bytes = this.local(wi);
-		HtmlToWordResultObject resultObject = new HtmlToWordResultObject();
-
-		resultObject.setBytes(bytes);
-		resultObject.setName(wi.getFileName());
-		resultObject.setPerson(effectivePerson.getDistinguishedName());
-
-		String flag = StringTools.uniqueToken();
-		cache.put(new Element(flag, resultObject));
-		Wo wo = new Wo();
-		wo.setId(flag);
-		result.setData(wo);
-		return result;
-	}
-
-	private byte[] local(Wi wi) throws Exception {
-		String content = "<html><head></head><body>" + wi.getContent() + "</body></html>";
-		try (POIFSFileSystem fs = new POIFSFileSystem();
-				InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
-				ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-			fs.createDocument(is, "WordDocument");
-			fs.writeFilesystem(out);
-			return out.toByteArray();
-		}
-	}
-
-	public static class Wo extends WoId {
-	}
-
-	public static class Wi extends GsonPropertyObject {
-
-		@FieldDescribe("转换文件名.")
-		private String fileName;
-		@FieldDescribe("内容.")
-		private String content;
-
-		public String getFileName() throws Exception {
-			return StringUtils.isEmpty(fileName) ? StringTools.uniqueToken() + ".doc" : fileName;
-		}
-
-		public void setFileName(String fileName) {
-			this.fileName = fileName;
-		}
-
-		public String getContent() {
-			return content;
-		}
-
-		public void setContent(String content) {
-			this.content = content;
-		}
-
-	}
-
-}

o2server/x_general_assemble_control/src/main/webapp/describe/sources/com/x/general/assemble/control/jaxrs/office/ActionHtmlToWordResult.java

@@ -1,46 +0,0 @@
-package com.x.general.assemble.control.jaxrs.office;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.x.base.core.project.cache.ApplicationCache;
-import com.x.base.core.project.exception.ExceptionAccessDenied;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.jaxrs.WoFile;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-import net.sf.ehcache.Element;
-
-class ActionHtmlToWordResult extends BaseAction {
-
-	private static Logger logger = LoggerFactory.getLogger(ActionHtmlToWordResult.class);
-
-	ActionResult<Wo> execute(EffectivePerson effectivePerson, String flag) throws Exception {
-		logger.info("{}", flag);
-		ActionResult<Wo> result = new ActionResult<>();
-		String cacheKey = ApplicationCache.concreteCacheKey(flag);
-		Element element = cache.get(cacheKey);
-		if (null != element && null != element.getObjectValue()) {
-			HtmlToWordResultObject obj = (HtmlToWordResultObject) element.getObjectValue();
-			if (!StringUtils.equals(effectivePerson.getDistinguishedName(), obj.getPerson())) {
-				throw new ExceptionAccessDenied(effectivePerson);
-			}
-			Wo wo = new Wo(obj.getBytes(), this.contentType(true, obj.getName()),
-					this.contentDisposition(true, obj.getName()));
-			result.setData(wo);
-		} else {
-			throw new ExceptionHtmlToWordResultObject(flag);
-		}
-		return result;
-	}
-
-	public static class Wo extends WoFile {
-
-		public Wo(byte[] bytes, String contentType, String contentDisposition) {
-			super(bytes, contentType, contentDisposition);
-		}
-
-	}
-
-}