模块合并 x_organization_assemble_custom -> x_organization_assemble_personal

x_organization_assemble_custom
模块废弃,所有模块合并到
x_organization_assemble_personal

o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/WrapOutInteger.java

@@ -1,6 +1,7 @@
 package com.x.base.core.project.http;
 
 import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.base.core.project.jaxrs.WrapInteger;
 
 public class WrapOutInteger extends GsonPropertyObject {
 
@@ -21,4 +22,6 @@ public class WrapOutInteger extends GsonPropertyObject {
 		this.value = value;
 	}
 
+
+
 }

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

@@ -1,17 +0,0 @@
-package com.x.base.core.project;
-
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleCategory;
-import com.x.base.core.project.annotation.ModuleType;
-
-@Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "布局")
-public class x_organization_assemble_custom extends AssembleA {
-
-	public x_organization_assemble_custom() {
-		super();
-		dependency.containerEntities.add("com.x.organization.core.entity.Custom");
-		dependency.containerEntities.add("com.x.organization.core.entity.Person");
-		dependency.containerEntities.add("com.x.organization.core.entity.Definition");
-		dependency.storeJars.add(x_organization_core_entity.class.getSimpleName());
-	}
-}

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

@@ -17,6 +17,8 @@ public class x_organization_assemble_personal extends AssembleA {
 		dependency.containerEntities.add("com.x.organization.core.entity.Unit");
 		dependency.containerEntities.add("com.x.organization.core.entity.UnitAttribute");
 		dependency.containerEntities.add("com.x.organization.core.entity.UnitDuty");
+		dependency.containerEntities.add("com.x.organization.core.entity.Custom");
+		dependency.containerEntities.add("com.x.organization.core.entity.Definition");
 		dependency.storeJars.add(x_organization_core_entity.class.getSimpleName());
 		dependency.storeJars.add(x_organization_core_express.class.getSimpleName());
 	}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/ActionApplication.java

@@ -5,6 +5,8 @@ import java.util.Set;
 import javax.ws.rs.ApplicationPath;
 
 import com.x.base.core.project.jaxrs.AbstractActionApplication;
+import com.x.organization.assemble.personal.jaxrs.custom.CustomAction;
+import com.x.organization.assemble.personal.jaxrs.definition.DefinitionAction;
 import com.x.organization.assemble.personal.jaxrs.icon.IconAction;
 import com.x.organization.assemble.personal.jaxrs.password.PasswordAction;
 import com.x.organization.assemble.personal.jaxrs.person.PersonAction;
@@ -20,6 +22,8 @@ public class ActionApplication extends AbstractActionApplication {
 		classes.add(ResetAction.class);
 		classes.add(RegistAction.class);
 		classes.add(IconAction.class);
+		classes.add(DefinitionAction.class);
+		classes.add(CustomAction.class);
 		return classes;
 	}
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/CustomJaxrsFilter.java

@@ -0,0 +1,10 @@
+package com.x.organization.assemble.personal.jaxrs;
+
+import javax.servlet.annotation.WebFilter;
+
+import com.x.base.core.project.jaxrs.ManagerUserJaxrsFilter;
+
+@WebFilter(urlPatterns = { "/jaxrs/custom/*" }, asyncSupported = true)
+public class CustomJaxrsFilter extends ManagerUserJaxrsFilter {
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/DefinitionJaxrsFilter.java

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

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/custom/ActionDelete.java

@@ -0,0 +1,36 @@
+package com.x.organization.assemble.personal.jaxrs.custom;
+
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+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.jaxrs.WoId;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.organization.core.entity.Custom;
+
+class ActionDelete extends BaseAction {
+
+	private static Logger logger = LoggerFactory.getLogger(ActionDelete.class);
+
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String name) throws Exception {
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			ActionResult<Wo> result = new ActionResult<>();
+			Wo wo = new Wo();
+			Custom o = this.getWithName(emc, effectivePerson.getDistinguishedName(), name);
+			if (null != o) {
+				emc.beginTransaction(Custom.class);
+				emc.remove(o);
+				emc.commit();
+				wo.setId(o.getId());
+				ApplicationCache.notify(Custom.class, effectivePerson.getDistinguishedName());
+			}
+			result.setData(wo);
+			return result;
+		}
+	}
+
+	public static class Wo extends WoId {
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/custom/ActionEdit.java

@@ -0,0 +1,42 @@
+package com.x.organization.assemble.personal.jaxrs.custom;
+
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.entity.annotation.CheckPersistType;
+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.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.organization.core.entity.Custom;
+
+class ActionEdit extends BaseAction {
+
+	private static Logger logger = LoggerFactory.getLogger(ActionEdit.class);
+
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String name, String wi) throws Exception {
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			ActionResult<Wo> result = new ActionResult<>();
+			Wo wo = new Wo();
+			Custom custom = this.getWithName(emc, effectivePerson.getDistinguishedName(), name);
+			emc.beginTransaction(Custom.class);
+			if (null != custom) {
+				custom.setData(wi);
+				emc.check(custom, CheckPersistType.all);
+			} else {
+				custom = new Custom();
+				custom.setPerson(effectivePerson.getDistinguishedName());
+				custom.setName(name);
+				custom.setData(wi);
+				emc.persist(custom, CheckPersistType.all);
+			}
+			emc.commit();
+			wo.setId(custom.getId());
+			result.setData(wo);
+			return result;
+		}
+	}
+
+	public static class Wo extends WoId {
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/custom/ActionGet.java

@@ -0,0 +1,26 @@
+package com.x.organization.assemble.personal.jaxrs.custom;
+
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.organization.core.entity.Custom;
+
+class ActionGet extends BaseAction {
+
+	private static Logger logger = LoggerFactory.getLogger(ActionGet.class);
+
+	ActionResult<String> execute(EffectivePerson effectivePerson, String name) throws Exception {
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			ActionResult<String> result = new ActionResult<>();
+			String wo = "";
+			Custom o = this.getWithName(emc, effectivePerson.getDistinguishedName(), name);
+			if (null != o) {
+				result.setData(o.getData());
+			}
+			return result;
+		}
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/custom/BaseAction.java

@@ -0,0 +1,33 @@
+package com.x.organization.assemble.personal.jaxrs.custom;
+
+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.container.EntityManagerContainer;
+import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import com.x.organization.core.entity.Custom;
+import com.x.organization.core.entity.Custom_;
+
+abstract class BaseAction extends StandardJaxrsAction {
+
+//	@MethodDescribe("根据Person查找Custom")
+	Custom getWithName(EntityManagerContainer emc, String person, String name) throws Exception {
+		EntityManager em = emc.get(Custom.class);
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<Custom> cq = cb.createQuery(Custom.class);
+		Root<Custom> root = cq.from(Custom.class);
+		Predicate p = cb.equal(root.get(Custom_.person), person);
+		p = cb.and(p, cb.equal(root.get(Custom_.name), name));
+		List<Custom> list = em.createQuery(cq.where(p)).setMaxResults(1).getResultList();
+		if (list.isEmpty()) {
+			return null;
+		} else {
+			return list.get(0);
+		}
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/custom/CustomAction.java

@@ -0,0 +1,87 @@
+package com.x.organization.assemble.personal.jaxrs.custom;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+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("custom")
+@JaxrsDescribe("个性化数据")
+public class CustomAction extends StandardJaxrsAction {
+
+	private static Logger logger = LoggerFactory.getLogger(CustomAction.class);
+
+	@JaxrsMethodDescribe(value = "根据当前的访问用户获取Custom。", action = ActionGet.class)
+	@GET
+	@Path("{name}")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("名称") @PathParam("name") String name) {
+		ActionResult<String> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionGet().execute(effectivePerson, name);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
+	}
+
+	@JaxrsMethodDescribe(value = "更新指定名称的Custom.", action = ActionEdit.class)
+	@PUT
+	@Path("{name}")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void update(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("名称") @PathParam("name") String name, String wi) {
+		ActionResult<ActionEdit.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionEdit().execute(effectivePerson, name, wi);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
+	}
+
+	@JaxrsMethodDescribe(value = "删除指定名称的Custom。", action = ActionDelete.class)
+	@DELETE
+	@Path("{name}")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("名称") @PathParam("name") String name) {
+		ActionResult<ActionDelete.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionDelete().execute(effectivePerson, name);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
+	}
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/definition/ActionDelete.java

@@ -0,0 +1,36 @@
+package com.x.organization.assemble.personal.jaxrs.definition;
+
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+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.jaxrs.WoId;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.organization.core.entity.Definition;
+
+class ActionDelete extends BaseAction {
+
+	private static Logger logger = LoggerFactory.getLogger(ActionDelete.class);
+
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String name) throws Exception {
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			ActionResult<Wo> result = new ActionResult<>();
+			Definition o = emc.flag(name, Definition.class);
+			Wo wo = new Wo();
+			if (null != o) {
+				emc.beginTransaction(Definition.class);
+				emc.remove(o);
+				emc.commit();
+				wo.setId(o.getId());
+				ApplicationCache.notify(Definition.class);
+			}
+			result.setData(wo);
+			return result;
+		}
+	}
+
+	public static class Wo extends WoId {
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/definition/ActionEdit.java

@@ -0,0 +1,43 @@
+package com.x.organization.assemble.personal.jaxrs.definition;
+
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.entity.annotation.CheckPersistType;
+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.jaxrs.WoId;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.organization.core.entity.Definition;
+
+class ActionEdit extends BaseAction {
+
+	private static Logger logger = LoggerFactory.getLogger(ActionEdit.class);
+
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String name, String wi) throws Exception {
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			ActionResult<Wo> result = new ActionResult<>();
+			Definition definition = emc.flag(name, Definition.class);
+			emc.beginTransaction(Definition.class);
+			if (null != definition) {
+				definition.setData(wi);
+				emc.check(definition, CheckPersistType.all);
+			} else {
+				definition = new Definition();
+				definition.setData(wi);
+				definition.setName(name);
+				emc.persist(definition, CheckPersistType.all);
+			}
+			emc.commit();
+			ApplicationCache.notify(Definition.class);
+			Wo wo = new Wo();
+			wo.setId(definition.getId());
+			result.setData(wo);
+			return result;
+		}
+	}
+
+	public static class Wo extends WoId {
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/definition/ActionGet.java

@@ -0,0 +1,36 @@
+package com.x.organization.assemble.personal.jaxrs.definition;
+
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.organization.core.entity.Definition;
+
+import net.sf.ehcache.Element;
+
+class ActionGet extends BaseAction {
+
+	private static Logger logger = LoggerFactory.getLogger(ActionGet.class);
+
+	ActionResult<String> execute(EffectivePerson effectivePerson, String name) throws Exception {
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			ActionResult<String> result = new ActionResult<>();
+			String cacheKey = name;
+			Element element = cache.get(cacheKey);
+			String wo = "";
+			if (null != element) {
+				wo = (String) element.getObjectValue();
+			} else {
+				Definition o = emc.flag(name, Definition.class);
+				if (null != o) {
+					wo = o.getData();
+					cache.put(new Element(cacheKey, wo));
+				}
+			}
+			result.setData(wo);
+			return result;
+		}
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/definition/BaseAction.java

@@ -0,0 +1,12 @@
+package com.x.organization.assemble.personal.jaxrs.definition;
+
+import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import com.x.organization.core.entity.Definition;
+
+import net.sf.ehcache.Ehcache;
+
+abstract class BaseAction extends StandardJaxrsAction {
+
+	protected Ehcache cache = ApplicationCache.instance().getCache(Definition.class);
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/definition/DefinitionAction.java

@@ -0,0 +1,87 @@
+package com.x.organization.assemble.personal.jaxrs.definition;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+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("definition")
+@JaxrsDescribe("定制")
+public class DefinitionAction extends StandardJaxrsAction {
+
+	private static Logger logger = LoggerFactory.getLogger(DefinitionAction.class);
+
+	@JaxrsMethodDescribe(value = "获取Definition.", action = ActionGet.class)
+	@GET
+	@Path("{name}")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("名称") @PathParam("name") String name) {
+		ActionResult<String> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionGet().execute(effectivePerson, name);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
+	}
+
+	@JaxrsMethodDescribe(value = "更新指定名称的Definition.", action = ActionEdit.class)
+	@PUT
+	@Path("{name}")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void update(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("名称") @PathParam("name") String name, String wi) {
+		ActionResult<ActionEdit.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionEdit().execute(effectivePerson, name, wi);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
+	}
+
+	@JaxrsMethodDescribe(value = "删除指定名称的Definition.", action = ActionDelete.class)
+	@DELETE
+	@Path("{name}")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("名称") @PathParam("name") String name) {
+		ActionResult<ActionDelete.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionDelete().execute(effectivePerson, name);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
+	}
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java

@@ -5,13 +5,15 @@ import java.util.Date;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import com.google.gson.JsonElement;
 import com.wx.pwd.CheckStrength;
 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.gson.GsonPropertyObject;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.http.WrapOutBoolean;
+import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.tools.Crypto;
@@ -22,10 +24,11 @@ class ActionChangePassword extends ActionBase {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionChangePassword.class);
 
-	ActionResult<WrapOutBoolean> execute(EffectivePerson effectivePerson, WrapInPassword wrapIn) throws Exception {
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
 		/* 管理员不可以修改密码 */
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<WrapOutBoolean> result = new ActionResult<>();
+			ActionResult<Wo> result = new ActionResult<>();
+			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 			Business business = new Business(emc);
 			if (Config.token().isInitialManager(effectivePerson.getDistinguishedName())) {
 				throw new ExceptionEditInitialManagerDeny();
@@ -35,40 +38,77 @@ class ActionChangePassword extends ActionBase {
 			if (null == person) {
 				throw new ExceptionPersonNotExisted(effectivePerson.getDistinguishedName());
 			}
-			if (StringUtils.isEmpty(wrapIn.getOldPassword())) {
+			if (StringUtils.isEmpty(wi.getOldPassword())) {
 				throw new ExceptionOldPasswordEmpty();
 			}
-			if (StringUtils.isEmpty(wrapIn.getNewPassword())) {
+			if (StringUtils.isEmpty(wi.getNewPassword())) {
 				throw new ExceptionNewPasswordEmpty();
 			}
-			if (StringUtils.isEmpty(wrapIn.getConfirmPassword())) {
+			if (StringUtils.isEmpty(wi.getConfirmPassword())) {
 				throw new ConfirmPasswordEmptyException();
 			}
-			if (!StringUtils.equals(wrapIn.getNewPassword(), wrapIn.getConfirmPassword())) {
+			if (!StringUtils.equals(wi.getNewPassword(), wi.getConfirmPassword())) {
 				throw new ExceptionTwicePasswordNotMatch();
 			}
-			if (StringUtils.equals(wrapIn.getNewPassword(), wrapIn.getOldPassword())) {
+			if (StringUtils.equals(wi.getNewPassword(), wi.getOldPassword())) {
 				throw new ExceptionNewPasswordSameAsOldPassword();
 			}
 			if (BooleanUtils.isTrue(Config.person().getSuperPermission())
-					&& StringUtils.equals(Config.token().getPassword(), wrapIn.getOldPassword())) {
+					&& StringUtils.equals(Config.token().getPassword(), wi.getOldPassword())) {
 				logger.info("user{name:" + person.getName() + "} use superPermission.");
 			} else {
-				if (!StringUtils.equals(Crypto.encrypt(wrapIn.getOldPassword(), Config.token().getKey()),
+				if (!StringUtils.equals(Crypto.encrypt(wi.getOldPassword(), Config.token().getKey()),
 						person.getPassword())) {
 					throw new ExceptionOldPasswordNotMatch();
 				}
-				if (CheckStrength.checkPasswordStrength(wrapIn.getNewPassword()) < 4) {
+				if (CheckStrength.checkPasswordStrength(wi.getNewPassword()) < 4) {
 					throw new ExceptionInvalidPassword();
 				}
 			}
 			emc.beginTransaction(Person.class);
-			person.setPassword(Crypto.encrypt(wrapIn.getNewPassword(), Config.token().getKey()));
+			person.setPassword(Crypto.encrypt(wi.getNewPassword(), Config.token().getKey()));
 			person.setChangePasswordTime(new Date());
 			emc.commit();
-			result.setData(WrapOutBoolean.trueInstance());
+			Wo wo = new Wo();
+			wo.setValue(true);
+			result.setData(wo);
 			return result;
 		}
 	}
 
+	public static class Wo extends WrapBoolean {
+	}
+
+	public static class Wi extends GsonPropertyObject {
+
+		private String oldPassword;
+		private String newPassword;
+		private String confirmPassword;
+
+		public String getOldPassword() {
+			return oldPassword;
+		}
+
+		public void setOldPassword(String oldPassword) {
+			this.oldPassword = oldPassword;
+		}
+
+		public String getConfirmPassword() {
+			return confirmPassword;
+		}
+
+		public void setConfirmPassword(String confirmPassword) {
+			this.confirmPassword = confirmPassword;
+		}
+
+		public String getNewPassword() {
+			return newPassword;
+		}
+
+		public void setNewPassword(String newPassword) {
+			this.newPassword = newPassword;
+		}
+
+	}
+
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionDecrypt.java

@@ -1,36 +0,0 @@
-package com.x.organization.assemble.personal.jaxrs.password;
-
-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.exception.ExceptionWhen;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.tools.Crypto;
-import com.x.organization.assemble.personal.Business;
-import com.x.organization.core.entity.Person;
-
-class ActionDecrypt extends ActionBase {
-
-	ActionResult<WrapOutPassword> execute(EffectivePerson effectivePerson) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			Business business = new Business(emc);
-			ActionResult<WrapOutPassword> result = new ActionResult<>();
-			WrapOutPassword wrap = new WrapOutPassword();
-			if (Config.token().isInitialManager(effectivePerson.getDistinguishedName())) {
-				throw new ConfirmPasswordEmptyException();
-			}
-			Person person = business.person().pick(effectivePerson.getDistinguishedName());
-			if (null == person) {
-				throw new ExceptionPersonNotExisted(effectivePerson.getDistinguishedName());
-			}
-			person = emc.find(person.getId(), Person.class, ExceptionWhen.not_found);
-			String password = Crypto.decrypt(person.getPassword(), Config.token().getKey());
-			wrap = new WrapOutPassword();
-			wrap.setPassword(password);
-			result.setData(wrap);
-			return result;
-		}
-	}
-
-}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/PasswordAction.java

@@ -2,55 +2,46 @@ package com.x.organization.assemble.personal.jaxrs.password;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
 import javax.ws.rs.PUT;
 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 javax.ws.rs.core.Response;
 
+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.http.WrapOutBoolean;
 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("password")
+@JaxrsDescribe("密码")
 public class PasswordAction extends StandardJaxrsAction {
 
-	//@HttpMethodDescribe(value = "获取当前用户的密码明码。", response = WrapOutPassword.class)
-	@GET
-	@Path("decrypt")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response getPassword(@Context HttpServletRequest request) {
-		ActionResult<WrapOutPassword> result = new ActionResult<>();
-		try {
-			EffectivePerson effectivePerson = this.effectivePerson(request);
-			result = new ActionDecrypt().execute(effectivePerson);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
+	private static Logger logger = LoggerFactory.getLogger(PasswordAction.class);
 
-	//@HttpMethodDescribe(value = "修改密码", request = WrapInPassword.class, response = WrapOutBoolean.class)
+	@JaxrsMethodDescribe(value = "修改密码.", action = ActionChangePassword.class)
 	@PUT
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Response changePassword(@Context HttpServletRequest request, WrapInPassword wrapIn) {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
+	public void changePassword(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			JsonElement jsonElement) {
+		ActionResult<ActionChangePassword.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			EffectivePerson effectivePerson = this.effectivePerson(request);
-			result = new ActionChangePassword().execute(effectivePerson, wrapIn);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
+			result = new ActionChangePassword().execute(effectivePerson, jsonElement);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, jsonElement);
+			result.error(e);
 		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
-
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/WrapInPassword.java

@@ -1,33 +0,0 @@
-package com.x.organization.assemble.personal.jaxrs.password;
-
-public class WrapInPassword {
-
-	private String oldPassword;
-	private String newPassword;
-	private String confirmPassword;
-
-	public String getOldPassword() {
-		return oldPassword;
-	}
-
-	public void setOldPassword(String oldPassword) {
-		this.oldPassword = oldPassword;
-	}
-
-	public String getConfirmPassword() {
-		return confirmPassword;
-	}
-
-	public void setConfirmPassword(String confirmPassword) {
-		this.confirmPassword = confirmPassword;
-	}
-
-	public String getNewPassword() {
-		return newPassword;
-	}
-
-	public void setNewPassword(String newPassword) {
-		this.newPassword = newPassword;
-	}
-
-}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/WrapOutPassword.java

@@ -1,17 +0,0 @@
-package com.x.organization.assemble.personal.jaxrs.password;
-
-import com.x.base.core.project.gson.GsonPropertyObject;
-
-public class WrapOutPassword extends GsonPropertyObject {
-
-	private String password;
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCaptcha.java

@@ -1,21 +1,22 @@
 package com.x.organization.assemble.personal.jaxrs.regist;
 
 import org.apache.commons.lang3.StringUtils;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
 
 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.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoCaptcha;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.organization.assemble.personal.Business;
 
 class ActionCaptcha extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCaptcha.class);
 
-	ActionResult<Wo> execute(Integer width, Integer height) throws Exception {
+	ActionResult<Wo> execute(EffectivePerson effectivePerson,Integer width, Integer height) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Business business = new Business(emc);

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCheckMobile.java

@@ -6,7 +6,8 @@ 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.http.ActionResult;
-import com.x.base.core.project.http.WrapOutBoolean;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 
@@ -14,9 +15,9 @@ class ActionCheckMobile extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCheckMobile.class);
 
-	ActionResult<WrapOutBoolean> execute(String mobile) throws Exception {
+	ActionResult<Wo> execute(EffectivePerson effectivePerson,String mobile) throws Exception {
 
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
+		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			if (!Config.person().isMobile(mobile)) {
 				throw new ExceptionInvalidMobile(mobile);
@@ -27,11 +28,14 @@ class ActionCheckMobile extends BaseAction {
 			if (BooleanUtils.isNotTrue(Config.collect().getEnable())) {
 				throw new ExceptionDisableCollect();
 			}
-			WrapOutBoolean wrap = new WrapOutBoolean();
-			wrap.setValue(true);
-			result.setData(wrap);
+			Wo wo = new Wo();
+			wo.setValue(true);
+			result.setData(wo);
 			return result;
 		}
 	}
 
+	public static class Wo extends WrapBoolean {
+	}
+
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCheckName.java

@@ -1,21 +1,22 @@
 package com.x.organization.assemble.personal.jaxrs.regist;
 
 import org.apache.commons.lang3.StringUtils;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
 
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.WrapOutBoolean;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.jaxrs.WrapBoolean;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.tools.StringTools;
 
 class ActionCheckName extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCheckName.class);
 
-	ActionResult<WrapOutBoolean> execute(String name) throws Exception {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String name) throws Exception {
+		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			if (StringUtils.isEmpty(name) || (!StringTools.isSimply(name))) {
 				throw new ExceptionInvalidName(name);
@@ -23,11 +24,15 @@ class ActionCheckName extends BaseAction {
 			if (this.nameExisted(emc, name)) {
 				throw new ExceptionNameExist(name);
 			}
-			WrapOutBoolean wrap = new WrapOutBoolean();
-			wrap.setValue(true);
-			result.setData(wrap);
+			Wo wo = new Wo();
+			wo.setValue(true);
+			result.setData(wo);
 			return result;
 		}
 	}
 
+	public static class Wo extends WrapBoolean {
+
+	}
+
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCheckPassword.java

@@ -1,22 +1,26 @@
 package com.x.organization.assemble.personal.jaxrs.regist;
 
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
 import com.wx.pwd.CheckStrength;
 import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.WrapOutInteger;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.jaxrs.WrapInteger;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 
 class ActionCheckPassword extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCheckPassword.class);
 
-	ActionResult<WrapOutInteger> execute(String password) throws Exception {
-		ActionResult<WrapOutInteger> result = new ActionResult<>();
-		WrapOutInteger wrap = new WrapOutInteger();
-		wrap.setValue(CheckStrength.checkPasswordStrength(password));
-		result.setData(wrap);
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String password) throws Exception {
+		ActionResult<Wo> result = new ActionResult<>();
+		Wo wo = new Wo();
+		wo.setValue(CheckStrength.checkPasswordStrength(password));
+		result.setData(wo);
+
 		return result;
 	}
 
+	public static class Wo extends WrapInteger {
+	}
+
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCode.java

@@ -7,7 +7,8 @@ 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.http.ActionResult;
-import com.x.base.core.project.http.WrapOutBoolean;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.organization.assemble.personal.Business;
@@ -16,8 +17,8 @@ class ActionCode extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCode.class);
 
-	ActionResult<WrapOutBoolean> execute(String mobile) throws Exception {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, String mobile) throws Exception {
+		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Business business = new Business(emc);
 			if (!StringUtils.equals(com.x.base.core.project.config.Person.REGISTER_TYPE_CODE,
@@ -34,11 +35,15 @@ class ActionCode extends BaseAction {
 				throw new ExceptionDisableCollect();
 			}
 			business.instrument().code().create(mobile);
-			WrapOutBoolean wrap = new WrapOutBoolean();
-			wrap.setValue(true);
-			result.setData(wrap);
+			Wo wo = new Wo();
+			wo.setValue(true);
+			result.setData(wo);
 			return result;
 		}
 	}
 
+	public static class Wo extends WrapBoolean {
+
+	}
+
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCreate.java

@@ -3,37 +3,40 @@ package com.x.organization.assemble.personal.jaxrs.regist;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import com.google.gson.JsonElement;
 import com.wx.pwd.CheckStrength;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.entity.type.GenderType;
 import com.x.base.core.project.config.Config;
+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.http.WrapOutBoolean;
+import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.tools.StringTools;
 import com.x.organization.assemble.personal.Business;
-import com.x.organization.assemble.personal.wrapin.WrapInRegist;
 import com.x.organization.core.entity.Person;
 
 class ActionCreate extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCreate.class);
 
-	ActionResult<WrapOutBoolean> execute(WrapInRegist wrapIn) throws Exception {
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			ActionResult<WrapOutBoolean> result = new ActionResult<>();
-			WrapOutBoolean wrap = new WrapOutBoolean();
+			ActionResult<Wo> result = new ActionResult<>();
+			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 			Business business = new Business(emc);
-			String name = wrapIn.getName();
-			String password = wrapIn.getPassword();
-			String mobile = wrapIn.getMobile();
-			GenderType genderType = wrapIn.getGenderType();
-			String codeAnswer = wrapIn.getCodeAnswer();
-			String captcha = wrapIn.getCaptcha();
-			String captchaAnswer = wrapIn.getCaptchaAnswer();
+			String name = wi.getName();
+			String password = wi.getPassword();
+			String mobile = wi.getMobile();
+			GenderType genderType = wi.getGenderType();
+			String codeAnswer = wi.getCodeAnswer();
+			String captcha = wi.getCaptcha();
+			String captchaAnswer = wi.getCaptchaAnswer();
 			if (StringUtils.equals(com.x.base.core.project.config.Person.REGISTER_TYPE_DISABLE,
 					Config.person().getRegister())) {
 				throw new ExceptionDisableRegist();
@@ -69,8 +72,9 @@ class ActionCreate extends BaseAction {
 				}
 			}
 			this.register(business, name, password, genderType, mobile);
-			wrap.setValue(true);
-			result.setData(wrap);
+			Wo wo = new Wo();
+			wo.setValue(true);
+			result.setData(wo);
 			return result;
 		}
 	}
@@ -87,4 +91,81 @@ class ActionCreate extends BaseAction {
 		business.entityManagerContainer().commit();
 	}
 
+	public static class Wi extends GsonPropertyObject {
+
+		private String name;
+
+		private GenderType genderType;
+
+		private String password;
+
+		private String mobile;
+
+		private String codeAnswer;
+
+		private String captchaAnswer;
+
+		private String captcha;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public GenderType getGenderType() {
+			return genderType;
+		}
+
+		public void setGenderType(GenderType genderType) {
+			this.genderType = genderType;
+		}
+
+		public String getPassword() {
+			return password;
+		}
+
+		public void setPassword(String password) {
+			this.password = password;
+		}
+
+		public String getMobile() {
+			return mobile;
+		}
+
+		public void setMobile(String mobile) {
+			this.mobile = mobile;
+		}
+
+		public String getCodeAnswer() {
+			return codeAnswer;
+		}
+
+		public void setCodeAnswer(String codeAnswer) {
+			this.codeAnswer = codeAnswer;
+		}
+
+		public String getCaptchaAnswer() {
+			return captchaAnswer;
+		}
+
+		public void setCaptchaAnswer(String captchaAnswer) {
+			this.captchaAnswer = captchaAnswer;
+		}
+
+		public String getCaptcha() {
+			return captcha;
+		}
+
+		public void setCaptcha(String captcha) {
+			this.captcha = captcha;
+		}
+
+	}
+
+	public static class Wo extends WrapBoolean {
+	}
+
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionMode.java

@@ -2,7 +2,8 @@ package com.x.organization.assemble.personal.jaxrs.regist;
 
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.WrapOutString;
+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;
 
@@ -10,12 +11,15 @@ class ActionMode extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionMode.class);
 
-	ActionResult<WrapOutString> execute() throws Exception {
-		ActionResult<WrapOutString> result = new ActionResult<>();
-		WrapOutString wrap = new WrapOutString();
-		wrap.setValue(Config.person().getRegister());
-		result.setData(wrap);
+	ActionResult<Wo> execute(EffectivePerson effectivePerson) throws Exception {
+		ActionResult<Wo> result = new ActionResult<>();
+		Wo wo = new Wo();
+		wo.setValue(Config.person().getRegister());
+		result.setData(wo);
 		return result;
 	}
 
+	public static class Wo extends WrapString {
+	}
+
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/RegistAction.java

@@ -7,39 +7,44 @@ 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 javax.ws.rs.core.Response;
 
+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.http.WrapOutBoolean;
-import com.x.base.core.project.http.WrapOutInteger;
-import com.x.base.core.project.http.WrapOutString;
 import com.x.base.core.project.jaxrs.ResponseFactory;
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.organization.assemble.personal.wrapin.WrapInRegist;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 
 @Path("regist")
 @JaxrsDescribe("注册")
 public class RegistAction extends StandardJaxrsAction {
 
+	private static Logger logger = LoggerFactory.getLogger(RegistAction.class);
+
 	@JaxrsMethodDescribe(value = "当前允许的注册模式,disable,captcha,code", action = ActionMode.class)
 	@GET
 	@Path("mode")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Response mode(@Context HttpServletRequest request) {
-		ActionResult<WrapOutString> result = new ActionResult<>();
+	public void mode(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
+		ActionResult<ActionMode.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionMode().execute();
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
+			result = new ActionMode().execute(effectivePerson);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
 		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
 
 	@JaxrsMethodDescribe(value = "生成一个captcha", action = ActionCaptcha.class)
@@ -47,16 +52,18 @@ public class RegistAction extends StandardJaxrsAction {
 	@Path("captcha/width/{width}/height/{height}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Response captcha(@Context HttpServletRequest request, @PathParam("width") Integer width,
-			@PathParam("height") Integer height) {
+	public void captcha(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("图像宽度") @PathParam("width") Integer width,
+			@JaxrsParameterDescribe("图像高度") @PathParam("height") Integer height) {
 		ActionResult<ActionCaptcha.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionCaptcha().execute(width, height);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
+			result = new ActionCaptcha().execute(effectivePerson, width, height);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
 		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
 
 	@JaxrsMethodDescribe(value = "生成一个code", action = ActionCode.class)
@@ -64,15 +71,17 @@ public class RegistAction extends StandardJaxrsAction {
 	@Path("code/mobile/{mobile}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Response code(@Context HttpServletRequest request, @PathParam("mobile") String mobile) {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
+	public void code(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("电话号码") @PathParam("mobile") String mobile) {
+		ActionResult<ActionCode.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionCode().execute(mobile);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
+			result = new ActionCode().execute(effectivePerson, mobile);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
 		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
 
 	@JaxrsMethodDescribe(value = "校验mobile是否已经存在", action = ActionCheckMobile.class)
@@ -80,15 +89,17 @@ public class RegistAction extends StandardJaxrsAction {
 	@Path("check/mobile/{mobile}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Response checkMobile(@Context HttpServletRequest request, @PathParam("mobile") String mobile) {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
+	public void checkMobile(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("电话号码") @PathParam("mobile") String mobile) {
+		ActionResult<ActionCheckMobile.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionCheckMobile().execute(mobile);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
+			result = new ActionCheckMobile().execute(effectivePerson, mobile);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
 		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
 
 	@JaxrsMethodDescribe(value = "校验name是否已经存在", action = ActionCheckName.class)
@@ -96,15 +107,17 @@ public class RegistAction extends StandardJaxrsAction {
 	@Path("check/name/{name}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Response checkName(@Context HttpServletRequest request, @PathParam("name") String name) {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
+	public void checkName(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("用户名") @PathParam("name") String name) {
+		ActionResult<ActionCheckName.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionCheckName().execute(name);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
+			result = new ActionCheckName().execute(effectivePerson, name);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
 		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
 
 	@JaxrsMethodDescribe(value = "校验password密码等级.", action = ActionCheckPassword.class)
@@ -112,30 +125,34 @@ public class RegistAction extends StandardJaxrsAction {
 	@Path("check/password/{password}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Response checkPassword(@Context HttpServletRequest request, @PathParam("password") String password) {
-		ActionResult<WrapOutInteger> result = new ActionResult<>();
+	public void checkPassword(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			@JaxrsParameterDescribe("密码") @PathParam("password") String password) {
+		ActionResult<ActionCheckPassword.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionCheckPassword().execute(password);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
+			result = new ActionCheckPassword().execute(effectivePerson, password);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
 		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
 
 	@JaxrsMethodDescribe(value = "注册人员", action = ActionCreate.class)
 	@POST
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
-	public Response create(@Context HttpServletRequest request, WrapInRegist wrapIn) {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
+	public void create(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			JsonElement jsonElement) {
+		ActionResult<ActionCreate.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionCreate().execute(wrapIn);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
+			result = new ActionCreate().execute(effectivePerson, jsonElement);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, jsonElement);
+			result.error(e);
 		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
+		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
 
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/wrapin/WrapInRegist.java

@@ -1,78 +0,0 @@
-package com.x.organization.assemble.personal.wrapin;
-
-import com.x.base.core.entity.type.GenderType;
-import com.x.base.core.project.gson.GsonPropertyObject;
-
-public class WrapInRegist extends GsonPropertyObject {
-
-	private String name;
-
-	private GenderType genderType;
-
-	private String password;
-
-	private String mobile;
-
-	private String codeAnswer;
-
-	private String captchaAnswer;
-
-	private String captcha;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public GenderType getGenderType() {
-		return genderType;
-	}
-
-	public void setGenderType(GenderType genderType) {
-		this.genderType = genderType;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getMobile() {
-		return mobile;
-	}
-
-	public void setMobile(String mobile) {
-		this.mobile = mobile;
-	}
-
-	public String getCodeAnswer() {
-		return codeAnswer;
-	}
-
-	public void setCodeAnswer(String codeAnswer) {
-		this.codeAnswer = codeAnswer;
-	}
-
-	public String getCaptchaAnswer() {
-		return captchaAnswer;
-	}
-
-	public void setCaptchaAnswer(String captchaAnswer) {
-		this.captchaAnswer = captchaAnswer;
-	}
-
-	public String getCaptcha() {
-		return captcha;
-	}
-
-	public void setCaptcha(String captcha) {
-		this.captcha = captcha;
-	}
-
-}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/wrapout/WrapOutIdentity.java

@@ -1,78 +0,0 @@
-package com.x.organization.assemble.personal.wrapout;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.entity.JpaObject;
-import com.x.organization.core.entity.Identity;
-
-public class WrapOutIdentity extends Identity {
-
-	private String unitName;
-	private String topUnit;
-	private String topUnitName;
-	private String personName;
-	private String onlineStatus;
-	private List<WrapOutUnitDuty> unitDutyList;
-
-	private static final long serialVersionUID = -7448825297703157229L;
-	public static List<String> Excludes = new ArrayList<>(JpaObject.FieldsInvisible);
-	private Long rank;
-
-	public Long getRank() {
-		return rank;
-	}
-
-	public void setRank(Long rank) {
-		this.rank = rank;
-	}
-
-	public String getPersonName() {
-		return personName;
-	}
-
-	public void setPersonName(String personName) {
-		this.personName = personName;
-	}
-
-	public String getOnlineStatus() {
-		return onlineStatus;
-	}
-
-	public void setOnlineStatus(String onlineStatus) {
-		this.onlineStatus = onlineStatus;
-	}
-
-	public String getUnitName() {
-		return unitName;
-	}
-
-	public void setUnitName(String unitName) {
-		this.unitName = unitName;
-	}
-
-	public String getTopUnit() {
-		return topUnit;
-	}
-
-	public void setTopUnit(String topUnit) {
-		this.topUnit = topUnit;
-	}
-
-	public String getTopUnitName() {
-		return topUnitName;
-	}
-
-	public void setTopUnitName(String topUnitName) {
-		this.topUnitName = topUnitName;
-	}
-
-	public List<WrapOutUnitDuty> getUnitDutyList() {
-		return unitDutyList;
-	}
-
-	public void setUnitDutyList(List<WrapOutUnitDuty> unitDutyList) {
-		this.unitDutyList = unitDutyList;
-	}
-
-}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/wrapout/WrapOutUnitDuty.java

@@ -1,33 +0,0 @@
-package com.x.organization.assemble.personal.wrapout;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.x.base.core.entity.JpaObject;
-import com.x.organization.core.entity.UnitDuty;
-
-public class WrapOutUnitDuty extends UnitDuty {
-
-	private static final long serialVersionUID = 2411311797461626124L;
-	public static List<String> Excludes = new ArrayList<>(JpaObject.FieldsInvisible);
-	private Long rank;
-
-	private String departmentName;
-
-	public Long getRank() {
-		return rank;
-	}
-
-	public void setRank(Long rank) {
-		this.rank = rank;
-	}
-
-	public String getDepartmentName() {
-		return departmentName;
-	}
-
-	public void setDepartmentName(String departmentName) {
-		this.departmentName = departmentName;
-	}
-
-}

o2server/x_strategydeploy_assemble_control/src/main/java/com/x/strategydeploy/assemble/control/x_strategydeploy_assemble_control.java

@@ -25,25 +25,4 @@ public class x_strategydeploy_assemble_control extends AssembleA {
 		dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName());
 		dependency.customJars.add("x_strategydeploy_core_entity");
 	}
-
-//	public static final Dependency dependency = new Dependency();
-//
-//	static {
-//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.Attachment");
-//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.StrategyDeploy");
-//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.MeasuresInfo");
-//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.KeyworkInfo");
-//		dependency.containerEntities.add("com.x.strategydeploy.core.entity.StrategyConfigSys");
-//		dependency.storageTypes.add(StorageType.strategyDeploy.toString());
-//		dependency.storeJars.add(x_organization_core_express.class.getName());
-//		dependency.storeJars.add(x_organization_core_entity.class.getName());
-//		dependency.storeJars.add(x_collaboration_core_message.class.getName());
-//		dependency.customJars.add("x_strategydeploy_core_entity");
-//	}
-
-//	public static final String name = "战略工作";
-//	public static List<String> containerEntities = new ArrayList<>();
-//	public static List<StorageType> usedStorageTypes = new ArrayList<>();
-//	public static List<Class<? extends Compilable>> dependents = new ArrayList<>();
-
 }