From fc06c957c8eb79d5a68e7ec93719e0fc354f0d44 Mon Sep 17 00:00:00 2001 From: SAM2O2O Date: Wed, 31 Jul 2019 23:14:26 +0800 Subject: [PATCH] update package --- .../com/akaxin/site/message/web/bean/WebGroupTextBean.java | 5 ----- .../com/akaxin/site/message/web/bean/WebResponseBean.java | 5 ----- .../com/akaxin/site/message/web/bean/WebU2TextBean.java | 5 ----- .../site => windchat/im}/message/api/IMessageService.java | 2 +- .../{akaxin/site => windchat/im}/message/bean/WebBean.java | 2 +- .../site => windchat/im}/message/dao/ImUserFriendDao.java | 2 +- .../site => windchat/im}/message/dao/ImUserGroupDao.java | 2 +- .../site => windchat/im}/message/dao/ImUserProfileDao.java | 2 +- .../site => windchat/im}/message/dao/ImUserSessionDao.java | 2 +- .../site => windchat/im}/message/dao/SessionDeviceDao.java | 2 +- .../site => windchat/im}/message/dao/SiteConfigDao.java | 2 +- .../im}/message/executor/MessageExecutor.java | 4 +++- .../im}/message/group/handler/AbstractGroupHandler.java | 2 +- .../im}/message/group/handler/GroupDetectionHandler.java | 4 +++- .../im}/message/group/handler/GroupMessageImageHandler.java | 2 +- .../group/handler/GroupMessageImageSecretHandler.java | 2 +- .../message/group/handler/GroupMessageNoticeHandler.java | 2 +- .../im}/message/group/handler/GroupMessageTextHandler.java | 2 +- .../group/handler/GroupMessageTextSecretHandler.java | 2 +- .../im}/message/group/handler/GroupMessageVoiceHandler.java | 2 +- .../group/handler/GroupMessageVoiceSecretHandler.java | 2 +- .../im}/message/group/handler/GroupMessageWebHandler.java | 3 ++- .../message/group/handler/GroupMessageWebNoticeHandler.java | 3 ++- .../im}/message/group/handler/GroupPsnHandler.java | 3 ++- .../im}/message/group/handler/GroupPushHandler.java | 6 +++++- .../im}/message/notice/handler/AbstractNoticeHandler.java | 2 +- .../im}/message/notice/handler/NoticeHandler.java | 2 +- .../im}/message/notice/handler/NoticePushHandler.java | 2 +- .../im}/message/platform/PlatformClient.java | 2 +- .../site => windchat/im}/message/push/PushClient.java | 2 +- .../im}/message/service/ImMessageService.java | 2 +- .../im}/message/service/MessageDispatcher.java | 3 ++- .../im}/message/sync/handler/AbstractSyncHandler.java | 2 +- .../im}/message/sync/handler/SyncFinishHandler.java | 2 +- .../im}/message/sync/handler/SyncGroupMessageHandler.java | 3 ++- .../im}/message/sync/handler/SyncMsgStatusHandler.java | 2 +- .../im}/message/sync/handler/SyncNoticeHandler.java | 2 +- .../im}/message/sync/handler/SyncU2MessageHandler.java | 2 +- .../im}/message/threads/MultiPushThreadExecutor.java | 2 +- .../im}/message/user2/handler/AbstractU2Handler.java | 2 +- .../im}/message/user2/handler/U2MessageImageHandler.java | 2 +- .../message/user2/handler/U2MessageImageSecretHandler.java | 2 +- .../im}/message/user2/handler/U2MessageNoticeHandler.java | 3 ++- .../im}/message/user2/handler/U2MessageTextHandler.java | 2 +- .../message/user2/handler/U2MessageTextSecretHandler.java | 2 +- .../im}/message/user2/handler/U2MessageVoiceHandler.java | 2 +- .../message/user2/handler/U2MessageVoiceSecretHandler.java | 2 +- .../im}/message/user2/handler/U2MessageWebHandler.java | 3 ++- .../message/user2/handler/U2MessageWebNoticeHandler.java | 3 ++- .../im}/message/user2/handler/UserDetectionHandler.java | 4 +++- .../im}/message/user2/handler/UserPsnHandler.java | 3 ++- .../im}/message/user2/handler/UserPushHandler.java | 6 +++++- .../site => windchat/im}/message/utils/HexUtils.java | 2 +- .../site => windchat/im}/message/utils/NumUtils.java | 2 +- .../im}/message/utils/SiteConfigHelper.java | 3 ++- .../com/windchat/im/message/web/bean/WebGroupTextBean.java | 5 +++++ .../com/windchat/im/message/web/bean/WebResponseBean.java | 5 +++++ .../com/windchat/im/message/web/bean/WebU2TextBean.java | 5 +++++ .../im}/message/web/chat/WebChatReceiveMessageHandler.java | 2 +- .../im}/message/web/chat/WebChatSendMessageHandler.java | 4 +++- 60 files changed, 95 insertions(+), 69 deletions(-) delete mode 100755 openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java delete mode 100755 openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java delete mode 100755 openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/api/IMessageService.java (76%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/bean/WebBean.java (94%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/ImUserFriendDao.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/ImUserGroupDao.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/ImUserProfileDao.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/ImUserSessionDao.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/SessionDeviceDao.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/SiteConfigDao.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/executor/MessageExecutor.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/AbstractGroupHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupDetectionHandler.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageImageHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageImageSecretHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageNoticeHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageTextHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageTextSecretHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageVoiceHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageVoiceSecretHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageWebHandler.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageWebNoticeHandler.java (96%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupPsnHandler.java (96%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupPushHandler.java (96%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/notice/handler/AbstractNoticeHandler.java (93%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/notice/handler/NoticeHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/notice/handler/NoticePushHandler.java (99%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/platform/PlatformClient.java (99%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/push/PushClient.java (99%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/service/ImMessageService.java (95%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/service/MessageDispatcher.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/AbstractSyncHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncFinishHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncGroupMessageHandler.java (99%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncMsgStatusHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncNoticeHandler.java (99%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncU2MessageHandler.java (99%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/threads/MultiPushThreadExecutor.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/AbstractU2Handler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageImageHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageImageSecretHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageNoticeHandler.java (96%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageTextHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageTextSecretHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageVoiceHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageVoiceSecretHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageWebHandler.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageWebNoticeHandler.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/UserDetectionHandler.java (97%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/UserPsnHandler.java (96%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/UserPushHandler.java (95%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/utils/HexUtils.java (96%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/utils/NumUtils.java (84%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/utils/SiteConfigHelper.java (96%) create mode 100755 openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java create mode 100755 openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java create mode 100755 openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/web/chat/WebChatReceiveMessageHandler.java (98%) rename openzaly-message/src/main/java/com/{akaxin/site => windchat/im}/message/web/chat/WebChatSendMessageHandler.java (96%) diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java b/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java deleted file mode 100755 index 9c602fd..0000000 --- a/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.akaxin.site.message.web.bean; - -public class WebGroupTextBean { - -} diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java b/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java deleted file mode 100755 index 14ab954..0000000 --- a/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.akaxin.site.message.web.bean; - -public class WebResponseBean { - -} diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java b/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java deleted file mode 100755 index 4d43edd..0000000 --- a/openzaly-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.akaxin.site.message.web.bean; - -public class WebU2TextBean { - -} diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/api/IMessageService.java b/openzaly-message/src/main/java/com/windchat/im/message/api/IMessageService.java similarity index 76% rename from openzaly-message/src/main/java/com/akaxin/site/message/api/IMessageService.java rename to openzaly-message/src/main/java/com/windchat/im/message/api/IMessageService.java index 54d1998..bcf9a5b 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/api/IMessageService.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/api/IMessageService.java @@ -1,4 +1,4 @@ -package com.akaxin.site.message.api; +package com.windchat.im.message.api; import com.akaxin.common.command.Command; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/bean/WebBean.java b/openzaly-message/src/main/java/com/windchat/im/message/bean/WebBean.java similarity index 94% rename from openzaly-message/src/main/java/com/akaxin/site/message/bean/WebBean.java rename to openzaly-message/src/main/java/com/windchat/im/message/bean/WebBean.java index 3992271..c93d7e0 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/bean/WebBean.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/bean/WebBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.message.bean; +package com.windchat.im.message.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java b/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserFriendDao.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java rename to openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserFriendDao.java index 796f1d6..21608e0 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserFriendDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.dao; +package com.windchat.im.message.dao; import java.sql.SQLException; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java b/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserGroupDao.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java rename to openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserGroupDao.java index 14ce93b..2a9a039 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserGroupDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.dao; +package com.windchat.im.message.dao; import java.sql.SQLException; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java b/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserProfileDao.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java rename to openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserProfileDao.java index 3e703a8..311bf12 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserProfileDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.dao; +package com.windchat.im.message.dao; import java.sql.SQLException; import java.util.List; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java b/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserSessionDao.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java rename to openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserSessionDao.java index 23768a2..4d09bd5 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserSessionDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.dao; +package com.windchat.im.message.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java b/openzaly-message/src/main/java/com/windchat/im/message/dao/SessionDeviceDao.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java rename to openzaly-message/src/main/java/com/windchat/im/message/dao/SessionDeviceDao.java index 8b67141..72140e4 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/dao/SessionDeviceDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.dao; +package com.windchat.im.message.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java b/openzaly-message/src/main/java/com/windchat/im/message/dao/SiteConfigDao.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java rename to openzaly-message/src/main/java/com/windchat/im/message/dao/SiteConfigDao.java index 753b437..fb878e3 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/dao/SiteConfigDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.dao; +package com.windchat.im.message.dao; import java.sql.SQLException; import java.util.Map; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java b/openzaly-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java rename to openzaly-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java index 124764a..78ed253 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.executor; +package com.windchat.im.message.executor; import com.akaxin.common.command.Command; import com.akaxin.common.constant.RequestAction; @@ -48,6 +48,8 @@ import com.akaxin.site.message.user2.handler.U2MessageWebNoticeHandler; import com.akaxin.site.message.user2.handler.UserDetectionHandler; import com.akaxin.site.message.user2.handler.UserPsnHandler; import com.akaxin.site.message.user2.handler.UserPushHandler; +import com.windchat.im.message.notice.handler.NoticeHandler; +import com.windchat.im.message.notice.handler.NoticePushHandler; /** * diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java index ff3c582..b403eab 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import org.apache.commons.lang3.StringUtils; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java index d2facfd..8421c57 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; +import com.windchat.im.message.dao.ImUserGroupDao; +import com.windchat.im.message.dao.ImUserProfileDao; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java index cb1b14d..c1d5405 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java index 218488e..8162775 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import com.akaxin.common.channel.ChannelSession; import com.akaxin.common.command.Command; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java index 43051be..6a516b3 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java index 9552871..84103e0 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java index 9c21d94..2a5d50f 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import com.akaxin.common.channel.ChannelSession; import com.akaxin.common.command.Command; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java index 691e710..b1a28f7 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java index 39fb402..b08a649 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java index e6dd7bb..6a972e0 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; +import com.windchat.im.message.bean.WebBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java index f401061..436c0df 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; +import com.windchat.im.message.bean.WebBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java index 9b85fe3..6eb04cf 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import java.util.List; +import com.windchat.im.message.dao.ImUserSessionDao; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java index f72b454..efdd4fe 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java @@ -13,11 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.group.handler; +package com.windchat.im.message.group.handler; import java.nio.charset.Charset; import java.util.List; +import com.windchat.im.message.dao.ImUserGroupDao; +import com.windchat.im.message.dao.ImUserProfileDao; +import com.windchat.im.message.push.PushClient; +import com.windchat.im.message.threads.MultiPushThreadExecutor; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java similarity index 93% rename from openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java index 2f5c52c..cc22127 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.notice.handler; +package com.windchat.im.message.notice.handler; import com.akaxin.common.executor.chain.handler.IHandler; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java index 17cc822..85a7cd2 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.notice.handler; +package com.windchat.im.message.notice.handler; import java.util.List; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java similarity index 99% rename from openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java index e2cb1f0..e7c36c1 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.notice.handler; +package com.windchat.im.message.notice.handler; import java.util.List; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java b/openzaly-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java similarity index 99% rename from openzaly-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java rename to openzaly-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java index d5f7dfc..317a8b4 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.platform; +package com.windchat.im.message.platform; import java.util.HashMap; import java.util.Map; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/push/PushClient.java b/openzaly-message/src/main/java/com/windchat/im/message/push/PushClient.java similarity index 99% rename from openzaly-message/src/main/java/com/akaxin/site/message/push/PushClient.java rename to openzaly-message/src/main/java/com/windchat/im/message/push/PushClient.java index a858659..0eed0fe 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/push/PushClient.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/push/PushClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.push; +package com.windchat.im.message.push; import java.util.HashMap; import java.util.Map; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java b/openzaly-message/src/main/java/com/windchat/im/message/service/ImMessageService.java similarity index 95% rename from openzaly-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java rename to openzaly-message/src/main/java/com/windchat/im/message/service/ImMessageService.java index 18198b5..71ef742 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/service/ImMessageService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.service; +package com.windchat.im.message.service; import com.akaxin.common.command.Command; import com.akaxin.site.message.api.IMessageService; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java b/openzaly-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java rename to openzaly-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java index 4c061c0..1dbc8a4 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.service; +package com.windchat.im.message.service; +import com.windchat.im.message.executor.MessageExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java index 1c6de72..d909daf 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.sync.handler; +package com.windchat.im.message.sync.handler; import org.apache.commons.lang3.StringUtils; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java index 4845273..1d35793 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.sync.handler; +package com.windchat.im.message.sync.handler; import java.util.Map; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java similarity index 99% rename from openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java index 68b02c7..72f371b 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.sync.handler; +package com.windchat.im.message.sync.handler; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.windchat.im.message.bean.WebBean; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java index 47e125e..cee7692 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.sync.handler; +package com.windchat.im.message.sync.handler; import java.util.List; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java similarity index 99% rename from openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java index 318fe3a..47bdd19 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.sync.handler; +package com.windchat.im.message.sync.handler; import java.util.Base64; import java.util.HashMap; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java similarity index 99% rename from openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java index 3a538ea..a7f9fd2 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.sync.handler; +package com.windchat.im.message.sync.handler; import java.util.Base64; import java.util.HashMap; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java b/openzaly-message/src/main/java/com/windchat/im/message/threads/MultiPushThreadExecutor.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java rename to openzaly-message/src/main/java/com/windchat/im/message/threads/MultiPushThreadExecutor.java index 25aed63..862eeed 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/threads/MultiPushThreadExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.threads; +package com.windchat.im.message.threads; import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java index 11defb0..a013118 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import org.apache.commons.lang3.StringUtils; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java index bc2d90b..90ae5a6 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java index b577f58..c8f9bd1 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java index dfa36e5..cbf8a3a 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; +import com.windchat.im.message.group.handler.AbstractGroupHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java index 3861496..8197c89 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import java.nio.charset.Charset; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java index 2b08953..e100e51 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import java.util.Base64; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java index fbd696a..224afc6 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java index 08d71c8..bc5efed 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java index 25dace5..5add2d3 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; +import com.windchat.im.message.bean.WebBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java index 244239e..3544966 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; +import com.windchat.im.message.bean.WebBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java index 5bfdfcc..637c054 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; +import com.windchat.im.message.dao.ImUserFriendDao; +import com.windchat.im.message.dao.ImUserProfileDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java index 05ed7f6..b97ffd2 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import java.util.List; +import com.windchat.im.message.dao.ImUserSessionDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java similarity index 95% rename from openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java index c527335..772251c 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java @@ -13,11 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.user2.handler; +package com.windchat.im.message.user2.handler; import java.nio.charset.Charset; import java.util.List; +import com.windchat.im.message.dao.ImUserFriendDao; +import com.windchat.im.message.dao.ImUserProfileDao; +import com.windchat.im.message.push.PushClient; +import com.windchat.im.message.threads.MultiPushThreadExecutor; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java b/openzaly-message/src/main/java/com/windchat/im/message/utils/HexUtils.java similarity index 96% rename from openzaly-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java rename to openzaly-message/src/main/java/com/windchat/im/message/utils/HexUtils.java index 09d5dcc..0eaeb77 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/utils/HexUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.utils; +package com.windchat.im.message.utils; public class HexUtils { diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java b/openzaly-message/src/main/java/com/windchat/im/message/utils/NumUtils.java similarity index 84% rename from openzaly-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java rename to openzaly-message/src/main/java/com/windchat/im/message/utils/NumUtils.java index b4d5406..1015fd8 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/utils/NumUtils.java @@ -1,4 +1,4 @@ -package com.akaxin.site.message.utils; +package com.windchat.im.message.utils; public class NumUtils { diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java b/openzaly-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java similarity index 96% rename from openzaly-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java rename to openzaly-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java index 9e9f047..c046571 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.utils; +package com.windchat.im.message.utils; import java.util.Map; +import com.windchat.im.message.dao.SiteConfigDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java new file mode 100755 index 0000000..773855c --- /dev/null +++ b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java @@ -0,0 +1,5 @@ +package com.windchat.im.message.web.bean; + +public class WebGroupTextBean { + +} diff --git a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java new file mode 100755 index 0000000..9af2b07 --- /dev/null +++ b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java @@ -0,0 +1,5 @@ +package com.windchat.im.message.web.bean; + +public class WebResponseBean { + +} diff --git a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java new file mode 100755 index 0000000..27038e3 --- /dev/null +++ b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java @@ -0,0 +1,5 @@ +package com.windchat.im.message.web.bean; + +public class WebU2TextBean { + +} diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java index 3eb2927..f2a0267 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.web.chat; +package com.windchat.im.message.web.chat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java b/openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java rename to openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java index 51084f1..2e3ae8b 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java +++ b/openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.message.web.chat; +package com.windchat.im.message.web.chat; +import com.windchat.im.message.dao.ImUserFriendDao; +import com.windchat.im.message.dao.ImUserProfileDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory;