From e9656176baee39c0aed07b1fddf60cb409f7344f Mon Sep 17 00:00:00 2001 From: SAM2O2O Date: Wed, 27 Nov 2019 23:33:33 +0800 Subject: [PATCH] update com.windchat.im package name --- .../im}/web/OpenzalyAdminApplication.java | 2 +- .../im}/web/admin/bean/WebMessageBean.java | 5 +- .../im}/web/admin/common/MsgUtils.java | 2 +- .../im}/web/admin/common/Timeutils.java | 2 +- .../admin/controller/AbstractController.java | 2 +- .../admin/controller/CommomController.java | 2 +- .../controller/ConfigManageController.java | 6 +- .../controller/GroupManageController.java | 8 +- .../admin/controller/MonitorController.java | 8 +- .../controller/PluginManageController.java | 6 +- .../admin/controller/UICManageController.java | 6 +- .../controller/UserManageController.java | 10 +- .../controller/UserSquareController.java | 4 +- .../web/admin/exception/ManagerException.java | 2 +- .../exception/UserPermissionException.java | 2 +- .../im}/web/admin/service/IConfigService.java | 2 +- .../im}/web/admin/service/IGroupService.java | 2 +- .../admin/service/IMessageManageService.java | 4 +- .../web/admin/service/IMonitorService.java | 2 +- .../im}/web/admin/service/IPluginService.java | 2 +- .../im}/web/admin/service/IUICService.java | 2 +- .../im}/web/admin/service/IUserService.java | 2 +- .../service/impl/ConfigManageService.java | 6 +- .../service/impl/GroupManageService.java | 4 +- .../service/impl/MessageManageService.java | 6 +- .../admin/service/impl/MonitorService.java | 4 +- .../service/impl/PluginManageService.java | 4 +- .../admin/service/impl/UICManageService.java | 4 +- .../admin/service/impl/UserManageService.java | 4 +- .../im}/web/utils/ArraysUtils.java | 2 +- windchat-boot/pom.xml | 6 +- .../im}/boot/config/AkxProject.java | 2 +- .../im}/boot/config/ConfigHelper.java | 4 +- .../im}/boot/config/ConfigKey.java | 2 +- .../im}/boot/config/ConfigListener.java | 2 +- .../im}/boot/config/SiteDefaultIcon.java | 2 +- .../im}/boot/main/Bootstrap.java | 38 +++--- .../spring/CustomizationWebServerBean.java | 7 +- .../boot/spring/OpenzalyConfiguration.java | 2 +- .../im}/boot/spring/OpenzalySpringBoot.java | 2 +- .../im}/boot/utils/BootLog.java | 2 +- .../im}/boot/utils/Helper.java | 6 +- .../im}/boot/utils/PropertiesUtils.java | 2 +- .../im}/boot/test/TestDefaultIcon.java | 2 +- .../im}/boot/test/TestFile.java | 2 +- .../im}/boot/test/TestHttpClient.java | 2 +- .../im}/boot/test/TestSystemPro.java | 2 +- .../site/business/bean/MsgNoticeBean.java | 5 - .../im}/business/api/IRequest.java | 2 +- .../im/business/bean/MsgNoticeBean.java | 5 + .../im}/business/bean/PlatformPhoneBean.java | 2 +- .../im}/business/cache/WebSessionCache.java | 2 +- .../im}/business/constant/AkxProject.java | 2 +- .../im}/business/constant/GroupConfig.java | 2 +- .../im}/business/constant/NoticeText.java | 2 +- .../im}/business/dao/ExpireTokenDao.java | 2 +- .../im}/business/dao/MonitorDao.java | 2 +- .../im}/business/dao/SiteConfigDao.java | 2 +- .../im}/business/dao/SiteLoginDao.java | 2 +- .../im}/business/dao/SitePluginDao.java | 2 +- .../im}/business/dao/SiteUicDao.java | 2 +- .../im}/business/dao/SiteUserDao.java | 2 +- .../im}/business/dao/UserDeviceDao.java | 2 +- .../im}/business/dao/UserFriendDao.java | 2 +- .../im}/business/dao/UserGroupDao.java | 2 +- .../im}/business/dao/UserProfileDao.java | 2 +- .../im}/business/dao/UserSessionDao.java | 2 +- .../im}/business/impl/AbstractRequest.java | 4 +- .../im}/business/impl/IRequestService.java | 2 +- .../business/impl/hai/HttpFriendService.java | 5 +- .../business/impl/hai/HttpGroupService.java | 5 +- .../business/impl/hai/HttpMessageService.java | 3 +- .../business/impl/hai/HttpPushService.java | 4 +- .../business/impl/hai/HttpSessionService.java | 4 +- .../business/impl/hai/HttpSiteService.java | 3 +- .../business/impl/hai/HttpUserService.java | 7 +- .../im}/business/impl/notice/GroupNotice.java | 4 +- .../im}/business/impl/notice/User2Notice.java | 3 +- .../business/impl/site/PlatformUserPhone.java | 3 +- .../im}/business/impl/site/SiteConfig.java | 4 +- .../im}/business/impl/site/UserUic.java | 3 +- .../business/impl/tai/ApiDeviceService.java | 4 +- .../im}/business/impl/tai/ApiFileService.java | 4 +- .../business/impl/tai/ApiFriendService.java | 5 +- .../business/impl/tai/ApiGroupService.java | 7 +- .../business/impl/tai/ApiPluginService.java | 5 +- .../impl/tai/ApiSecretChatService.java | 3 +- .../im}/business/impl/tai/ApiSiteService.java | 5 +- .../im}/business/impl/tai/ApiUserService.java | 5 +- .../im}/business/impl/tai/ApiWebService.java | 3 +- .../im}/business/push/PushNotification.java | 2 +- .../im}/business/push/PushText.java | 4 +- .../business/service/ApiRequestService.java | 3 +- .../business/service/ApiServiceFactory.java | 2 +- .../business/service/HttpRequestService.java | 3 +- .../im}/business/utils/FilePathUtils.java | 2 +- .../im}/business/utils/FileServerUtils.java | 2 +- .../im}/business/utils/HexUtils.java | 2 +- .../im}/business/utils/StringRandomUtils.java | 2 +- .../im}/business/test/TestHttpProto.java | 2 +- .../com/akaxin/common/utils/GsonUtils.java | 34 ------ .../common/channel/ChannelManager.java | 2 +- .../common/channel/ChannelSession.java | 2 +- .../common/channel/ChannelWriter.java | 8 +- .../common/channel/WebChannelManager.java | 2 +- .../common/command/Command.java | 10 +- .../common/command/CommandResponse.java | 2 +- .../common/command/RedisCommand.java | 12 +- .../common/constant/CharsetCoding.java | 2 +- .../common/constant/CommandConst.java | 2 +- .../common/constant/ConfigConst.java | 2 +- .../common/constant/ErrorCode2.java | 2 +- .../common/constant/HttpUriAction.java | 2 +- .../common/constant/IErrorCode.java | 2 +- .../common/constant/RequestAction.java | 2 +- .../common/crypto/AESCrypto.java | 4 +- .../common/crypto/HashCrypto.java | 2 +- .../common/crypto/RSACrypto.java | 2 +- .../common/exceptions/ZalyException.java | 3 +- .../common/exceptions/ZalyException2.java | 3 +- .../common/executor/AbstracteExecutor.java | 4 +- .../common/executor/IExecutor.java | 2 +- .../common/executor/SimpleExecutor.java | 4 +- .../executor/chain/AbstractHandlerChain.java | 3 +- .../executor/chain/CustomRHandlerChain.java | 3 +- .../executor/chain/SimpleHandlerChain.java | 2 +- .../executor/chain/handler/IHandler.java | 2 +- .../chain/handler/MethodReflectHandler.java | 3 +- .../common/http/ZalyHttpClient.java | 2 +- .../common/logs/AkxLog4jManager.java | 2 +- .../common/logs/LogCreater.java | 2 +- .../common/logs/LogUtils.java | 5 +- .../common/netty/IRedisCommandResponse.java | 3 +- .../common/netty/NettyClient2.java | 10 +- .../common/netty/NettyClientHandler.java | 4 +- .../common/netty/PlatformClientHandler.java | 4 +- .../common/netty/PlatformSSLClient.java | 13 +- .../common/netty/RedisCommandResponse.java | 3 +- .../common/netty/codec/MessageDecoder.java | 2 +- .../common/netty/codec/MessageEncoder.java | 3 +- .../common/netty/codec/ProtocolParser.java | 8 +- .../common/netty/codec/ReplaySignal.java | 2 +- .../common/resp/AbstractParameter.java | 2 +- .../common/resp/RedisBytesParameter.java | 2 +- .../common/resp/RedisDoubleParameter.java | 2 +- .../common/resp/RedisIntegerParameter.java | 2 +- .../common/resp/RedisStringParameter.java | 2 +- .../common/ssl/ZalySSLContext.java | 2 +- .../common/ssl/ZalyTrustManagerFactory.java | 2 +- .../com/windchat/common/utils/GsonUtils.java | 17 +++ .../common/utils/IpUtils.java | 2 +- .../common/utils/PrintUtils.java | 2 +- .../common/utils/ServerAddress.java | 2 +- .../common/utils/ServerAddressUtils.java | 2 +- .../common/utils/StringHelper.java | 2 +- .../common/utils/TimeFormats.java | 2 +- .../common/utils/URLRegexUtils.java | 2 +- .../common/utils/UserIdUtils.java | 2 +- .../common/utils/ValidatorPattern.java | 2 +- .../common/test/TestInetAddress.java | 2 +- .../site/connector/cache/PluginCache.java | 5 - .../im/connector/cache/PluginCache.java | 5 + .../connector/codec/parser/ChannelConst.java | 2 +- .../codec/parser/IProtocolParser.java | 4 +- .../codec/parser/ProtocolParser.java | 6 +- .../codec/protocol/MessageDecoder.java | 6 +- .../codec/protocol/MessageEncoder.java | 6 +- .../codec/protocol/ReplaySignal.java | 2 +- .../im}/connector/constant/AkxProject.java | 2 +- .../im}/connector/constant/HttpConst.java | 2 +- .../im}/connector/constant/PluginConst.java | 2 +- .../exception/HttpServerException.java | 2 +- .../exception/TcpServerException.java | 2 +- .../handler/AbstractCommonHandler.java | 2 +- .../connector/handler/ApiRequestHandler.java | 4 +- .../connector/handler/HttpRequestHandler.java | 8 +- .../connector/handler/ImMessageHandler.java | 4 +- .../connector/handler/ImSiteAuthHandler.java | 6 +- .../connector/handler/WSRequestHandler.java | 2 +- .../im}/connector/http/HttpServer.java | 8 +- .../http/handler/HttpServerHandler.java | 10 +- .../im}/connector/netty/NettyServer.java | 12 +- .../connector/netty/PrefixThreadFactory.java | 2 +- .../netty/handler/NettyServerHandler.java | 8 +- .../im}/connector/session/PluginSession.java | 4 +- .../im}/connector/session/SessionManager.java | 2 +- .../im}/connector/session/UserSession.java | 2 +- .../connector/ssl/NettySocketSslContext.java | 2 +- .../im}/connector/ssl/SslKeyStore.java | 2 +- .../im}/connector/ssl/StreamReader.java | 4 +- .../im}/connector/utils/HexUtils.java | 2 +- .../im}/connector/ws/WsServer.java | 6 +- .../connector/ws/handler/WsServerHandler.java | 4 +- .../message/web/bean/WebGroupTextBean.java | 5 - .../message/web/bean/WebResponseBean.java | 5 - .../site/message/web/bean/WebU2TextBean.java | 5 - .../im}/message/api/IMessageService.java | 2 +- .../im}/message/bean/WebBean.java | 2 +- .../im}/message/dao/ImUserFriendDao.java | 2 +- .../im}/message/dao/ImUserGroupDao.java | 2 +- .../im}/message/dao/ImUserProfileDao.java | 2 +- .../im}/message/dao/ImUserSessionDao.java | 2 +- .../im}/message/dao/SessionDeviceDao.java | 2 +- .../im}/message/dao/SiteConfigDao.java | 2 +- .../im}/message/executor/MessageExecutor.java | 4 +- .../group/handler/AbstractGroupHandler.java | 2 +- .../group/handler/GroupDetectionHandler.java | 4 +- .../handler/GroupMessageImageHandler.java | 2 +- .../GroupMessageImageSecretHandler.java | 2 +- .../handler/GroupMessageNoticeHandler.java | 2 +- .../handler/GroupMessageTextHandler.java | 2 +- .../GroupMessageTextSecretHandler.java | 2 +- .../handler/GroupMessageVoiceHandler.java | 2 +- .../GroupMessageVoiceSecretHandler.java | 2 +- .../group/handler/GroupMessageWebHandler.java | 3 +- .../handler/GroupMessageWebNoticeHandler.java | 3 +- .../group/handler/GroupPsnHandler.java | 3 +- .../group/handler/GroupPushHandler.java | 6 +- .../notice/handler/AbstractNoticeHandler.java | 2 +- .../message/notice/handler/NoticeHandler.java | 2 +- .../notice/handler/NoticePushHandler.java | 2 +- .../im}/message/platform/PlatformClient.java | 2 +- .../im}/message/push/PushClient.java | 2 +- .../im}/message/service/ImMessageService.java | 2 +- .../message/service/MessageDispatcher.java | 3 +- .../sync/handler/AbstractSyncHandler.java | 2 +- .../sync/handler/SyncFinishHandler.java | 2 +- .../sync/handler/SyncGroupMessageHandler.java | 3 +- .../sync/handler/SyncMsgStatusHandler.java | 2 +- .../sync/handler/SyncNoticeHandler.java | 2 +- .../sync/handler/SyncU2MessageHandler.java | 2 +- .../threads/MultiPushThreadExecutor.java | 2 +- .../user2/handler/AbstractU2Handler.java | 2 +- .../user2/handler/U2MessageImageHandler.java | 2 +- .../handler/U2MessageImageSecretHandler.java | 2 +- .../user2/handler/U2MessageNoticeHandler.java | 3 +- .../user2/handler/U2MessageTextHandler.java | 2 +- .../handler/U2MessageTextSecretHandler.java | 2 +- .../user2/handler/U2MessageVoiceHandler.java | 2 +- .../handler/U2MessageVoiceSecretHandler.java | 2 +- .../user2/handler/U2MessageWebHandler.java | 3 +- .../handler/U2MessageWebNoticeHandler.java | 3 +- .../user2/handler/UserDetectionHandler.java | 4 +- .../message/user2/handler/UserPsnHandler.java | 3 +- .../user2/handler/UserPushHandler.java | 6 +- .../im}/message/utils/HexUtils.java | 2 +- .../im}/message/utils/NumUtils.java | 2 +- .../im}/message/utils/SiteConfigHelper.java | 3 +- .../im/message/web/bean/WebGroupTextBean.java | 5 + .../im/message/web/bean/WebResponseBean.java | 5 + .../im/message/web/bean/WebU2TextBean.java | 5 + .../chat/WebChatReceiveMessageHandler.java | 2 +- .../web/chat/WebChatSendMessageHandler.java | 4 +- windchat-storage/pom.xml | 112 ++++++++---------- 254 files changed, 547 insertions(+), 473 deletions(-) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/OpenzalyAdminApplication.java (97%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/bean/WebMessageBean.java (94%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/common/MsgUtils.java (92%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/common/Timeutils.java (91%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/AbstractController.java (97%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/CommomController.java (95%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/ConfigManageController.java (98%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/GroupManageController.java (98%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/MonitorController.java (94%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/PluginManageController.java (98%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/UICManageController.java (97%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/UserManageController.java (98%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/controller/UserSquareController.java (98%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/exception/ManagerException.java (89%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/exception/UserPermissionException.java (82%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/IConfigService.java (93%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/IGroupService.java (95%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/IMessageManageService.java (79%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/IMonitorService.java (89%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/IPluginService.java (89%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/IUICService.java (83%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/IUserService.java (92%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/impl/ConfigManageService.java (97%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/impl/GroupManageService.java (96%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/impl/MessageManageService.java (96%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/impl/MonitorService.java (91%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/impl/PluginManageService.java (94%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/impl/UICManageService.java (94%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/admin/service/impl/UserManageService.java (98%) rename windchat-admin/src/main/java/com/{akaxin/site => windchat/im}/web/utils/ArraysUtils.java (89%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/config/AkxProject.java (86%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/config/ConfigHelper.java (97%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/config/ConfigKey.java (97%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/config/ConfigListener.java (97%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/config/SiteDefaultIcon.java (99%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/main/Bootstrap.java (91%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/spring/CustomizationWebServerBean.java (90%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/spring/OpenzalyConfiguration.java (94%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/spring/OpenzalySpringBoot.java (97%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/utils/BootLog.java (93%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/utils/Helper.java (98%) rename windchat-boot/src/main/java/com/{akaxin/site => windchat/im}/boot/utils/PropertiesUtils.java (98%) rename windchat-boot/src/test/java/com/{akaxin/site => windchat/im}/boot/test/TestDefaultIcon.java (91%) rename windchat-boot/src/test/java/com/{akaxin/site => windchat/im}/boot/test/TestFile.java (95%) rename windchat-boot/src/test/java/com/{akaxin/site => windchat/im}/boot/test/TestHttpClient.java (93%) rename windchat-boot/src/test/java/com/{akaxin/site => windchat/im}/boot/test/TestSystemPro.java (78%) delete mode 100755 windchat-business/src/main/java/com/akaxin/site/business/bean/MsgNoticeBean.java rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/api/IRequest.java (82%) create mode 100755 windchat-business/src/main/java/com/windchat/im/business/bean/MsgNoticeBean.java rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/bean/PlatformPhoneBean.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/cache/WebSessionCache.java (97%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/constant/AkxProject.java (62%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/constant/GroupConfig.java (94%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/constant/NoticeText.java (95%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/ExpireTokenDao.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/MonitorDao.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/SiteConfigDao.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/SiteLoginDao.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/SitePluginDao.java (99%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/SiteUicDao.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/SiteUserDao.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/UserDeviceDao.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/UserFriendDao.java (99%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/UserGroupDao.java (99%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/UserProfileDao.java (99%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/dao/UserSessionDao.java (97%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/AbstractRequest.java (95%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/IRequestService.java (82%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/hai/HttpFriendService.java (97%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/hai/HttpGroupService.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/hai/HttpMessageService.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/hai/HttpPushService.java (94%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/hai/HttpSessionService.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/hai/HttpSiteService.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/hai/HttpUserService.java (97%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/notice/GroupNotice.java (97%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/notice/User2Notice.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/site/PlatformUserPhone.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/site/SiteConfig.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/site/UserUic.java (95%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiDeviceService.java (97%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiFileService.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiFriendService.java (99%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiGroupService.java (99%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiPluginService.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiSecretChatService.java (97%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiSiteService.java (99%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiUserService.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/impl/tai/ApiWebService.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/push/PushNotification.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/push/PushText.java (92%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/service/ApiRequestService.java (94%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/service/ApiServiceFactory.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/service/HttpRequestService.java (97%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/utils/FilePathUtils.java (98%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/utils/FileServerUtils.java (99%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/utils/HexUtils.java (96%) rename windchat-business/src/main/java/com/{akaxin/site => windchat/im}/business/utils/StringRandomUtils.java (94%) rename windchat-business/src/test/java/com/{akaxin/site => windchat/im}/business/test/TestHttpProto.java (95%) delete mode 100755 windchat-common/src/main/java/com/akaxin/common/utils/GsonUtils.java rename windchat-common/src/main/java/com/{akaxin => windchat}/common/channel/ChannelManager.java (97%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/channel/ChannelSession.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/channel/ChannelWriter.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/channel/WebChannelManager.java (97%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/command/Command.java (96%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/command/CommandResponse.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/command/RedisCommand.java (88%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/constant/CharsetCoding.java (82%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/constant/CommandConst.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/constant/ConfigConst.java (94%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/constant/ErrorCode2.java (99%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/constant/HttpUriAction.java (97%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/constant/IErrorCode.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/constant/RequestAction.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/crypto/AESCrypto.java (96%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/crypto/HashCrypto.java (97%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/crypto/RSACrypto.java (99%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/exceptions/ZalyException.java (92%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/exceptions/ZalyException2.java (92%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/executor/AbstracteExecutor.java (93%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/executor/IExecutor.java (94%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/executor/SimpleExecutor.java (90%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/executor/chain/AbstractHandlerChain.java (91%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/executor/chain/CustomRHandlerChain.java (90%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/executor/chain/SimpleHandlerChain.java (96%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/executor/chain/handler/IHandler.java (82%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/executor/chain/handler/MethodReflectHandler.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/http/ZalyHttpClient.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/logs/AkxLog4jManager.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/logs/LogCreater.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/logs/LogUtils.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/IRedisCommandResponse.java (91%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/NettyClient2.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/NettyClientHandler.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/PlatformClientHandler.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/PlatformSSLClient.java (94%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/RedisCommandResponse.java (94%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/codec/MessageDecoder.java (97%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/codec/MessageEncoder.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/codec/ProtocolParser.java (94%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/netty/codec/ReplaySignal.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/resp/AbstractParameter.java (92%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/resp/RedisBytesParameter.java (96%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/resp/RedisDoubleParameter.java (94%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/resp/RedisIntegerParameter.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/resp/RedisStringParameter.java (96%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/ssl/ZalySSLContext.java (95%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/ssl/ZalyTrustManagerFactory.java (98%) create mode 100755 windchat-common/src/main/java/com/windchat/common/utils/GsonUtils.java rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/IpUtils.java (91%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/PrintUtils.java (94%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/ServerAddress.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/ServerAddressUtils.java (97%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/StringHelper.java (99%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/TimeFormats.java (98%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/URLRegexUtils.java (97%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/UserIdUtils.java (97%) rename windchat-common/src/main/java/com/{akaxin => windchat}/common/utils/ValidatorPattern.java (98%) rename windchat-common/src/test/java/com/{akaxin => windchat}/common/test/TestInetAddress.java (50%) delete mode 100755 windchat-connector/src/main/java/com/akaxin/site/connector/cache/PluginCache.java create mode 100755 windchat-connector/src/main/java/com/windchat/im/connector/cache/PluginCache.java rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/codec/parser/ChannelConst.java (88%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/codec/parser/IProtocolParser.java (90%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/codec/parser/ProtocolParser.java (94%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/codec/protocol/MessageDecoder.java (88%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/codec/protocol/MessageEncoder.java (94%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/codec/protocol/ReplaySignal.java (93%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/constant/AkxProject.java (62%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/constant/HttpConst.java (78%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/constant/PluginConst.java (72%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/exception/HttpServerException.java (90%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/exception/TcpServerException.java (87%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/handler/AbstractCommonHandler.java (97%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/handler/ApiRequestHandler.java (98%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/handler/HttpRequestHandler.java (95%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/handler/ImMessageHandler.java (97%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/handler/ImSiteAuthHandler.java (97%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/handler/WSRequestHandler.java (97%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/http/HttpServer.java (95%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/http/handler/HttpServerHandler.java (96%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/netty/NettyServer.java (95%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/netty/PrefixThreadFactory.java (97%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/netty/handler/NettyServerHandler.java (97%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/session/PluginSession.java (96%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/session/SessionManager.java (97%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/session/UserSession.java (98%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/ssl/NettySocketSslContext.java (98%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/ssl/SslKeyStore.java (99%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/ssl/StreamReader.java (92%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/utils/HexUtils.java (90%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/ws/WsServer.java (96%) rename windchat-connector/src/main/java/com/{akaxin/site => windchat/im}/connector/ws/handler/WsServerHandler.java (98%) delete mode 100755 windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java delete mode 100755 windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java delete mode 100755 windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/api/IMessageService.java (76%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/bean/WebBean.java (94%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/ImUserFriendDao.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/ImUserGroupDao.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/ImUserProfileDao.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/ImUserSessionDao.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/SessionDeviceDao.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/dao/SiteConfigDao.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/executor/MessageExecutor.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/AbstractGroupHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupDetectionHandler.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageImageHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageImageSecretHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageNoticeHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageTextHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageTextSecretHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageVoiceHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageVoiceSecretHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageWebHandler.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupMessageWebNoticeHandler.java (96%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupPsnHandler.java (96%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/group/handler/GroupPushHandler.java (96%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/notice/handler/AbstractNoticeHandler.java (93%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/notice/handler/NoticeHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/notice/handler/NoticePushHandler.java (99%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/platform/PlatformClient.java (99%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/push/PushClient.java (99%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/service/ImMessageService.java (95%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/service/MessageDispatcher.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/AbstractSyncHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncFinishHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncGroupMessageHandler.java (99%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncMsgStatusHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncNoticeHandler.java (99%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/sync/handler/SyncU2MessageHandler.java (99%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/threads/MultiPushThreadExecutor.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/AbstractU2Handler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageImageHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageImageSecretHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageNoticeHandler.java (96%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageTextHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageTextSecretHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageVoiceHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageVoiceSecretHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageWebHandler.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/U2MessageWebNoticeHandler.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/UserDetectionHandler.java (97%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/UserPsnHandler.java (96%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/user2/handler/UserPushHandler.java (95%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/utils/HexUtils.java (96%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/utils/NumUtils.java (84%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/utils/SiteConfigHelper.java (96%) create mode 100755 windchat-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java create mode 100755 windchat-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java create mode 100755 windchat-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/web/chat/WebChatReceiveMessageHandler.java (98%) rename windchat-message/src/main/java/com/{akaxin/site => windchat/im}/message/web/chat/WebChatSendMessageHandler.java (96%) diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/OpenzalyAdminApplication.java b/windchat-admin/src/main/java/com/windchat/im/web/OpenzalyAdminApplication.java similarity index 97% rename from windchat-admin/src/main/java/com/akaxin/site/web/OpenzalyAdminApplication.java rename to windchat-admin/src/main/java/com/windchat/im/web/OpenzalyAdminApplication.java index e97926f..a8ec7ac 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/OpenzalyAdminApplication.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/OpenzalyAdminApplication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web; +package com.windchat.im.web; import org.springframework.boot.Banner; import org.springframework.boot.SpringApplication; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/bean/WebMessageBean.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/bean/WebMessageBean.java similarity index 94% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/bean/WebMessageBean.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/bean/WebMessageBean.java index cb82f0b..3e44716 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/bean/WebMessageBean.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/bean/WebMessageBean.java @@ -1,6 +1,7 @@ -package com.akaxin.site.web.admin.bean; +package com.windchat.im.web.admin.bean; -import com.akaxin.common.utils.GsonUtils; + +import com.windchat.common.utils.GsonUtils; public class WebMessageBean { private String siteUserId; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/common/MsgUtils.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/common/MsgUtils.java similarity index 92% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/common/MsgUtils.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/common/MsgUtils.java index 4ecab59..2a31e86 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/common/MsgUtils.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/common/MsgUtils.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.common; +package com.windchat.im.web.admin.common; import org.apache.commons.lang3.StringUtils; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/common/Timeutils.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/common/Timeutils.java similarity index 91% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/common/Timeutils.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/common/Timeutils.java index 88bdd90..c3613e2 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/common/Timeutils.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/common/Timeutils.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.common; +package com.windchat.im.web.admin.common; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/AbstractController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/AbstractController.java similarity index 97% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/AbstractController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/AbstractController.java index 862d09c..9c5ba5a 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/AbstractController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/AbstractController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import java.util.Map; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/CommomController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/CommomController.java similarity index 95% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/CommomController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/CommomController.java index e756602..0adccd6 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/CommomController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/CommomController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/ConfigManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/ConfigManageController.java similarity index 98% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/ConfigManageController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/ConfigManageController.java index ac68a6f..fb52602 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/ConfigManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/ConfigManageController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import java.util.HashMap; import java.util.Map; @@ -21,6 +21,7 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; +import com.windchat.im.web.admin.service.IConfigService; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Level; import org.slf4j.Logger; @@ -39,8 +40,7 @@ import com.akaxin.proto.core.ConfigProto; import com.akaxin.proto.core.ConfigProto.ConfigKey; import com.akaxin.proto.core.PluginProto; import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.web.admin.exception.UserPermissionException; -import com.akaxin.site.web.admin.service.IConfigService; +import com.windchat.im.web.admin.exception.UserPermissionException; import com.google.protobuf.InvalidProtocolBufferException; /** diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/GroupManageController.java similarity index 98% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/GroupManageController.java index 78a9bd7..87b7563 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/GroupManageController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import java.util.ArrayList; import java.util.HashMap; @@ -23,6 +23,9 @@ import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.windchat.im.web.admin.exception.UserPermissionException; +import com.windchat.im.web.admin.service.IConfigService; +import com.windchat.im.web.admin.service.IGroupService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,9 +43,6 @@ import com.windchat.im.storage.bean.GroupMemberBean; import com.windchat.im.storage.bean.GroupProfileBean; import com.windchat.im.storage.bean.SimpleGroupBean; import com.windchat.im.storage.bean.UserProfileBean; -import com.akaxin.site.web.admin.exception.UserPermissionException; -import com.akaxin.site.web.admin.service.IConfigService; -import com.akaxin.site.web.admin.service.IGroupService; import com.google.protobuf.InvalidProtocolBufferException; /** diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/MonitorController.java similarity index 94% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/MonitorController.java index 867b3c6..ca2436c 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/MonitorController.java @@ -1,11 +1,11 @@ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import com.akaxin.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; import com.windchat.im.storage.bean.MonitorBean; -import com.akaxin.site.web.admin.common.Timeutils; -import com.akaxin.site.web.admin.exception.UserPermissionException; -import com.akaxin.site.web.admin.service.IMonitorService; +import com.windchat.im.web.admin.common.Timeutils; +import com.windchat.im.web.admin.exception.UserPermissionException; +import com.windchat.im.web.admin.service.IMonitorService; import com.google.protobuf.InvalidProtocolBufferException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/PluginManageController.java similarity index 98% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/PluginManageController.java index 59804ae..6bf0c73 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/PluginManageController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import java.util.ArrayList; import java.util.HashMap; @@ -22,6 +22,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; +import com.windchat.im.web.admin.exception.UserPermissionException; +import com.windchat.im.web.admin.service.IPluginService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,8 +37,6 @@ import org.springframework.web.servlet.ModelAndView; import com.akaxin.common.utils.StringHelper; import com.akaxin.proto.core.PluginProto; import com.windchat.im.storage.bean.PluginBean; -import com.akaxin.site.web.admin.exception.UserPermissionException; -import com.akaxin.site.web.admin.service.IPluginService; import com.google.protobuf.InvalidProtocolBufferException; //插件扩展管理 diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UICManageController.java similarity index 97% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UICManageController.java index 545f1f6..3f2877d 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UICManageController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import java.util.ArrayList; import java.util.HashMap; @@ -22,8 +22,9 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import com.akaxin.site.web.admin.exception.UserPermissionException; +import com.windchat.im.web.admin.exception.UserPermissionException; import com.google.protobuf.InvalidProtocolBufferException; +import com.windchat.im.web.admin.service.IUICService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +39,6 @@ import com.akaxin.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; import com.akaxin.site.business.impl.site.SiteConfig; import com.windchat.im.storage.bean.UicBean; -import com.akaxin.site.web.admin.service.IUICService; //邀请码管理 @Controller diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserManageController.java similarity index 98% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserManageController.java index 05e84e8..8b91595 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserManageController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import java.util.ArrayList; import java.util.HashMap; @@ -25,6 +25,10 @@ import java.util.regex.Pattern; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.windchat.im.web.admin.exception.ManagerException; +import com.windchat.im.web.admin.exception.UserPermissionException; +import com.windchat.im.web.admin.service.IConfigService; +import com.windchat.im.web.admin.service.IUserService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,10 +45,6 @@ import com.akaxin.proto.core.PluginProto; import com.akaxin.proto.core.UserProto.UserStatus; import com.windchat.im.storage.bean.SimpleUserBean; import com.windchat.im.storage.bean.UserProfileBean; -import com.akaxin.site.web.admin.exception.ManagerException; -import com.akaxin.site.web.admin.exception.UserPermissionException; -import com.akaxin.site.web.admin.service.IConfigService; -import com.akaxin.site.web.admin.service.IUserService; import com.google.protobuf.InvalidProtocolBufferException; /** diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserSquareController.java similarity index 98% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserSquareController.java index 3a277c3..3fb58d0 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserSquareController.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.controller; +package com.windchat.im.web.admin.controller; import java.util.ArrayList; import java.util.HashMap; @@ -8,6 +8,7 @@ import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.windchat.im.web.admin.service.IUserService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +27,6 @@ import com.akaxin.site.business.impl.notice.User2Notice; import com.akaxin.site.business.push.PushNotification; import com.windchat.im.storage.bean.SimpleUserBean; import com.windchat.im.storage.bean.UserProfileBean; -import com.akaxin.site.web.admin.service.IUserService; import com.google.protobuf.InvalidProtocolBufferException; /** diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/ManagerException.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/exception/ManagerException.java similarity index 89% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/ManagerException.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/exception/ManagerException.java index 27b4a55..02c1ad4 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/ManagerException.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/exception/ManagerException.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.exception; +package com.windchat.im.web.admin.exception; import com.akaxin.common.utils.StringHelper; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/UserPermissionException.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/exception/UserPermissionException.java similarity index 82% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/UserPermissionException.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/exception/UserPermissionException.java index 3cf282e..9891f72 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/UserPermissionException.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/exception/UserPermissionException.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.exception; +package com.windchat.im.web.admin.exception; public class UserPermissionException extends Exception { /** diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IConfigService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IConfigService.java similarity index 93% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IConfigService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/IConfigService.java index 5b6de2c..6faf11a 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IConfigService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IConfigService.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.service; +package com.windchat.im.web.admin.service; import java.util.List; import java.util.Map; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IGroupService.java similarity index 95% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/IGroupService.java index 20fb64d..9153275 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IGroupService.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.service; +package com.windchat.im.web.admin.service; import java.util.List; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMessageManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IMessageManageService.java similarity index 79% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMessageManageService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/IMessageManageService.java index 2c170c1..cc6579f 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMessageManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IMessageManageService.java @@ -1,6 +1,6 @@ -package com.akaxin.site.web.admin.service; +package com.windchat.im.web.admin.service; -import com.akaxin.site.web.admin.bean.WebMessageBean; +import com.windchat.im.web.admin.bean.WebMessageBean; /** * 后台管理发送消息接口 diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMonitorService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IMonitorService.java similarity index 89% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMonitorService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/IMonitorService.java index 27d7772..c13491d 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMonitorService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IMonitorService.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.service; +package com.windchat.im.web.admin.service; public interface IMonitorService { int queryNumRegisterPerDay(long now, int day); diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IPluginService.java similarity index 89% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/IPluginService.java index cf95e5f..9d72983 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IPluginService.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.service; +package com.windchat.im.web.admin.service; import java.util.List; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IUICService.java similarity index 83% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/IUICService.java index 474fe82..0ee2fae 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IUICService.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.service; +package com.windchat.im.web.admin.service; import java.util.List; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IUserService.java similarity index 92% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/IUserService.java index 489dae0..bf4e89c 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/IUserService.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.admin.service; +package com.windchat.im.web.admin.service; import java.util.List; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/ConfigManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/ConfigManageService.java similarity index 97% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/ConfigManageService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/ConfigManageService.java index 7c643cc..e2a72b3 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/ConfigManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/ConfigManageService.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.service.impl; +package com.windchat.im.web.admin.service.impl; import java.util.Collection; import java.util.List; import java.util.Map; +import com.windchat.im.web.admin.service.IConfigService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,8 +27,7 @@ import org.springframework.stereotype.Service; import com.akaxin.site.business.dao.SiteConfigDao; import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.web.admin.service.IConfigService; -import com.akaxin.site.web.utils.ArraysUtils; +import com.windchat.im.web.utils.ArraysUtils; @Service public class ConfigManageService implements IConfigService { diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/GroupManageService.java similarity index 96% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/GroupManageService.java index 05e0e53..96fce3f 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/GroupManageService.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.service.impl; +package com.windchat.im.web.admin.service.impl; import java.util.List; import java.util.Set; +import com.windchat.im.web.admin.service.IGroupService; import org.springframework.stereotype.Service; import com.akaxin.site.business.dao.UserGroupDao; @@ -25,7 +26,6 @@ import com.akaxin.site.business.impl.site.SiteConfig; import com.windchat.im.storage.bean.GroupMemberBean; import com.windchat.im.storage.bean.GroupProfileBean; import com.windchat.im.storage.bean.SimpleGroupBean; -import com.akaxin.site.web.admin.service.IGroupService; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MessageManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MessageManageService.java similarity index 96% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MessageManageService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MessageManageService.java index a9058a2..bdba12f 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MessageManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MessageManageService.java @@ -1,5 +1,7 @@ -package com.akaxin.site.web.admin.service.impl; +package com.windchat.im.web.admin.service.impl; +import com.windchat.im.web.admin.bean.WebMessageBean; +import com.windchat.im.web.admin.service.IMessageManageService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -11,8 +13,6 @@ import com.akaxin.proto.core.CoreProto.MsgType; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.api.IMessageService; import com.akaxin.site.message.service.ImMessageService; -import com.akaxin.site.web.admin.bean.WebMessageBean; -import com.akaxin.site.web.admin.service.IMessageManageService; /** * 后台管理发送消息实现 diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MonitorService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MonitorService.java similarity index 91% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MonitorService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MonitorService.java index a563b23..c728b0f 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MonitorService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MonitorService.java @@ -1,7 +1,7 @@ -package com.akaxin.site.web.admin.service.impl; +package com.windchat.im.web.admin.service.impl; import com.akaxin.site.business.dao.MonitorDao; -import com.akaxin.site.web.admin.service.IMonitorService; +import com.windchat.im.web.admin.service.IMonitorService; import org.springframework.stereotype.Service; diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/PluginManageService.java similarity index 94% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/PluginManageService.java index 9ea28a7..3592c70 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/PluginManageService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.service.impl; +package com.windchat.im.web.admin.service.impl; import java.util.List; +import com.windchat.im.web.admin.service.IPluginService; import org.springframework.stereotype.Service; import com.akaxin.site.business.dao.SitePluginDao; import com.windchat.im.storage.bean.PluginBean; -import com.akaxin.site.web.admin.service.IPluginService; /** * 扩展管理Service diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UICManageService.java similarity index 94% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UICManageService.java index e0746e7..59342d3 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UICManageService.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.service.impl; +package com.windchat.im.web.admin.service.impl; import java.util.List; +import com.windchat.im.web.admin.service.IUICService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -24,7 +25,6 @@ import org.springframework.stereotype.Service; import com.akaxin.proto.core.UicProto.UicStatus; import com.akaxin.site.business.dao.SiteUicDao; import com.windchat.im.storage.bean.UicBean; -import com.akaxin.site.web.admin.service.IUICService; @Service public class UICManageService implements IUICService { diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UserManageService.java similarity index 98% rename from windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java rename to windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UserManageService.java index 0c9ad3c..5ac4a4d 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UserManageService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.web.admin.service.impl; +package com.windchat.im.web.admin.service.impl; import java.io.File; import java.sql.SQLException; @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import com.windchat.im.web.admin.service.IUserService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +47,6 @@ import com.windchat.im.storage.service.MessageDaoService; import com.windchat.im.storage.service.UserFriendDaoService; import com.windchat.im.storage.service.UserProfileDaoService; import com.windchat.im.storage.service.UserSessionDaoService; -import com.akaxin.site.web.admin.service.IUserService; @Service("userManageService") public class UserManageService implements IUserService { diff --git a/windchat-admin/src/main/java/com/akaxin/site/web/utils/ArraysUtils.java b/windchat-admin/src/main/java/com/windchat/im/web/utils/ArraysUtils.java similarity index 89% rename from windchat-admin/src/main/java/com/akaxin/site/web/utils/ArraysUtils.java rename to windchat-admin/src/main/java/com/windchat/im/web/utils/ArraysUtils.java index 0d83783..6b5e6e7 100755 --- a/windchat-admin/src/main/java/com/akaxin/site/web/utils/ArraysUtils.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/utils/ArraysUtils.java @@ -1,4 +1,4 @@ -package com.akaxin.site.web.utils; +package com.windchat.im.web.utils; import java.util.ArrayList; import java.util.List; diff --git a/windchat-boot/pom.xml b/windchat-boot/pom.xml index 358deed..58b357e 100755 --- a/windchat-boot/pom.xml +++ b/windchat-boot/pom.xml @@ -6,7 +6,7 @@ windchat 0.0.1 - com.akaxin.site + com.windchat.im windchat-boot 0.0.1-SNAPSHOT @@ -24,7 +24,7 @@ 2.0.2.RELEASE - com.akaxin.site.boot.main.Bootstrap + com.windchat.im.boot.main.Bootstrap ZIP true @@ -46,7 +46,7 @@ true lib/ - com.akaxin.site.boot.main.Bootstrap + Bootstrap diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/config/AkxProject.java b/windchat-boot/src/main/java/com/windchat/im/boot/config/AkxProject.java similarity index 86% rename from windchat-boot/src/main/java/com/akaxin/site/boot/config/AkxProject.java rename to windchat-boot/src/main/java/com/windchat/im/boot/config/AkxProject.java index f2b82aa..ed5d2f6 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/config/AkxProject.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/config/AkxProject.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.config; +package com.windchat.im.boot.config; /** * diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigHelper.java b/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigHelper.java similarity index 97% rename from windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigHelper.java rename to windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigHelper.java index b7e343b..b595e1f 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigHelper.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.boot.config; +package com.windchat.im.boot.config; import java.util.HashMap; import java.util.Map; @@ -22,7 +22,7 @@ import java.util.Properties; import org.apache.commons.lang3.StringUtils; import com.akaxin.proto.core.ConfigProto; -import com.akaxin.site.boot.utils.PropertiesUtils; +import com.windchat.im.boot.utils.PropertiesUtils; /** * diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigKey.java b/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigKey.java similarity index 97% rename from windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigKey.java rename to windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigKey.java index e89dc2a..4abd76d 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigKey.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigKey.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.boot.config; +package com.windchat.im.boot.config; /** * 站点服务，相关配置字段 diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigListener.java b/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigListener.java similarity index 97% rename from windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigListener.java rename to windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigListener.java index cf3d145..5b18fbc 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigListener.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigListener.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.config; +package com.windchat.im.boot.config; import java.util.Map; import java.util.concurrent.Executors; diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/config/SiteDefaultIcon.java b/windchat-boot/src/main/java/com/windchat/im/boot/config/SiteDefaultIcon.java similarity index 99% rename from windchat-boot/src/main/java/com/akaxin/site/boot/config/SiteDefaultIcon.java rename to windchat-boot/src/main/java/com/windchat/im/boot/config/SiteDefaultIcon.java index a41c4ca..13217a1 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/config/SiteDefaultIcon.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/config/SiteDefaultIcon.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.boot.config; +package com.windchat.im.boot.config; /** * 站点相关的需要设置的默认图片 diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java b/windchat-boot/src/main/java/com/windchat/im/boot/main/Bootstrap.java similarity index 91% rename from windchat-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java rename to windchat-boot/src/main/java/com/windchat/im/boot/main/Bootstrap.java index 90c1c15..7cd1a36 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/main/Bootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.boot.main; +package com.windchat.im.boot.main; import java.io.File; import java.io.IOException; @@ -21,6 +21,9 @@ import java.io.PrintWriter; import java.util.Base64; import java.util.Map; +import com.windchat.im.boot.spring.OpenzalySpringBoot; +import com.windchat.im.boot.utils.BootLog; +import com.windchat.im.boot.utils.Helper; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Level; @@ -32,26 +35,23 @@ import com.akaxin.common.executor.AbstracteExecutor; import com.akaxin.common.logs.AkxLog4jManager; import com.akaxin.common.utils.StringHelper; import com.akaxin.proto.core.FileProto.FileType; -import com.akaxin.site.boot.config.AkxProject; -import com.akaxin.site.boot.config.ConfigHelper; -import com.akaxin.site.boot.config.ConfigKey; -import com.akaxin.site.boot.config.ConfigListener; -import com.akaxin.site.boot.config.SiteDefaultIcon; -import com.akaxin.site.boot.spring.OpenzalySpringBoot; -import com.akaxin.site.boot.utils.BootLog; -import com.akaxin.site.boot.utils.Helper; +import com.windchat.im.boot.config.AkxProject; +import com.windchat.im.boot.config.ConfigHelper; +import com.windchat.im.boot.config.ConfigKey; +import com.windchat.im.boot.config.ConfigListener; +import com.windchat.im.boot.config.SiteDefaultIcon; import com.akaxin.site.business.utils.FilePathUtils; import com.akaxin.site.business.utils.FileServerUtils; -import com.akaxin.site.connector.exception.HttpServerException; -import com.akaxin.site.connector.exception.TcpServerException; -import com.akaxin.site.connector.handler.ApiRequestHandler; -import com.akaxin.site.connector.handler.HttpRequestHandler; -import com.akaxin.site.connector.handler.ImMessageHandler; -import com.akaxin.site.connector.handler.ImSiteAuthHandler; -import com.akaxin.site.connector.handler.WSRequestHandler; -import com.akaxin.site.connector.http.HttpServer; -import com.akaxin.site.connector.netty.NettyServer; -import com.akaxin.site.connector.ws.WsServer; +import com.windchat.im.connector.exception.HttpServerException; +import com.windchat.im.connector.exception.TcpServerException; +import com.windchat.im.connector.handler.ApiRequestHandler; +import com.windchat.im.connector.handler.HttpRequestHandler; +import com.windchat.im.connector.handler.ImMessageHandler; +import com.windchat.im.connector.handler.ImSiteAuthHandler; +import com.windchat.im.connector.handler.WSRequestHandler; +import com.windchat.im.connector.http.HttpServer; +import com.windchat.im.connector.netty.NettyServer; +import com.windchat.im.connector.ws.WsServer; import com.windchat.im.storage.DataSourceManager; import com.windchat.im.storage.dao.config.DBConfig; import com.windchat.im.storage.dao.sqlite.manager.PluginArgs; diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/spring/CustomizationWebServerBean.java b/windchat-boot/src/main/java/com/windchat/im/boot/spring/CustomizationWebServerBean.java similarity index 90% rename from windchat-boot/src/main/java/com/akaxin/site/boot/spring/CustomizationWebServerBean.java rename to windchat-boot/src/main/java/com/windchat/im/boot/spring/CustomizationWebServerBean.java index f224356..a30c0b2 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/spring/CustomizationWebServerBean.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/spring/CustomizationWebServerBean.java @@ -1,8 +1,10 @@ -package com.akaxin.site.boot.spring; +package com.windchat.im.boot.spring; import java.net.InetAddress; import java.net.UnknownHostException; +import com.windchat.im.boot.config.ConfigHelper; +import com.windchat.im.boot.config.ConfigKey; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,9 +12,6 @@ import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; import org.springframework.stereotype.Component; -import com.akaxin.site.boot.config.ConfigHelper; -import com.akaxin.site.boot.config.ConfigKey; - @Component public class CustomizationWebServerBean implements WebServerFactoryCustomizer { private static Logger logger = LoggerFactory.getLogger(CustomizationWebServerBean.class); diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalyConfiguration.java b/windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalyConfiguration.java similarity index 94% rename from windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalyConfiguration.java rename to windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalyConfiguration.java index 4c7a52f..9174357 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalyConfiguration.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalyConfiguration.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.spring; +package com.windchat.im.boot.spring; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalySpringBoot.java b/windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalySpringBoot.java similarity index 97% rename from windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalySpringBoot.java rename to windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalySpringBoot.java index 30bb7b6..2640b44 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalySpringBoot.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalySpringBoot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.boot.spring; +package com.windchat.im.boot.spring; import org.springframework.boot.Banner; import org.springframework.boot.SpringApplication; diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/utils/BootLog.java b/windchat-boot/src/main/java/com/windchat/im/boot/utils/BootLog.java similarity index 93% rename from windchat-boot/src/main/java/com/akaxin/site/boot/utils/BootLog.java rename to windchat-boot/src/main/java/com/windchat/im/boot/utils/BootLog.java index 5c5d1ca..1b609ba 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/utils/BootLog.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/utils/BootLog.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.utils; +package com.windchat.im.boot.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java b/windchat-boot/src/main/java/com/windchat/im/boot/utils/Helper.java similarity index 98% rename from windchat-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java rename to windchat-boot/src/main/java/com/windchat/im/boot/utils/Helper.java index e53b522..b1cff61 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/utils/Helper.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.utils; +package com.windchat.im.boot.utils; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -7,6 +7,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; +import com.windchat.im.boot.config.ConfigHelper; +import com.windchat.im.boot.config.ConfigKey; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; @@ -17,8 +19,6 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.utils.PrintUtils; import com.akaxin.common.utils.StringHelper; -import com.akaxin.site.boot.config.ConfigHelper; -import com.akaxin.site.boot.config.ConfigKey; import com.windchat.im.storage.DataSourceManager; import com.windchat.im.storage.dao.config.DBConfig; import com.windchat.im.storage.dao.config.DBType; diff --git a/windchat-boot/src/main/java/com/akaxin/site/boot/utils/PropertiesUtils.java b/windchat-boot/src/main/java/com/windchat/im/boot/utils/PropertiesUtils.java similarity index 98% rename from windchat-boot/src/main/java/com/akaxin/site/boot/utils/PropertiesUtils.java rename to windchat-boot/src/main/java/com/windchat/im/boot/utils/PropertiesUtils.java index 0899afb..e744f69 100755 --- a/windchat-boot/src/main/java/com/akaxin/site/boot/utils/PropertiesUtils.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/utils/PropertiesUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.boot.utils; +package com.windchat.im.boot.utils; import java.io.IOException; import java.io.InputStream; diff --git a/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestDefaultIcon.java b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestDefaultIcon.java similarity index 91% rename from windchat-boot/src/test/java/com/akaxin/site/boot/test/TestDefaultIcon.java rename to windchat-boot/src/test/java/com/windchat/im/boot/test/TestDefaultIcon.java index 5e8b379..bf423a0 100755 --- a/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestDefaultIcon.java +++ b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestDefaultIcon.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.test; +package com.windchat.im.boot.test; import java.util.Base64; diff --git a/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestFile.java b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestFile.java similarity index 95% rename from windchat-boot/src/test/java/com/akaxin/site/boot/test/TestFile.java rename to windchat-boot/src/test/java/com/windchat/im/boot/test/TestFile.java index bad75e3..ba85d1e 100755 --- a/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestFile.java +++ b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestFile.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.test; +package com.windchat.im.boot.test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestHttpClient.java b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestHttpClient.java similarity index 93% rename from windchat-boot/src/test/java/com/akaxin/site/boot/test/TestHttpClient.java rename to windchat-boot/src/test/java/com/windchat/im/boot/test/TestHttpClient.java index 38b9a89..2f953b4 100755 --- a/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestHttpClient.java +++ b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestHttpClient.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.test; +package com.windchat.im.boot.test; import java.util.HashMap; import java.util.Map; diff --git a/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestSystemPro.java b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestSystemPro.java similarity index 78% rename from windchat-boot/src/test/java/com/akaxin/site/boot/test/TestSystemPro.java rename to windchat-boot/src/test/java/com/windchat/im/boot/test/TestSystemPro.java index 16ee45f..feb06d1 100755 --- a/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestSystemPro.java +++ b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestSystemPro.java @@ -1,4 +1,4 @@ -package com.akaxin.site.boot.test; +package com.windchat.im.boot.test; public class TestSystemPro { public static void main(String[] args) { diff --git a/windchat-business/src/main/java/com/akaxin/site/business/bean/MsgNoticeBean.java b/windchat-business/src/main/java/com/akaxin/site/business/bean/MsgNoticeBean.java deleted file mode 100755 index 28c3e10..0000000 --- a/windchat-business/src/main/java/com/akaxin/site/business/bean/MsgNoticeBean.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.akaxin.site.business.bean; - -public class MsgNoticeBean { - -} diff --git a/windchat-business/src/main/java/com/akaxin/site/business/api/IRequest.java b/windchat-business/src/main/java/com/windchat/im/business/api/IRequest.java similarity index 82% rename from windchat-business/src/main/java/com/akaxin/site/business/api/IRequest.java rename to windchat-business/src/main/java/com/windchat/im/business/api/IRequest.java index 6af6ec8..190ed21 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/api/IRequest.java +++ b/windchat-business/src/main/java/com/windchat/im/business/api/IRequest.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.api; +package com.windchat.im.business.api; import com.akaxin.common.command.Command; import com.akaxin.common.command.CommandResponse; diff --git a/windchat-business/src/main/java/com/windchat/im/business/bean/MsgNoticeBean.java b/windchat-business/src/main/java/com/windchat/im/business/bean/MsgNoticeBean.java new file mode 100755 index 0000000..e065e11 --- /dev/null +++ b/windchat-business/src/main/java/com/windchat/im/business/bean/MsgNoticeBean.java @@ -0,0 +1,5 @@ +package com.windchat.im.business.bean; + +public class MsgNoticeBean { + +} diff --git a/windchat-business/src/main/java/com/akaxin/site/business/bean/PlatformPhoneBean.java b/windchat-business/src/main/java/com/windchat/im/business/bean/PlatformPhoneBean.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/bean/PlatformPhoneBean.java rename to windchat-business/src/main/java/com/windchat/im/business/bean/PlatformPhoneBean.java index 9da266b..2bbd381 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/bean/PlatformPhoneBean.java +++ b/windchat-business/src/main/java/com/windchat/im/business/bean/PlatformPhoneBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.bean; +package com.windchat.im.business.bean; import org.apache.commons.lang3.StringUtils; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/cache/WebSessionCache.java b/windchat-business/src/main/java/com/windchat/im/business/cache/WebSessionCache.java similarity index 97% rename from windchat-business/src/main/java/com/akaxin/site/business/cache/WebSessionCache.java rename to windchat-business/src/main/java/com/windchat/im/business/cache/WebSessionCache.java index ef263ee..291375a 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/cache/WebSessionCache.java +++ b/windchat-business/src/main/java/com/windchat/im/business/cache/WebSessionCache.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.cache; +package com.windchat.im.business.cache; import java.util.concurrent.TimeUnit; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/constant/AkxProject.java b/windchat-business/src/main/java/com/windchat/im/business/constant/AkxProject.java similarity index 62% rename from windchat-business/src/main/java/com/akaxin/site/business/constant/AkxProject.java rename to windchat-business/src/main/java/com/windchat/im/business/constant/AkxProject.java index 32283e7..813445b 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/constant/AkxProject.java +++ b/windchat-business/src/main/java/com/windchat/im/business/constant/AkxProject.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.constant; +package com.windchat.im.business.constant; public interface AkxProject { diff --git a/windchat-business/src/main/java/com/akaxin/site/business/constant/GroupConfig.java b/windchat-business/src/main/java/com/windchat/im/business/constant/GroupConfig.java similarity index 94% rename from windchat-business/src/main/java/com/akaxin/site/business/constant/GroupConfig.java rename to windchat-business/src/main/java/com/windchat/im/business/constant/GroupConfig.java index fcf9ec2..584bb54 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/constant/GroupConfig.java +++ b/windchat-business/src/main/java/com/windchat/im/business/constant/GroupConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.constant; +package com.windchat.im.business.constant; public interface GroupConfig { int GROUP_MAX_MEMBER_COUNT = 200; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/constant/NoticeText.java b/windchat-business/src/main/java/com/windchat/im/business/constant/NoticeText.java similarity index 95% rename from windchat-business/src/main/java/com/akaxin/site/business/constant/NoticeText.java rename to windchat-business/src/main/java/com/windchat/im/business/constant/NoticeText.java index 4077bcf..7ec52a7 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/constant/NoticeText.java +++ b/windchat-business/src/main/java/com/windchat/im/business/constant/NoticeText.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.constant; +package com.windchat.im.business.constant; /** * 通知相关的默认配置文案,{*}表示支持事件点击的位置 diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/ExpireTokenDao.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/ExpireTokenDao.java index bcce24c..a9d1a3c 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/ExpireTokenDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/MonitorDao.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/MonitorDao.java index 568a25e..8bc61c9 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/MonitorDao.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import com.windchat.im.storage.api.*; import com.windchat.im.storage.service.*; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/SiteConfigDao.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/SiteConfigDao.java index a4563dc..ef187ba 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/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.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; import java.util.Map; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/SiteLoginDao.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/SiteLoginDao.java index a9a10e5..3b14314 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/SiteLoginDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/SitePluginDao.java similarity index 99% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/SitePluginDao.java index 2895c0e..f21bd09 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/SitePluginDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; import java.util.List; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/SiteUicDao.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/SiteUicDao.java index ad5f584..894d3f3 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/SiteUicDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; import java.util.List; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/SiteUserDao.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/SiteUserDao.java index c40dba4..ca3dafc 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/SiteUserDao.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.util.List; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/UserDeviceDao.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/UserDeviceDao.java index 3786003..1e43b94 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/UserDeviceDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; import java.util.List; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/UserFriendDao.java similarity index 99% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/UserFriendDao.java index 24f77d4..9710d49 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/UserFriendDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/UserGroupDao.java similarity index 99% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/UserGroupDao.java index 5a7528b..2cf76e5 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/UserGroupDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/UserProfileDao.java similarity index 99% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/UserProfileDao.java index 97f3d6f..70d74c2 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/UserProfileDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; import java.util.List; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/UserSessionDao.java similarity index 97% rename from windchat-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java rename to windchat-business/src/main/java/com/windchat/im/business/dao/UserSessionDao.java index b6207d3..c19af88 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/UserSessionDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.dao; +package com.windchat.im.business.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java b/windchat-business/src/main/java/com/windchat/im/business/impl/AbstractRequest.java similarity index 95% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/AbstractRequest.java index 96ed48d..bcdbd86 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/AbstractRequest.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl; +package com.windchat.im.business.impl; import java.lang.reflect.Method; import com.akaxin.site.business.dao.UserGroupDao; import com.akaxin.site.business.dao.UserProfileDao; +import com.windchat.im.business.dao.UserGroupDao; +import com.windchat.im.business.dao.UserProfileDao; import com.windchat.im.storage.bean.GroupProfileBean; import com.windchat.im.storage.bean.SimpleUserBean; import org.apache.commons.lang3.StringUtils; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/IRequestService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/IRequestService.java similarity index 82% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/IRequestService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/IRequestService.java index 3caa4e5..c7aa385 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/IRequestService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/IRequestService.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.impl; +package com.windchat.im.business.impl; import com.akaxin.common.command.Command; import com.akaxin.common.command.CommandResponse; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpFriendService.java similarity index 97% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpFriendService.java index 7b52201..bc38427 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpFriendService.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.hai; +package com.windchat.im.business.impl.hai; import java.util.List; +import com.windchat.im.business.dao.UserFriendDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpGroupService.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpGroupService.java index 7e1260a..2d94804 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpGroupService.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.hai; +package com.windchat.im.business.impl.hai; import java.util.List; +import com.windchat.im.business.constant.GroupConfig; +import com.windchat.im.business.dao.UserGroupDao; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpMessageService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpMessageService.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpMessageService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpMessageService.java index 86f4fb2..05989f3 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpMessageService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpMessageService.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.hai; +package com.windchat.im.business.impl.hai; +import com.windchat.im.business.impl.AbstractRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpPushService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpPushService.java similarity index 94% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpPushService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpPushService.java index a8815b1..d95d8b5 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpPushService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpPushService.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.hai; +package com.windchat.im.business.impl.hai; import java.util.List; +import com.windchat.im.business.dao.SiteUserDao; +import com.windchat.im.business.impl.AbstractRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSessionService.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSessionService.java index 76f2768..e1b61fe 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSessionService.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.hai; +package com.windchat.im.business.impl.hai; import java.util.Base64; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSiteService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSiteService.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSiteService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSiteService.java index 77304e2..b625390 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSiteService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSiteService.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.hai; +package com.windchat.im.business.impl.hai; import java.util.Map; +import com.windchat.im.business.impl.AbstractRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpUserService.java similarity index 97% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpUserService.java index 2de03e3..1961bcb 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpUserService.java @@ -13,10 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.hai; +package com.windchat.im.business.impl.hai; import java.util.List; +import com.windchat.im.business.dao.UserFriendDao; +import com.windchat.im.business.dao.UserGroupDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.utils.FilePathUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java b/windchat-business/src/main/java/com/windchat/im/business/impl/notice/GroupNotice.java similarity index 97% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/notice/GroupNotice.java index b8f15b5..9515913 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/notice/GroupNotice.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.notice; +package com.windchat.im.business.impl.notice; import java.util.List; +import com.windchat.im.business.constant.NoticeText; +import com.windchat.im.business.dao.UserProfileDao; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java b/windchat-business/src/main/java/com/windchat/im/business/impl/notice/User2Notice.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/notice/User2Notice.java index 7371bf6..70694bd 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/notice/User2Notice.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.notice; +package com.windchat.im.business.impl.notice; +import com.windchat.im.business.constant.NoticeText; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/site/PlatformUserPhone.java b/windchat-business/src/main/java/com/windchat/im/business/impl/site/PlatformUserPhone.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/site/PlatformUserPhone.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/site/PlatformUserPhone.java index eb5b325..576ba04 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/site/PlatformUserPhone.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/site/PlatformUserPhone.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.site; +package com.windchat.im.business.impl.site; +import com.windchat.im.business.bean.PlatformPhoneBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/site/SiteConfig.java b/windchat-business/src/main/java/com/windchat/im/business/impl/site/SiteConfig.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/site/SiteConfig.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/site/SiteConfig.java index e99c5f1..a4c7bad 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/site/SiteConfig.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/site/SiteConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.site; +package com.windchat.im.business.impl.site; import java.util.Arrays; import java.util.HashSet; @@ -21,6 +21,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.windchat.im.business.constant.GroupConfig; +import com.windchat.im.business.dao.SiteConfigDao; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java b/windchat-business/src/main/java/com/windchat/im/business/impl/site/UserUic.java similarity index 95% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/site/UserUic.java index 42286f0..b26ff5a 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/site/UserUic.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.site; +package com.windchat.im.business.impl.site; +import com.windchat.im.business.dao.SiteUicDao; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiDeviceService.java similarity index 97% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiDeviceService.java index d72288f..b9dbcd8 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiDeviceService.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; import java.util.List; +import com.windchat.im.business.dao.UserDeviceDao; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFileService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFileService.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFileService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFileService.java index 19e8219..443c7e6 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFileService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFileService.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.utils.FilePathUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFriendService.java similarity index 99% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFriendService.java index bc3b066..96f32da 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFriendService.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; import java.util.List; +import com.windchat.im.business.dao.UserFriendDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiGroupService.java similarity index 99% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiGroupService.java index f08c623..b5b9f3b 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiGroupService.java @@ -13,11 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; import java.util.List; import java.util.UUID; +import com.windchat.im.business.constant.GroupConfig; +import com.windchat.im.business.dao.ExpireTokenDao; +import com.windchat.im.business.dao.UserGroupDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiPluginService.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiPluginService.java index 6f1ab5b..79f1352 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiPluginService.java @@ -13,13 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; import java.util.Base64; import java.util.List; import java.util.Map; //import org.apache.commons.codec.binary.Base64; +import com.windchat.im.business.dao.SitePluginDao; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.impl.site.SiteConfig; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSecretChatService.java similarity index 97% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSecretChatService.java index df61e50..6b43488 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSecretChatService.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSiteService.java similarity index 99% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSiteService.java index 5291201..92f0fa1 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSiteService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; import java.security.PublicKey; import java.security.Signature; @@ -22,6 +22,9 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import com.windchat.im.business.bean.PlatformPhoneBean; +import com.windchat.im.business.dao.*; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiUserService.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiUserService.java index 709583d..50daf01 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiUserService.java @@ -13,11 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.windchat.im.business.dao.UserFriendDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiWebService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiWebService.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiWebService.java rename to windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiWebService.java index 8257094..878f1ce 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiWebService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiWebService.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.impl.tai; +package com.windchat.im.business.impl.tai; +import com.windchat.im.business.impl.AbstractRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/push/PushNotification.java b/windchat-business/src/main/java/com/windchat/im/business/push/PushNotification.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/push/PushNotification.java rename to windchat-business/src/main/java/com/windchat/im/business/push/PushNotification.java index c47a5a0..96b2407 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/push/PushNotification.java +++ b/windchat-business/src/main/java/com/windchat/im/business/push/PushNotification.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.push; +package com.windchat.im.business.push; import java.util.List; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/push/PushText.java b/windchat-business/src/main/java/com/windchat/im/business/push/PushText.java similarity index 92% rename from windchat-business/src/main/java/com/akaxin/site/business/push/PushText.java rename to windchat-business/src/main/java/com/windchat/im/business/push/PushText.java index d21e3ea..93c162c 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/push/PushText.java +++ b/windchat-business/src/main/java/com/windchat/im/business/push/PushText.java @@ -1,5 +1,7 @@ -package com.akaxin.site.business.push; +package com.windchat.im.business.push; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.site.SiteConfig; import org.apache.commons.lang3.StringUtils; import com.akaxin.common.utils.StringHelper; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/service/ApiRequestService.java b/windchat-business/src/main/java/com/windchat/im/business/service/ApiRequestService.java similarity index 94% rename from windchat-business/src/main/java/com/akaxin/site/business/service/ApiRequestService.java rename to windchat-business/src/main/java/com/windchat/im/business/service/ApiRequestService.java index ddf64c6..a63e9a0 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/service/ApiRequestService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/service/ApiRequestService.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.service; +package com.windchat.im.business.service; +import com.windchat.im.business.api.IRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/service/ApiServiceFactory.java b/windchat-business/src/main/java/com/windchat/im/business/service/ApiServiceFactory.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/service/ApiServiceFactory.java rename to windchat-business/src/main/java/com/windchat/im/business/service/ApiServiceFactory.java index 04afbe3..e85f80d 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/service/ApiServiceFactory.java +++ b/windchat-business/src/main/java/com/windchat/im/business/service/ApiServiceFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.service; +package com.windchat.im.business.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/service/HttpRequestService.java b/windchat-business/src/main/java/com/windchat/im/business/service/HttpRequestService.java similarity index 97% rename from windchat-business/src/main/java/com/akaxin/site/business/service/HttpRequestService.java rename to windchat-business/src/main/java/com/windchat/im/business/service/HttpRequestService.java index 0356fa2..937fe84 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/service/HttpRequestService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/service/HttpRequestService.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.service; +package com.windchat.im.business.service; +import com.windchat.im.business.api.IRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/utils/FilePathUtils.java b/windchat-business/src/main/java/com/windchat/im/business/utils/FilePathUtils.java similarity index 98% rename from windchat-business/src/main/java/com/akaxin/site/business/utils/FilePathUtils.java rename to windchat-business/src/main/java/com/windchat/im/business/utils/FilePathUtils.java index 00435c8..fec15fd 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/utils/FilePathUtils.java +++ b/windchat-business/src/main/java/com/windchat/im/business/utils/FilePathUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.utils; +package com.windchat.im.business.utils; import org.apache.commons.lang3.StringUtils; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/utils/FileServerUtils.java b/windchat-business/src/main/java/com/windchat/im/business/utils/FileServerUtils.java similarity index 99% rename from windchat-business/src/main/java/com/akaxin/site/business/utils/FileServerUtils.java rename to windchat-business/src/main/java/com/windchat/im/business/utils/FileServerUtils.java index 72a37a6..4b907b2 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/utils/FileServerUtils.java +++ b/windchat-business/src/main/java/com/windchat/im/business/utils/FileServerUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.business.utils; +package com.windchat.im.business.utils; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/windchat-business/src/main/java/com/akaxin/site/business/utils/HexUtils.java b/windchat-business/src/main/java/com/windchat/im/business/utils/HexUtils.java similarity index 96% rename from windchat-business/src/main/java/com/akaxin/site/business/utils/HexUtils.java rename to windchat-business/src/main/java/com/windchat/im/business/utils/HexUtils.java index 8cb9297..26713cd 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/utils/HexUtils.java +++ b/windchat-business/src/main/java/com/windchat/im/business/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.business.utils; +package com.windchat.im.business.utils; /** * byte数组与字符串之间转换 diff --git a/windchat-business/src/main/java/com/akaxin/site/business/utils/StringRandomUtils.java b/windchat-business/src/main/java/com/windchat/im/business/utils/StringRandomUtils.java similarity index 94% rename from windchat-business/src/main/java/com/akaxin/site/business/utils/StringRandomUtils.java rename to windchat-business/src/main/java/com/windchat/im/business/utils/StringRandomUtils.java index 2e3fbdf..9864697 100755 --- a/windchat-business/src/main/java/com/akaxin/site/business/utils/StringRandomUtils.java +++ b/windchat-business/src/main/java/com/windchat/im/business/utils/StringRandomUtils.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.utils; +package com.windchat.im.business.utils; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; diff --git a/windchat-business/src/test/java/com/akaxin/site/business/test/TestHttpProto.java b/windchat-business/src/test/java/com/windchat/im/business/test/TestHttpProto.java similarity index 95% rename from windchat-business/src/test/java/com/akaxin/site/business/test/TestHttpProto.java rename to windchat-business/src/test/java/com/windchat/im/business/test/TestHttpProto.java index 3c69914..a0b2255 100755 --- a/windchat-business/src/test/java/com/akaxin/site/business/test/TestHttpProto.java +++ b/windchat-business/src/test/java/com/windchat/im/business/test/TestHttpProto.java @@ -1,4 +1,4 @@ -package com.akaxin.site.business.test; +package com.windchat.im.business.test; import java.io.IOException; diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/GsonUtils.java b/windchat-common/src/main/java/com/akaxin/common/utils/GsonUtils.java deleted file mode 100755 index 5bcf754..0000000 --- a/windchat-common/src/main/java/com/akaxin/common/utils/GsonUtils.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright 2018-2028 Akaxin Group - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.akaxin.common.utils; - -import com.google.gson.Gson; - -/** - * - * @author Sam{@link an.guoyue254@gmail.com} - * @since 2018-01-31 12:34:31 - */ -public class GsonUtils { - public static String toJson(Object obj) { - Gson gson = new Gson(); - return gson.toJson(obj); - } - - public static T fromJson(String str, Class clazz) { - return new Gson().fromJson(str, clazz); - } -} diff --git a/windchat-common/src/main/java/com/akaxin/common/channel/ChannelManager.java b/windchat-common/src/main/java/com/windchat/common/channel/ChannelManager.java similarity index 97% rename from windchat-common/src/main/java/com/akaxin/common/channel/ChannelManager.java rename to windchat-common/src/main/java/com/windchat/common/channel/ChannelManager.java index ccfb926..73222fe 100755 --- a/windchat-common/src/main/java/com/akaxin/common/channel/ChannelManager.java +++ b/windchat-common/src/main/java/com/windchat/common/channel/ChannelManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.channel; +package com.windchat.common.channel; import java.util.Map; import java.util.Set; diff --git a/windchat-common/src/main/java/com/akaxin/common/channel/ChannelSession.java b/windchat-common/src/main/java/com/windchat/common/channel/ChannelSession.java similarity index 98% rename from windchat-common/src/main/java/com/akaxin/common/channel/ChannelSession.java rename to windchat-common/src/main/java/com/windchat/common/channel/ChannelSession.java index fc89e77..4ad5e80 100755 --- a/windchat-common/src/main/java/com/akaxin/common/channel/ChannelSession.java +++ b/windchat-common/src/main/java/com/windchat/common/channel/ChannelSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.channel; +package com.windchat.common.channel; import com.akaxin.common.constant.RequestAction; diff --git a/windchat-common/src/main/java/com/akaxin/common/channel/ChannelWriter.java b/windchat-common/src/main/java/com/windchat/common/channel/ChannelWriter.java similarity index 95% rename from windchat-common/src/main/java/com/akaxin/common/channel/ChannelWriter.java rename to windchat-common/src/main/java/com/windchat/common/channel/ChannelWriter.java index 4b90500..2da4de6 100755 --- a/windchat-common/src/main/java/com/akaxin/common/channel/ChannelWriter.java +++ b/windchat-common/src/main/java/com/windchat/common/channel/ChannelWriter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.channel; +package com.windchat.common.channel; import java.util.HashMap; import java.util.Map; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.command.RedisCommand; -import com.akaxin.common.constant.CommandConst; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.command.RedisCommand; +import com.windchat.common.constant.CommandConst; import com.akaxin.proto.core.CoreProto; import com.google.protobuf.ByteString; diff --git a/windchat-common/src/main/java/com/akaxin/common/channel/WebChannelManager.java b/windchat-common/src/main/java/com/windchat/common/channel/WebChannelManager.java similarity index 97% rename from windchat-common/src/main/java/com/akaxin/common/channel/WebChannelManager.java rename to windchat-common/src/main/java/com/windchat/common/channel/WebChannelManager.java index 84d41be..cb1d4ea 100755 --- a/windchat-common/src/main/java/com/akaxin/common/channel/WebChannelManager.java +++ b/windchat-common/src/main/java/com/windchat/common/channel/WebChannelManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.channel; +package com.windchat.common.channel; import java.util.Map; import java.util.Set; diff --git a/windchat-common/src/main/java/com/akaxin/common/command/Command.java b/windchat-common/src/main/java/com/windchat/common/command/Command.java similarity index 96% rename from windchat-common/src/main/java/com/akaxin/common/command/Command.java rename to windchat-common/src/main/java/com/windchat/common/command/Command.java index 6dd39c2..87028bf 100755 --- a/windchat-common/src/main/java/com/akaxin/common/command/Command.java +++ b/windchat-common/src/main/java/com/windchat/common/command/Command.java @@ -13,16 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.command; +package com.windchat.common.command; import java.util.HashMap; import java.util.Map; +import com.windchat.common.channel.ChannelSession; +import com.windchat.common.utils.StringHelper; import org.apache.commons.lang3.StringUtils; -import com.akaxin.common.channel.ChannelSession; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.channel.ChannelSession; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.utils.StringHelper; import io.netty.channel.ChannelHandlerContext; diff --git a/windchat-common/src/main/java/com/akaxin/common/command/CommandResponse.java b/windchat-common/src/main/java/com/windchat/common/command/CommandResponse.java similarity index 98% rename from windchat-common/src/main/java/com/akaxin/common/command/CommandResponse.java rename to windchat-common/src/main/java/com/windchat/common/command/CommandResponse.java index 5f9023f..3f470d1 100755 --- a/windchat-common/src/main/java/com/akaxin/common/command/CommandResponse.java +++ b/windchat-common/src/main/java/com/windchat/common/command/CommandResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.command; +package com.windchat.common.command; import java.util.HashMap; import java.util.Map; diff --git a/windchat-common/src/main/java/com/akaxin/common/command/RedisCommand.java b/windchat-common/src/main/java/com/windchat/common/command/RedisCommand.java similarity index 88% rename from windchat-common/src/main/java/com/akaxin/common/command/RedisCommand.java rename to windchat-common/src/main/java/com/windchat/common/command/RedisCommand.java index b9bf6c9..f5aba45 100755 --- a/windchat-common/src/main/java/com/akaxin/common/command/RedisCommand.java +++ b/windchat-common/src/main/java/com/windchat/common/command/RedisCommand.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.command; +package com.windchat.common.command; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import com.akaxin.common.resp.AbstractParameter; -import com.akaxin.common.resp.RedisBytesParameter; -import com.akaxin.common.resp.RedisDoubleParameter; -import com.akaxin.common.resp.RedisIntegerParameter; -import com.akaxin.common.resp.RedisStringParameter; +import com.windchat.common.resp.AbstractParameter; +import com.windchat.common.resp.RedisBytesParameter; +import com.windchat.common.resp.RedisDoubleParameter; +import com.windchat.common.resp.RedisIntegerParameter; +import com.windchat.common.resp.RedisStringParameter; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/windchat-common/src/main/java/com/akaxin/common/constant/CharsetCoding.java b/windchat-common/src/main/java/com/windchat/common/constant/CharsetCoding.java similarity index 82% rename from windchat-common/src/main/java/com/akaxin/common/constant/CharsetCoding.java rename to windchat-common/src/main/java/com/windchat/common/constant/CharsetCoding.java index ed42bfb..82403c1 100755 --- a/windchat-common/src/main/java/com/akaxin/common/constant/CharsetCoding.java +++ b/windchat-common/src/main/java/com/windchat/common/constant/CharsetCoding.java @@ -1,4 +1,4 @@ -package com.akaxin.common.constant; +package com.windchat.common.constant; /** * diff --git a/windchat-common/src/main/java/com/akaxin/common/constant/CommandConst.java b/windchat-common/src/main/java/com/windchat/common/constant/CommandConst.java similarity index 98% rename from windchat-common/src/main/java/com/akaxin/common/constant/CommandConst.java rename to windchat-common/src/main/java/com/windchat/common/constant/CommandConst.java index 657f0d8..f618adc 100755 --- a/windchat-common/src/main/java/com/akaxin/common/constant/CommandConst.java +++ b/windchat-common/src/main/java/com/windchat/common/constant/CommandConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.constant; +package com.windchat.common.constant; public interface CommandConst { public String PROTOCOL_VERSION = "1.0";// 网络协议版本 diff --git a/windchat-common/src/main/java/com/akaxin/common/constant/ConfigConst.java b/windchat-common/src/main/java/com/windchat/common/constant/ConfigConst.java similarity index 94% rename from windchat-common/src/main/java/com/akaxin/common/constant/ConfigConst.java rename to windchat-common/src/main/java/com/windchat/common/constant/ConfigConst.java index 502c5a6..2f48e31 100755 --- a/windchat-common/src/main/java/com/akaxin/common/constant/ConfigConst.java +++ b/windchat-common/src/main/java/com/windchat/common/constant/ConfigConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.constant; +package com.windchat.common.constant; public interface ConfigConst { public String DEFAULT_SITE_ADMIN = "ZALY_SHAOYE"; diff --git a/windchat-common/src/main/java/com/akaxin/common/constant/ErrorCode2.java b/windchat-common/src/main/java/com/windchat/common/constant/ErrorCode2.java similarity index 99% rename from windchat-common/src/main/java/com/akaxin/common/constant/ErrorCode2.java rename to windchat-common/src/main/java/com/windchat/common/constant/ErrorCode2.java index 0bd0d9b..ac6fba7 100755 --- a/windchat-common/src/main/java/com/akaxin/common/constant/ErrorCode2.java +++ b/windchat-common/src/main/java/com/windchat/common/constant/ErrorCode2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.common.constant; +package com.windchat.common.constant; /** * 
diff --git a/windchat-common/src/main/java/com/akaxin/common/constant/HttpUriAction.java b/windchat-common/src/main/java/com/windchat/common/constant/HttpUriAction.java
similarity index 97%
rename from windchat-common/src/main/java/com/akaxin/common/constant/HttpUriAction.java
rename to windchat-common/src/main/java/com/windchat/common/constant/HttpUriAction.java
index ae55c10..edd4664 100755
--- a/windchat-common/src/main/java/com/akaxin/common/constant/HttpUriAction.java
+++ b/windchat-common/src/main/java/com/windchat/common/constant/HttpUriAction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.constant;
+package com.windchat.common.constant;
 
 /**
  * @author Sam{@link an.guoyue254@gmail.com}
diff --git a/windchat-common/src/main/java/com/akaxin/common/constant/IErrorCode.java b/windchat-common/src/main/java/com/windchat/common/constant/IErrorCode.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/constant/IErrorCode.java
rename to windchat-common/src/main/java/com/windchat/common/constant/IErrorCode.java
index 964071a..ee60502 100755
--- a/windchat-common/src/main/java/com/akaxin/common/constant/IErrorCode.java
+++ b/windchat-common/src/main/java/com/windchat/common/constant/IErrorCode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.constant;
+package com.windchat.common.constant;
 
 public interface IErrorCode {
 	public String getCode();
diff --git a/windchat-common/src/main/java/com/akaxin/common/constant/RequestAction.java b/windchat-common/src/main/java/com/windchat/common/constant/RequestAction.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/constant/RequestAction.java
rename to windchat-common/src/main/java/com/windchat/common/constant/RequestAction.java
index 77432e1..ef6b021 100755
--- a/windchat-common/src/main/java/com/akaxin/common/constant/RequestAction.java
+++ b/windchat-common/src/main/java/com/windchat/common/constant/RequestAction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.constant;
+package com.windchat.common.constant;
 
 /**
  * @author Sam{@link an.guoyue254@gmail.com}
diff --git a/windchat-common/src/main/java/com/akaxin/common/crypto/AESCrypto.java b/windchat-common/src/main/java/com/windchat/common/crypto/AESCrypto.java
similarity index 96%
rename from windchat-common/src/main/java/com/akaxin/common/crypto/AESCrypto.java
rename to windchat-common/src/main/java/com/windchat/common/crypto/AESCrypto.java
index a7d1daa..9153a2d 100755
--- a/windchat-common/src/main/java/com/akaxin/common/crypto/AESCrypto.java
+++ b/windchat-common/src/main/java/com/windchat/common/crypto/AESCrypto.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.crypto;
+package com.windchat.common.crypto;
 
 import java.security.SecureRandom;
 
@@ -10,7 +10,7 @@ import javax.crypto.spec.SecretKeySpec;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.constant.CharsetCoding;
+import com.windchat.common.constant.CharsetCoding;
 
 public class AESCrypto {
 	private static final Logger logger = LoggerFactory.getLogger(AESCrypto.class);
diff --git a/windchat-common/src/main/java/com/akaxin/common/crypto/HashCrypto.java b/windchat-common/src/main/java/com/windchat/common/crypto/HashCrypto.java
similarity index 97%
rename from windchat-common/src/main/java/com/akaxin/common/crypto/HashCrypto.java
rename to windchat-common/src/main/java/com/windchat/common/crypto/HashCrypto.java
index 7e4e23b..23500cc 100755
--- a/windchat-common/src/main/java/com/akaxin/common/crypto/HashCrypto.java
+++ b/windchat-common/src/main/java/com/windchat/common/crypto/HashCrypto.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.crypto;
+package com.windchat.common.crypto;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/windchat-common/src/main/java/com/akaxin/common/crypto/RSACrypto.java b/windchat-common/src/main/java/com/windchat/common/crypto/RSACrypto.java
similarity index 99%
rename from windchat-common/src/main/java/com/akaxin/common/crypto/RSACrypto.java
rename to windchat-common/src/main/java/com/windchat/common/crypto/RSACrypto.java
index 1fe9484..043efec 100755
--- a/windchat-common/src/main/java/com/akaxin/common/crypto/RSACrypto.java
+++ b/windchat-common/src/main/java/com/windchat/common/crypto/RSACrypto.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.crypto;
+package com.windchat.common.crypto;
 
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException.java b/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException.java
similarity index 92%
rename from windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException.java
rename to windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException.java
index 4add708..30b6cc9 100755
--- a/windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException.java
+++ b/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.exceptions;
+package com.windchat.common.exceptions;
 
 import com.akaxin.common.constant.IErrorCode;
+import com.windchat.common.constant.IErrorCode;
 
 /**
  * 自定义API请求过程中产生的特殊异常
diff --git a/windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException2.java b/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException2.java
similarity index 92%
rename from windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException2.java
rename to windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException2.java
index 5af5580..2999cab 100755
--- a/windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException2.java
+++ b/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException2.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.exceptions;
+package com.windchat.common.exceptions;
 
 import com.akaxin.common.constant.IErrorCode;
+import com.windchat.common.constant.IErrorCode;
 
 /**
  * 
diff --git a/windchat-common/src/main/java/com/akaxin/common/executor/AbstracteExecutor.java b/windchat-common/src/main/java/com/windchat/common/executor/AbstracteExecutor.java
similarity index 93%
rename from windchat-common/src/main/java/com/akaxin/common/executor/AbstracteExecutor.java
rename to windchat-common/src/main/java/com/windchat/common/executor/AbstracteExecutor.java
index 8c449f6..509d7ee 100755
--- a/windchat-common/src/main/java/com/akaxin/common/executor/AbstracteExecutor.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/AbstracteExecutor.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.executor;
+package com.windchat.common.executor;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.executor.chain.handler.IHandler;
 
 /**
  * @author Sam{@link an.guoyue254@gmail.com}
diff --git a/windchat-common/src/main/java/com/akaxin/common/executor/IExecutor.java b/windchat-common/src/main/java/com/windchat/common/executor/IExecutor.java
similarity index 94%
rename from windchat-common/src/main/java/com/akaxin/common/executor/IExecutor.java
rename to windchat-common/src/main/java/com/windchat/common/executor/IExecutor.java
index 2355513..694515b 100755
--- a/windchat-common/src/main/java/com/akaxin/common/executor/IExecutor.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/IExecutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.executor;
+package com.windchat.common.executor;
 
 public interface IExecutor {
 	public R execute(String name, T t);
diff --git a/windchat-common/src/main/java/com/akaxin/common/executor/SimpleExecutor.java b/windchat-common/src/main/java/com/windchat/common/executor/SimpleExecutor.java
similarity index 90%
rename from windchat-common/src/main/java/com/akaxin/common/executor/SimpleExecutor.java
rename to windchat-common/src/main/java/com/windchat/common/executor/SimpleExecutor.java
index 9865b3a..a599e08 100755
--- a/windchat-common/src/main/java/com/akaxin/common/executor/SimpleExecutor.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/SimpleExecutor.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.executor;
+package com.windchat.common.executor;
 
-import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.executor.chain.handler.IHandler;
 
 /**
  * 定义一个简单统一的执行器
diff --git a/windchat-common/src/main/java/com/akaxin/common/executor/chain/AbstractHandlerChain.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/AbstractHandlerChain.java
similarity index 91%
rename from windchat-common/src/main/java/com/akaxin/common/executor/chain/AbstractHandlerChain.java
rename to windchat-common/src/main/java/com/windchat/common/executor/chain/AbstractHandlerChain.java
index 6477b6f..6abc640 100755
--- a/windchat-common/src/main/java/com/akaxin/common/executor/chain/AbstractHandlerChain.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/AbstractHandlerChain.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.executor.chain;
+package com.windchat.common.executor.chain;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.executor.chain.handler.IHandler;
 
 /**
  * @author Sam{@link an.guoyue254@gmail.com}
diff --git a/windchat-common/src/main/java/com/akaxin/common/executor/chain/CustomRHandlerChain.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/CustomRHandlerChain.java
similarity index 90%
rename from windchat-common/src/main/java/com/akaxin/common/executor/chain/CustomRHandlerChain.java
rename to windchat-common/src/main/java/com/windchat/common/executor/chain/CustomRHandlerChain.java
index 852da5e..2a0fa33 100755
--- a/windchat-common/src/main/java/com/akaxin/common/executor/chain/CustomRHandlerChain.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/CustomRHandlerChain.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.executor.chain;
+package com.windchat.common.executor.chain;
 
 import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.executor.chain.handler.IHandler;
 
 /**
  * 自定义返回值的handler
diff --git a/windchat-common/src/main/java/com/akaxin/common/executor/chain/SimpleHandlerChain.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/SimpleHandlerChain.java
similarity index 96%
rename from windchat-common/src/main/java/com/akaxin/common/executor/chain/SimpleHandlerChain.java
rename to windchat-common/src/main/java/com/windchat/common/executor/chain/SimpleHandlerChain.java
index d21089c..6227a92 100755
--- a/windchat-common/src/main/java/com/akaxin/common/executor/chain/SimpleHandlerChain.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/SimpleHandlerChain.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.executor.chain;
+package com.windchat.common.executor.chain;
 
 import com.akaxin.common.executor.chain.handler.IHandler;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/IHandler.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/handler/IHandler.java
similarity index 82%
rename from windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/IHandler.java
rename to windchat-common/src/main/java/com/windchat/common/executor/chain/handler/IHandler.java
index 983129c..cacd62a 100755
--- a/windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/IHandler.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/handler/IHandler.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.executor.chain.handler;
+package com.windchat.common.executor.chain.handler;
 
 /**
  * 
diff --git a/windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/MethodReflectHandler.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/handler/MethodReflectHandler.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/MethodReflectHandler.java
rename to windchat-common/src/main/java/com/windchat/common/executor/chain/handler/MethodReflectHandler.java
index ccb8b2f..d1f6362 100755
--- a/windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/MethodReflectHandler.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/handler/MethodReflectHandler.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.executor.chain.handler;
+package com.windchat.common.executor.chain.handler;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import com.windchat.common.command.Command;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/http/ZalyHttpClient.java b/windchat-common/src/main/java/com/windchat/common/http/ZalyHttpClient.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/http/ZalyHttpClient.java
rename to windchat-common/src/main/java/com/windchat/common/http/ZalyHttpClient.java
index a307ecf..4989c72 100755
--- a/windchat-common/src/main/java/com/akaxin/common/http/ZalyHttpClient.java
+++ b/windchat-common/src/main/java/com/windchat/common/http/ZalyHttpClient.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.http;
+package com.windchat.common.http;
 
 import java.io.IOException;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/logs/AkxLog4jManager.java b/windchat-common/src/main/java/com/windchat/common/logs/AkxLog4jManager.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/logs/AkxLog4jManager.java
rename to windchat-common/src/main/java/com/windchat/common/logs/AkxLog4jManager.java
index a70f25f..1eaea5e 100755
--- a/windchat-common/src/main/java/com/akaxin/common/logs/AkxLog4jManager.java
+++ b/windchat-common/src/main/java/com/windchat/common/logs/AkxLog4jManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.logs;
+package com.windchat.common.logs;
 
 import java.util.Enumeration;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/logs/LogCreater.java b/windchat-common/src/main/java/com/windchat/common/logs/LogCreater.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/logs/LogCreater.java
rename to windchat-common/src/main/java/com/windchat/common/logs/LogCreater.java
index 6292834..06c29ff 100755
--- a/windchat-common/src/main/java/com/akaxin/common/logs/LogCreater.java
+++ b/windchat-common/src/main/java/com/windchat/common/logs/LogCreater.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.logs;
+package com.windchat.common.logs;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.DailyRollingFileAppender;
diff --git a/windchat-common/src/main/java/com/akaxin/common/logs/LogUtils.java b/windchat-common/src/main/java/com/windchat/common/logs/LogUtils.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/logs/LogUtils.java
rename to windchat-common/src/main/java/com/windchat/common/logs/LogUtils.java
index 7e60e81..f664002 100755
--- a/windchat-common/src/main/java/com/akaxin/common/logs/LogUtils.java
+++ b/windchat-common/src/main/java/com/windchat/common/logs/LogUtils.java
@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.logs;
+package com.windchat.common.logs;
 
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.utils.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.helpers.FormattingTuple;
 import org.slf4j.helpers.MessageFormatter;
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/IRedisCommandResponse.java b/windchat-common/src/main/java/com/windchat/common/netty/IRedisCommandResponse.java
similarity index 91%
rename from windchat-common/src/main/java/com/akaxin/common/netty/IRedisCommandResponse.java
rename to windchat-common/src/main/java/com/windchat/common/netty/IRedisCommandResponse.java
index 86350a5..53ffdb6 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/IRedisCommandResponse.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/IRedisCommandResponse.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty;
+package com.windchat.common.netty;
 
 import com.akaxin.common.command.RedisCommand;
+import com.windchat.common.command.RedisCommand;
 
 /**
  * 
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/NettyClient2.java b/windchat-common/src/main/java/com/windchat/common/netty/NettyClient2.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/netty/NettyClient2.java
rename to windchat-common/src/main/java/com/windchat/common/netty/NettyClient2.java
index 54c53b5..3655865 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/NettyClient2.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/NettyClient2.java
@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty;
+package com.windchat.common.netty;
 
 import java.util.concurrent.TimeUnit;
 
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.netty.codec.MessageDecoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.netty.codec.MessageDecoder;
-import com.akaxin.common.netty.codec.MessageEncoder;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.netty.codec.MessageDecoder;
+import com.windchat.common.netty.codec.MessageEncoder;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/NettyClientHandler.java b/windchat-common/src/main/java/com/windchat/common/netty/NettyClientHandler.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/netty/NettyClientHandler.java
rename to windchat-common/src/main/java/com/windchat/common/netty/NettyClientHandler.java
index e255ad7..3f1871d 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/NettyClientHandler.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/NettyClientHandler.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty;
+package com.windchat.common.netty;
 
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/PlatformClientHandler.java b/windchat-common/src/main/java/com/windchat/common/netty/PlatformClientHandler.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/netty/PlatformClientHandler.java
rename to windchat-common/src/main/java/com/windchat/common/netty/PlatformClientHandler.java
index fb79be8..6243f87 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/PlatformClientHandler.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/PlatformClientHandler.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty;
+package com.windchat.common.netty;
 
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/PlatformSSLClient.java b/windchat-common/src/main/java/com/windchat/common/netty/PlatformSSLClient.java
similarity index 94%
rename from windchat-common/src/main/java/com/akaxin/common/netty/PlatformSSLClient.java
rename to windchat-common/src/main/java/com/windchat/common/netty/PlatformSSLClient.java
index 1f88c73..90e2b26 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/PlatformSSLClient.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/PlatformSSLClient.java
@@ -13,19 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty;
+package com.windchat.common.netty;
 
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLEngine;
 
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.netty.codec.MessageDecoder;
+import com.windchat.common.ssl.ZalySSLContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.netty.codec.MessageDecoder;
-import com.akaxin.common.netty.codec.MessageEncoder;
-import com.akaxin.common.ssl.ZalySSLContext;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.netty.codec.MessageDecoder;
+import com.windchat.common.netty.codec.MessageEncoder;
+import com.windchat.common.ssl.ZalySSLContext;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/RedisCommandResponse.java b/windchat-common/src/main/java/com/windchat/common/netty/RedisCommandResponse.java
similarity index 94%
rename from windchat-common/src/main/java/com/akaxin/common/netty/RedisCommandResponse.java
rename to windchat-common/src/main/java/com/windchat/common/netty/RedisCommandResponse.java
index e729543..0406a35 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/RedisCommandResponse.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/RedisCommandResponse.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty;
+package com.windchat.common.netty;
 
 import com.akaxin.common.command.RedisCommand;
 import com.google.gson.Gson;
+import com.windchat.common.command.RedisCommand;
 
 public class RedisCommandResponse implements IRedisCommandResponse {
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageDecoder.java b/windchat-common/src/main/java/com/windchat/common/netty/codec/MessageDecoder.java
similarity index 97%
rename from windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageDecoder.java
rename to windchat-common/src/main/java/com/windchat/common/netty/codec/MessageDecoder.java
index f88a46f..b2b4d3c 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageDecoder.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/codec/MessageDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty.codec;
+package com.windchat.common.netty.codec;
 
 import java.util.List;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageEncoder.java b/windchat-common/src/main/java/com/windchat/common/netty/codec/MessageEncoder.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageEncoder.java
rename to windchat-common/src/main/java/com/windchat/common/netty/codec/MessageEncoder.java
index 8ddb61b..badb9c1 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageEncoder.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/codec/MessageEncoder.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty.codec;
+package com.windchat.common.netty.codec;
 
 import java.nio.ByteBuffer;
 
+import com.windchat.common.command.RedisCommand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/codec/ProtocolParser.java b/windchat-common/src/main/java/com/windchat/common/netty/codec/ProtocolParser.java
similarity index 94%
rename from windchat-common/src/main/java/com/akaxin/common/netty/codec/ProtocolParser.java
rename to windchat-common/src/main/java/com/windchat/common/netty/codec/ProtocolParser.java
index c7c7671..47f0f72 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/codec/ProtocolParser.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/codec/ProtocolParser.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty.codec;
+package com.windchat.common.netty.codec;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.resp.AbstractParameter;
-import com.akaxin.common.resp.RedisBytesParameter;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.resp.AbstractParameter;
+import com.windchat.common.resp.RedisBytesParameter;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
diff --git a/windchat-common/src/main/java/com/akaxin/common/netty/codec/ReplaySignal.java b/windchat-common/src/main/java/com/windchat/common/netty/codec/ReplaySignal.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/netty/codec/ReplaySignal.java
rename to windchat-common/src/main/java/com/windchat/common/netty/codec/ReplaySignal.java
index 6db1564..79b6c3e 100755
--- a/windchat-common/src/main/java/com/akaxin/common/netty/codec/ReplaySignal.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/codec/ReplaySignal.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.netty.codec;
+package com.windchat.common.netty.codec;
 
 /**
  * 
diff --git a/windchat-common/src/main/java/com/akaxin/common/resp/AbstractParameter.java b/windchat-common/src/main/java/com/windchat/common/resp/AbstractParameter.java
similarity index 92%
rename from windchat-common/src/main/java/com/akaxin/common/resp/AbstractParameter.java
rename to windchat-common/src/main/java/com/windchat/common/resp/AbstractParameter.java
index fcb262a..0d21a73 100755
--- a/windchat-common/src/main/java/com/akaxin/common/resp/AbstractParameter.java
+++ b/windchat-common/src/main/java/com/windchat/common/resp/AbstractParameter.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.resp;
+package com.windchat.common.resp;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
diff --git a/windchat-common/src/main/java/com/akaxin/common/resp/RedisBytesParameter.java b/windchat-common/src/main/java/com/windchat/common/resp/RedisBytesParameter.java
similarity index 96%
rename from windchat-common/src/main/java/com/akaxin/common/resp/RedisBytesParameter.java
rename to windchat-common/src/main/java/com/windchat/common/resp/RedisBytesParameter.java
index 3fbccd2..d6abce5 100755
--- a/windchat-common/src/main/java/com/akaxin/common/resp/RedisBytesParameter.java
+++ b/windchat-common/src/main/java/com/windchat/common/resp/RedisBytesParameter.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.resp;
+package com.windchat.common.resp;
 
 import java.nio.ByteBuffer;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/resp/RedisDoubleParameter.java b/windchat-common/src/main/java/com/windchat/common/resp/RedisDoubleParameter.java
similarity index 94%
rename from windchat-common/src/main/java/com/akaxin/common/resp/RedisDoubleParameter.java
rename to windchat-common/src/main/java/com/windchat/common/resp/RedisDoubleParameter.java
index f58c5ec..4d43f41 100755
--- a/windchat-common/src/main/java/com/akaxin/common/resp/RedisDoubleParameter.java
+++ b/windchat-common/src/main/java/com/windchat/common/resp/RedisDoubleParameter.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.resp;
+package com.windchat.common.resp;
 
 import java.nio.ByteBuffer;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/resp/RedisIntegerParameter.java b/windchat-common/src/main/java/com/windchat/common/resp/RedisIntegerParameter.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/resp/RedisIntegerParameter.java
rename to windchat-common/src/main/java/com/windchat/common/resp/RedisIntegerParameter.java
index 9566972..3e3da0d 100755
--- a/windchat-common/src/main/java/com/akaxin/common/resp/RedisIntegerParameter.java
+++ b/windchat-common/src/main/java/com/windchat/common/resp/RedisIntegerParameter.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.resp;
+package com.windchat.common.resp;
 
 import java.nio.ByteBuffer;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/resp/RedisStringParameter.java b/windchat-common/src/main/java/com/windchat/common/resp/RedisStringParameter.java
similarity index 96%
rename from windchat-common/src/main/java/com/akaxin/common/resp/RedisStringParameter.java
rename to windchat-common/src/main/java/com/windchat/common/resp/RedisStringParameter.java
index be2e9e3..a254300 100755
--- a/windchat-common/src/main/java/com/akaxin/common/resp/RedisStringParameter.java
+++ b/windchat-common/src/main/java/com/windchat/common/resp/RedisStringParameter.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.resp;
+package com.windchat.common.resp;
 
 import java.nio.ByteBuffer;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/ssl/ZalySSLContext.java b/windchat-common/src/main/java/com/windchat/common/ssl/ZalySSLContext.java
similarity index 95%
rename from windchat-common/src/main/java/com/akaxin/common/ssl/ZalySSLContext.java
rename to windchat-common/src/main/java/com/windchat/common/ssl/ZalySSLContext.java
index ff65e01..8a30913 100755
--- a/windchat-common/src/main/java/com/akaxin/common/ssl/ZalySSLContext.java
+++ b/windchat-common/src/main/java/com/windchat/common/ssl/ZalySSLContext.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.ssl;
+package com.windchat.common.ssl;
 
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
diff --git a/windchat-common/src/main/java/com/akaxin/common/ssl/ZalyTrustManagerFactory.java b/windchat-common/src/main/java/com/windchat/common/ssl/ZalyTrustManagerFactory.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/ssl/ZalyTrustManagerFactory.java
rename to windchat-common/src/main/java/com/windchat/common/ssl/ZalyTrustManagerFactory.java
index 8a467d9..c64dcf2 100755
--- a/windchat-common/src/main/java/com/akaxin/common/ssl/ZalyTrustManagerFactory.java
+++ b/windchat-common/src/main/java/com/windchat/common/ssl/ZalyTrustManagerFactory.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.ssl;
+package com.windchat.common.ssl;
 
 import java.net.Socket;
 import java.security.KeyStore;
diff --git a/windchat-common/src/main/java/com/windchat/common/utils/GsonUtils.java b/windchat-common/src/main/java/com/windchat/common/utils/GsonUtils.java
new file mode 100755
index 0000000..33527e1
--- /dev/null
+++ b/windchat-common/src/main/java/com/windchat/common/utils/GsonUtils.java
@@ -0,0 +1,17 @@
+package com.windchat.common.utils;
+
+import com.google.gson.Gson;
+
+/**
+ * @author
+ */
+public class GsonUtils {
+    public static String toJson(Object obj) {
+        Gson gson = new Gson();
+        return gson.toJson(obj);
+    }
+
+    public static  T fromJson(String str, Class clazz) {
+        return new Gson().fromJson(str, clazz);
+    }
+}
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/IpUtils.java b/windchat-common/src/main/java/com/windchat/common/utils/IpUtils.java
similarity index 91%
rename from windchat-common/src/main/java/com/akaxin/common/utils/IpUtils.java
rename to windchat-common/src/main/java/com/windchat/common/utils/IpUtils.java
index d663400..2ea6909 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/IpUtils.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/IpUtils.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/PrintUtils.java b/windchat-common/src/main/java/com/windchat/common/utils/PrintUtils.java
similarity index 94%
rename from windchat-common/src/main/java/com/akaxin/common/utils/PrintUtils.java
rename to windchat-common/src/main/java/com/windchat/common/utils/PrintUtils.java
index 4bd58e6..0b7f81c 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/PrintUtils.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/PrintUtils.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 import java.io.PrintWriter;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/ServerAddress.java b/windchat-common/src/main/java/com/windchat/common/utils/ServerAddress.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/utils/ServerAddress.java
rename to windchat-common/src/main/java/com/windchat/common/utils/ServerAddress.java
index 099ff1d..ddf9d6d 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/ServerAddress.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/ServerAddress.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/ServerAddressUtils.java b/windchat-common/src/main/java/com/windchat/common/utils/ServerAddressUtils.java
similarity index 97%
rename from windchat-common/src/main/java/com/akaxin/common/utils/ServerAddressUtils.java
rename to windchat-common/src/main/java/com/windchat/common/utils/ServerAddressUtils.java
index 3c35642..ea2e678 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/ServerAddressUtils.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/ServerAddressUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 /**
  * 
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/StringHelper.java b/windchat-common/src/main/java/com/windchat/common/utils/StringHelper.java
similarity index 99%
rename from windchat-common/src/main/java/com/akaxin/common/utils/StringHelper.java
rename to windchat-common/src/main/java/com/windchat/common/utils/StringHelper.java
index 783af95..40f85a5 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/StringHelper.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/StringHelper.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 import java.util.Random;
 import java.util.regex.Matcher;
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/TimeFormats.java b/windchat-common/src/main/java/com/windchat/common/utils/TimeFormats.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/utils/TimeFormats.java
rename to windchat-common/src/main/java/com/windchat/common/utils/TimeFormats.java
index da5dd8b..67139f1 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/TimeFormats.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/TimeFormats.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/URLRegexUtils.java b/windchat-common/src/main/java/com/windchat/common/utils/URLRegexUtils.java
similarity index 97%
rename from windchat-common/src/main/java/com/akaxin/common/utils/URLRegexUtils.java
rename to windchat-common/src/main/java/com/windchat/common/utils/URLRegexUtils.java
index aeb831b..43a0db1 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/URLRegexUtils.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/URLRegexUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/UserIdUtils.java b/windchat-common/src/main/java/com/windchat/common/utils/UserIdUtils.java
similarity index 97%
rename from windchat-common/src/main/java/com/akaxin/common/utils/UserIdUtils.java
rename to windchat-common/src/main/java/com/windchat/common/utils/UserIdUtils.java
index 04720c1..eb30606 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/UserIdUtils.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/UserIdUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 import java.util.UUID;
 import java.util.zip.CRC32;
diff --git a/windchat-common/src/main/java/com/akaxin/common/utils/ValidatorPattern.java b/windchat-common/src/main/java/com/windchat/common/utils/ValidatorPattern.java
similarity index 98%
rename from windchat-common/src/main/java/com/akaxin/common/utils/ValidatorPattern.java
rename to windchat-common/src/main/java/com/windchat/common/utils/ValidatorPattern.java
index fc265d3..1a0f621 100755
--- a/windchat-common/src/main/java/com/akaxin/common/utils/ValidatorPattern.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/ValidatorPattern.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.utils;
+package com.windchat.common.utils;
 
 import java.util.regex.Pattern;
 
diff --git a/windchat-common/src/test/java/com/akaxin/common/test/TestInetAddress.java b/windchat-common/src/test/java/com/windchat/common/test/TestInetAddress.java
similarity index 50%
rename from windchat-common/src/test/java/com/akaxin/common/test/TestInetAddress.java
rename to windchat-common/src/test/java/com/windchat/common/test/TestInetAddress.java
index 870eda6..b3239b0 100755
--- a/windchat-common/src/test/java/com/akaxin/common/test/TestInetAddress.java
+++ b/windchat-common/src/test/java/com/windchat/common/test/TestInetAddress.java
@@ -1,4 +1,4 @@
-package com.akaxin.common.test;
+package com.windchat.common.test;
 
 public class TestInetAddress {
 }
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/cache/PluginCache.java b/windchat-connector/src/main/java/com/akaxin/site/connector/cache/PluginCache.java
deleted file mode 100755
index 677d07c..0000000
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/cache/PluginCache.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.akaxin.site.connector.cache;
-
-public class PluginCache {
-
-}
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/cache/PluginCache.java b/windchat-connector/src/main/java/com/windchat/im/connector/cache/PluginCache.java
new file mode 100755
index 0000000..75c1b00
--- /dev/null
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/cache/PluginCache.java
@@ -0,0 +1,5 @@
+package com.windchat.im.connector.cache;
+
+public class PluginCache {
+
+}
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ChannelConst.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ChannelConst.java
similarity index 88%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ChannelConst.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ChannelConst.java
index 260fff2..de9557b 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ChannelConst.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ChannelConst.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.codec.parser;
+package com.windchat.im.connector.codec.parser;
 
 import com.akaxin.common.channel.ChannelSession;
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/IProtocolParser.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/IProtocolParser.java
similarity index 90%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/IProtocolParser.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/IProtocolParser.java
index 9386514..4e32d98 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/IProtocolParser.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/IProtocolParser.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.codec.parser;
+package com.windchat.im.connector.codec.parser;
 
 import java.util.List;
 
-import com.akaxin.site.connector.codec.protocol.MessageDecoder;
+import com.windchat.im.connector.codec.protocol.MessageDecoder;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ProtocolParser.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ProtocolParser.java
similarity index 94%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ProtocolParser.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ProtocolParser.java
index fb17955..42c0b8e 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ProtocolParser.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ProtocolParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.codec.parser;
+package com.windchat.im.connector.codec.parser;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,8 +21,8 @@ import java.util.List;
 import com.akaxin.common.command.RedisCommand;
 import com.akaxin.common.resp.AbstractParameter;
 import com.akaxin.common.resp.RedisBytesParameter;
-import com.akaxin.site.connector.codec.protocol.MessageDecoder;
-import com.akaxin.site.connector.codec.protocol.ReplaySignal;
+import com.windchat.im.connector.codec.protocol.MessageDecoder;
+import com.windchat.im.connector.codec.protocol.ReplaySignal;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageDecoder.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageDecoder.java
similarity index 88%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageDecoder.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageDecoder.java
index f2efb50..7392801 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageDecoder.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageDecoder.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.codec.protocol;
+package com.windchat.im.connector.codec.protocol;
 
 import java.util.List;
 
-import com.akaxin.site.connector.codec.parser.IProtocolParser;
-import com.akaxin.site.connector.codec.parser.ProtocolParser;
+import com.windchat.im.connector.codec.parser.IProtocolParser;
+import com.windchat.im.connector.codec.parser.ProtocolParser;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageEncoder.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageEncoder.java
similarity index 94%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageEncoder.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageEncoder.java
index 79d75a3..a402b85 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageEncoder.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageEncoder.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.codec.protocol;
+package com.windchat.im.connector.codec.protocol;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 
+import com.windchat.im.connector.codec.parser.ChannelConst;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.akaxin.common.channel.ChannelSession;
 import com.akaxin.common.command.RedisCommand;
 import com.akaxin.common.constant.RequestAction;
-import com.akaxin.site.connector.codec.parser.ChannelConst;
-import com.akaxin.site.connector.constant.AkxProject;
+import com.windchat.im.connector.constant.AkxProject;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/ReplaySignal.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/ReplaySignal.java
similarity index 93%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/ReplaySignal.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/ReplaySignal.java
index 847825e..72654e8 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/ReplaySignal.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/ReplaySignal.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.codec.protocol;
+package com.windchat.im.connector.codec.protocol;
 
 /**
  * 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/constant/AkxProject.java b/windchat-connector/src/main/java/com/windchat/im/connector/constant/AkxProject.java
similarity index 62%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/constant/AkxProject.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/constant/AkxProject.java
index eb46ef3..34bcd08 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/constant/AkxProject.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/constant/AkxProject.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.constant;
+package com.windchat.im.connector.constant;
 
 public interface AkxProject {
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/constant/HttpConst.java b/windchat-connector/src/main/java/com/windchat/im/connector/constant/HttpConst.java
similarity index 78%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/constant/HttpConst.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/constant/HttpConst.java
index 582cc82..d5cdadd 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/constant/HttpConst.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/constant/HttpConst.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.constant;
+package com.windchat.im.connector.constant;
 
 public interface HttpConst {
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/constant/PluginConst.java b/windchat-connector/src/main/java/com/windchat/im/connector/constant/PluginConst.java
similarity index 72%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/constant/PluginConst.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/constant/PluginConst.java
index 804d56c..db73322 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/constant/PluginConst.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/constant/PluginConst.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.constant;
+package com.windchat.im.connector.constant;
 
 public interface PluginConst {
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/exception/HttpServerException.java b/windchat-connector/src/main/java/com/windchat/im/connector/exception/HttpServerException.java
similarity index 90%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/exception/HttpServerException.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/exception/HttpServerException.java
index 068e2ba..9f73ded 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/exception/HttpServerException.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/exception/HttpServerException.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.exception;
+package com.windchat.im.connector.exception;
 
 /**
  * define custom exception for httpserver
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/exception/TcpServerException.java b/windchat-connector/src/main/java/com/windchat/im/connector/exception/TcpServerException.java
similarity index 87%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/exception/TcpServerException.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/exception/TcpServerException.java
index 2179f8f..482b465 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/exception/TcpServerException.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/exception/TcpServerException.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.exception;
+package com.windchat.im.connector.exception;
 
 public class TcpServerException extends Throwable {
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/AbstractCommonHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/AbstractCommonHandler.java
similarity index 97%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/handler/AbstractCommonHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/handler/AbstractCommonHandler.java
index 55430d6..695b510 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/AbstractCommonHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/AbstractCommonHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.handler;
+package com.windchat.im.connector.handler;
 
 import com.akaxin.common.command.CommandResponse;
 import com.akaxin.common.constant.CommandConst;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ApiRequestHandler.java
similarity index 98%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/handler/ApiRequestHandler.java
index 8dd292b..7167199 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ApiRequestHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.handler;
+package com.windchat.im.connector.handler;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,7 +32,7 @@ import com.akaxin.common.constant.RequestAction;
 import com.akaxin.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.site.business.service.ApiRequestService;
-import com.akaxin.site.connector.constant.AkxProject;
+import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.storage.api.IUserSessionDao;
 import com.windchat.im.storage.bean.SimpleAuthBean;
 import com.windchat.im.storage.service.UserSessionDaoService;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/HttpRequestHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/HttpRequestHandler.java
similarity index 95%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/handler/HttpRequestHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/handler/HttpRequestHandler.java
index 413cadd..e6c7016 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/HttpRequestHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/HttpRequestHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.handler;
+package com.windchat.im.connector.handler;
 
 import java.util.Base64;
 
@@ -29,9 +29,9 @@ import com.akaxin.common.crypto.AESCrypto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.PluginProto;
 import com.akaxin.site.business.service.HttpRequestService;
-import com.akaxin.site.connector.constant.AkxProject;
-import com.akaxin.site.connector.constant.HttpConst;
-import com.akaxin.site.connector.constant.PluginConst;
+import com.windchat.im.connector.constant.AkxProject;
+import com.windchat.im.connector.constant.HttpConst;
+import com.windchat.im.connector.constant.PluginConst;
 
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImMessageHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImMessageHandler.java
similarity index 97%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImMessageHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/handler/ImMessageHandler.java
index 719c12c..353c205 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImMessageHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImMessageHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.handler;
+package com.windchat.im.connector.handler;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,7 +32,7 @@ import com.akaxin.common.constant.ErrorCode2;
 import com.akaxin.common.constant.RequestAction;
 import com.akaxin.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
-import com.akaxin.site.connector.constant.AkxProject;
+import com.windchat.im.connector.constant.AkxProject;
 import com.akaxin.site.message.service.ImMessageService;
 
 /**
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImSiteAuthHandler.java
similarity index 97%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/handler/ImSiteAuthHandler.java
index 933aee3..363e1f9 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImSiteAuthHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.handler;
+package com.windchat.im.connector.handler;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -32,8 +32,8 @@ import com.akaxin.common.utils.StringHelper;
 import com.akaxin.proto.site.ImSiteAuthProto;
 import com.akaxin.proto.site.ImSiteHelloProto;
 import com.akaxin.site.business.impl.site.SiteConfig;
-import com.akaxin.site.connector.constant.AkxProject;
-import com.akaxin.site.connector.session.SessionManager;
+import com.windchat.im.connector.constant.AkxProject;
+import com.windchat.im.connector.session.SessionManager;
 import com.windchat.im.storage.bean.SimpleAuthBean;
 
 import io.netty.channel.Channel;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/WSRequestHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/WSRequestHandler.java
similarity index 97%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/handler/WSRequestHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/handler/WSRequestHandler.java
index b5e353b..7872790 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/handler/WSRequestHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/WSRequestHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.handler;
+package com.windchat.im.connector.handler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/http/HttpServer.java b/windchat-connector/src/main/java/com/windchat/im/connector/http/HttpServer.java
similarity index 95%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/http/HttpServer.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/http/HttpServer.java
index cf461b9..af3d07e 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/http/HttpServer.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/http/HttpServer.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.http;
+package com.windchat.im.connector.http;
 
+import com.windchat.im.connector.http.handler.HttpServerHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,9 +23,8 @@ import com.akaxin.common.command.Command;
 import com.akaxin.common.command.CommandResponse;
 import com.akaxin.common.executor.AbstracteExecutor;
 import com.akaxin.common.executor.SimpleExecutor;
-import com.akaxin.site.connector.constant.AkxProject;
-import com.akaxin.site.connector.exception.HttpServerException;
-import com.akaxin.site.connector.http.handler.HttpServerHandler;
+import com.windchat.im.connector.constant.AkxProject;
+import com.windchat.im.connector.exception.HttpServerException;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/http/handler/HttpServerHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/http/handler/HttpServerHandler.java
similarity index 96%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/http/handler/HttpServerHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/http/handler/HttpServerHandler.java
index 6a5953e..f26c02a 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/http/handler/HttpServerHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/http/handler/HttpServerHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.http.handler;
+package com.windchat.im.connector.http.handler;
 
 import java.net.InetSocketAddress;
 import java.util.Base64;
@@ -32,10 +32,10 @@ import com.akaxin.common.executor.AbstracteExecutor;
 import com.akaxin.common.logs.LogUtils;
 import com.akaxin.common.utils.StringHelper;
 import com.akaxin.proto.core.PluginProto;
-import com.akaxin.site.connector.constant.AkxProject;
-import com.akaxin.site.connector.constant.HttpConst;
-import com.akaxin.site.connector.constant.PluginConst;
-import com.akaxin.site.connector.session.PluginSession;
+import com.windchat.im.connector.constant.AkxProject;
+import com.windchat.im.connector.constant.HttpConst;
+import com.windchat.im.connector.constant.PluginConst;
+import com.windchat.im.connector.session.PluginSession;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/netty/NettyServer.java b/windchat-connector/src/main/java/com/windchat/im/connector/netty/NettyServer.java
similarity index 95%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/netty/NettyServer.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/netty/NettyServer.java
index d5d8d7b..2c76dbb 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/netty/NettyServer.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/netty/NettyServer.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.netty;
+package com.windchat.im.connector.netty;
 
 import java.util.concurrent.TimeUnit;
 
+import com.windchat.im.connector.codec.protocol.MessageEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,11 +25,10 @@ import com.akaxin.common.command.Command;
 import com.akaxin.common.command.CommandResponse;
 import com.akaxin.common.executor.AbstracteExecutor;
 import com.akaxin.common.executor.SimpleExecutor;
-import com.akaxin.site.connector.codec.protocol.MessageDecoder;
-import com.akaxin.site.connector.codec.protocol.MessageEncoder;
-import com.akaxin.site.connector.constant.AkxProject;
-import com.akaxin.site.connector.exception.TcpServerException;
-import com.akaxin.site.connector.netty.handler.NettyServerHandler;
+import com.windchat.im.connector.codec.protocol.MessageDecoder;
+import com.windchat.im.connector.constant.AkxProject;
+import com.windchat.im.connector.exception.TcpServerException;
+import com.windchat.im.connector.netty.handler.NettyServerHandler;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/netty/PrefixThreadFactory.java b/windchat-connector/src/main/java/com/windchat/im/connector/netty/PrefixThreadFactory.java
similarity index 97%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/netty/PrefixThreadFactory.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/netty/PrefixThreadFactory.java
index a03b811..19797bf 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/netty/PrefixThreadFactory.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/netty/PrefixThreadFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.netty;
+package com.windchat.im.connector.netty;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/netty/handler/NettyServerHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/netty/handler/NettyServerHandler.java
similarity index 97%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/netty/handler/NettyServerHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/netty/handler/NettyServerHandler.java
index 332e630..fc97457 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/netty/handler/NettyServerHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/netty/handler/NettyServerHandler.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.netty.handler;
+package com.windchat.im.connector.netty.handler;
 
 import java.net.InetSocketAddress;
 import java.util.Map;
 
+import com.windchat.im.connector.codec.parser.ChannelConst;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,9 +33,8 @@ import com.akaxin.common.executor.AbstracteExecutor;
 import com.akaxin.common.logs.LogUtils;
 import com.akaxin.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
-import com.akaxin.site.connector.codec.parser.ChannelConst;
-import com.akaxin.site.connector.constant.AkxProject;
-import com.akaxin.site.connector.session.SessionManager;
+import com.windchat.im.connector.constant.AkxProject;
+import com.windchat.im.connector.session.SessionManager;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java b/windchat-connector/src/main/java/com/windchat/im/connector/session/PluginSession.java
similarity index 96%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/session/PluginSession.java
index 22be071..5ae9601 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/session/PluginSession.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.session;
+package com.windchat.im.connector.session;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.akaxin.common.utils.StringHelper;
-import com.akaxin.site.connector.constant.AkxProject;
+import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.storage.api.IPluginDao;
 import com.windchat.im.storage.bean.PluginBean;
 import com.windchat.im.storage.service.PluginServiceDao;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java b/windchat-connector/src/main/java/com/windchat/im/connector/session/SessionManager.java
similarity index 97%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/session/SessionManager.java
index 54d1cff..b7aeac0 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/session/SessionManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.session;
+package com.windchat.im.connector.session;
 
 import com.windchat.im.storage.bean.SimpleAuthBean;
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java b/windchat-connector/src/main/java/com/windchat/im/connector/session/UserSession.java
similarity index 98%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/session/UserSession.java
index 41544df..0395d8a 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/session/UserSession.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.session;
+package com.windchat.im.connector.session;
 
 import java.sql.SQLException;
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/NettySocketSslContext.java b/windchat-connector/src/main/java/com/windchat/im/connector/ssl/NettySocketSslContext.java
similarity index 98%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/ssl/NettySocketSslContext.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/ssl/NettySocketSslContext.java
index 243ff17..b854189 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/NettySocketSslContext.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/ssl/NettySocketSslContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package com.akaxin.site.connector.ssl;
+package com.windchat.im.connector.ssl;
 
 import java.security.KeyStore;
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/SslKeyStore.java b/windchat-connector/src/main/java/com/windchat/im/connector/ssl/SslKeyStore.java
similarity index 99%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/ssl/SslKeyStore.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/ssl/SslKeyStore.java
index 604f48f..1d19db1 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/SslKeyStore.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/ssl/SslKeyStore.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.ssl;
+package com.windchat.im.connector.ssl;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/StreamReader.java b/windchat-connector/src/main/java/com/windchat/im/connector/ssl/StreamReader.java
similarity index 92%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/ssl/StreamReader.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/ssl/StreamReader.java
index 2d9fb4f..c950b8d 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/StreamReader.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/ssl/StreamReader.java
@@ -1,6 +1,4 @@
-package com.akaxin.site.connector.ssl;
-
-import java.io.InputStream;
+package com.windchat.im.connector.ssl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/utils/HexUtils.java b/windchat-connector/src/main/java/com/windchat/im/connector/utils/HexUtils.java
similarity index 90%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/utils/HexUtils.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/utils/HexUtils.java
index 0a0e630..da3efe2 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/utils/HexUtils.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/utils/HexUtils.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.utils;
+package com.windchat.im.connector.utils;
 
 public class HexUtils {
 
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/ws/WsServer.java b/windchat-connector/src/main/java/com/windchat/im/connector/ws/WsServer.java
similarity index 96%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/ws/WsServer.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/ws/WsServer.java
index 631f98f..c83ba3d 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/ws/WsServer.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/ws/WsServer.java
@@ -1,5 +1,7 @@
-package com.akaxin.site.connector.ws;
+package com.windchat.im.connector.ws;
 
+import com.windchat.im.connector.constant.AkxProject;
+import com.windchat.im.connector.ws.handler.WsServerHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -7,8 +9,6 @@ import com.akaxin.common.command.Command;
 import com.akaxin.common.command.CommandResponse;
 import com.akaxin.common.executor.AbstracteExecutor;
 import com.akaxin.common.executor.SimpleExecutor;
-import com.akaxin.site.connector.constant.AkxProject;
-import com.akaxin.site.connector.ws.handler.WsServerHandler;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
diff --git a/windchat-connector/src/main/java/com/akaxin/site/connector/ws/handler/WsServerHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/ws/handler/WsServerHandler.java
similarity index 98%
rename from windchat-connector/src/main/java/com/akaxin/site/connector/ws/handler/WsServerHandler.java
rename to windchat-connector/src/main/java/com/windchat/im/connector/ws/handler/WsServerHandler.java
index 8720f33..4b59bae 100755
--- a/windchat-connector/src/main/java/com/akaxin/site/connector/ws/handler/WsServerHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/ws/handler/WsServerHandler.java
@@ -1,4 +1,4 @@
-package com.akaxin.site.connector.ws.handler;
+package com.windchat.im.connector.ws.handler;
 
 import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
@@ -15,7 +15,7 @@ import com.akaxin.common.command.CommandResponse;
 import com.akaxin.common.constant.CharsetCoding;
 import com.akaxin.common.executor.AbstracteExecutor;
 import com.akaxin.site.business.cache.WebSessionCache;
-import com.akaxin.site.connector.codec.parser.ChannelConst;
+import com.windchat.im.connector.codec.parser.ChannelConst;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java
deleted file mode 100755
index 9c602fd..0000000
--- a/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java
deleted file mode 100755
index 14ab954..0000000
--- a/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java
deleted file mode 100755
index 4d43edd..0000000
--- a/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/api/IMessageService.java b/windchat-message/src/main/java/com/windchat/im/message/api/IMessageService.java
similarity index 76%
rename from windchat-message/src/main/java/com/akaxin/site/message/api/IMessageService.java
rename to windchat-message/src/main/java/com/windchat/im/message/api/IMessageService.java
index 54d1998..bcf9a5b 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/api/IMessageService.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/bean/WebBean.java b/windchat-message/src/main/java/com/windchat/im/message/bean/WebBean.java
similarity index 94%
rename from windchat-message/src/main/java/com/akaxin/site/message/bean/WebBean.java
rename to windchat-message/src/main/java/com/windchat/im/message/bean/WebBean.java
index 3992271..c93d7e0 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/bean/WebBean.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java b/windchat-message/src/main/java/com/windchat/im/message/dao/ImUserFriendDao.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java
rename to windchat-message/src/main/java/com/windchat/im/message/dao/ImUserFriendDao.java
index 796f1d6..21608e0 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java b/windchat-message/src/main/java/com/windchat/im/message/dao/ImUserGroupDao.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java
rename to windchat-message/src/main/java/com/windchat/im/message/dao/ImUserGroupDao.java
index 14ce93b..2a9a039 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java b/windchat-message/src/main/java/com/windchat/im/message/dao/ImUserProfileDao.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java
rename to windchat-message/src/main/java/com/windchat/im/message/dao/ImUserProfileDao.java
index 3e703a8..311bf12 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java b/windchat-message/src/main/java/com/windchat/im/message/dao/ImUserSessionDao.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java
rename to windchat-message/src/main/java/com/windchat/im/message/dao/ImUserSessionDao.java
index 23768a2..4d09bd5 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java b/windchat-message/src/main/java/com/windchat/im/message/dao/SessionDeviceDao.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java
rename to windchat-message/src/main/java/com/windchat/im/message/dao/SessionDeviceDao.java
index 8b67141..72140e4 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java b/windchat-message/src/main/java/com/windchat/im/message/dao/SiteConfigDao.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java
rename to windchat-message/src/main/java/com/windchat/im/message/dao/SiteConfigDao.java
index 753b437..fb878e3 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java b/windchat-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java
rename to windchat-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java
index 124764a..78ed253 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java
index ff3c582..b403eab 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java
index d2facfd..8421c57 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java
index cb1b14d..c1d5405 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java
index 218488e..8162775 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java
index 43051be..6a516b3 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java
index 9552871..84103e0 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java
index 9c21d94..2a5d50f 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java
index 691e710..b1a28f7 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java
index 39fb402..b08a649 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java
index e6dd7bb..6a972e0 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java
similarity index 96%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java
index f401061..436c0df 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java
similarity index 96%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java
index 9b85fe3..6eb04cf 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java
similarity index 96%
rename from windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java
index f72b454..efdd4fe 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java
similarity index 93%
rename from windchat-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java
index 2f5c52c..cc22127 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java
index 17cc822..85a7cd2 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java
similarity index 99%
rename from windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java
index e2cb1f0..e7c36c1 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java b/windchat-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java
similarity index 99%
rename from windchat-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java
rename to windchat-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java
index d5f7dfc..317a8b4 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/push/PushClient.java b/windchat-message/src/main/java/com/windchat/im/message/push/PushClient.java
similarity index 99%
rename from windchat-message/src/main/java/com/akaxin/site/message/push/PushClient.java
rename to windchat-message/src/main/java/com/windchat/im/message/push/PushClient.java
index a858659..0eed0fe 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/push/PushClient.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java b/windchat-message/src/main/java/com/windchat/im/message/service/ImMessageService.java
similarity index 95%
rename from windchat-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java
rename to windchat-message/src/main/java/com/windchat/im/message/service/ImMessageService.java
index 18198b5..71ef742 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java b/windchat-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java
rename to windchat-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java
index 4c061c0..1dbc8a4 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java
index 1c6de72..d909daf 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java
index 4845273..1d35793 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java
similarity index 99%
rename from windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java
index 68b02c7..72f371b 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java
index 47e125e..cee7692 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java
similarity index 99%
rename from windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java
index 318fe3a..47bdd19 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java
similarity index 99%
rename from windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java
index 3a538ea..a7f9fd2 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java b/windchat-message/src/main/java/com/windchat/im/message/threads/MultiPushThreadExecutor.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java
rename to windchat-message/src/main/java/com/windchat/im/message/threads/MultiPushThreadExecutor.java
index 25aed63..862eeed 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java
index 11defb0..a013118 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java
index bc2d90b..90ae5a6 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java
index b577f58..c8f9bd1 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java
similarity index 96%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java
index dfa36e5..cbf8a3a 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java
index 3861496..8197c89 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java
index 2b08953..e100e51 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java
index fbd696a..224afc6 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java
index 08d71c8..bc5efed 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java
index 25dace5..5add2d3 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java
index 244239e..3544966 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java
similarity index 97%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java
index 5bfdfcc..637c054 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java
similarity index 96%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java
index 05ed7f6..b97ffd2 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java
similarity index 95%
rename from windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java
index c527335..772251c 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java b/windchat-message/src/main/java/com/windchat/im/message/utils/HexUtils.java
similarity index 96%
rename from windchat-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java
rename to windchat-message/src/main/java/com/windchat/im/message/utils/HexUtils.java
index 09d5dcc..0eaeb77 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java b/windchat-message/src/main/java/com/windchat/im/message/utils/NumUtils.java
similarity index 84%
rename from windchat-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java
rename to windchat-message/src/main/java/com/windchat/im/message/utils/NumUtils.java
index b4d5406..1015fd8 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java b/windchat-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java
similarity index 96%
rename from windchat-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java
rename to windchat-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java
index 9e9f047..c046571 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java
+++ b/windchat-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/windchat-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java b/windchat-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java
new file mode 100755
index 0000000..773855c
--- /dev/null
+++ b/windchat-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/windchat-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java b/windchat-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java
new file mode 100755
index 0000000..9af2b07
--- /dev/null
+++ b/windchat-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/windchat-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java b/windchat-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java
new file mode 100755
index 0000000..27038e3
--- /dev/null
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java
similarity index 98%
rename from windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java
index 3eb2927..f2a0267 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java
+++ b/windchat-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/windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java
similarity index 96%
rename from windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java
rename to windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java
index 51084f1..2e3ae8b 100755
--- a/windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java
+++ b/windchat-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;
 
diff --git a/windchat-storage/pom.xml b/windchat-storage/pom.xml
index fb60111..d7b52f6 100755
--- a/windchat-storage/pom.xml
+++ b/windchat-storage/pom.xml
@@ -1,73 +1,65 @@
-
 
-	4.0.0
-	
-		com.windchat.im
-		windchat
-		0.0.1
-	
-	com.windchat.im
-	windchat-storage
-	0.0.1-RELEASE
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    4.0.0
+    
+        com.windchat.im
+        windchat
+        0.0.1
+    
+    com.windchat.im
+    windchat-storage
+    0.0.1-RELEASE
 
-	
-		1.6
-		1.6
-	
+    
+        1.6
+        1.6
+    
 
-	
+    
 
-		
-			org.springframework.boot
-			spring-boot-starter-jdbc
-			
-				
-					org.springframework.boot
-					spring-boot-starter-logging
-				
-				
-					mysql
-					mysql-connector-java
-				
-			
-		
+        
+            org.springframework.boot
+            spring-boot-starter-jdbc
+            
+                
+                    org.springframework.boot
+                    spring-boot-starter-logging
+                
+                
+                    mysql
+                    mysql-connector-java
+                
+            
+        
 
-		
-		
-			c3p0
-			c3p0
-			0.9.1.2
-		
+        
+        
+            c3p0
+            c3p0
+            0.9.1.2
+        
 
 
-		
-		
-			mysql
-			mysql-connector-java
-			
-		
+        
+        
+            mysql
+            mysql-connector-java
+            
+        
 
 
-		
-			org.xerial
-			sqlite-jdbc
-			
-		
+        
+            org.xerial
+            sqlite-jdbc
+            
+        
 
-		
-			com.akaxin.common
-			openzaly-common
-			0.0.1-RELEASE
-		
+        
+            com.windchat.common
+            windchat-common
+            0.0.1-RELEASE
+        
 
-	
+    
 
 
\ No newline at end of file