废弃collaboration模块,改用message模块

o2server/x_collaboration_assemble_websocket/.gitignore

@@ -1,4 +0,0 @@
-.classpath
-.project
-/.settings/
-/target/

o2server/x_collaboration_assemble_websocket/pom.xml

@@ -1,59 +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_collaboration_assemble_websocket</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_collaboration_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
-
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>describe</id>
-						<phase>prepare-package</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-war</id>
-						<phase>verify</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/AbstractFactory.java

@@ -1,24 +0,0 @@
-package com.x.collaboration.assemble.websocket;
-
-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_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/ApplicationServletContextListener.java

@@ -1,32 +0,0 @@
-package com.x.collaboration.assemble.websocket;
-
-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();
-		} 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_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/Business.java

@@ -1,26 +0,0 @@
-package com.x.collaboration.assemble.websocket;
-
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.collaboration.assemble.websocket.factory.DialogFactory;
-
-public class Business {
-
-	private EntityManagerContainer emc;
-
-	public Business(EntityManagerContainer emc) throws Exception {
-		this.emc = emc;
-	}
-
-	public EntityManagerContainer entityManagerContainer() {
-		return this.emc;
-	}
-
-	private DialogFactory component;
-
-	public DialogFactory component() throws Exception {
-		if (null == this.component) {
-			this.component = new DialogFactory(this);
-		}
-		return component;
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/ThisApplication.java

@@ -1,38 +0,0 @@
-package com.x.collaboration.assemble.websocket;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.websocket.Session;
-
-import com.x.base.core.project.Context;
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.collaboration.assemble.websocket.timer.CleanupConnectionsTimer;
-
-public class ThisApplication {
-
-	protected static Context context;
-
-	public static final ConcurrentHashMap<String, Session> connections = new ConcurrentHashMap<>();
-
-	public static Context context() {
-		return context;
-	}
-
-	public static void init() {
-		try {
-			LoggerFactory.setLevel(Config.logLevel().x_collaboration_assemble_websocket());
-			context.scheduleLocal(CleanupConnectionsTimer.class, 5, 60 * 30);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static void destroy() {
-		try {
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/factory/DialogFactory.java

@@ -1,12 +0,0 @@
-package com.x.collaboration.assemble.websocket.factory;
-
-import com.x.collaboration.assemble.websocket.AbstractFactory;
-import com.x.collaboration.assemble.websocket.Business;
-
-public class DialogFactory extends AbstractFactory {
-
-	public DialogFactory(Business business) throws Exception {
-		super(business);
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/ActionApplication.java

@@ -1,26 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs;
-
-import java.util.Set;
-
-import javax.ws.rs.ApplicationPath;
-
-import com.x.base.core.project.jaxrs.AbstractActionApplication;
-import com.x.collaboration.assemble.websocket.jaxrs.dialog.DialogAction;
-import com.x.collaboration.assemble.websocket.jaxrs.message.MessageAction;
-import com.x.collaboration.assemble.websocket.jaxrs.online.OnlineAction;
-import com.x.collaboration.assemble.websocket.jaxrs.sms.SMSAction;
-import com.x.collaboration.assemble.websocket.jaxrs.talk.TalkAction;
-
-@ApplicationPath("jaxrs")
-public class ActionApplication extends AbstractActionApplication {
-
-	public Set<Class<?>> getClasses() {
-        classes.add(SMSAction.class);
-		classes.add(OnlineAction.class);
-		classes.add(MessageAction.class);
-		classes.add(DialogAction.class);
-		classes.add(TalkAction.class);
-		return classes;
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/DialogFilter.java

@@ -1,10 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = { "/jaxrs/dialog/*" })
-public class DialogFilter extends CipherManagerUserJaxrsFilter {
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/MessageFilter.java

@@ -1,10 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.CipherManagerJaxrsFilter;
-
-@WebFilter(urlPatterns = { "/jaxrs/message/*" })
-public class MessageFilter extends CipherManagerJaxrsFilter {
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/OnlineJaxrsFilter.java

@@ -1,10 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = { "/jaxrs/online/*" })
-public class OnlineJaxrsFilter extends CipherManagerUserJaxrsFilter {
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/SMSFilter.java

@@ -1,10 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.CipherManagerJaxrsFilter;
-
-@WebFilter(urlPatterns = { "/jaxrs/sms/*" }, asyncSupported = true)
-public class SMSFilter extends CipherManagerJaxrsFilter {
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/TalkFilter.java

@@ -1,10 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs;
-
-import javax.servlet.annotation.WebFilter;
-
-import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter;
-
-@WebFilter(urlPatterns = { "/jaxrs/talk/*" })
-public class TalkFilter extends CipherManagerUserJaxrsFilter {
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/dialog/ActionListTalk.java

@@ -1,45 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.dialog;
-
-import java.util.ArrayList;
-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.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.project.gson.XGsonBuilder;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.collaboration.assemble.websocket.Business;
-import com.x.collaboration.core.entity.Dialog;
-import com.x.collaboration.core.entity.Dialog_;
-
-public class ActionListTalk {
-
-	private Gson gson = XGsonBuilder.instance();
-
-	protected List<JsonElement> execute(Business business, EffectivePerson effectivePerson, String person)
-			throws Exception {
-		EntityManagerContainer emc = business.entityManagerContainer();
-		EntityManager em = emc.get(Dialog.class);
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<Dialog> cq = cb.createQuery(Dialog.class);
-		Root<Dialog> root = cq.from(Dialog.class);
-		Predicate p = cb.and(cb.equal(root.get(Dialog_.from), effectivePerson.getDistinguishedName()),
-				cb.equal(root.get(Dialog_.person), person));
-		p = cb.or(p, cb.and(cb.equal(root.get(Dialog_.person), effectivePerson.getDistinguishedName()),
-				cb.equal(root.get(Dialog_.from), person)));
-		cq.select(root).where(p).orderBy(cb.desc(root.get(Dialog_.createTime)));
-		List<Dialog> list = em.createQuery(cq).setMaxResults(30).getResultList();
-		List<JsonElement> jsonElements = new ArrayList<>();
-		for (Dialog o : list) {
-			jsonElements.add(gson.fromJson(o.getBody(), JsonElement.class));
-		}
-		return jsonElements;
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/dialog/DialogAction.java

@@ -1,52 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.dialog;
-
-import java.util.ArrayList;
-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.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-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.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.collaboration.assemble.websocket.Business;
-
-@Path("dialog")
-public class DialogAction extends StandardJaxrsAction {
-
-	// private static Logger logger =
-	// LoggerFactory.getLogger(MessageAction.class);
-
-	// @HttpMethodDescribe(value = "列示当前人员的聊天对话.", response = WrapOutString.class)
-	@GET
-	@Path("list/talk/person/{person}")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response listTalk(@Context HttpServletRequest request, @PathParam("person") String person) {
-		ActionResult<List<JsonElement>> result = new ActionResult<>();
-		List<JsonElement> wraps = new ArrayList<>();
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			Business business = new Business(emc);
-			EffectivePerson effectivePerson = this.effectivePerson(request);
-			wraps = new ActionListTalk().execute(business, effectivePerson, person);
-			result.setData(wraps);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/message/ActionForward.java

@@ -1,29 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.message;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.http.WrapOutBoolean;
-import com.x.collaboration.core.message.BaseMessage;
-import com.x.collaboration.core.message.MessageCategory;
-
-public class ActionForward extends BaseAction {
-
-	public WrapOutBoolean execute(JsonElement jsonElement) throws Exception {
-		MessageCategory category = BaseMessage.extractCategory(jsonElement);
-		WrapOutBoolean wrap = new WrapOutBoolean();
-		wrap.setValue(false);
-		if (null != category) {
-			switch (category) {
-			case notification:
-				wrap.setValue(this.sendNotificationOnLocal(jsonElement));
-				break;
-			case dialog:
-				wrap.setValue(this.sendDialogOnLocal(jsonElement));
-				break;
-			default:
-				break;
-			}
-		}
-		return wrap;
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/message/ActionSend.java

@@ -1,152 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.message;
-
-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 org.apache.commons.lang3.StringUtils;
-
-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.entity.annotation.CheckPersistType;
-import com.x.base.core.project.Application;
-import com.x.base.core.project.x_collaboration_assemble_websocket;
-import com.x.base.core.project.connection.CipherConnectionAction;
-import com.x.base.core.project.http.WrapOutBoolean;
-import com.x.base.core.project.tools.ListTools;
-import com.x.collaboration.assemble.websocket.ThisApplication;
-import com.x.collaboration.core.entity.Dialog;
-import com.x.collaboration.core.entity.Notification;
-import com.x.collaboration.core.entity.Talk;
-import com.x.collaboration.core.entity.Talk_;
-import com.x.collaboration.core.message.BaseMessage;
-import com.x.collaboration.core.message.MessageCategory;
-import com.x.collaboration.core.message.dialog.DialogMessage;
-import com.x.collaboration.core.message.notification.NotificationMessage;
-import com.x.organization.core.express.Organization;
-
-public class ActionSend extends BaseAction {
-
-	private Organization org = new Organization(ThisApplication.context());
-
-	protected WrapOutBoolean execute(JsonElement jsonElement) throws Exception {
-		MessageCategory category = BaseMessage.extractCategory(jsonElement);
-		WrapOutBoolean wrap = new WrapOutBoolean();
-		if (null != category) {
-			switch (category) {
-			case notification:
-				this.sendNotification(jsonElement);
-				break;
-			case dialog:
-				this.sendDialog(jsonElement);
-			default:
-				break;
-			}
-		}
-		return wrap;
-	}
-
-	private WrapOutBoolean sendNotification(JsonElement jsonElement) throws Exception {
-		boolean arrived = this.sendNotificationOnLocal(jsonElement);
-		arrived = arrived || this.forwardOnRemote(jsonElement);
-		if (!arrived) {
-			this.storeNotification(jsonElement);
-		}
-		WrapOutBoolean wrap = new WrapOutBoolean();
-		wrap.setValue(arrived);
-		return wrap;
-	}
-
-	private WrapOutBoolean sendDialog(JsonElement jsonElement) throws Exception {
-		boolean arrived = this.sendDialogOnLocal(jsonElement);
-		arrived = arrived || this.forwardOnRemote(jsonElement);
-		this.storeDialog(jsonElement, arrived);
-		WrapOutBoolean wrap = new WrapOutBoolean();
-		wrap.setValue(arrived);
-		return wrap;
-	}
-
-	protected boolean forwardOnRemote(JsonElement jsonElement) throws Exception {
-		boolean sent = false;
-		List<Application> list = ThisApplication.context().applications().get(x_collaboration_assemble_websocket.class);
-		if (ListTools.isNotEmpty(list)) {
-			for (Application application : list) {
-				if (!StringUtils.equals(application.getToken(), ThisApplication.context().token())) {
-					WrapOutBoolean wrap = CipherConnectionAction
-							.put(false, application.getUrlRoot() + "message", jsonElement)
-							.getData(WrapOutBoolean.class);
-					sent = sent || wrap.getValue();
-				}
-			}
-		}
-		return sent;
-	}
-
-	private void storeNotification(JsonElement jsonElement) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			String name = NotificationMessage.extractPerson(jsonElement);
-			String person = org.person().get(name);
-			if (StringUtils.isNotEmpty(person)) {
-				emc.beginTransaction(Notification.class);
-				Notification o = new Notification();
-				o.setPerson(person);
-				o.setBody(jsonElement.toString());
-				emc.persist(o, CheckPersistType.all);
-				emc.commit();
-			}
-		}
-	}
-
-	private void storeDialog(JsonElement jsonElement, Boolean arrived) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			String personName = DialogMessage.extractPerson(jsonElement);
-			String from = DialogMessage.extractFrom(jsonElement);
-			String person = org.person().get(personName);
-			if (StringUtils.isNotEmpty(person)) {
-				emc.beginTransaction(Dialog.class);
-				Dialog o = new Dialog();
-				o.setPerson(person);
-				o.setFrom(from);
-				o.setBody(jsonElement.toString());
-				o.setArrived(arrived);
-				emc.persist(o, CheckPersistType.all);
-				this.storeTalk(emc, o);
-				emc.commit();
-			}
-		}
-	}
-
-	private void storeTalk(EntityManagerContainer emc, Dialog dialog) throws Exception {
-		EntityManager em = emc.beginTransaction(Talk.class);
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<Talk> cq = cb.createQuery(Talk.class);
-		Root<Talk> root = cq.from(Talk.class);
-		Predicate p = cb.and(cb.equal(root.get(Talk_.person), dialog.getPerson()),
-				cb.equal(root.get(Talk_.from), dialog.getFrom()));
-		p = cb.or(p, cb.and(cb.equal(root.get(Talk_.person), dialog.getFrom()),
-				cb.equal(root.get(Talk_.from), dialog.getPerson())));
-		cq.select(root).where(p);
-		List<Talk> list = em.createQuery(cq).getResultList();
-		Talk talk = null;
-		if (!list.isEmpty()) {
-			talk = list.get(0);
-			this.updateTalk(talk, dialog);
-		} else {
-			talk = new Talk();
-			this.updateTalk(talk, dialog);
-			emc.persist(talk, CheckPersistType.all);
-		}
-	}
-
-	private void updateTalk(Talk talk, Dialog dialog) {
-		talk.setArrived(dialog.getArrived());
-		talk.setBody(dialog.getBody());
-		talk.setFrom(dialog.getFrom());
-		talk.setPerson(dialog.getPerson());
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/message/BaseAction.java

@@ -1,45 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.message;
-
-import javax.websocket.Session;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.collaboration.assemble.websocket.ThisApplication;
-import com.x.collaboration.core.message.dialog.DialogMessage;
-import com.x.collaboration.core.message.notification.NotificationMessage;
-
-abstract class BaseAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(BaseAction.class);
-
-	boolean sendNotificationOnLocal(JsonElement jsonElement) throws Exception {
-		String person = NotificationMessage.extractPerson(jsonElement);
-		if (StringUtils.isNotEmpty(person)) {
-			Session session = ThisApplication.connections.get(person);
-			if (session != null && session.isOpen()) {
-				logger.debug("send notification on local, person:{},message:{}.", person, jsonElement);
-				session.getBasicRemote().sendText(jsonElement.toString());
-				return true;
-			}
-		}
-		return false;
-	}
-
-	boolean sendDialogOnLocal(JsonElement jsonElement) throws Exception {
-		String person = DialogMessage.extractPerson(jsonElement);
-		if (StringUtils.isNotEmpty(person)) {
-			Session session = ThisApplication.connections.get(person);
-			if (session != null && session.isOpen()) {
-				logger.debug("send dialog on local, person:{},message:{}.", person, jsonElement);
-				session.getBasicRemote().sendText(jsonElement.toString());
-				return true;
-			}
-		}
-		return false;
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/message/MessageAction.java

@@ -1,63 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.message;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-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.http.ActionResult;
-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("message")
-public class MessageAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(MessageAction.class);
-
-	// @HttpMethodDescribe(value = "发送WebSocket消息接口,同时呼叫其他模块进行发送,如果不能发送则保存到本地.",
-	// response = WrapOutString.class)
-	@POST
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response send(@Context HttpServletRequest request, JsonElement jsonElement) {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
-		WrapOutBoolean wrap = null;
-		try {
-			logger.debug("receive message:{}", jsonElement);
-			wrap = new ActionSend().execute(jsonElement);
-			result.setData(wrap);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-	// @HttpMethodDescribe(value = "转发WebSocket消息")
-	@PUT
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response forward(@Context HttpServletRequest request, JsonElement jsonElement) {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
-		WrapOutBoolean wrap = new WrapOutBoolean();
-		try {
-			wrap = new ActionForward().execute(jsonElement);
-			result.setData(wrap);
-		} catch (Exception e) {
-			e.printStackTrace();
-			result.error(e);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/online/ActionGetOnline.java

@@ -1,19 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.online;
-
-import com.x.base.core.project.http.WrapOutOnline;
-
-public class ActionGetOnline extends BaseAction {
-
-	public WrapOutOnline execute(String person) throws Exception {
-		WrapOutOnline wrap = new WrapOutOnline();
-		wrap.setPerson(person);
-		if (this.getOnlineLocal(person)) {
-			wrap.setOnlineStatus(WrapOutOnline.status_online);
-		} else if (this.getOnLineRemote(person)) {
-			wrap.setOnlineStatus(WrapOutOnline.status_online);
-		} else {
-			wrap.setOnlineStatus(WrapOutOnline.status_offline);
-		}
-		return wrap;
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/online/ActionGetOnlineLocal.java

@@ -1,17 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.online;
-
-import com.x.base.core.project.http.WrapOutOnline;
-
-public class ActionGetOnlineLocal extends BaseAction {
-
-	public WrapOutOnline execute(String person) throws Exception {
-		WrapOutOnline wrap = new WrapOutOnline();
-		wrap.setPerson(person);
-		if (this.getOnlineLocal(person)) {
-			wrap.setOnlineStatus(WrapOutOnline.status_online);
-		} else {
-			wrap.setOnlineStatus(WrapOutOnline.status_offline);
-		}
-		return wrap;
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/online/ActionListOnline.java

@@ -1,45 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.online;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.x.base.core.project.http.WrapInStringList;
-import com.x.base.core.project.http.WrapOutOnline;
-import com.x.base.core.project.tools.ListTools;
-
-public class ActionListOnline extends BaseAction {
-
-	public List<WrapOutOnline> execute(WrapInStringList wrapIn) throws Exception {
-		List<WrapOutOnline> wraps = new ArrayList<>();
-		if (ListTools.isNotEmpty(wrapIn.getValueList())) {
-			for (String str : wrapIn.getValueList()) {
-				WrapOutOnline o = new WrapOutOnline();
-				o.setPerson(str);
-				o.setOnlineStatus(WrapOutOnline.status_offline);
-				wraps.add(o);
-			}
-			for (WrapOutOnline o : this.listOnlineLocal(wrapIn)) {
-				if (StringUtils.equals(o.getOnlineStatus(), WrapOutOnline.status_online)) {
-					updateOnline(wraps, o.getPerson());
-				}
-			}
-			for (WrapOutOnline o : this.listOnLineRemote(wrapIn)) {
-				if (StringUtils.equals(o.getOnlineStatus(), WrapOutOnline.status_online)) {
-					updateOnline(wraps, o.getPerson());
-				}
-			}
-		}
-		return wraps;
-	}
-
-	private void updateOnline(List<WrapOutOnline> wraps, String person) {
-		for (WrapOutOnline wrap : wraps) {
-			if (StringUtils.equals(wrap.getPerson(), person)) {
-				wrap.setOnlineStatus(WrapOutOnline.status_online);
-				break;
-			}
-		}
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/online/ActionListOnlineAll.java

@@ -1,28 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.online;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.x.base.core.project.http.WrapOutOnline;
-import com.x.base.core.project.tools.ListTools;
-import com.x.base.core.project.tools.SortTools;
-
-public class ActionListOnlineAll extends BaseAction {
-
-	public List<WrapOutOnline> execute() throws Exception {
-		Set<String> set = new HashSet<>();
-		set.addAll(ListTools.extractProperty(this.listOnlineAllLocal(), "person", String.class, true, true));
-		set.addAll(ListTools.extractProperty(this.listOnLineAllRemote(), "person", String.class, true, true));
-		List<WrapOutOnline> wraps = new ArrayList<>();
-		for (String str : set) {
-			WrapOutOnline wrap = new WrapOutOnline();
-			wrap.setPerson(str);
-			wrap.setOnlineStatus(WrapOutOnline.status_online);
-			wraps.add(wrap);
-		}
-		SortTools.asc(wraps, false, "person");
-		return wraps;
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/online/ActionListOnlineAllLocal.java

@@ -1,12 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.online;
-
-import java.util.List;
-
-import com.x.base.core.project.http.WrapOutOnline;
-
-public class ActionListOnlineAllLocal extends BaseAction {
-
-	public List<WrapOutOnline> execute() throws Exception {
-		return this.listOnlineAllLocal();
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/online/ActionListOnlineLocal.java

@@ -1,13 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.online;
-
-import java.util.List;
-
-import com.x.base.core.project.http.WrapInStringList;
-import com.x.base.core.project.http.WrapOutOnline;
-
-public class ActionListOnlineLocal extends BaseAction {
-
-	public List<WrapOutOnline> execute(WrapInStringList wrapIn) throws Exception {
-		return this.listOnlineLocal(wrapIn);
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/online/BaseAction.java

@@ -1,140 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.online;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.websocket.Session;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.x.base.core.project.Application;
-import com.x.base.core.project.x_collaboration_assemble_websocket;
-import com.x.base.core.project.connection.CipherConnectionAction;
-import com.x.base.core.project.http.WrapInStringList;
-import com.x.base.core.project.http.WrapOutOnline;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.base.core.project.tools.ListTools;
-import com.x.collaboration.assemble.websocket.ThisApplication;
-
-abstract class BaseAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(BaseAction.class);
-
-	Boolean getOnlineLocal(String person) throws Exception {
-		Session session = ThisApplication.connections.get(person);
-		return (null == session || (!session.isOpen())) ? false : true;
-	}
-
-	Boolean getOnLineRemote(String person) throws Exception {
-		List<Application> list = ThisApplication.context().applications().get(x_collaboration_assemble_websocket.class);
-		if (ListTools.isNotEmpty(list)) {
-			for (Application application : list) {
-				if (!StringUtils.equals(application.getToken(), ThisApplication.context().token())) {
-					WrapOutOnline wrap = CipherConnectionAction
-							.get(false, application, "online", "person", person, "local").getData(WrapOutOnline.class);
-					if (StringUtils.equals(wrap.getOnlineStatus(), WrapOutOnline.status_online)) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	List<WrapOutOnline> listOnlineLocal(WrapInStringList wrapIn) throws Exception {
-		List<WrapOutOnline> wraps = new ArrayList<>();
-		if (ListTools.isNotEmpty(wrapIn.getValueList())) {
-			for (String str : wrapIn.getValueList()) {
-				WrapOutOnline o = new WrapOutOnline();
-				o.setPerson(str);
-				o.setOnlineStatus(WrapOutOnline.status_offline);
-				wraps.add(o);
-			}
-			for (WrapOutOnline o : wraps) {
-				Session session = ThisApplication.connections.get(o.getPerson());
-				if ((null != session) && (session.isOpen())) {
-					o.setOnlineStatus(WrapOutOnline.status_online);
-				}
-			}
-		}
-		return wraps;
-	}
-
-	List<WrapOutOnline> listOnLineRemote(WrapInStringList wrapIn) throws Exception {
-		List<WrapOutOnline> wraps = new ArrayList<>();
-		if (ListTools.isNotEmpty(wrapIn.getValueList())) {
-			for (String str : wrapIn.getValueList()) {
-				WrapOutOnline o = new WrapOutOnline();
-				o.setPerson(str);
-				o.setOnlineStatus(WrapOutOnline.status_offline);
-				wraps.add(o);
-			}
-			List<Application> list = ThisApplication.context().applications()
-					.get(x_collaboration_assemble_websocket.class);
-			if (ListTools.isEmpty(list)) {
-				for (Application application : list) {
-					if (!StringUtils.equals(application.getToken(), ThisApplication.context().token())) {
-						List<WrapOutOnline> results = CipherConnectionAction
-								.get(false, application, "online", "list", "local").getDataAsList(WrapOutOnline.class);
-						for (WrapOutOnline o : results) {
-							if (StringUtils.equals(WrapOutOnline.status_online, o.getOnlineStatus())) {
-								for (WrapOutOnline wrap : wraps) {
-									if (StringUtils.equals(wrap.getPerson(), o.getPerson())) {
-										wrap.setOnlineStatus(WrapOutOnline.status_online);
-										break;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return wraps;
-	}
-
-	List<WrapOutOnline> listOnlineAllLocal() throws Exception {
-		List<WrapOutOnline> wraps = new ArrayList<>();
-		for (Entry<String, Session> entry : ThisApplication.connections.entrySet()) {
-			Session session = entry.getValue();
-			if ((null != session) && (session.isOpen())) {
-				WrapOutOnline o = new WrapOutOnline();
-				o.setPerson(entry.getKey());
-				o.setOnlineStatus(WrapOutOnline.status_online);
-				wraps.add(o);
-			}
-		}
-		return wraps;
-	}
-
-	List<WrapOutOnline> listOnLineAllRemote() throws Exception {
-		Set<String> set = new HashSet<>();
-		List<Application> list = ThisApplication.context().applications().get(x_collaboration_assemble_websocket.class);
-		if (ListTools.isEmpty(list)) {
-			for (Application application : list) {
-				if (!StringUtils.equals(application.getToken(), ThisApplication.context().token())) {
-					List<WrapOutOnline> results = CipherConnectionAction
-							.get(false, application, "online", "list", "all", "local")
-							.getDataAsList(WrapOutOnline.class);
-					for (WrapOutOnline o : results) {
-						set.add(o.getPerson());
-					}
-				}
-			}
-		}
-		List<WrapOutOnline> wraps = new ArrayList<>();
-		for (String str : set) {
-			WrapOutOnline wrap = new WrapOutOnline();
-			wrap.setPerson(str);
-			wrap.setOnlineStatus(WrapOutOnline.status_online);
-			wraps.add(wrap);
-		}
-		return wraps;
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/online/OnlineAction.java

@@ -1,136 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.online;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import com.x.base.core.project.annotation.JaxrsMethodDescribe;
-import com.x.base.core.project.http.ActionResult;
-import com.x.base.core.project.http.HttpMediaType;
-import com.x.base.core.project.http.WrapInStringList;
-import com.x.base.core.project.http.WrapOutOnline;
-import com.x.base.core.project.jaxrs.ResponseFactory;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-
-@Path("online")
-public class OnlineAction extends StandardJaxrsAction {
-
-	@JaxrsMethodDescribe(value = "查看指定人员是否在线。", action = ActionGetOnline.class)
-	@GET
-	@Path("person/{person}")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response getOnline(@Context HttpServletRequest request, @PathParam("person") String person) {
-		ActionResult<WrapOutOnline> result = new ActionResult<>();
-		WrapOutOnline wrap = null;
-		try {
-			wrap = new ActionGetOnline().execute(person);
-			result.setData(wrap);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-	@JaxrsMethodDescribe(value = "查看指定人员是否在本服务器。", action = ActionGetOnlineLocal.class)
-	@GET
-	@Path("person/{person}/local")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response getOnlineLocal(@Context HttpServletRequest request, @PathParam("person") String person) {
-		ActionResult<WrapOutOnline> result = new ActionResult<>();
-		WrapOutOnline wrap = null;
-		try {
-			wrap = new ActionGetOnlineLocal().execute(person);
-			result.setData(wrap);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-	@JaxrsMethodDescribe(value = "查看指定人员列表是否在线，同时也呼叫其他服务器进行查找。", action = ActionListOnline.class)
-	@PUT
-	@Path("list")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response listOnline(@Context HttpServletRequest request, WrapInStringList wrapIn) {
-		ActionResult<List<WrapOutOnline>> result = new ActionResult<>();
-		List<WrapOutOnline> wraps = null;
-		try {
-			wraps = new ActionListOnline().execute(wrapIn);
-			result.setData(wraps);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-	@JaxrsMethodDescribe(value = "查看指定人员列表是否在线，仅查找本服务器。", action = ActionListOnlineLocal.class)
-	@PUT
-	@Path("list/local")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response listOnlineLocal(@Context HttpServletRequest request, WrapInStringList wrapIn) {
-		ActionResult<List<WrapOutOnline>> result = new ActionResult<>();
-		List<WrapOutOnline> wraps = null;
-		try {
-			wraps = new ActionListOnlineLocal().execute(wrapIn);
-			result.setData(wraps);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-	@JaxrsMethodDescribe(value = "查找所有在线的人员，同时呼叫其他服务器进行查找。", action = ActionListOnlineAll.class)
-	@GET
-	@Path("list/all")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response listOnlineAll(@Context HttpServletRequest request) {
-		ActionResult<List<WrapOutOnline>> result = new ActionResult<>();
-		List<WrapOutOnline> wraps = new ArrayList<>();
-		try {
-			wraps = new ActionListOnlineAll().execute();
-			result.setData(wraps);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-	@JaxrsMethodDescribe(value = "查找所有在本地服务器的人员", action = ActionListOnlineAllLocal.class)
-	@GET
-	@Path("list/all/local")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response listOnlineAllLocal(@Context HttpServletRequest request) {
-		ActionResult<List<WrapOutOnline>> result = new ActionResult<>();
-		List<WrapOutOnline> wraps = new ArrayList<>();
-		try {
-			wraps = new ActionListOnlineAllLocal().execute();
-			result.setData(wraps);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/sms/ActionBase.java

@@ -1,6 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.sms;
-
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-
-abstract class ActionBase extends StandardJaxrsAction {
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/sms/ActionSendSMS.java

@@ -1,52 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.sms;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.google.gson.JsonElement;
-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.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.collaboration.assemble.websocket.ThisApplication;
-import com.x.collaboration.core.entity.SMSMessage;
-import com.x.organization.core.express.Organization;
-
-public class ActionSendSMS extends ActionBase {
-
-    private static  Logger logger = LoggerFactory.getLogger(ActionSendSMS.class);
-
-	private Organization org = new Organization( ThisApplication.context() );
-
-    /**
-     * 发送短信到
-     * @param jsonElement
-     * @return
-     * @throws Exception
-     */
-	protected ActionResult<WrapOutBoolean> execute(HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception {
-        ActionResult<WrapOutBoolean> result = new ActionResult<>();
-        Wi wi = null;
-        Boolean check = true;
-
-        try {
-            wi = this.convertToWrapIn( jsonElement, Wi.class );
-        } catch (Exception e ) {
-            check = false;
-            Exception exception = new ExceptionSendSMS( e, wi.getPerson() );
-            result.error( exception );
-            logger.error( e, effectivePerson, request, null);
-        }
-
-        if( check ){
-            //获取企业短信中心的配置，然后调用服务接入短信
-            System.out.println("系统正在发送短信到企业短信中心，收信人：" + wi.getPerson() + ", 手机号：" + wi.getMobile() );
-            result.setData( null );
-        }
-
-        return result;
-	}
-
-    public static class Wi extends SMSMessage {
-    }
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/sms/ExceptionSendSMS.java

@@ -1,12 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.sms;
-
-import com.x.base.core.project.exception.PromptException;
-
-public class ExceptionSendSMS extends PromptException {
-
-	private static final long serialVersionUID = 1859164370743532895L;
-
-	public ExceptionSendSMS( Throwable e, String personName ) {
-	    super("系统发送短信到企业短信中心发生异常.Person:" + personName , e );
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/sms/SMSAction.java

@@ -1,46 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.sms;
-
-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.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("sms")
-@JaxrsDescribe("短消息发送服务")
-public class SMSAction extends StandardJaxrsAction {
-
-	private static Logger logger = LoggerFactory.getLogger(SMSAction.class);
-
-	@JaxrsMethodDescribe(value = "发送短信接口,将短信发送到企业短信提醒中心.", action = ActionSendSMS.class)
-	@POST
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response send(@Context HttpServletRequest request, JsonElement jsonElement) {
-		ActionResult<WrapOutBoolean> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			logger.info("receive sms:{}", jsonElement);
-			result = new ActionSendSMS().execute(request, effectivePerson, jsonElement);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/talk/ActionList.java

@@ -1,46 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.talk;
-
-import java.util.ArrayList;
-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.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.project.gson.XGsonBuilder;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.collaboration.assemble.websocket.Business;
-import com.x.collaboration.core.entity.Talk;
-import com.x.collaboration.core.entity.Talk_;
-
-public class ActionList {
-
-	private Gson gson = XGsonBuilder.instance();
-
-	protected List<JsonElement> execute(Business business, EffectivePerson effectivePerson) throws Exception {
-		List<Talk> talks = this.listTalk(business, effectivePerson);
-		List<JsonElement> list = new ArrayList<>();
-		for (Talk o : talks) {
-			list.add(gson.fromJson(o.getBody(), JsonElement.class));
-		}
-		return list;
-	}
-
-	private List<Talk> listTalk(Business business, EffectivePerson effectivePerson) throws Exception {
-		EntityManagerContainer emc = business.entityManagerContainer();
-		EntityManager em = emc.get(Talk.class);
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<Talk> cq = cb.createQuery(Talk.class);
-		Root<Talk> root = cq.from(Talk.class);
-		Predicate p = cb.equal(root.get(Talk_.from), effectivePerson.getDistinguishedName());
-		p = cb.or(p, cb.equal(root.get(Talk_.person), effectivePerson.getDistinguishedName()));
-		cq.select(root).where(p).orderBy(cb.desc(root.get(Talk_.updateTime)));
-		return em.createQuery(cq).setMaxResults(50).getResultList();
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/jaxrs/talk/TalkAction.java

@@ -1,48 +0,0 @@
-package com.x.collaboration.assemble.websocket.jaxrs.talk;
-
-import java.util.ArrayList;
-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.Produces;
-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.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.http.HttpMediaType;
-import com.x.base.core.project.jaxrs.ResponseFactory;
-import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.collaboration.assemble.websocket.Business;
-
-@Path("talk")
-public class TalkAction extends StandardJaxrsAction {
-
-	// @JaxrsMethodDescribe(value = "列示当前人员的聊天对话.", response = WrapOutString.class)
-	@GET
-	@Path("list")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public Response listTalk(@Context HttpServletRequest request) {
-		ActionResult<List<JsonElement>> result = new ActionResult<>();
-		List<JsonElement> wraps = new ArrayList<>();
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			Business business = new Business(emc);
-			EffectivePerson effectivePerson = this.effectivePerson(request);
-			wraps = new ActionList().execute(business, effectivePerson);
-			result.setData(wraps);
-		} catch (Throwable th) {
-			th.printStackTrace();
-			result.error(th);
-		}
-		return ResponseFactory.getDefaultActionResultResponse(result);
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/timer/CleanConnectionsTimer.java

@@ -1,34 +0,0 @@
-package com.x.collaboration.assemble.websocket.timer;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-
-import javax.websocket.Session;
-
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.collaboration.assemble.websocket.ThisApplication;
-
-public class CleanConnectionsTimer implements Runnable {
-
-	private static Logger logger = LoggerFactory.getLogger(CleanConnectionsTimer.class);
-
-	public void run() {
-		try {
-			List<String> removes = new ArrayList<>();
-			for (Entry<String, Session> entry : ThisApplication.connections.entrySet()) {
-				if ((null == entry.getValue()) || (!entry.getValue().isOpen())) {
-					removes.add(entry.getKey());
-				}
-			}
-			for (String str : removes) {
-				ThisApplication.connections.remove(str);
-			}
-			logger.info("clean {} websocket session.", removes.size());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/timer/CleanupConnectionsTimer.java

@@ -1,40 +0,0 @@
-package com.x.collaboration.assemble.websocket.timer;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-
-import javax.websocket.Session;
-
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.collaboration.assemble.websocket.ThisApplication;
-
-public class CleanupConnectionsTimer implements Job {
-
-	private static Logger logger = LoggerFactory.getLogger(CleanupConnectionsTimer.class);
-
-	@Override
-	public void execute(JobExecutionContext arg0) throws JobExecutionException {
-		try {
-			List<String> removes = new ArrayList<>();
-			for (Entry<String, Session> entry : ThisApplication.connections.entrySet()) {
-				if ((null == entry.getValue()) || (!entry.getValue().isOpen())) {
-					removes.add(entry.getKey());
-				}
-			}
-			for (String str : removes) {
-				ThisApplication.connections.remove(str);
-			}
-			logger.info("clean {} websocket session.", removes.size());
-		} catch (Exception e) {
-			logger.error(e);
-			throw new JobExecutionException(e);
-		}
-	}
-
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/ws/Service.java

@@ -1,183 +0,0 @@
-package com.x.collaboration.assemble.websocket.ws;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-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 javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.gson.Gson;
-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.x_collaboration_assemble_websocket;
-import com.x.base.core.project.gson.XGsonBuilder;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.http.HttpToken;
-import com.x.base.core.project.http.TokenType;
-import com.x.base.core.project.http.WrapOutBoolean;
-import com.x.base.core.project.tools.SortTools;
-import com.x.collaboration.assemble.websocket.ThisApplication;
-import com.x.collaboration.core.entity.Dialog;
-import com.x.collaboration.core.entity.Dialog_;
-import com.x.collaboration.core.entity.Notification;
-import com.x.collaboration.core.entity.Notification_;
-import com.x.collaboration.core.message.BaseMessage;
-import com.x.collaboration.core.message.MessageCategory;
-import com.x.collaboration.core.message.dialog.DialogMessage;
-import com.x.collaboration.core.message.dialog.DialogType;
-import com.x.collaboration.core.message.dialog.TextMessage;
-
-@ServerEndpoint(value = "/ws/collaboration", configurator = WsConfigurator.class)
-public class Service {
-
-	private final static Gson gson = XGsonBuilder.instance();
-
-	@OnOpen
-	public void open(Session session) {
-		EffectivePerson effectivePerson = (EffectivePerson) session.getUserProperties().get(HttpToken.X_Person);
-		if (TokenType.anonymous.equals(effectivePerson.getTokenType())) {
-			return;
-		}
-		ThisApplication.connections.put(effectivePerson.getDistinguishedName(), session);
-		try {
-			List<Notification> notifications = this.loadNotifications(effectivePerson.getDistinguishedName());
-			for (Notification o : notifications) {
-				session.getBasicRemote().sendText(o.getBody());
-			}
-			List<Dialog> dialogs = this.loadDialogs(effectivePerson.getDistinguishedName());
-			for (Dialog o : dialogs) {
-				session.getBasicRemote().sendText(o.getBody());
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@OnClose
-	public void close(Session session, CloseReason reason) throws IOException {
-		EffectivePerson effectivePerson = (EffectivePerson) session.getUserProperties().get(HttpToken.X_Person);
-		if (TokenType.anonymous.equals(effectivePerson.getTokenType())) {
-			return;
-		}
-		ThisApplication.connections.remove(effectivePerson.getDistinguishedName());
-	}
-
-	@OnError
-	public void error(Throwable t) throws Throwable {
-
-	}
-
-	@OnMessage
-	public void handlingText(String text, Session session) {
-		EffectivePerson effectivePerson = (EffectivePerson) session.getUserProperties().get(HttpToken.X_Person);
-		if (TokenType.anonymous.equals(effectivePerson.getTokenType())) {
-			return;
-		}
-		try {
-			JsonElement jsonElement = gson.fromJson(text, JsonElement.class);
-			MessageCategory category = BaseMessage.extractCategory(jsonElement);
-			if (null != category) {
-				switch (category) {
-				case notification:
-					break;
-				case dialog:
-					this.dialog(jsonElement, effectivePerson);
-					break;
-				case operation:
-					break;
-				default:
-					break;
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@OnMessage
-	public void handlingBinary(byte[] binary, boolean last, Session session) {
-		System.out.println("received binary:" + binary.toString());
-	}
-
-	private List<Notification> loadNotifications(String person) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			EntityManager em = emc.get(Notification.class);
-			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<Notification> cq = cb.createQuery(Notification.class);
-			Root<Notification> root = cq.from(Notification.class);
-			Predicate p = cb.equal(root.get(Notification_.person), person);
-			cq.select(root).where(p);
-			List<Notification> list = em.createQuery(cq).getResultList();
-			emc.beginTransaction(Notification.class);
-			for (Notification o : list) {
-				emc.remove(o);
-			}
-			emc.commit();
-			List<Notification> messages = new ArrayList<>(list);
-			SortTools.asc(messages, false, "createTime");
-			return messages;
-		}
-	}
-
-	private List<Dialog> loadDialogs(String person) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-			EntityManager em = emc.get(Dialog.class);
-			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<Dialog> cq = cb.createQuery(Dialog.class);
-			Root<Dialog> root = cq.from(Dialog.class);
-			Predicate p = cb.equal(root.get(Dialog_.person), person);
-			p = cb.and(p, cb.notEqual(root.get(Dialog_.arrived), true));
-			cq.select(root).where(p);
-			List<Dialog> list = em.createQuery(cq).getResultList();
-			emc.beginTransaction(Dialog.class);
-			for (Dialog o : list) {
-				o.setArrived(true);
-			}
-			emc.commit();
-			List<Dialog> messages = new ArrayList<>(list);
-			SortTools.asc(messages, false, "createTime");
-			return messages;
-		}
-	}
-
-	private void dialog(JsonElement jsonElement, EffectivePerson effectivePerson) throws Exception {
-		DialogType type = DialogMessage.extractType(jsonElement);
-		if (null != type) {
-			switch (type) {
-			case text:
-				dialogText(jsonElement, effectivePerson);
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	private WrapOutBoolean dialogText(JsonElement jsonElement, EffectivePerson effectivePerson) throws Exception {
-		TextMessage message = gson.fromJson(jsonElement, TextMessage.class);
-		if (StringUtils.isEmpty(message.getPerson())) {
-			throw new Exception("invaild message:" + message);
-		}
-		message.setFrom(effectivePerson.getDistinguishedName());
-		message.setTime(new Date());
-		WrapOutBoolean wrap = ThisApplication.context().applications()
-				.postQuery(x_collaboration_assemble_websocket.class, "message", message).getData(WrapOutBoolean.class);
-		return wrap;
-
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/java/com/x/collaboration/assemble/websocket/ws/WsConfigurator.java

@@ -1,44 +0,0 @@
-package com.x.collaboration.assemble.websocket.ws;
-
-import java.util.List;
-
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.http.EffectivePerson;
-import com.x.base.core.project.http.HttpToken;
-import com.x.base.core.project.tools.ListTools;
-
-public class WsConfigurator extends ServerEndpointConfig.Configurator {
-	@Override
-	public void modifyHandshake(ServerEndpointConfig config, HandshakeRequest request, HandshakeResponse response) {
-		try {
-			EffectivePerson effectivePerson = this.getEffectivePerson(request);
-			config.getUserProperties().put(HttpToken.X_Person, effectivePerson);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	private EffectivePerson getEffectivePerson(HandshakeRequest request) {
-		try {
-			List<String> list = request.getParameterMap().get(HttpToken.X_Token);
-			String token = null;
-			if (ListTools.isNotEmpty(list)) {
-				token = list.get(0);
-			}
-			if (StringUtils.isNotEmpty(token)) {
-				HttpToken httpToken = new HttpToken();
-				return httpToken.who(token,  Config.token().getCipher());
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return EffectivePerson.anonymous();
-	}
-
-}

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

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

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/common.js

@@ -1,26 +0,0 @@
-function failure(data) {
-    console.log(data);
-    alert(data.message);
-}
-
-function splitValue(str) {
-    if (str) {
-	if (str.length > 0) {
-	    return str.split(',');
-	}
-    }
-    return [];
-}
-
-function joinValue(o, split) {
-    var s = ',';
-    if (split) {
-	s = '' + split;
-    }
-    if (o) {
-	if (toString.apply(o) === '[object Array]') {
-	    return o.join(s);
-	}
-    }
-    return o;
-}

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/debug.js

@@ -1,77 +0,0 @@
-debug_parameter = {};
-
-function debug_init() {
-    $('#result').html('');
-    $('#content').html('');
-    var str = '<table border="1" width="100%">';
-    str += '<tr><td colspan="2"><a href="#" id="get">get</a>&nbsp<a href="#" id="on">on</a>&nbsp;<a href="#" id="off">off</a></td></tr>';
-    str += '<tr><td>debug:</td><td id="status">&nbsp;</td></tr>';
-    str += '</table>';
-    $('#content').html(str);
-    $('#get').click(function() {
-	debug_get();
-    });
-    $('#on').click(function() {
-	debug_on();
-    });
-    $('#off').click(function() {
-	debug_off();
-    });
-}
-
-function debug_get() {
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/debug',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).done(function(json) {
-	if (json.type == 'success') {
-	    $('#status').html(json.data.value + '');
-	}
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function debug_on() {
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/debug/true',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).done(function(json) {
-	if (json.type == 'success') {
-	    $('#status').html(json.data.value + '');
-	}
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function debug_off() {
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/debug/false',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).done(function(json) {
-	if (json.type == 'success') {
-	    $('#status').html(json.data.value + '');
-	}
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/describe.js

@@ -1,399 +0,0 @@
-var Describe = function() {
-//20180730
-}
-
-Describe.splitValue = function(str) {
-	if (str) {
-		if (str.length > 0) {
-			return str.split(',');
-		}
-	}
-	return [];
-}
-
-Describe.joinValue = function(o, split) {
-	var s = ',';
-	if (split) {
-		s = '' + split;
-	}
-	if (o) {
-		if (toString.apply(o) === '[object Array]') {
-			return o.join(s);
-		}
-	}
-	return o;
-}
-
-Describe.doPost = function(address, m, data) {
-	$('#url').html(address);
-	if ((m.resultContentType) && m.resultContentType.indexOf('application/json') > -1) {
-		$.ajax({
-			url : address,
-			type : 'POST',
-			headers : {
-				'x-debugger' : true
-			},
-			contentType : (m.contentType.indexOf('application/json') > -1) ? m.contentType : false,
-			processData : (m.contentType.indexOf('application/json') > -1) ? true : false,
-			xhrFields : {
-				'withCredentials' : true
-			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
-		}).always(function(resultJson) {
-			$('#result').html(JSON.stringify(resultJson, null, 4));
-			Describe.writeOut(m.outs, resultJson);
-		});
-	} else {
-		$.ajax({
-			url : address,
-			type : 'POST',
-			headers : {
-				'x-debugger' : true
-			},
-			contentType : (m.contentType.indexOf('application/json') > -1) ? m.contentType : false,
-			processData : (m.contentType.indexOf('application/json') > -1) ? true : false,
-			xhrFields : {
-				'withCredentials' : true
-			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
-		});
-	}
-}
-
-Describe.doPut = function(address, m, data) {
-	$('#url').html(address);
-	if ((m.resultContentType) && m.resultContentType.indexOf('application/json') > -1) {
-		$.ajax({
-			url : address,
-			type : 'PUT',
-			headers : {
-				'x-debugger' : true
-			},
-			contentType : (m.contentType.indexOf('application/json') > -1) ? m.contentType : false,
-			processData : (m.contentType.indexOf('application/json') > -1) ? true : false,
-			xhrFields : {
-				'withCredentials' : true
-			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
-		}).always(function(resultJson) {
-			$('#result').html(JSON.stringify(resultJson, null, 4));
-			Describe.writeOut(m.outs, resultJson);
-		});
-	} else {
-		$.ajax({
-			url : address,
-			type : 'PUT',
-			headers : {
-				'x-debugger' : true
-			},
-			contentType : (m.contentType.indexOf('application/json') > -1) ? m.contentType : false,
-			processData : (m.contentType.indexOf('application/json') > -1) ? true : false,
-			xhrFields : {
-				'withCredentials' : true
-			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
-		});
-	}
-}
-
-Describe.doGet = function(address, m) {
-	$('#url').html(address);
-	if ((m.resultContentType) && m.resultContentType.indexOf('application/json') > -1) {
-		$.ajax({
-			type : 'GET',
-			dataType : 'json',
-			url : address,
-			headers : {
-				'x-debugger' : true
-			},
-			contentType : m.contentType,
-			xhrFields : {
-				'withCredentials' : true
-			},
-			crossDomain : true
-		}).always(function(resultJson) {
-			$('#result').html(JSON.stringify(resultJson, null, 4));
-			Describe.writeOut(m.outs, resultJson);
-		});
-	} else {
-		window.open(address, '_blank');
-	}
-}
-
-Describe.doDelete = function(address, m) {
-	$('#url').html(address);
-	if ((m.resultContentType) && m.resultContentType.indexOf('application/json') > -1) {
-		$.ajax({
-			type : 'DELETE',
-			dataType : 'json',
-			url : address,
-			headers : {
-				'x-debugger' : true
-			},
-			contentType : m.contentType,
-			xhrFields : {
-				'withCredentials' : true
-			},
-			crossDomain : true
-		}).always(function(resultJson) {
-			$('#result').html(JSON.stringify(resultJson, null, 4));
-			Describe.writeOut(m.outs, resultJson);
-		});
-	} else {
-		$.ajax({
-			type : 'DELETE',
-			dataType : 'json',
-			url : address,
-			headers : {
-				'x-debugger' : true
-			},
-			contentType : m.contentType,
-			xhrFields : {
-				'withCredentials' : true
-			},
-			crossDomain : true
-		});
-	}
-}
-
-Describe.writeOut = function(outs, json) {
-	if (outs && (outs.length) && json && json.data) {
-		$.each(Object.keys(json.data), function(i, k) {
-			$('#out_' + k + '_out', '#outs').html(json.data[k]);
-		});
-	}
-}
-
-Describe.prototype = {
-	"load" : function() {
-		var str = '<ul>';
-		$.getJSON('../describe/describe.json?rd=' + Math.random(), function(json) {
-			$.each(json.jaxrs, function(ji, j) {
-				str += '<li>' + j.name;
-				$.each(j.methods, function(mi, m) {
-					str += '<ul><li><a id ="' + j.name + '_' + m.name + '" href="#">' + m.name + '</a></li></ul>';
-				});
-				str += '</li>'
-			});
-			str += '</ul>';
-			$("#menu").html(str);
-			$.each(json.jaxrs, function(ji, j) {
-				$.each(j.methods, function(mi, m) {
-					$('#' + j.name + '_' + m.name).click(
-							function() {
-								$('#result').html('');
-								var txt = '<fieldset id="method"><legend>Method</legend>';
-								txt += '<table>';
-								txt += '<tr><td>name:</td><td><a href="../describe/sources/' + m.className.replace(/\./g, '/') + '.java">' + m.name + '</a></td></tr>';
-								txt += '<tr><td>path:</td><td>' + m.path + '</td></tr>';
-								txt += '<tr><td>type:</td><td>' + m.type + '</td></tr>';
-								txt += '<tr><td>description:</td><td>' + m.description + '</td></tr>';
-								txt += '</table>';
-								txt += '<button id="' + m.name + "_" + m.type + '">' + m.type + '</button>';
-								txt += '<div id="url">&nbsp;</div>';
-								txt += '</fieldset>';
-								if (m.pathParameters && m.pathParameters.length > 0) {
-									txt += '<fieldset id="pathParameters"><legend>Path Parameter</legend>';
-									txt += '<table >';
-									$.each(m.pathParameters, function(pi, p) {
-										if (m.name == 'listNext' || m.name == 'listPrev') {
-											switch (p.name) {
-											case 'flag':
-											case 'id':
-												txt += '<tr><td><input type="text" id="' + p.name + '" style="width:600px; padding:1px; border:1px #000000 solid" value="(0)"/></td><td>' + p.name
-														+ ':' + p.description + '</td></tr>';
-												break;
-											case 'count':
-												txt += '<tr><td><input type="text" id="' + p.name + '" style="width:600px; padding:1px; border:1px #000000 solid" value="20"/></td><td>' + p.name + ':'
-														+ p.description + '</td></tr>';
-												break;
-											default:
-												txt += '<tr><td><input type="text" id="' + p.name + '" style="width:600px; padding:1px; border:1px #000000 solid"/></td><td>' + p.name + ':'
-														+ p.description + '</td></tr>';
-												break
-											}
-										} else {
-											txt += '<tr><td><input type="text" id="' + p.name + '" style="width:600px; padding:1px; border:1px #000000 solid"/></td><td>' + p.name + ':'
-													+ p.description + '</td></tr>';
-										}
-									});
-									txt += '</table>';
-									txt += '</fieldset>';
-								}
-								if (m.formParameters && m.formParameters.length > 0) {
-									txt += '<fieldset id="formParameters"><legend>Form Parameter</legend>';
-									txt += '<table >';
-									$.each(m.formParameters, function(pi, p) {
-										if (p.type == "File") {
-											txt += '<tr><td><input type="file" name="' + p.name + '" id="' + p.name + '" style="width:600px; padding:1px; border:1px #000000 solid"/></td><td>'
-													+ p.name + ':' + p.description + '</td></tr>';
-										} else {
-											txt += '<tr><td><input type="text" id="' + p.name + '" style="width:600px; padding:1px; border:1px #000000 solid"/></td><td>' + p.name + ':'
-													+ p.description + '</td></tr>';
-										}
-									});
-									txt += '</table>';
-									txt += '</fieldset>';
-								}
-								if (m.queryParameters && m.queryParameters.length > 0) {
-									txt += '<fieldset id="queryParameters"><legend>Query Parameter</legend>';
-									txt += '<table >';
-									$.each(m.queryParameters, function(pi, p) {
-										txt += '<tr><td><input type="text" id="' + p.name + '" style="width:600px; padding:1px; border:1px #000000 solid"/></td><td>' + p.name + ':' + p.description
-												+ '</td></tr>';
-									});
-									txt += '</table>';
-									txt += '</fieldset>';
-								}
-								if (m.ins && m.ins.length > 0) {
-									txt += '<fieldset id="ins"><legend>In</legend>';
-									txt += '<table>';
-									$.each(m.ins, function(ii, i) {
-										if (i.isCollection) {
-											txt += '<tr><td><textarea id="' + i.name + '" style="width:600px; padding:1px; border:1px #000000 solid"/></td><td>' + i.name + ':' + i.description
-											'</td></tr>';
-										} else {
-											txt += '<tr><td><input type="text" id="' + i.name + '" style="width:600px; padding:1px; border:1px #000000 solid"/></td><td>' + i.name + ':'
-													+ i.description
-											'</td></tr>';
-										}
-									});
-									txt += '</table>';
-									txt += '</fieldset>';
-								}
-								if (m.useJsonElementParameter) {
-									txt += '<fieldset><legend>JsonElement</legend>';
-									txt += '<table><tr><td>';
-									txt += '<textarea id="jsonElement" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>';
-									txt += '</td><td>json</td></tr>';
-									txt += '</table>';
-									txt += '</fieldset>';
-								}
-								if (m.outs && m.outs.length > 0) {
-									txt += '<fieldset id="outs"><legend>Out</legend>';
-									txt += '<table>';
-									$.each(m.outs, function(oi, o) {
-										txt += '<tr><td>' + o.name + '</td><td>' + o.type + '</td><td>' + (o.isCollection ? 'multi' : 'single') + '</td><td>' + o.description + '</td><td id="out_'
-												+ o.name + '_out">&nbsp;</td></tr>';
-									});
-									txt += '</table>';
-									txt += '</fieldset>';
-								}
-								$('#content').html(txt);
-								$('#' + m.name + '_' + m.type, '#method').click(function() {
-									var address = '../' + m.path;
-									if (m.pathParameters && m.pathParameters.length > 0) {
-										$.each(m.pathParameters, function(pi, p) {
-											address = address.replace('{' + p.name + '}', encodeURIComponent($('#' + p.name, '#pathParameters').val()));
-										});
-									}
-									if (m.queryParameters && m.queryParameters.length > 0) {
-										$.each(m.queryParameters, function(pi, p) {
-											var query = p.name + '=' + encodeURIComponent($('#' + p.name, '#queryParameters').val());
-											if (address.indexOf("?") > 0) {
-												address += '&' + query;
-											} else {
-												address += '?' + query;
-											}
-										});
-									}
-									if (m.contentType.indexOf('application/json') > -1) {
-										switch (m.type) {
-										case 'POST':
-											var data = {};
-											if (m.ins && m.ins.length > 0) {
-												$.each(m.ins, function(ii, i) {
-													switch (i.type) {
-													default:
-														if (i.isBaseType) {
-															if (i.isCollection) {
-																data[i.name] = Describe.splitValue($('#' + i.name, '#ins').val());
-															} else {
-																data[i.name] = $('#' + i.name, '#ins').val();
-															}
-														} else {
-															data[i.name] = $.parseJSON($('#' + i.name, '#ins').val());
-														}
-													}
-												});
-											} else if (m.useJsonElementParameter) {
-												data = $.parseJSON($('#jsonElement').val());
-											}
-											Describe.doPost(address, m, data);
-											break;
-										case 'PUT':
-											var data = {};
-											if (m.ins && m.ins.length > 0) {
-												$.each(m.ins, function(ii, i) {
-													switch (i.type) {
-													default:
-														if (i.isBaseType) {
-															if (i.isCollection) {
-																data[i.name] = Describe.splitValue($('#' + i.name, '#ins').val());
-															} else {
-																data[i.name] = $('#' + i.name, '#ins').val();
-															}
-														} else {
-															data[i.name] = $.parseJSON($('#' + i.name, '#ins').val());
-														}
-													}
-												});
-											} else if (m.useJsonElementParameter) {
-												data = $.parseJSON($('#jsonElement').val());
-											}
-											Describe.doPut(address, m, data);
-											break;
-										case 'GET':
-											Describe.doGet(address, m);
-											break;
-										case 'DELETE':
-											Describe.doDelete(address, m);
-											break;
-										default:
-											break;
-										}
-									} else {
-										switch (m.type) {
-										case 'POST':
-											var formData = new FormData();
-											if (m.formParameters && m.formParameters.length > 0) {
-												$.each(m.formParameters, function(pi, p) {
-													if (p.type == "File") {
-														formData.append(p.name, $('input[type=file]', '#formParameters')[0].files[0]);
-													} else {
-														formData.append(p.name, $('#' + p.name, '#formParameters').val());
-													}
-												});
-											}
-											Describe.doPost(address, m, formData);
-											break;
-										case 'PUT':
-											var formData = new FormData();
-											if (m.formParameters && m.formParameters.length > 0) {
-												$.each(m.formParameters, function(pi, p) {
-													if (p.type == "File") {
-														formData.append(p.name, $('input[type=file]', '#formParameters')[0].files[0]);
-													} else {
-														formData.append(p.name, $('#' + p.name, '#formParameters').val());
-													}
-												});
-											}
-											Describe.doPut(address, m, formData);
-											break;
-										case 'GET':
-											Describe.doGet(address, m);
-											break;
-										case 'DELETE':
-											Describe.doDelete(address, m);
-											break;
-										default:
-											break;
-										}
-									}
-								})
-							});
-				});
-			});
-		});
-	}
-}

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/dialog.js

@@ -1,30 +0,0 @@
-dialog_parameter = {};
-
-function dialog_listTalk_init() {
-    $('#result').html('');
-    $('#content').html('');
-    var str = '<table border="1" width="100%">';
-    str += '<tr><td colspan="2"><a href="#" id="list">list</a></td></tr>';
-    str += '<tr><td>person:</td><td><input type="text" id="person" style="width:95%"/></td></tr>';
-    str += '</table>';
-    $('#content').html(str);
-    $('#list').click(function() {
-	dialog_listTalk($('#person').val());
-    });
-}
-
-function dialog_listTalk(person) {
-    $('#result').html('');
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/dialog/list/talk/person/' + person,
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/index.html

@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8" />
-<meta http-equiv="pragma" content="no-cache" />
-<script src="./jquery.min.js"></script>
-<script src="./clipboard.min.js"></script>
-<script>
-    $.getScript('./describe.js?rd=' + Math.random()).then(function() {
-		var describe = new Describe();
-		describe.load();
-    }).catch( function() {
-		alert('get describe error.'); 
-    });
-	
-	$(document).ready(function(){
-        var clipboard = new Clipboard("#btn");
-	});	
-</script>
-</head>
-
-<body style="font-size: 12px; font-family: Microsoft Yahei; margin: 0px">
-	<table style="width: 1800px; margin: 0 auto">
-		<tr>
-			<td style="width: 350px;" valign="top">
-				<fieldset>
-					<legend>Menu</legend>
-					<div id="menu" style="height: 850px; overflow: auto">&nbsp;</div>
-				</fieldset>
-			</td>
-			<td valign="top">
-				<fieldset>
-					<legend>Content</legend>
-					<div id="content"
-						style="white-space: pre; font-size: 12px; word-break: break-all; word-wrap: break-word">&nbsp;</div>
-				</fieldset>
-				<fieldset>
-					<legend>
-						Result&nbsp;<a href="javascript:" data-clipboard-target="#result">copy</a>&nbsp;
-					</legend>
-					<div id="result"
-						style="white-space: pre; font-size: 12px; word-break: break-all; word-wrap: break-word; width: 1400px">&nbsp;</div>
-				</fieldset>
-			</td>
-		</tr>
-	</table>
-</body>
-</html>

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/logger.js

@@ -1,105 +0,0 @@
-logger_parameter = {};
-
-function logger_init() {
-    $('#result').html('');
-    $('#content').html('');
-    var str = '<table border="1" width="100%">';
-    str += '<tr><td colspan="2"><a href="#" id="get">get</a>&nbsp<a href="#" id="trace">trace</a>&nbsp;<a href="#" id="debug">debug</a>&nbsp;<a href="#" id="info">info</a>&nbsp;<a href="#" id="warn">warn</a></td></tr>';
-    str += '<tr><td>debug:</td><td id="level">&nbsp;</td></tr>';
-    str += '</table>';
-    $('#content').html(str);
-    $('#get').click(function() {
-	logger_get();
-    });
-    $('#trace').click(function() {
-	logger_trace();
-    });
-    $('#debug').click(function() {
-	logger_debug();
-    });
-    $('#info').click(function() {
-	logger_info();
-    });
-    $('#warn').click(function() {
-	logger_warn();
-    });
-}
-
-function logger_get() {
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/logger',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).done(function(json) {
-	if (json.type == 'success') {
-	    $('#level').html(json.data.value);
-	}
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function logger_trace() {
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/logger/trace',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function logger_debug() {
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/logger/debug',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function logger_info() {
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/logger/info',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function logger_warn() {
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/logger/warn',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/online.js

@@ -1,137 +0,0 @@
-online_parameter = {
-    webSocket : null
-};
-
-function online_get_init() {
-    $('#result').html('');
-    var str = '<table border="1" width="100%">';
-    str += '<tr><td colspan="2"><a href="#" id="get">get</a>&nbsp;<a href="#" id="getLocal">getLocal</a></td></tr>';
-    str += '<tr><td>person:</td><td><input type="text" id="person" style="width:95%"/></td></tr>';
-    str += '</table>';
-    $('#content').html(str);
-    $('#get').click(function() {
-	online_get($('#person').val());
-    });
-    $('#getLocal').click(function() {
-	online_getLocal($('#person').val());
-    });
-}
-
-function online_get(person) {
-    $('#result').html('');
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/online/person/' + person,
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function online_getLocal(person) {
-    $('#result').html('');
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/online/person/' + person + '/local',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function online_list_init() {
-    $('#result').html('');
-    var str = '<table border="1" width="100%">';
-    str += '<tr><td colspan="2"><a href="#" id="list">list</a>&nbsp;<a href="#" id="listLocal">listLocal</a></td></tr>';
-    str += '<tr><td>personList:</td><td><textarea id="personList" style="width:95%"/></td></tr>';
-    str += '</table>';
-    $('#content').html(str);
-    $('#list').click(function() {
-	online_list();
-    });
-    $('#listLocal').click(function() {
-	online_listLocal();
-    });
-}
-
-function online_list() {
-    $('#result').html('');
-    $.ajax({
-	type : 'put',
-	dataType : 'json',
-	url : '../jaxrs/online/list',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	data : JSON.stringify({
-	    valueList : splitValue($('#personList').val())
-	}),
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function online_listLocal() {
-    $('#result').html('');
-    $.ajax({
-	type : 'put',
-	dataType : 'json',
-	url : '../jaxrs/online/list/local',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	data : JSON.stringify({
-	    valueList : splitValue($('#personList').val())
-	}),
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function online_listAll() {
-    $('#content').html('');
-    $('#result').html('');
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/online/list/all',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}
-
-function online_listAllLocal() {
-    $('#content').html('');
-    $('#result').html('');
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/online/list/all/local',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/talk.js

@@ -1,17 +0,0 @@
-talk_parameter = {};
-
-function talk_list() {
-    $('#result').html('');
-    $.ajax({
-	type : 'get',
-	dataType : 'json',
-	url : '../jaxrs/talk/list',
-	contentType : 'application/json; charset=utf-8',
-	xhrFields : {
-	    'withCredentials' : true
-	},
-	crossDomain : true
-    }).always(function(json) {
-	$('#result').html(JSON.stringify(json, null, 4));
-    });
-}

o2server/x_collaboration_assemble_websocket/src/main/webapp/jest/ws.js

@@ -1,52 +0,0 @@
-ws_parameter = {
-    webSocket : null
-};
-function ws_connect() {
-    $('#result').html('');
-    var str = '<table border="1" width="100%">';
-    str += '<tr><td colspan="2"><a href="#" id="send">send</a>&nbsp;<a href="#" id="close">close</a></td></tr>';
-    str += '<tr><td>message:</td><td><input type="text" id="message" style="width:95%"/></td></tr>';
-    str += '</table>';
-    $('#content').html(str);
-    $('#send').click(function() {
-	ws_send($('#message').val());
-    });
-    var url = location.href;
-    url = url.substring(url.indexOf('://'));
-    url = url.substring(0, url.indexOf('x_collaboration_assemble_websocket/'));
-    url = 'ws' + url + 'x_collaboration_assemble_websocket/ws/collaboration';
-    url = url + '?x-token=' + getCookie("x-token");
-    ws_parameter.webSocket = new WebSocket(url);
-    ws_parameter.webSocket.onopen = function(evt) {
-	ws_onOpen(evt)
-    };
-    ws_parameter.webSocket.onclose = function(evt) {
-	ws_onClose(evt)
-    };
-    ws_parameter.webSocket.onmessage = function(evt) {
-	ws_onMessage(evt)
-    };
-    ws_parameter.webSocket.onerror = function(evt) {
-	ws_onError(evt)
-    };
-}
-
-function ws_send(messagae) {
-    ws_parameter.webSocket.send(message);
-}
-
-function ws_onOpen(evt) {
-
-}
-
-function ws_onClose(evt) {
-
-}
-
-function ws_onMessage(evt) {
-    $('#result').append(evt.data);
-}
-
-function ws_onError(evt) {
-    $('#result').append(evt.data);
-}

o2server/x_collaboration_core_entity/.gitignore

@@ -1,4 +0,0 @@
-.classpath
-.project
-/.settings/
-/target/

o2server/x_collaboration_core_entity/pom.xml

@@ -1,56 +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_collaboration_core_entity</artifactId>
-	<packaging>jar</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_base_core_project</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>metamodel</id>
-						<phase>generate-sources</phase>
-					</execution>
-					<execution>
-						<id>createEnhancePersistenceXml</id>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.openjpa</groupId>
-				<artifactId>openjpa-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>enhancer</id>
-						<phase>process-classes</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-jar</id>
-						<phase>verify</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/Dialog.java

@@ -1,112 +0,0 @@
-package com.x.collaboration.core.entity;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import org.apache.openjpa.persistence.jdbc.Index;
-
-import com.x.base.core.entity.AbstractPersistenceProperties;
-import com.x.base.core.entity.JpaObject;
-import com.x.base.core.entity.SliceJpaObject;
-import com.x.base.core.entity.annotation.CheckPersist;
-import com.x.base.core.entity.annotation.ContainerEntity;
-import com.x.base.core.project.annotation.FieldDescribe;
-
-@ContainerEntity
-@Entity
-@Table(name = PersistenceProperties.Dialog.table, uniqueConstraints = {
-		@UniqueConstraint(name = PersistenceProperties.Dialog.table + JpaObject.IndexNameMiddle
-				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,
-						JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) })
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-public class Dialog extends SliceJpaObject {
-
-	private static final long serialVersionUID = -4661579588259404853L;
-
-	private static final String TABLE = PersistenceProperties.Dialog.table;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	@FieldDescribe("数据库主键,自动生成.")
-	@Id
-	@Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME)
-	private String id = createId();
-	/* 以上为 JpaObject 默认字段 */
-
-	public void onPersist() throws Exception {
-	}
-
-	/* 更新运行方法 */
-
-	@FieldDescribe("目标用户.")
-	@Column(length = AbstractPersistenceProperties.organization_name_length, name = "xperson")
-	@Index(name = TABLE + "_person")
-	@CheckPersist(allowEmpty = false)
-	private String person;
-
-	@FieldDescribe("发送用户.")
-	@Column(length = AbstractPersistenceProperties.organization_name_length, name = "xfrom")
-	@Index(name = TABLE + "_from")
-	@CheckPersist(allowEmpty = true)
-	private String from;
-
-	@FieldDescribe("消息内容.")
-	@Lob
-	@Basic(fetch = FetchType.EAGER)
-	@Column(length = JpaObject.length_1M, name = "xbody")
-	@CheckPersist(allowEmpty = false)
-	private String body;
-
-	@FieldDescribe("是否已经发送到用户")
-	@Column(name = "xarrived")
-	@Index(name = TABLE + "_arrived")
-	@CheckPersist(allowEmpty = false)
-	private Boolean arrived;
-
-	public String getPerson() {
-		return person;
-	}
-
-	public String getBody() {
-		return body;
-	}
-
-	public void setBody(String body) {
-		this.body = body;
-	}
-
-	public void setPerson(String person) {
-		this.person = person;
-	}
-
-	public Boolean getArrived() {
-		return arrived;
-	}
-
-	public void setArrived(Boolean arrived) {
-		this.arrived = arrived;
-	}
-
-	public String getFrom() {
-		return from;
-	}
-
-	public void setFrom(String from) {
-		this.from = from;
-	}
-
-}

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/Notification.java

@@ -1,85 +0,0 @@
-package com.x.collaboration.core.entity;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import org.apache.openjpa.persistence.jdbc.Index;
-
-import com.x.base.core.entity.AbstractPersistenceProperties;
-import com.x.base.core.entity.JpaObject;
-import com.x.base.core.entity.SliceJpaObject;
-import com.x.base.core.entity.annotation.CheckPersist;
-import com.x.base.core.entity.annotation.ContainerEntity;
-import com.x.base.core.project.annotation.FieldDescribe;
-
-@ContainerEntity
-@Entity
-@Table(name = PersistenceProperties.Notification.table, uniqueConstraints = {
-		@UniqueConstraint(name = PersistenceProperties.Notification.table + JpaObject.IndexNameMiddle
-				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,
-						JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) })
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-public class Notification extends SliceJpaObject {
-
-	private static final long serialVersionUID = -6208215660506077358L;
-
-	private static final String TABLE = PersistenceProperties.Notification.table;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	@FieldDescribe("数据库主键,自动生成.")
-	@Id
-	@Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME)
-	private String id = createId();
-
-	/* 以上为 JpaObject 默认字段 */
-
-	public void onPersist() throws Exception {
-	}
-
-	/* 更新运行方法 */
-
-	@FieldDescribe("所属用户.")
-	@Column(length = AbstractPersistenceProperties.organization_name_length, name = "xperson")
-	@Index(name = TABLE + "_person")
-	@CheckPersist(allowEmpty = false)
-	private String person;
-
-	@FieldDescribe("消息内容.")
-	@Lob
-	@Basic(fetch = FetchType.EAGER)
-	@Column(length = JpaObject.length_1M, name = "xbody")
-	@CheckPersist(allowEmpty = false)
-	private String body;
-
-	public String getPerson() {
-		return person;
-	}
-
-	public String getBody() {
-		return body;
-	}
-
-	public void setBody(String body) {
-		this.body = body;
-	}
-
-	public void setPerson(String person) {
-		this.person = person;
-	}
-
-}

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/PersistenceProperties.java

@@ -1,23 +0,0 @@
-package com.x.collaboration.core.entity;
-
-import com.x.base.core.entity.AbstractPersistenceProperties;
-
-public final class PersistenceProperties extends AbstractPersistenceProperties {
-
-	public static class SMSMessage {
-		public static final String table = "COL_SMSMESSAGE";
-	}
-
-    public static class Notification {
-        public static final String table = "COL_NOTIFICATION";
-    }
-
-	public static class Dialog {
-		public static final String table = "COL_DIALOG";
-	}
-
-	public static class Talk {
-		public static final String table = "COL_TALK";
-	}
-
-}

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/SMSMessage.java

@@ -1,92 +0,0 @@
-package com.x.collaboration.core.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import org.apache.openjpa.persistence.jdbc.Index;
-
-import com.x.base.core.entity.AbstractPersistenceProperties;
-import com.x.base.core.entity.JpaObject;
-import com.x.base.core.entity.SliceJpaObject;
-import com.x.base.core.entity.annotation.CheckPersist;
-import com.x.base.core.entity.annotation.ContainerEntity;
-import com.x.base.core.project.annotation.FieldDescribe;
-
-@ContainerEntity
-@Entity
-@Table(name = PersistenceProperties.SMSMessage.table, uniqueConstraints = {
-		@UniqueConstraint(name = PersistenceProperties.SMSMessage.table + JpaObject.IndexNameMiddle
-				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,
-						JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) })
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-public class SMSMessage extends SliceJpaObject {
-
-	private static final long serialVersionUID = -6208215660506077358L;
-
-	private static final String TABLE = PersistenceProperties.SMSMessage.table;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	@FieldDescribe("数据库主键,自动生成.")
-	@Id
-	@Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME)
-	private String id = createId();
-
-	/* 以上为 JpaObject 默认字段 */
-
-	public void onPersist() throws Exception {
-	}
-
-	/* 更新运行方法 */
-	@FieldDescribe("所属用户.")
-	@Column(length = AbstractPersistenceProperties.organization_name_length, name = "xperson")
-	@Index(name = TABLE + "_person")
-	@CheckPersist(allowEmpty = false)
-	private String person;
-
-	@FieldDescribe("手机号码.")
-	@Column(length = JpaObject.length_16B, name = "xmobile")
-	@Index(name = TABLE + "_mobile")
-	@CheckPersist(allowEmpty = false)
-	private String mobile;
-
-	@FieldDescribe("消息内容.")
-	@Column(length = JpaObject.length_255B, name = "xmessage")
-	@CheckPersist(allowEmpty = false)
-	private String message;
-
-	public String getPerson() {
-		return person;
-	}
-
-	public void setPerson(String person) {
-		this.person = person;
-	}
-
-	public String getMobile() {
-		return mobile;
-	}
-
-	public void setMobile(String mobile) {
-		this.mobile = mobile;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-}

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/Talk.java

@@ -1,113 +0,0 @@
-package com.x.collaboration.core.entity;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import org.apache.openjpa.persistence.jdbc.Index;
-
-import com.x.base.core.entity.AbstractPersistenceProperties;
-import com.x.base.core.entity.JpaObject;
-import com.x.base.core.entity.SliceJpaObject;
-import com.x.base.core.entity.annotation.CheckPersist;
-import com.x.base.core.entity.annotation.ContainerEntity;
-import com.x.base.core.project.annotation.FieldDescribe;
-
-@ContainerEntity
-@Entity
-@Table(name = PersistenceProperties.Talk.table, uniqueConstraints = {
-		@UniqueConstraint(name = PersistenceProperties.Talk.table + JpaObject.IndexNameMiddle
-				+ JpaObject.DefaultUniqueConstraintSuffix, columnNames = { JpaObject.IDCOLUMN,
-						JpaObject.CREATETIMECOLUMN, JpaObject.UPDATETIMECOLUMN, JpaObject.SEQUENCECOLUMN }) })
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-public class Talk extends SliceJpaObject {
-
-	private static final long serialVersionUID = -1026536462158314368L;
-
-	private static final String TABLE = PersistenceProperties.Talk.table;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	@FieldDescribe("数据库主键,自动生成.")
-	@Id
-	@Column(length = length_id, name = ColumnNamePrefix + id_FIELDNAME)
-	private String id = createId();
-
-	/* 以上为 JpaObject 默认字段 */
-
-	public void onPersist() throws Exception {
-	}
-
-	/* 更新运行方法 */
-
-	@FieldDescribe("目标用户.")
-	@Column(length = AbstractPersistenceProperties.organization_name_length, name = "xperson")
-	@Index(name = TABLE + "_person")
-	@CheckPersist(allowEmpty = false)
-	private String person;
-
-	@FieldDescribe("发送用户.")
-	@Column(length = AbstractPersistenceProperties.organization_name_length, name = "xfrom")
-	@Index(name = TABLE + "_from")
-	@CheckPersist(allowEmpty = true)
-	private String from;
-
-	@FieldDescribe("消息内容.")
-	@Lob
-	@Basic(fetch = FetchType.EAGER)
-	@Column(length = JpaObject.length_1M, name = "xbody")
-	@CheckPersist(allowEmpty = false)
-	private String body;
-
-	@FieldDescribe("是否已经发送到用户")
-	@Column(name = "xarrived")
-	@Index(name = TABLE + "_arrived")
-	@CheckPersist(allowEmpty = false)
-	private Boolean arrived;
-
-	public String getPerson() {
-		return person;
-	}
-
-	public String getBody() {
-		return body;
-	}
-
-	public void setBody(String body) {
-		this.body = body;
-	}
-
-	public void setPerson(String person) {
-		this.person = person;
-	}
-
-	public Boolean getArrived() {
-		return arrived;
-	}
-
-	public void setArrived(Boolean arrived) {
-		this.arrived = arrived;
-	}
-
-	public String getFrom() {
-		return from;
-	}
-
-	public void setFrom(String from) {
-		this.from = from;
-	}
-
-}

o2server/x_collaboration_core_message/.gitignore

@@ -1,4 +0,0 @@
-.classpath
-.project
-/.settings/
-/target/

o2server/x_collaboration_core_message/pom.xml

@@ -1,33 +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_collaboration_core_message</artifactId>
-	<packaging>jar</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_base_core_project</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-jar</id>
-						<phase>verify</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/BaseMessage.java

@@ -1,52 +0,0 @@
-package com.x.collaboration.core.message;
-
-import java.util.Date;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.x.base.core.project.gson.GsonPropertyObject;
-
-public class BaseMessage extends GsonPropertyObject {
-
-	protected static String extractTextField(JsonElement jsonElement, String name) {
-		if ((null != jsonElement) && jsonElement.isJsonObject()) {
-			JsonObject jsonObject = jsonElement.getAsJsonObject();
-			if (jsonObject.has(name)) {
-				return jsonObject.get(name).getAsString();
-			}
-		}
-		return null;
-	}
-
-	public static MessageCategory extractCategory(JsonElement jsonElement) {
-		return MessageCategory.valueOf(extractTextField(jsonElement, FIELD_CATEGORY));
-	}
-
-	protected static String FIELD_CATEGORY = "category";
-
-	protected BaseMessage(MessageCategory category) {
-		this.time = new Date();
-		this.category = category;
-	}
-
-	private Date time;
-
-	private MessageCategory category;
-
-	public Date getTime() {
-		return time;
-	}
-
-	public void setTime(Date time) {
-		this.time = time;
-	}
-
-	public MessageCategory getCategory() {
-		return category;
-	}
-
-	public void setCategory(MessageCategory category) {
-		this.category = category;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/Collaboration.java

@@ -1,53 +0,0 @@
-package com.x.collaboration.core.message;
-
-import java.util.concurrent.LinkedBlockingQueue;
-
-import com.x.base.core.project.Context;
-import com.x.base.core.project.x_collaboration_service_message;
-
-public class Collaboration {
-
-	private static Context context;
-
-	private static LinkedBlockingQueue<BaseMessage> SendQueue = new LinkedBlockingQueue<>();
-
-	public static void send(BaseMessage message) throws Exception {
-		SendQueue.put(message);
-	}
-
-	public static void start(Context context) {
-		Collaboration.context = context;
-		SendThread thread = new SendThread();
-		thread.start();
-	}
-
-	public static void stop() {
-		try {
-			SendQueue.put(new StopSignal());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	private static class SendThread extends Thread {
-		public void run() {
-			while (true) {
-				try {
-					BaseMessage o = SendQueue.take();
-					if (o instanceof StopSignal) {
-						break;
-					}
-					context.applications().postQuery(x_collaboration_service_message.class, "message", o);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	private static class StopSignal extends BaseMessage {
-		public StopSignal() {
-			super(null);
-		}
-	}
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/MessageCategory.java

@@ -1,8 +0,0 @@
-package com.x.collaboration.core.message;
-
-import com.x.base.core.entity.JpaObject;
-
-public enum MessageCategory {
-	dialog, notification, operation;
-	public static final int length = JpaObject.length_16B;
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/dialog/DialogMessage.java

@@ -1,66 +0,0 @@
-package com.x.collaboration.core.message.dialog;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.gson.JsonElement;
-import com.x.collaboration.core.message.BaseMessage;
-import com.x.collaboration.core.message.MessageCategory;
-
-public abstract class DialogMessage extends BaseMessage {
-
-	protected static String FIELD_PERSON = "person";
-	protected static String FIELD_TYPE = "type";
-	protected static String FIELD_FROM = "from";
-
-	private DialogType type;
-	private String from;
-	private String person;
-
-	public DialogMessage(DialogType type, String from, String person) {
-		super(MessageCategory.dialog);
-		this.type = type;
-		this.from = from;
-		this.person = person;
-	}
-
-	public static String extractFrom(JsonElement jsonElement) {
-		return extractTextField(jsonElement, FIELD_FROM);
-	}
-
-	public static String extractPerson(JsonElement jsonElement) {
-		return extractTextField(jsonElement, FIELD_PERSON);
-	}
-
-	public static DialogType extractType(JsonElement jsonElement) {
-		String value = extractTextField(jsonElement, FIELD_TYPE);
-		if (StringUtils.isNotEmpty(value)) {
-			return DialogType.valueOf(value);
-		}
-		return null;
-	}
-
-	public DialogType getType() {
-		return type;
-	}
-
-	public void setType(DialogType type) {
-		this.type = type;
-	}
-
-	public String getPerson() {
-		return person;
-	}
-
-	public void setPerson(String person) {
-		this.person = person;
-	}
-
-	public String getFrom() {
-		return from;
-	}
-
-	public void setFrom(String from) {
-		this.from = from;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/dialog/DialogType.java

@@ -1,8 +0,0 @@
-package com.x.collaboration.core.message.dialog;
-
-import com.x.base.core.entity.JpaObject;
-
-public enum DialogType {
-	text, image, file;
-	public static final int length = JpaObject.length_64B;
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/dialog/FileMessage.java

@@ -1,31 +0,0 @@
-package com.x.collaboration.core.message.dialog;
-
-public class FileMessage extends DialogMessage {
-
-	private String folder;
-	private String attachment;
-
-	public FileMessage(String from, String person, String folder, String attachment) {
-		super(DialogType.text, from, person);
-		this.folder = folder;
-		this.attachment = attachment;
-	}
-
-	public String getFolder() {
-		return folder;
-	}
-
-	public void setFolder(String folder) {
-		this.folder = folder;
-	}
-
-	public String getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(String attachment) {
-		this.attachment = attachment;
-	}
-
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/dialog/TextMessage.java

@@ -1,20 +0,0 @@
-package com.x.collaboration.core.message.dialog;
-
-public class TextMessage extends DialogMessage {
-
-	private String text;
-
-	public TextMessage(String from, String person, String text) {
-		super(DialogType.text, from, person);
-		this.text = text;
-	}
-
-	public String getText() {
-		return text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/AttendanceAppealAcceptMessage.java

@@ -1,40 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class AttendanceAppealAcceptMessage extends NotificationMessage {
-
-	public AttendanceAppealAcceptMessage(String person, String id, String detailId, String messageContent) {
-		super(NotificationType.attendanceAppealAccept, person);
-		this.id = id;
-		this.detailId = detailId;
-		this.messageContent = messageContent;
-	}
-
-	private String id;
-	private String detailId;
-	private String messageContent;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getDetailId() {
-		return detailId;
-	}
-
-	public void setDetailId(String detailId) {
-		this.detailId = detailId;
-	}
-
-	public String getMessageContent() {
-		return messageContent;
-	}
-
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/AttendanceAppealCancelMessage.java

@@ -1,37 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-
-public class AttendanceAppealCancelMessage extends NotificationMessage {
-
-	public AttendanceAppealCancelMessage( String person, String id, String detailId, String messageContent ) {
-		super( NotificationType.attendanceAppealCancel, person );
-		this.id = id;
-		this.detailId = detailId;
-		this.messageContent = messageContent;
-	}
-
-	private String id;
-	private String detailId;
-	private String messageContent;
-	
-	
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getDetailId() {
-		return detailId;
-	}
-	public void setDetailId(String detailId) {
-		this.detailId = detailId;
-	}
-	public String getMessageContent() {
-		return messageContent;
-	}
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-	
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/AttendanceAppealInviteMessage.java

@@ -1,36 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-
-public class AttendanceAppealInviteMessage extends NotificationMessage {
-
-	public AttendanceAppealInviteMessage( String person, String id, String detailId, String messageContent ) {
-		super( NotificationType.attendanceAppealInvite, person );
-		this.id = id;
-		this.detailId = detailId;
-		this.messageContent = messageContent;
-	}
-
-	private String id;
-	private String detailId;
-	private String messageContent;
-	
-	
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getDetailId() {
-		return detailId;
-	}
-	public void setDetailId(String detailId) {
-		this.detailId = detailId;
-	}
-	public String getMessageContent() {
-		return messageContent;
-	}
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/AttendanceAppealRejectMessage.java

@@ -1,36 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-
-public class AttendanceAppealRejectMessage extends NotificationMessage {
-
-	public AttendanceAppealRejectMessage( String person, String id, String detailId, String messageContent ) {
-		super( NotificationType.attendanceAppealReject, person );
-		this.id = id;
-		this.detailId = detailId;
-		this.messageContent = messageContent;
-	}
-
-	private String id;
-	private String detailId;
-	private String messageContent;
-	
-	
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getDetailId() {
-		return detailId;
-	}
-	public void setDetailId(String detailId) {
-		this.detailId = detailId;
-	}
-	public String getMessageContent() {
-		return messageContent;
-	}
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/FileModifyMessage.java

@@ -1,20 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class FileModifyMessage extends NotificationMessage {
-
-	private String attachment;
-
-	public FileModifyMessage(String person, String attachment) {
-		super(NotificationType.fileModify, person);
-		this.attachment = attachment;
-	}
-
-	public String getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(String attachment) {
-		this.attachment = attachment;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/FileShareMessage.java

@@ -1,20 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class FileShareMessage extends NotificationMessage {
-
-	private String attachment;
-
-	public FileShareMessage(String person, String attachment) {
-		super(NotificationType.fileShare, person);
-		this.attachment = attachment;
-	}
-
-	public String getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(String attachment) {
-		this.attachment = attachment;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/MeetingAcceptMessage.java

@@ -1,40 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class MeetingAcceptMessage extends NotificationMessage {
-
-	public MeetingAcceptMessage(String person, String building, String room, String meeting) {
-		super(NotificationType.meetingAccept, person);
-		this.building = building;
-		this.room = room;
-		this.meeting = meeting;
-	}
-
-	private String building;
-	private String room;
-	private String meeting;
-
-	public String getMeeting() {
-		return meeting;
-	}
-
-	public void setMeeting(String meeting) {
-		this.meeting = meeting;
-	}
-
-	public String getRoom() {
-		return room;
-	}
-
-	public void setRoom(String room) {
-		this.room = room;
-	}
-
-	public String getBuilding() {
-		return building;
-	}
-
-	public void setBuilding(String building) {
-		this.building = building;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/MeetingCancelMessage.java

@@ -1,40 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class MeetingCancelMessage extends NotificationMessage {
-
-	public MeetingCancelMessage(String person, String building, String room, String meeting) {
-		super(NotificationType.meetingCancel, person);
-		this.building = building;
-		this.room = room;
-		this.meeting = meeting;
-	}
-
-	private String building;
-	private String room;
-	private String meeting;
-
-	public String getMeeting() {
-		return meeting;
-	}
-
-	public void setMeeting(String meeting) {
-		this.meeting = meeting;
-	}
-
-	public String getRoom() {
-		return room;
-	}
-
-	public void setRoom(String room) {
-		this.room = room;
-	}
-
-	public String getBuilding() {
-		return building;
-	}
-
-	public void setBuilding(String building) {
-		this.building = building;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/MeetingInviteMessage.java

@@ -1,40 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class MeetingInviteMessage extends NotificationMessage {
-
-	public MeetingInviteMessage(String person, String building, String room, String meeting) {
-		super(NotificationType.meetingInvite, person);
-		this.building = building;
-		this.room = room;
-		this.meeting = meeting;
-	}
-
-	private String building;
-	private String room;
-	private String meeting;
-
-	public String getMeeting() {
-		return meeting;
-	}
-
-	public void setMeeting(String meeting) {
-		this.meeting = meeting;
-	}
-
-	public String getRoom() {
-		return room;
-	}
-
-	public void setRoom(String room) {
-		this.room = room;
-	}
-
-	public String getBuilding() {
-		return building;
-	}
-
-	public void setBuilding(String building) {
-		this.building = building;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/MeetingRejectMessage.java

@@ -1,40 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class MeetingRejectMessage extends NotificationMessage {
-
-	public MeetingRejectMessage(String person, String building, String room, String meeting) {
-		super(NotificationType.meetingReject, person);
-		this.building = building;
-		this.room = room;
-		this.meeting = meeting;
-	}
-
-	private String building;
-	private String room;
-	private String meeting;
-
-	public String getMeeting() {
-		return meeting;
-	}
-
-	public void setMeeting(String meeting) {
-		this.meeting = meeting;
-	}
-
-	public String getRoom() {
-		return room;
-	}
-
-	public void setRoom(String room) {
-		this.room = room;
-	}
-
-	public String getBuilding() {
-		return building;
-	}
-
-	public void setBuilding(String building) {
-		this.building = building;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/NotificationMessage.java

@@ -1,45 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-import com.google.gson.JsonElement;
-import com.x.collaboration.core.message.BaseMessage;
-import com.x.collaboration.core.message.MessageCategory;
-
-public abstract class NotificationMessage extends BaseMessage {
-
-	public static String extractPerson(JsonElement jsonElement) {
-		return extractTextField(jsonElement, FIELD_PERSON);
-	}
-
-	public static NotificationType extractType(JsonElement jsonElement) {
-		return NotificationType.valueOf(extractTextField(jsonElement, FIELD_TYPE));
-	}
-
-	protected static String FIELD_PERSON = "person";
-	protected static String FIELD_TYPE = "type";
-
-	private NotificationType type;
-	private String person;
-
-	public NotificationMessage(NotificationType type, String person) {
-		super(MessageCategory.notification);
-		this.type = type;
-		this.person = person;
-	}
-
-	public NotificationType getType() {
-		return type;
-	}
-
-	public void setType(NotificationType type) {
-		this.type = type;
-	}
-
-	public String getPerson() {
-		return person;
-	}
-
-	public void setPerson(String person) {
-		this.person = person;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/NotificationType.java

@@ -1,8 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-import com.x.base.core.entity.JpaObject;
-
-public enum NotificationType {
-	chat, task, read, review, plain, fileShare, fileModify, broadcast, meetingInvite, meetingCancel, meetingAccept, meetingReject, attendanceAppealReject, attendanceAppealInvite, attendanceAppealCancel, attendanceAppealAccept, okrCenterWorkDeployAccept, okrWorkDeployAccept, okrWorkGetAccept, okrWorkDeletedAccept, okrWorkReportDeletedAccept;
-	public static final int length = JpaObject.length_64B;
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/OkrCenterWorkDeployAcceptMessage.java

@@ -1,36 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-
-public class OkrCenterWorkDeployAcceptMessage extends NotificationMessage {
-
-	public OkrCenterWorkDeployAcceptMessage( String person, String centerId, String centerTitle, String messageContent ) {
-		super( NotificationType.okrCenterWorkDeployAccept, person );
-		this.centerId = centerId;
-		this.centerTitle = centerTitle;
-		this.messageContent = messageContent;
-	}
-
-	private String centerId;
-	private String centerTitle;
-	private String messageContent;
-	
-	public String getCenterId() {
-		return centerId;
-	}
-	public void setCenterId(String centerId) {
-		this.centerId = centerId;
-	}
-	public String getCenterTitle() {
-		return centerTitle;
-	}
-	public void setCenterTitle(String centerTitle) {
-		this.centerTitle = centerTitle;
-	}
-	public String getMessageContent() {
-		return messageContent;
-	}
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-	
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/OkrWorkDeletedAcceptMessage.java

@@ -1,36 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-
-public class OkrWorkDeletedAcceptMessage extends NotificationMessage {
-
-	public OkrWorkDeletedAcceptMessage( String person, String workId, String workTitle, String messageContent ) {
-		super( NotificationType.okrWorkDeletedAccept, person );
-		this.workId = workId;
-		this.workTitle = workTitle;
-		this.messageContent = messageContent;
-	}
-
-	private String workId;
-	private String workTitle;
-	private String messageContent;	
-	
-	public String getWorkId() {
-		return workId;
-	}
-	public void setWorkId(String workId) {
-		this.workId = workId;
-	}
-	public String getWorkTitle() {
-		return workTitle;
-	}
-	public void setWorkTitle(String workTitle) {
-		this.workTitle = workTitle;
-	}
-	public String getMessageContent() {
-		return messageContent;
-	}
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-	
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/OkrWorkDeployAcceptMessage.java

@@ -1,36 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-
-public class OkrWorkDeployAcceptMessage extends NotificationMessage {
-
-	public OkrWorkDeployAcceptMessage( String person, String workId, String workTitle, String messageContent ) {
-		super( NotificationType.okrWorkDeployAccept, person );
-		this.workId = workId;
-		this.workTitle = workTitle;
-		this.messageContent = messageContent;
-	}
-
-	private String workId;
-	private String workTitle;
-	private String messageContent;	
-	
-	public String getWorkId() {
-		return workId;
-	}
-	public void setWorkId(String workId) {
-		this.workId = workId;
-	}
-	public String getWorkTitle() {
-		return workTitle;
-	}
-	public void setWorkTitle(String workTitle) {
-		this.workTitle = workTitle;
-	}
-	public String getMessageContent() {
-		return messageContent;
-	}
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-	
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/OkrWorkGetAcceptMessage.java

@@ -1,36 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-
-public class OkrWorkGetAcceptMessage extends NotificationMessage {
-
-	public OkrWorkGetAcceptMessage( String person, String workId, String workTitle, String messageContent ) {
-		super( NotificationType.okrWorkGetAccept, person );
-		this.workId = workId;
-		this.workTitle = workTitle;
-		this.messageContent = messageContent;
-	}
-
-	private String workId;
-	private String workTitle;
-	private String messageContent;	
-	
-	public String getWorkId() {
-		return workId;
-	}
-	public void setWorkId(String workId) {
-		this.workId = workId;
-	}
-	public String getWorkTitle() {
-		return workTitle;
-	}
-	public void setWorkTitle(String workTitle) {
-		this.workTitle = workTitle;
-	}
-	public String getMessageContent() {
-		return messageContent;
-	}
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-	
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/OkrWorkReportDeletedAcceptMessage.java

@@ -1,37 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-
-public class OkrWorkReportDeletedAcceptMessage extends NotificationMessage {
-
-	public OkrWorkReportDeletedAcceptMessage( String person, String reportId, String reportTitle, String messageContent ) {
-		super( NotificationType.okrWorkReportDeletedAccept, person );
-		this.reportId = reportId;
-		this.reportTitle = reportTitle;
-		this.messageContent = messageContent;
-	}
-
-	private String reportId;
-	private String reportTitle;
-	private String messageContent;	
-	
-	
-	public String getReportId() {
-		return reportId;
-	}
-	public void setReportId(String reportId) {
-		this.reportId = reportId;
-	}
-	public String getReportTitle() {
-		return reportTitle;
-	}
-	public void setReportTitle(String reportTitle) {
-		this.reportTitle = reportTitle;
-	}
-	public String getMessageContent() {
-		return messageContent;
-	}
-	public void setMessageContent(String messageContent) {
-		this.messageContent = messageContent;
-	}
-	
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/ReadMessage.java

@@ -1,30 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class ReadMessage extends NotificationMessage {
-
-	private String work;
-	private String read;
-
-	public ReadMessage(String person, String work, String read) {
-		super(NotificationType.read, person);
-		this.work = work;
-		this.read = read;
-	}
-
-	public String getWork() {
-		return work;
-	}
-
-	public void setWork(String work) {
-		this.work = work;
-	}
-
-	public String getRead() {
-		return read;
-	}
-
-	public void setRead(String read) {
-		this.read = read;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/ReviewMessage.java

@@ -1,30 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class ReviewMessage extends NotificationMessage {
-
-	private String work;
-	private String review;
-
-	public ReviewMessage(String person, String work, String review) {
-		super(NotificationType.review, person);
-		this.work = work;
-		this.review = review;
-	}
-
-	public String getWork() {
-		return work;
-	}
-
-	public void setWork(String work) {
-		this.work = work;
-	}
-
-	public String getReview() {
-		return review;
-	}
-
-	public void setReview(String review) {
-		this.review = review;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/notification/TaskMessage.java

@@ -1,30 +0,0 @@
-package com.x.collaboration.core.message.notification;
-
-public class TaskMessage extends NotificationMessage {
-
-	private String work;
-	private String task;
-
-	public TaskMessage(String person, String work, String task) {
-		super(NotificationType.task, person);
-		this.work = work;
-		this.task = task;
-	}
-
-	public String getWork() {
-		return work;
-	}
-
-	public void setWork(String work) {
-		this.work = work;
-	}
-
-	public String getTask() {
-		return task;
-	}
-
-	public void setTask(String task) {
-		this.task = task;
-	}
-
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/operation/OperationMessage.java

@@ -1,10 +0,0 @@
-package com.x.collaboration.core.message.operation;
-
-import com.x.collaboration.core.message.BaseMessage;
-import com.x.collaboration.core.message.MessageCategory;
-
-public class OperationMessage extends BaseMessage {
-	public OperationMessage() {
-		super(MessageCategory.operation);
-	}
-}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/transfer/PushMessageTransferMessage.java

@@ -1,28 +0,0 @@
-//package com.x.collaboration.core.message.transfer;
-//
-//public class PushMessageTransferMessage extends TransferMessage {
-//
-//	private String account;
-//	private String unit;
-//	private String password;
-//	public String getAccount() {
-//		return account;
-//	}
-//	public void setAccount(String account) {
-//		this.account = account;
-//	}
-//	public String getUnit() {
-//		return unit;
-//	}
-//	public void setUnit(String unit) {
-//		this.unit = unit;
-//	}
-//	public String getPassword() {
-//		return password;
-//	}
-//	public void setPassword(String password) {
-//		this.password = password;
-//	}
-//
-//
-//}

o2server/x_collaboration_core_message/src/main/java/com/x/collaboration/core/message/transfer/TransferMessage.java

@@ -1,70 +0,0 @@
-//package com.x.collaboration.core.message.transfer;
-//
-//import java.util.Date;
-//
-//import com.x.base.core.gson.GsonPropertyObject;
-//import com.x.base.core.gson.XGsonBuilder;
-//import com.x.collaboration.core.message.BaseMessage;
-//import com.x.collaboration.core.message.dialog.DialogMessage;
-//import com.x.collaboration.core.message.notification.NotificationMessage;
-//import com.x.collaboration.core.message.notification.NotificationType;
-//import com.x.collaboration.core.message.operation.OperationMessage;
-//
-//public class TransferMessage extends GsonPropertyObject {
-//
-//	private String data;
-//
-//	public String getData() {
-//		return data;
-//	}
-//
-//	public void setData(String data) {
-//		this.data = data;
-//	}
-//
-//	public void setData(BaseMessage message) throws Exception {
-//		this.data = XGsonBuilder.toJson(message);
-//	}
-//
-//	public String getPerson() {
-//		return XGsonBuilder.instance().fromJson(this.data, BaseMessage.class).getPerson();
-//	}
-//
-//	public Date getDateTime() {
-//		return XGsonBuilder.instance().fromJson(this.data, BaseMessage.class).getDateTime();
-//	}
-//
-//	public String getType() {
-//		return XGsonBuilder.instance().fromJson(this.data, BaseMessage.class).getType();
-//	}
-//
-//	public NotificationType getMessageType() {
-//		return XGsonBuilder.instance().fromJson(this.data, BaseMessage.class).getMessageType();
-//	}
-//
-//	public BaseMessage unwrap() {
-//		switch (this.getMessageType()) {
-//		case notification:
-//			return XGsonBuilder.instance().fromJson(this.data, NotificationMessage.class);
-//		case operation:
-//			return XGsonBuilder.instance().fromJson(this.data, OperationMessage.class);
-//		case dialog:
-//			return XGsonBuilder.instance().fromJson(this.data, DialogMessage.class);
-//		default:
-//			return null;
-//		}
-//	}
-//
-//	public NotificationMessage unwrapNotificationMessage() {
-//		return XGsonBuilder.instance().fromJson(data, NotificationMessage.class);
-//	}
-//
-//	public DialogMessage unwrapDialogMessage() {
-//		return XGsonBuilder.instance().fromJson(data, DialogMessage.class);
-//	}
-//
-//	public OperationMessage unwrapOperationMessage() {
-//		return XGsonBuilder.instance().fromJson(data, OperationMessage.class);
-//	}
-//
-//}

o2server/x_collaboration_core_message/src/test/java/com/x/collaboration/core/message/test/dialog/DialogFormatOut.java

@@ -1,8 +0,0 @@
-package com.x.collaboration.core.message.test.dialog;
-
-import com.x.collaboration.core.message.dialog.TextMessage;
-
-public class DialogFormatOut {
-	private TextMessage textMessage = new TextMessage("发送人",
-			"接受人", "内容");
-}

o2server/x_collaboration_core_message/src/test/java/com/x/collaboration/core/message/test/dialog/NotificationFormatOut.java

@@ -1,195 +0,0 @@
-package com.x.collaboration.core.message.test.dialog;
-
-import com.x.collaboration.core.message.notification.AttendanceAppealAcceptMessage;
-import com.x.collaboration.core.message.notification.AttendanceAppealCancelMessage;
-import com.x.collaboration.core.message.notification.AttendanceAppealInviteMessage;
-import com.x.collaboration.core.message.notification.AttendanceAppealRejectMessage;
-import com.x.collaboration.core.message.notification.FileModifyMessage;
-import com.x.collaboration.core.message.notification.FileShareMessage;
-import com.x.collaboration.core.message.notification.MeetingAcceptMessage;
-import com.x.collaboration.core.message.notification.MeetingCancelMessage;
-import com.x.collaboration.core.message.notification.MeetingInviteMessage;
-import com.x.collaboration.core.message.notification.MeetingRejectMessage;
-import com.x.collaboration.core.message.notification.OkrCenterWorkDeployAcceptMessage;
-import com.x.collaboration.core.message.notification.OkrWorkDeletedAcceptMessage;
-import com.x.collaboration.core.message.notification.OkrWorkDeployAcceptMessage;
-import com.x.collaboration.core.message.notification.OkrWorkGetAcceptMessage;
-import com.x.collaboration.core.message.notification.OkrWorkReportDeletedAcceptMessage;
-import com.x.collaboration.core.message.notification.ReadMessage;
-import com.x.collaboration.core.message.notification.ReviewMessage;
-import com.x.collaboration.core.message.notification.TaskMessage;
-
-public class NotificationFormatOut {
-	private AttendanceAppealAcceptMessage attendanceAppealAcceptMessage = new AttendanceAppealAcceptMessage("接收人",
-			"考勤申述id", "考勤明细id", "内容");
-	private AttendanceAppealCancelMessage attendanceAppealCancelMessage = new AttendanceAppealCancelMessage("接收人",
-			"考勤申述id", "考勤明细id", "内容");
-	private AttendanceAppealInviteMessage attendanceAppealInviteMessage = new AttendanceAppealInviteMessage("接收人",
-			"考勤申述id", "考勤明细id", "内容");
-	private AttendanceAppealRejectMessage attendanceAppealRejectMessage = new AttendanceAppealRejectMessage("接收人",
-			"考勤申述id", "考勤明细id", "内容");
-	private FileModifyMessage fileModifyMessage = new FileModifyMessage("接收人", "文件id");
-	private FileShareMessage fileShareMessage = new FileShareMessage("接收人", "文件id");
-	private MeetingAcceptMessage meetingAcceptMessage = new MeetingAcceptMessage("接收人", "楼房id", "会议室id", "会议id");
-	private MeetingCancelMessage meetingCancelMessage = new MeetingCancelMessage("接收人", "楼房id", "会议室id", "会议id");
-	private MeetingInviteMessage meetingInviteMessage = new MeetingInviteMessage("接收人", "楼房id", "会议室id", "会议id");
-	private MeetingRejectMessage meetingRejectMessage = new MeetingRejectMessage("接收人", "楼房id", "会议室id", "会议id");
-	private OkrCenterWorkDeployAcceptMessage okrCenterWorkDeployAcceptMessage = new OkrCenterWorkDeployAcceptMessage(
-			"接收人", "中心工作id", "工作名称", "内容");
-	private OkrWorkDeletedAcceptMessage okrWorkDeletedAcceptMessage = new OkrWorkDeletedAcceptMessage("接收人", "工作id",
-			"工作名称", "内容");
-	private OkrWorkDeployAcceptMessage okrWorkDeployAcceptMessage = new OkrWorkDeployAcceptMessage("接收人", "工作id",
-			"工作名称", "内容");
-	private OkrWorkGetAcceptMessage okrWorkGetAcceptMessage = new OkrWorkGetAcceptMessage("接收人", "工作id", "工作名称", "内容");
-	private OkrWorkReportDeletedAcceptMessage okrWorkReportDeletedAcceptMessage = new OkrWorkReportDeletedAcceptMessage(
-			"接收人", "工作汇报id", "工作汇报名称", "内容");
-	private ReadMessage readMessage = new ReadMessage("接收人", "workId", "待阅id");
-	private ReviewMessage reviewMessage = new ReviewMessage("接收人", "workId", "reviewId");
-	private TaskMessage taskMessage = new TaskMessage("接收人", "workId", "待办id");
-
-	public AttendanceAppealAcceptMessage getAttendanceAppealAcceptMessage() {
-		return attendanceAppealAcceptMessage;
-	}
-
-	public void setAttendanceAppealAcceptMessage(AttendanceAppealAcceptMessage attendanceAppealAcceptMessage) {
-		this.attendanceAppealAcceptMessage = attendanceAppealAcceptMessage;
-	}
-
-	public AttendanceAppealCancelMessage getAttendanceAppealCancelMessage() {
-		return attendanceAppealCancelMessage;
-	}
-
-	public void setAttendanceAppealCancelMessage(AttendanceAppealCancelMessage attendanceAppealCancelMessage) {
-		this.attendanceAppealCancelMessage = attendanceAppealCancelMessage;
-	}
-
-	public AttendanceAppealInviteMessage getAttendanceAppealInviteMessage() {
-		return attendanceAppealInviteMessage;
-	}
-
-	public void setAttendanceAppealInviteMessage(AttendanceAppealInviteMessage attendanceAppealInviteMessage) {
-		this.attendanceAppealInviteMessage = attendanceAppealInviteMessage;
-	}
-
-	public AttendanceAppealRejectMessage getAttendanceAppealRejectMessage() {
-		return attendanceAppealRejectMessage;
-	}
-
-	public void setAttendanceAppealRejectMessage(AttendanceAppealRejectMessage attendanceAppealRejectMessage) {
-		this.attendanceAppealRejectMessage = attendanceAppealRejectMessage;
-	}
-
-	public FileModifyMessage getFileModifyMessage() {
-		return fileModifyMessage;
-	}
-
-	public void setFileModifyMessage(FileModifyMessage fileModifyMessage) {
-		this.fileModifyMessage = fileModifyMessage;
-	}
-
-	public FileShareMessage getFileShareMessage() {
-		return fileShareMessage;
-	}
-
-	public void setFileShareMessage(FileShareMessage fileShareMessage) {
-		this.fileShareMessage = fileShareMessage;
-	}
-
-	public MeetingAcceptMessage getMeetingAcceptMessage() {
-		return meetingAcceptMessage;
-	}
-
-	public void setMeetingAcceptMessage(MeetingAcceptMessage meetingAcceptMessage) {
-		this.meetingAcceptMessage = meetingAcceptMessage;
-	}
-
-	public MeetingCancelMessage getMeetingCancelMessage() {
-		return meetingCancelMessage;
-	}
-
-	public void setMeetingCancelMessage(MeetingCancelMessage meetingCancelMessage) {
-		this.meetingCancelMessage = meetingCancelMessage;
-	}
-
-	public MeetingInviteMessage getMeetingInviteMessage() {
-		return meetingInviteMessage;
-	}
-
-	public void setMeetingInviteMessage(MeetingInviteMessage meetingInviteMessage) {
-		this.meetingInviteMessage = meetingInviteMessage;
-	}
-
-	public MeetingRejectMessage getMeetingRejectMessage() {
-		return meetingRejectMessage;
-	}
-
-	public void setMeetingRejectMessage(MeetingRejectMessage meetingRejectMessage) {
-		this.meetingRejectMessage = meetingRejectMessage;
-	}
-
-	public OkrCenterWorkDeployAcceptMessage getOkrCenterWorkDeployAcceptMessage() {
-		return okrCenterWorkDeployAcceptMessage;
-	}
-
-	public void setOkrCenterWorkDeployAcceptMessage(OkrCenterWorkDeployAcceptMessage okrCenterWorkDeployAcceptMessage) {
-		this.okrCenterWorkDeployAcceptMessage = okrCenterWorkDeployAcceptMessage;
-	}
-
-	public OkrWorkDeletedAcceptMessage getOkrWorkDeletedAcceptMessage() {
-		return okrWorkDeletedAcceptMessage;
-	}
-
-	public void setOkrWorkDeletedAcceptMessage(OkrWorkDeletedAcceptMessage okrWorkDeletedAcceptMessage) {
-		this.okrWorkDeletedAcceptMessage = okrWorkDeletedAcceptMessage;
-	}
-
-	public OkrWorkDeployAcceptMessage getOkrWorkDeployAcceptMessage() {
-		return okrWorkDeployAcceptMessage;
-	}
-
-	public void setOkrWorkDeployAcceptMessage(OkrWorkDeployAcceptMessage okrWorkDeployAcceptMessage) {
-		this.okrWorkDeployAcceptMessage = okrWorkDeployAcceptMessage;
-	}
-
-	public OkrWorkGetAcceptMessage getOkrWorkGetAcceptMessage() {
-		return okrWorkGetAcceptMessage;
-	}
-
-	public void setOkrWorkGetAcceptMessage(OkrWorkGetAcceptMessage okrWorkGetAcceptMessage) {
-		this.okrWorkGetAcceptMessage = okrWorkGetAcceptMessage;
-	}
-
-	public OkrWorkReportDeletedAcceptMessage getOkrWorkReportDeletedAcceptMessage() {
-		return okrWorkReportDeletedAcceptMessage;
-	}
-
-	public void setOkrWorkReportDeletedAcceptMessage(
-			OkrWorkReportDeletedAcceptMessage okrWorkReportDeletedAcceptMessage) {
-		this.okrWorkReportDeletedAcceptMessage = okrWorkReportDeletedAcceptMessage;
-	}
-
-	public ReadMessage getReadMessage() {
-		return readMessage;
-	}
-
-	public void setReadMessage(ReadMessage readMessage) {
-		this.readMessage = readMessage;
-	}
-
-	public ReviewMessage getReviewMessage() {
-		return reviewMessage;
-	}
-
-	public void setReviewMessage(ReviewMessage reviewMessage) {
-		this.reviewMessage = reviewMessage;
-	}
-
-	public TaskMessage getTaskMessage() {
-		return taskMessage;
-	}
-
-	public void setTaskMessage(TaskMessage taskMessage) {
-		this.taskMessage = taskMessage;
-	}
-
-}

o2server/x_collaboration_core_message/src/test/java/com/x/collaboration/core/message/test/dialog/TestClient.java

@@ -1,22 +0,0 @@
-package com.x.collaboration.core.message.test.dialog;
-
-import java.io.File;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.Test;
-
-import com.x.base.core.project.gson.XGsonBuilder;
-
-public class TestClient {
-	@Test
-	public void test() throws Exception {
-		NotificationFormatOut format = new NotificationFormatOut();
-		FileUtils.writeStringToFile(new File("NotificationFormatOut.json"), XGsonBuilder.toJson(format));
-	}
-
-	@Test
-	public void test1() throws Exception {
-		DialogFormatOut format = new DialogFormatOut();
-		FileUtils.writeStringToFile(new File("DialogFormatOut.json"), XGsonBuilder.toJson(format));
-	}
-}

o2server/x_collaboration_service_message/.gitignore

@@ -1,4 +0,0 @@
-.classpath
-.project
-/.settings/
-/target/

o2server/x_collaboration_service_message/pom.xml

@@ -1,58 +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_collaboration_service_message</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_collaboration_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>describe</id>
-						<phase>prepare-package</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-war</id>
-						<phase>verify</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

o2server/x_collaboration_service_message/src/main/java/x/collaboration/service/message/AbstractFactory.java

@@ -1,24 +0,0 @@
-package x.collaboration.service.message;
-
-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_collaboration_service_message/src/main/java/x/collaboration/service/message/ApplicationServletContextListener.java

@@ -1,32 +0,0 @@
-package x.collaboration.service.message;
-
-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();
-		} 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_collaboration_service_message/src/main/java/x/collaboration/service/message/Business.java

@@ -1,27 +0,0 @@
-package x.collaboration.service.message;
-
-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_collaboration_service_message/src/main/java/x/collaboration/service/message/PushMessage.java

@@ -1,71 +0,0 @@
-package x.collaboration.service.message;
-
-import com.x.base.core.project.gson.GsonPropertyObject;
-
-public class PushMessage extends GsonPropertyObject {
-
-	private String account;
-	private String unit;
-	private String password;
-	private String data;
-	private String ticker;
-	private String text;
-	private String title;
-
-	public String getAccount() {
-		return account;
-	}
-
-	public void setAccount(String account) {
-		this.account = account;
-	}
-
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getData() {
-		return data;
-	}
-
-	public void setData(String data) {
-		this.data = data;
-	}
-
-	public String getTicker() {
-		return ticker;
-	}
-
-	public void setTicker(String ticker) {
-		this.ticker = ticker;
-	}
-
-	public String getText() {
-		return text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-}

o2server/x_collaboration_service_message/src/main/java/x/collaboration/service/message/PushMessageQueue.java

@@ -1,106 +0,0 @@
-package x.collaboration.service.message;
-
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.Context;
-import com.x.base.core.project.x_processplatform_assemble_surface;
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.connection.ConnectionAction;
-import com.x.base.core.project.gson.XGsonBuilder;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.base.core.project.organization.Person;
-import com.x.base.core.project.queue.AbstractQueue;
-import com.x.collaboration.core.message.BaseMessage;
-import com.x.collaboration.core.message.MessageCategory;
-import com.x.collaboration.core.message.notification.NotificationMessage;
-import com.x.collaboration.core.message.notification.NotificationType;
-import com.x.collaboration.core.message.notification.TaskMessage;
-import com.x.organization.core.express.Organization;
-
-public class PushMessageQueue extends AbstractQueue<JsonElement> {
-
-	private static Logger logger = LoggerFactory.getLogger(PushMessageQueue.class);
-
-	private Context context;
-	private Organization organization;
-
-	PushMessageQueue(Context context) {
-		this.context = context;
-		this.organization = new Organization(ThisApplication.context());
-	}
-
-	@Override
-	protected void execute(JsonElement jsonElement) throws Exception {
-		if (BooleanUtils.isTrue(Config.collect().getEnable())) {
-			MessageCategory category = BaseMessage.extractCategory(jsonElement);
-			if (null != category) {
-				switch (category) {
-				case notification:
-					notification(jsonElement);
-					break;
-				default:
-					break;
-				}
-			}
-		}
-
-	}
-
-	private void notification(JsonElement jsonElement) throws Exception {
-		String name = NotificationMessage.extractPerson(jsonElement);
-		if (StringUtils.isNotEmpty(name)) {
-			Person person = organization.person().getObject(name);
-			if (null != person) {
-				if (StringUtils.isNotEmpty(person.getMobile())) {
-					PushMessage push = new PushMessage();
-					push.setData(jsonElement.toString());
-					push.setAccount(person.getMobile());
-					push.setUnit(Config.collect().getName());
-					push.setPassword(Config.collect().getPassword());
-					fillNotification(jsonElement, push);
-					if (null != push) {
-						logger.debug("send message:{}.", push);
-						ConnectionAction.post(
-								"http://collect.o2server.io:20080/o2_collect_assemble/jaxrs/collect/pushmessage/transfer",
-								null, push);
-					}
-				}
-			}
-		}
-	}
-
-	private void fillNotification(JsonElement jsonElement, PushMessage push) throws Exception {
-		NotificationType type = NotificationMessage.extractType(jsonElement);
-		if (null != type) {
-			switch (type) {
-			case attendanceAppealAccept:
-				break;
-			case task:
-				TaskMessage taskMessage = XGsonBuilder.instance().fromJson(jsonElement, TaskMessage.class);
-				push = fillNotificationTask(taskMessage, push);
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	private PushMessage fillNotificationTask(TaskMessage message, PushMessage push) throws Exception {
-		JsonElement jsonElement = context.applications()
-				.getQuery(x_processplatform_assemble_surface.class, "work/" + message.getWork()).getData();
-		/** 如果无法取到task说明数据已经被删除或者已经失效 */
-		if ((null != jsonElement) && (jsonElement.isJsonObject())) {
-			/** title 数据包含在work内部 */
-			String title = XGsonBuilder.extractString(jsonElement, "work.title");
-			push.setTitle("您有新的待办需要处理:" + title);
-			push.setText("您有新的待办需要处理:" + title);
-			push.setTicker("待办提醒.");
-			return push;
-		}
-		return null;
-	}
-
-}

o2server/x_collaboration_service_message/src/main/java/x/collaboration/service/message/SmsQueue.java

@@ -1,33 +0,0 @@
-package x.collaboration.service.message;
-
-import com.google.gson.JsonElement;
-import com.x.base.core.project.Context;
-import com.x.base.core.project.x_collaboration_assemble_websocket;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.base.core.project.queue.AbstractQueue;
-
-public class SmsQueue extends AbstractQueue<JsonElement> {
-
-	private Context context;
-
-	SmsQueue(Context context) {
-		this.context = context;
-	}
-
-	private static Logger logger = LoggerFactory.getLogger(SmsQueue.class);
-
-    /**
-     * 调用服务将短信信息通过x_collaboration_assemble_websocket发送到真实的企业短信提醒中心
-     * 企业内部的短信提醒中心一般都是Web服务接口：目前有Domino的短信中心和Java的短信提醒中心，配置需要读取sms.json
-     *
-     * @param jsonElement
-     * @throws Exception
-     */
-	@Override
-	protected void execute( JsonElement jsonElement ) throws Exception {
-		logger.debug("send message:{}.", jsonElement);
-		context.applications().postQuery(x_collaboration_assemble_websocket.class, "sms", jsonElement);
-
-	}
-}