diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/AbstractController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/AbstractController.java index 9c5ba5a..d059d84 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/AbstractController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/AbstractController.java @@ -17,9 +17,9 @@ package com.windchat.im.web.admin.controller; import java.util.Map; -import com.akaxin.common.utils.GsonUtils; +import com.windchat.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.im.business.impl.site.SiteConfig; public class AbstractController { diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/ConfigManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/ConfigManageController.java index fb52602..95ca925 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/ConfigManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/ConfigManageController.java @@ -34,12 +34,12 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.akaxin.common.logs.AkxLog4jManager; -import com.akaxin.common.utils.GsonUtils; +import com.windchat.common.logs.AkxLog4jManager; +import com.windchat.common.utils.GsonUtils; 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.windchat.im.business.impl.site.SiteConfig; import com.windchat.im.web.admin.exception.UserPermissionException; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/GroupManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/GroupManageController.java index 87b7563..adc5b69 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/GroupManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/GroupManageController.java @@ -36,9 +36,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.akaxin.common.utils.GsonUtils; +import com.windchat.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; -import com.akaxin.site.business.dao.UserProfileDao; +import com.windchat.im.business.dao.UserProfileDao; import com.windchat.im.storage.bean.GroupMemberBean; import com.windchat.im.storage.bean.GroupProfileBean; import com.windchat.im.storage.bean.SimpleGroupBean; diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/MonitorController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/MonitorController.java index ca2436c..22a11fe 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/MonitorController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/MonitorController.java @@ -1,6 +1,6 @@ package com.windchat.im.web.admin.controller; -import com.akaxin.common.utils.GsonUtils; +import com.windchat.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; import com.windchat.im.storage.bean.MonitorBean; import com.windchat.im.web.admin.common.Timeutils; diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/PluginManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/PluginManageController.java index 6bf0c73..0b2291b 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/PluginManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/PluginManageController.java @@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.utils.StringHelper; import com.akaxin.proto.core.PluginProto; import com.windchat.im.storage.bean.PluginBean; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UICManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UICManageController.java index 3f2877d..b6eafe0 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UICManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UICManageController.java @@ -35,9 +35,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.akaxin.common.utils.GsonUtils; +import com.windchat.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.im.business.impl.site.SiteConfig; import com.windchat.im.storage.bean.UicBean; //邀请码管理 diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserManageController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserManageController.java index 8b91595..6afc4c4 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserManageController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserManageController.java @@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.utils.StringHelper; import com.akaxin.proto.core.PluginProto; import com.akaxin.proto.core.UserProto.UserStatus; import com.windchat.im.storage.bean.SimpleUserBean; diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserSquareController.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserSquareController.java index 3fb58d0..3219164 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserSquareController.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/controller/UserSquareController.java @@ -19,12 +19,12 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.akaxin.common.utils.GsonUtils; +import com.windchat.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; import com.akaxin.proto.core.UserProto; -import com.akaxin.site.business.dao.UserFriendDao; -import com.akaxin.site.business.impl.notice.User2Notice; -import com.akaxin.site.business.push.PushNotification; +import com.windchat.im.business.dao.UserFriendDao; +import com.windchat.im.business.impl.notice.User2Notice; +import com.windchat.im.business.push.PushNotification; import com.windchat.im.storage.bean.SimpleUserBean; import com.windchat.im.storage.bean.UserProfileBean; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/exception/ManagerException.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/exception/ManagerException.java index 02c1ad4..57f9a8e 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/exception/ManagerException.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/exception/ManagerException.java @@ -1,6 +1,6 @@ package com.windchat.im.web.admin.exception; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.utils.StringHelper; public class ManagerException extends Throwable { /** diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/ConfigManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/ConfigManageService.java index e2a72b3..4e6a077 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/ConfigManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/ConfigManageService.java @@ -25,8 +25,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import com.akaxin.site.business.dao.SiteConfigDao; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.im.business.dao.SiteConfigDao; +import com.windchat.im.business.impl.site.SiteConfig; import com.windchat.im.web.utils.ArraysUtils; @Service diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/GroupManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/GroupManageService.java index 96fce3f..d82754b 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/GroupManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/GroupManageService.java @@ -21,8 +21,8 @@ import java.util.Set; import com.windchat.im.web.admin.service.IGroupService; import org.springframework.stereotype.Service; -import com.akaxin.site.business.dao.UserGroupDao; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.im.business.dao.UserGroupDao; +import com.windchat.im.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; diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MessageManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MessageManageService.java index bdba12f..1a99026 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MessageManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MessageManageService.java @@ -6,13 +6,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import com.akaxin.common.command.Command; -import com.akaxin.common.constant.RequestAction; +import com.windchat.common.command.Command; +import com.windchat.common.constant.RequestAction; import com.akaxin.proto.core.CoreProto; 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.windchat.im.message.api.IMessageService; +import com.windchat.im.message.service.ImMessageService; /** * 后台管理发送消息实现 diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MonitorService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MonitorService.java index c728b0f..7bb6bca 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MonitorService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/MonitorService.java @@ -1,6 +1,6 @@ package com.windchat.im.web.admin.service.impl; -import com.akaxin.site.business.dao.MonitorDao; +import com.windchat.im.business.dao.MonitorDao; import com.windchat.im.web.admin.service.IMonitorService; import org.springframework.stereotype.Service; diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/PluginManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/PluginManageService.java index 3592c70..f5b16e3 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/PluginManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/PluginManageService.java @@ -20,7 +20,7 @@ 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.business.dao.SitePluginDao; import com.windchat.im.storage.bean.PluginBean; /** diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UICManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UICManageService.java index 59342d3..f899ab8 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UICManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UICManageService.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import com.akaxin.proto.core.UicProto.UicStatus; -import com.akaxin.site.business.dao.SiteUicDao; +import com.windchat.im.business.dao.SiteUicDao; import com.windchat.im.storage.bean.UicBean; @Service diff --git a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UserManageService.java b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UserManageService.java index 5ac4a4d..16a8782 100755 --- a/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UserManageService.java +++ b/windchat-admin/src/main/java/com/windchat/im/web/admin/service/impl/UserManageService.java @@ -27,10 +27,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import com.akaxin.site.business.dao.UserGroupDao; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.business.utils.FilePathUtils; +import com.windchat.im.business.dao.UserGroupDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.site.SiteConfig; +import com.windchat.im.business.utils.FilePathUtils; import com.windchat.im.storage.api.IGroupDao; import com.windchat.im.storage.api.IMessageDao; import com.windchat.im.storage.api.IUserDeviceDao; diff --git a/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigListener.java b/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigListener.java index 5b18fbc..951bb07 100755 --- a/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigListener.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/config/ConfigListener.java @@ -6,11 +6,11 @@ import java.util.concurrent.TimeUnit; import org.apache.log4j.Logger; -import com.akaxin.common.logs.LogCreater; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.logs.LogCreater; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.ConfigProto; -import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.message.utils.SiteConfigHelper; +import com.windchat.im.business.impl.site.SiteConfig; +import com.windchat.im.message.utils.SiteConfigHelper; /** * 站点配置监听器，定时更新缓存中数据 diff --git a/windchat-boot/src/main/java/com/windchat/im/boot/main/Bootstrap.java b/windchat-boot/src/main/java/com/windchat/im/boot/main/Bootstrap.java index 7cd1a36..04c5031 100755 --- a/windchat-boot/src/main/java/com/windchat/im/boot/main/Bootstrap.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/main/Bootstrap.java @@ -27,21 +27,21 @@ import com.windchat.im.boot.utils.Helper; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Level; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.HttpUriAction; -import com.akaxin.common.constant.RequestAction; -import com.akaxin.common.executor.AbstracteExecutor; -import com.akaxin.common.logs.AkxLog4jManager; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.HttpUriAction; +import com.windchat.common.constant.RequestAction; +import com.windchat.common.executor.AbstracteExecutor; +import com.windchat.common.logs.AkxLog4jManager; +import com.windchat.common.utils.StringHelper; import com.akaxin.proto.core.FileProto.FileType; 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.windchat.im.business.utils.FilePathUtils; +import com.windchat.im.business.utils.FileServerUtils; import com.windchat.im.connector.exception.HttpServerException; import com.windchat.im.connector.exception.TcpServerException; import com.windchat.im.connector.handler.ApiRequestHandler; diff --git a/windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalySpringBoot.java b/windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalySpringBoot.java index 2640b44..a05df53 100755 --- a/windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalySpringBoot.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/spring/OpenzalySpringBoot.java @@ -24,14 +24,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * openzaly支持springboot框架，在启动main中会同样启动springboot * * 在maven modules中，springboot会存在启动main中扫描不到其他modules中的package，两种方法解决： - * 其一：@SpringBootApplication(scanBasePackages={"com.akaxin.site.*"}) + * 其一：@SpringBootApplication(scanBasePackages={"com.windchat.im.*"}) * 其二：SpringApplication.run(Class...clazzs ,args),clazzs 把需要加载的主类添加上 * * * @author Sam{@link an.guoyue254@gmail.com} * @since 2018-06-05 19:25:55 */ -@SpringBootApplication(scanBasePackages = { "com.akaxin.site.*" }) +@SpringBootApplication(scanBasePackages = { "com.windchat.im.*" }) public class OpenzalySpringBoot { public static void main(String[] args) { diff --git a/windchat-boot/src/main/java/com/windchat/im/boot/utils/Helper.java b/windchat-boot/src/main/java/com/windchat/im/boot/utils/Helper.java index b1cff61..296b20e 100755 --- a/windchat-boot/src/main/java/com/windchat/im/boot/utils/Helper.java +++ b/windchat-boot/src/main/java/com/windchat/im/boot/utils/Helper.java @@ -17,8 +17,8 @@ import org.apache.commons.cli.ParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.utils.PrintUtils; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.utils.PrintUtils; +import com.windchat.common.utils.StringHelper; 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/test/java/com/windchat/im/boot/test/TestDefaultIcon.java b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestDefaultIcon.java index bf423a0..acede3d 100755 --- a/windchat-boot/src/test/java/com/windchat/im/boot/test/TestDefaultIcon.java +++ b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestDefaultIcon.java @@ -2,7 +2,7 @@ package com.windchat.im.boot.test; import java.util.Base64; -import com.akaxin.site.business.utils.FileServerUtils; +import com.windchat.im.business.utils.FileServerUtils; public class TestDefaultIcon { public static void main(String args[]) { diff --git a/windchat-boot/src/test/java/com/windchat/im/boot/test/TestFile.java b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestFile.java index ba85d1e..04bb782 100755 --- a/windchat-boot/src/test/java/com/windchat/im/boot/test/TestFile.java +++ b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestFile.java @@ -4,8 +4,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.proto.core.FileProto.FileType; -import com.akaxin.site.business.utils.FilePathUtils; -import com.akaxin.site.business.utils.FileServerUtils; +import com.windchat.im.business.utils.FilePathUtils; +import com.windchat.im.business.utils.FileServerUtils; public class TestFile { private static final Logger logger = LoggerFactory.getLogger(TestFile.class); diff --git a/windchat-boot/src/test/java/com/windchat/im/boot/test/TestHttpClient.java b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestHttpClient.java index 2f953b4..4bb2720 100755 --- a/windchat-boot/src/test/java/com/windchat/im/boot/test/TestHttpClient.java +++ b/windchat-boot/src/test/java/com/windchat/im/boot/test/TestHttpClient.java @@ -3,8 +3,8 @@ package com.windchat.im.boot.test; import java.util.HashMap; import java.util.Map; -import com.akaxin.common.http.ZalyHttpClient; -import com.akaxin.common.utils.GsonUtils; +import com.windchat.common.http.ZalyHttpClient; +import com.windchat.common.utils.GsonUtils; public class TestHttpClient { public static void main(String args[]) throws Exception { diff --git a/windchat-business/src/main/java/com/windchat/im/business/api/IRequest.java b/windchat-business/src/main/java/com/windchat/im/business/api/IRequest.java index 190ed21..0c4e64c 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/api/IRequest.java +++ b/windchat-business/src/main/java/com/windchat/im/business/api/IRequest.java @@ -1,7 +1,7 @@ package com.windchat.im.business.api; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; public interface IRequest { diff --git a/windchat-business/src/main/java/com/windchat/im/business/bean/PlatformPhoneBean.java b/windchat-business/src/main/java/com/windchat/im/business/bean/PlatformPhoneBean.java index 2bbd381..3f5e363 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/bean/PlatformPhoneBean.java +++ b/windchat-business/src/main/java/com/windchat/im/business/bean/PlatformPhoneBean.java @@ -2,7 +2,7 @@ package com.windchat.im.business.bean; import org.apache.commons.lang3.StringUtils; -import com.akaxin.common.utils.GsonUtils; +import com.windchat.common.utils.GsonUtils; public class PlatformPhoneBean { diff --git a/windchat-business/src/main/java/com/windchat/im/business/dao/UserGroupDao.java b/windchat-business/src/main/java/com/windchat/im/business/dao/UserGroupDao.java index 2cf76e5..57b8588 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/dao/UserGroupDao.java +++ b/windchat-business/src/main/java/com/windchat/im/business/dao/UserGroupDao.java @@ -24,9 +24,9 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.utils.StringHelper; import com.akaxin.proto.core.GroupProto; -import com.akaxin.site.business.impl.notice.GroupNotice; +import com.windchat.im.business.impl.notice.GroupNotice; import com.windchat.im.storage.api.IGroupDao; import com.windchat.im.storage.api.IMessageDao; import com.windchat.im.storage.api.IUserGroupDao; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/AbstractRequest.java b/windchat-business/src/main/java/com/windchat/im/business/impl/AbstractRequest.java index bcdbd86..6d27067 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/AbstractRequest.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/AbstractRequest.java @@ -17,8 +17,8 @@ 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.business.dao.UserGroupDao; import com.windchat.im.business.dao.UserProfileDao; import com.windchat.im.storage.bean.GroupProfileBean; @@ -27,11 +27,11 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.logs.LogUtils; /** * diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/IRequestService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/IRequestService.java index c7aa385..7f56aeb 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/IRequestService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/IRequestService.java @@ -1,7 +1,7 @@ package com.windchat.im.business.impl; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; public interface IRequestService { public CommandResponse execute(Command command); diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpFriendService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpFriendService.java index bc38427..f876b45 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpFriendService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpFriendService.java @@ -24,22 +24,22 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.UserProto; import com.akaxin.proto.plugin.HaiFriendAddProto; import com.akaxin.proto.plugin.HaiFriendApplyProto; import com.akaxin.proto.plugin.HaiFriendRelationsProto.HaiFriendRelationsRequest; import com.akaxin.proto.plugin.HaiFriendRelationsProto.HaiFriendRelationsResponse; -import com.akaxin.site.business.dao.UserFriendDao; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.impl.notice.User2Notice; -import com.akaxin.site.business.push.PushNotification; +import com.windchat.im.business.dao.UserFriendDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.impl.notice.User2Notice; +import com.windchat.im.business.push.PushNotification; import com.windchat.im.storage.bean.SimpleUserBean; /** diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpGroupService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpGroupService.java index 2d94804..e6f15f7 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpGroupService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpGroupService.java @@ -24,12 +24,12 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.GroupProto; import com.akaxin.proto.core.UserProto; import com.akaxin.proto.plugin.HaiGroupAddMemberProto; @@ -41,9 +41,9 @@ import com.akaxin.proto.plugin.HaiGroupNonmembersProto; import com.akaxin.proto.plugin.HaiGroupProfileProto; import com.akaxin.proto.plugin.HaiGroupRemoveMemberProto; import com.akaxin.proto.plugin.HaiGroupUpdateProto; -import com.akaxin.site.business.constant.GroupConfig; -import com.akaxin.site.business.dao.UserGroupDao; -import com.akaxin.site.business.impl.AbstractRequest; +import com.windchat.im.business.constant.GroupConfig; +import com.windchat.im.business.dao.UserGroupDao; +import com.windchat.im.business.impl.AbstractRequest; import com.windchat.im.storage.bean.GroupMemberBean; import com.windchat.im.storage.bean.GroupProfileBean; import com.windchat.im.storage.bean.SimpleGroupBean; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpMessageService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpMessageService.java index 05989f3..b5d16b5 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpMessageService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpMessageService.java @@ -19,16 +19,16 @@ import com.windchat.im.business.impl.AbstractRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.RequestAction; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.RequestAction; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.plugin.HaiMessageProxyProto; import com.akaxin.proto.site.ImCtsMessageProto.ImCtsMessageRequest; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.message.api.IMessageService; -import com.akaxin.site.message.service.ImMessageService; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.message.api.IMessageService; +import com.windchat.im.message.service.ImMessageService; /** * 扩展使用的消息服务 diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpPushService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpPushService.java index d95d8b5..4b6eb16 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpPushService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpPushService.java @@ -22,14 +22,14 @@ import com.windchat.im.business.impl.AbstractRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.plugin.HaiPushNoticesProto.HaiPushNoticesRequest; -import com.akaxin.site.business.dao.SiteUserDao; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.push.PushNotification; +import com.windchat.im.business.dao.SiteUserDao; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.push.PushNotification; /** * 扩展使用的PUSH服务 diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSessionService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSessionService.java index e1b61fe..f5893cd 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSessionService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSessionService.java @@ -23,18 +23,18 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CharsetCoding; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.crypto.AESCrypto; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CharsetCoding; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.crypto.AESCrypto; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.UserProto; import com.akaxin.proto.plugin.HaiSessionProfileProto; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.AbstractRequest; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; import com.windchat.im.storage.api.IUserSessionDao; import com.windchat.im.storage.bean.SimpleAuthBean; import com.windchat.im.storage.bean.UserProfileBean; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSiteService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSiteService.java index b625390..8cee31b 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSiteService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpSiteService.java @@ -21,14 +21,14 @@ import com.windchat.im.business.impl.AbstractRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.ConfigProto; import com.akaxin.proto.plugin.HaiSiteGetConfigProto; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.impl.site.SiteConfig; /** * hai接口，提供对站点配置相关操作 diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpUserService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpUserService.java index 1961bcb..a058cf3 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpUserService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/hai/HttpUserService.java @@ -26,12 +26,12 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.GroupProto; import com.akaxin.proto.core.UserProto; import com.akaxin.proto.plugin.HaiUserAvatarProto; @@ -41,12 +41,12 @@ import com.akaxin.proto.plugin.HaiUserListProto; import com.akaxin.proto.plugin.HaiUserPhoneProto; import com.akaxin.proto.plugin.HaiUserProfileProto; import com.akaxin.proto.plugin.HaiUserUpdateProto; -import com.akaxin.site.business.dao.UserFriendDao; -import com.akaxin.site.business.dao.UserGroupDao; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.utils.FilePathUtils; -import com.akaxin.site.business.utils.FileServerUtils; +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 com.windchat.im.business.utils.FileServerUtils; import com.windchat.im.storage.bean.SimpleGroupBean; import com.windchat.im.storage.bean.SimpleUserBean; import com.windchat.im.storage.bean.UserProfileBean; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/notice/GroupNotice.java b/windchat-business/src/main/java/com/windchat/im/business/impl/notice/GroupNotice.java index 9515913..9ccdd6a 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/notice/GroupNotice.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/notice/GroupNotice.java @@ -23,14 +23,14 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.constant.RequestAction; +import com.windchat.common.command.Command; +import com.windchat.common.constant.RequestAction; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.business.constant.NoticeText; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.message.api.IMessageService; -import com.akaxin.site.message.service.ImMessageService; +import com.windchat.im.business.constant.NoticeText; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.message.api.IMessageService; +import com.windchat.im.message.service.ImMessageService; import com.windchat.im.storage.bean.SimpleUserBean; import com.google.protobuf.ByteString; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/notice/User2Notice.java b/windchat-business/src/main/java/com/windchat/im/business/impl/notice/User2Notice.java index 70694bd..34b8ef2 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/notice/User2Notice.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/notice/User2Notice.java @@ -20,16 +20,16 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.constant.RequestAction; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.command.Command; +import com.windchat.common.constant.RequestAction; +import com.windchat.common.utils.StringHelper; import com.akaxin.proto.client.ImStcNoticeProto; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.core.CoreProto.MsgType; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.business.constant.NoticeText; -import com.akaxin.site.message.api.IMessageService; -import com.akaxin.site.message.service.ImMessageService; +import com.windchat.im.business.constant.NoticeText; +import com.windchat.im.message.api.IMessageService; +import com.windchat.im.message.service.ImMessageService; import com.windchat.im.storage.bean.ApplyFriendBean; import com.google.protobuf.ByteString; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/site/PlatformUserPhone.java b/windchat-business/src/main/java/com/windchat/im/business/impl/site/PlatformUserPhone.java index 576ba04..4be1790 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/site/PlatformUserPhone.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/site/PlatformUserPhone.java @@ -19,10 +19,10 @@ import com.windchat.im.business.bean.PlatformPhoneBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.constant.CommandConst; +import com.windchat.common.constant.CommandConst; import com.akaxin.proto.platform.ApiPhoneConfirmTokenProto; -import com.akaxin.site.business.bean.PlatformPhoneBean; -import com.akaxin.site.message.platform.PlatformClient; +import com.windchat.im.business.bean.PlatformPhoneBean; +import com.windchat.im.message.platform.PlatformClient; /** * 当注册方式为：实名用户，此时需要向平台验证手机号码是否正确 diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/site/SiteConfig.java b/windchat-business/src/main/java/com/windchat/im/business/impl/site/SiteConfig.java index a4c7bad..db04aec 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/site/SiteConfig.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/site/SiteConfig.java @@ -29,9 +29,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.proto.core.ConfigProto; -import com.akaxin.site.business.constant.GroupConfig; -import com.akaxin.site.business.dao.SiteConfigDao; -import com.akaxin.site.message.utils.SiteConfigHelper; +import com.windchat.im.business.constant.GroupConfig; +import com.windchat.im.business.dao.SiteConfigDao; +import com.windchat.im.message.utils.SiteConfigHelper; /** * 管理站点配置相关信息 diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/site/UserUic.java b/windchat-business/src/main/java/com/windchat/im/business/impl/site/UserUic.java index b26ff5a..d8af7d5 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/site/UserUic.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/site/UserUic.java @@ -21,7 +21,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.proto.core.UicProto; -import com.akaxin.site.business.dao.SiteUicDao; +import com.windchat.im.business.dao.SiteUicDao; import com.windchat.im.storage.bean.UicBean; /** diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiDeviceService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiDeviceService.java index b9dbcd8..9d548ba 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiDeviceService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiDeviceService.java @@ -23,16 +23,16 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.DeviceProto; import com.akaxin.proto.site.ApiDeviceBoundListProto; import com.akaxin.proto.site.ApiDeviceListProto; import com.akaxin.proto.site.ApiDeviceProfileProto; -import com.akaxin.site.business.dao.UserDeviceDao; -import com.akaxin.site.business.impl.AbstractRequest; +import com.windchat.im.business.dao.UserDeviceDao; +import com.windchat.im.business.impl.AbstractRequest; import com.windchat.im.storage.bean.UserDeviceBean; /** diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFileService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFileService.java index 443c7e6..c35f4f0 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFileService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFileService.java @@ -21,16 +21,16 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.FileProto; import com.akaxin.proto.site.ApiFileDownloadProto; import com.akaxin.proto.site.ApiFileUploadProto; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.utils.FilePathUtils; -import com.akaxin.site.business.utils.FileServerUtils; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.utils.FilePathUtils; +import com.windchat.im.business.utils.FileServerUtils; import com.google.protobuf.ByteString; /** diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFriendService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFriendService.java index 96f32da..3345491 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFriendService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiFriendService.java @@ -24,14 +24,14 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.logs.LogUtils; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.logs.LogUtils; +import com.windchat.common.utils.StringHelper; import com.akaxin.proto.core.UserProto; import com.akaxin.proto.site.ApiFriendApplyCountProto; import com.akaxin.proto.site.ApiFriendApplyListProto; @@ -45,12 +45,12 @@ import com.akaxin.proto.site.ApiFriendRemarkProto; import com.akaxin.proto.site.ApiFriendSettingProto; import com.akaxin.proto.site.ApiFriendUpdateMuteProto; import com.akaxin.proto.site.ApiFriendUpdateSettingProto; -import com.akaxin.site.business.dao.UserFriendDao; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.impl.notice.User2Notice; -import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.business.push.PushNotification; +import com.windchat.im.business.dao.UserFriendDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.impl.notice.User2Notice; +import com.windchat.im.business.impl.site.SiteConfig; +import com.windchat.im.business.push.PushNotification; import com.windchat.im.storage.bean.ApplyFriendBean; import com.windchat.im.storage.bean.ApplyUserBean; import com.windchat.im.storage.bean.SimpleUserBean; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiGroupService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiGroupService.java index b5b9f3b..f107277 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiGroupService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiGroupService.java @@ -27,14 +27,14 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.exceptions.ZalyException; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.exceptions.ZalyException; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.GroupProto; import com.akaxin.proto.core.TokenProto; import com.akaxin.proto.core.UserProto; @@ -53,12 +53,12 @@ import com.akaxin.proto.site.ApiGroupRemoveMemberProto; import com.akaxin.proto.site.ApiGroupSettingProto; import com.akaxin.proto.site.ApiGroupUpdateProfileProto; import com.akaxin.proto.site.ApiGroupUpdateSettingProto; -import com.akaxin.site.business.constant.GroupConfig; -import com.akaxin.site.business.dao.ExpireTokenDao; -import com.akaxin.site.business.dao.UserGroupDao; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.impl.site.SiteConfig; +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 com.windchat.im.business.impl.site.SiteConfig; import com.windchat.im.storage.bean.ExpireToken; import com.windchat.im.storage.bean.GroupMemberBean; import com.windchat.im.storage.bean.GroupProfileBean; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiPluginService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiPluginService.java index 79f1352..9a008ed 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiPluginService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiPluginService.java @@ -27,24 +27,24 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CharsetCoding; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.crypto.AESCrypto; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.http.ZalyHttpClient; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CharsetCoding; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.crypto.AESCrypto; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.http.ZalyHttpClient; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.core.PluginProto; import com.akaxin.proto.site.ApiPluginListProto; import com.akaxin.proto.site.ApiPluginPageProto; import com.akaxin.proto.site.ApiPluginProxyProto; -import com.akaxin.site.business.dao.SitePluginDao; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.im.business.dao.SitePluginDao; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.impl.site.SiteConfig; import com.windchat.im.storage.bean.PluginBean; import com.google.protobuf.ByteString; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSecretChatService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSecretChatService.java index 6b43488..f5ef4a6 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSecretChatService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSecretChatService.java @@ -20,16 +20,16 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.core.ConfigProto; import com.akaxin.proto.core.DeviceProto; import com.akaxin.proto.site.ApiSecretChatApplyU2Proto; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.im.business.impl.AbstractRequest; +import com.windchat.im.business.impl.site.SiteConfig; import com.windchat.im.storage.api.IUserDeviceDao; import com.windchat.im.storage.bean.UserDeviceBean; import com.windchat.im.storage.service.DeviceDaoService; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSiteService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSiteService.java index 92f0fa1..d4d98dc 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSiteService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiSiteService.java @@ -29,34 +29,34 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.crypto.HashCrypto; -import com.akaxin.common.crypto.RSACrypto; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.logs.LogUtils; -import com.akaxin.common.utils.StringHelper; -import com.akaxin.common.utils.UserIdUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.crypto.HashCrypto; +import com.windchat.common.crypto.RSACrypto; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.logs.LogUtils; +import com.windchat.common.utils.StringHelper; +import com.windchat.common.utils.UserIdUtils; import com.akaxin.proto.core.ConfigProto; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.core.UserProto; import com.akaxin.proto.site.ApiSiteConfigProto; import com.akaxin.proto.site.ApiSiteLoginProto; import com.akaxin.proto.site.ApiSiteRegisterProto; -import com.akaxin.site.business.bean.PlatformPhoneBean; -import com.akaxin.site.business.dao.SiteConfigDao; -import com.akaxin.site.business.dao.SiteLoginDao; -import com.akaxin.site.business.dao.UserFriendDao; -import com.akaxin.site.business.dao.UserGroupDao; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.business.impl.notice.User2Notice; -import com.akaxin.site.business.impl.site.PlatformUserPhone; -import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.business.impl.site.UserUic; +import com.windchat.im.business.bean.PlatformPhoneBean; +import com.windchat.im.business.dao.SiteConfigDao; +import com.windchat.im.business.dao.SiteLoginDao; +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.impl.notice.User2Notice; +import com.windchat.im.business.impl.site.PlatformUserPhone; +import com.windchat.im.business.impl.site.SiteConfig; +import com.windchat.im.business.impl.site.UserUic; import com.windchat.im.storage.api.IUserDeviceDao; import com.windchat.im.storage.bean.ApplyFriendBean; import com.windchat.im.storage.bean.SimpleUserBean; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiUserService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiUserService.java index 50daf01..85f916e 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiUserService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiUserService.java @@ -25,24 +25,24 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.exceptions.ZalyException2; -import com.akaxin.common.logs.LogUtils; -import com.akaxin.common.utils.StringHelper; -import com.akaxin.common.utils.ValidatorPattern; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.exceptions.ZalyException2; +import com.windchat.common.logs.LogUtils; +import com.windchat.common.utils.StringHelper; +import com.windchat.common.utils.ValidatorPattern; import com.akaxin.proto.core.UserProto; import com.akaxin.proto.site.ApiUserMuteProto; import com.akaxin.proto.site.ApiUserProfileProto; import com.akaxin.proto.site.ApiUserSearchProto; import com.akaxin.proto.site.ApiUserUpdateMuteProto; import com.akaxin.proto.site.ApiUserUpdateProfileProto; -import com.akaxin.site.business.dao.UserFriendDao; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.AbstractRequest; +import com.windchat.im.business.dao.UserFriendDao; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.AbstractRequest; import com.windchat.im.storage.bean.UserFriendBean; import com.windchat.im.storage.bean.UserProfileBean; diff --git a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiWebService.java b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiWebService.java index 878f1ce..4922ff0 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiWebService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/impl/tai/ApiWebService.java @@ -20,16 +20,16 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; -import com.akaxin.common.exceptions.ZalyException; -import com.akaxin.common.logs.LogUtils; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; +import com.windchat.common.exceptions.ZalyException; +import com.windchat.common.logs.LogUtils; import com.akaxin.proto.site.ApiWebAuthProto; -import com.akaxin.site.business.cache.WebSessionCache; -import com.akaxin.site.business.impl.AbstractRequest; +import com.windchat.im.business.cache.WebSessionCache; +import com.windchat.im.business.impl.AbstractRequest; /** * webim服务 diff --git a/windchat-business/src/main/java/com/windchat/im/business/push/PushNotification.java b/windchat-business/src/main/java/com/windchat/im/business/push/PushNotification.java index 96b2407..bf4dd05 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/push/PushNotification.java +++ b/windchat-business/src/main/java/com/windchat/im/business/push/PushNotification.java @@ -6,15 +6,15 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.utils.StringHelper; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.utils.StringHelper; import com.akaxin.proto.core.ConfigProto; import com.akaxin.proto.core.PushProto; import com.akaxin.proto.platform.ApiPushNotificationProto; -import com.akaxin.site.message.dao.ImUserProfileDao; -import com.akaxin.site.message.push.PushClient; -import com.akaxin.site.message.threads.MultiPushThreadExecutor; -import com.akaxin.site.message.utils.SiteConfigHelper; +import com.windchat.im.message.dao.ImUserProfileDao; +import com.windchat.im.message.push.PushClient; +import com.windchat.im.message.threads.MultiPushThreadExecutor; +import com.windchat.im.message.utils.SiteConfigHelper; public class PushNotification { private static final Logger logger = LoggerFactory.getLogger(PushNotification.class); diff --git a/windchat-business/src/main/java/com/windchat/im/business/push/PushText.java b/windchat-business/src/main/java/com/windchat/im/business/push/PushText.java index 93c162c..90c5c87 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/push/PushText.java +++ b/windchat-business/src/main/java/com/windchat/im/business/push/PushText.java @@ -4,9 +4,9 @@ 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; -import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.common.utils.StringHelper; +import com.windchat.im.business.dao.UserProfileDao; +import com.windchat.im.business.impl.site.SiteConfig; import com.windchat.im.storage.bean.SimpleUserBean; /** diff --git a/windchat-business/src/main/java/com/windchat/im/business/service/ApiRequestService.java b/windchat-business/src/main/java/com/windchat/im/business/service/ApiRequestService.java index a63e9a0..d41cb47 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/service/ApiRequestService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/service/ApiRequestService.java @@ -19,12 +19,12 @@ import com.windchat.im.business.api.IRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.utils.StringHelper; -import com.akaxin.site.business.api.IRequest; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.utils.StringHelper; +import com.windchat.im.business.api.IRequest; /** * API处理业务逻辑 diff --git a/windchat-business/src/main/java/com/windchat/im/business/service/ApiServiceFactory.java b/windchat-business/src/main/java/com/windchat/im/business/service/ApiServiceFactory.java index e85f80d..a2f9acd 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/service/ApiServiceFactory.java +++ b/windchat-business/src/main/java/com/windchat/im/business/service/ApiServiceFactory.java @@ -18,16 +18,16 @@ package com.windchat.im.business.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.constant.RequestAction; -import com.akaxin.site.business.impl.IRequestService; -import com.akaxin.site.business.impl.tai.ApiDeviceService; -import com.akaxin.site.business.impl.tai.ApiFileService; -import com.akaxin.site.business.impl.tai.ApiFriendService; -import com.akaxin.site.business.impl.tai.ApiGroupService; -import com.akaxin.site.business.impl.tai.ApiPluginService; -import com.akaxin.site.business.impl.tai.ApiSecretChatService; -import com.akaxin.site.business.impl.tai.ApiSiteService; -import com.akaxin.site.business.impl.tai.ApiUserService; +import com.windchat.common.constant.RequestAction; +import com.windchat.im.business.impl.IRequestService; +import com.windchat.im.business.impl.tai.ApiDeviceService; +import com.windchat.im.business.impl.tai.ApiFileService; +import com.windchat.im.business.impl.tai.ApiFriendService; +import com.windchat.im.business.impl.tai.ApiGroupService; +import com.windchat.im.business.impl.tai.ApiPluginService; +import com.windchat.im.business.impl.tai.ApiSecretChatService; +import com.windchat.im.business.impl.tai.ApiSiteService; +import com.windchat.im.business.impl.tai.ApiUserService; /** * API业务请求，分发工厂 diff --git a/windchat-business/src/main/java/com/windchat/im/business/service/HttpRequestService.java b/windchat-business/src/main/java/com/windchat/im/business/service/HttpRequestService.java index 937fe84..bef10a0 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/service/HttpRequestService.java +++ b/windchat-business/src/main/java/com/windchat/im/business/service/HttpRequestService.java @@ -19,19 +19,19 @@ import com.windchat.im.business.api.IRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.common.command.Command; -import com.akaxin.common.command.CommandResponse; -import com.akaxin.common.constant.CommandConst; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.HttpUriAction; -import com.akaxin.site.business.api.IRequest; -import com.akaxin.site.business.impl.hai.HttpFriendService; -import com.akaxin.site.business.impl.hai.HttpGroupService; -import com.akaxin.site.business.impl.hai.HttpMessageService; -import com.akaxin.site.business.impl.hai.HttpPushService; -import com.akaxin.site.business.impl.hai.HttpSessionService; -import com.akaxin.site.business.impl.hai.HttpSiteService; -import com.akaxin.site.business.impl.hai.HttpUserService; +import com.windchat.common.command.Command; +import com.windchat.common.command.CommandResponse; +import com.windchat.common.constant.CommandConst; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.HttpUriAction; +import com.windchat.im.business.api.IRequest; +import com.windchat.im.business.impl.hai.HttpFriendService; +import com.windchat.im.business.impl.hai.HttpGroupService; +import com.windchat.im.business.impl.hai.HttpMessageService; +import com.windchat.im.business.impl.hai.HttpPushService; +import com.windchat.im.business.impl.hai.HttpSessionService; +import com.windchat.im.business.impl.hai.HttpSiteService; +import com.windchat.im.business.impl.hai.HttpUserService; /** * Http请求服务分发 diff --git a/windchat-business/src/main/java/com/windchat/im/business/utils/FilePathUtils.java b/windchat-business/src/main/java/com/windchat/im/business/utils/FilePathUtils.java index fec15fd..57efef4 100755 --- a/windchat-business/src/main/java/com/windchat/im/business/utils/FilePathUtils.java +++ b/windchat-business/src/main/java/com/windchat/im/business/utils/FilePathUtils.java @@ -18,7 +18,7 @@ package com.windchat.im.business.utils; import org.apache.commons.lang3.StringUtils; import com.akaxin.proto.core.ConfigProto.ConfigKey; -import com.akaxin.site.business.impl.site.SiteConfig; +import com.windchat.im.business.impl.site.SiteConfig; /** * 提供站点服务文件路径位置，路径存放在站点配置表中。
diff --git a/windchat-business/src/test/java/com/windchat/im/business/test/TestHttpProto.java b/windchat-business/src/test/java/com/windchat/im/business/test/TestHttpProto.java index a0b2255..909fa1b 100755 --- a/windchat-business/src/test/java/com/windchat/im/business/test/TestHttpProto.java +++ b/windchat-business/src/test/java/com/windchat/im/business/test/TestHttpProto.java @@ -2,7 +2,7 @@ package com.windchat.im.business.test; import java.io.IOException; -import com.akaxin.common.http.ZalyHttpClient; +import com.windchat.common.http.ZalyHttpClient; import com.akaxin.proto.core.PluginProto; public class TestHttpProto { diff --git a/windchat-common/src/main/java/com/windchat/common/channel/ChannelSession.java b/windchat-common/src/main/java/com/windchat/common/channel/ChannelSession.java index 4ad5e80..2fe992c 100755 --- a/windchat-common/src/main/java/com/windchat/common/channel/ChannelSession.java +++ b/windchat-common/src/main/java/com/windchat/common/channel/ChannelSession.java @@ -15,7 +15,7 @@ */ package com.windchat.common.channel; -import com.akaxin.common.constant.RequestAction; +import com.windchat.common.constant.RequestAction; import io.netty.channel.Channel; diff --git a/windchat-common/src/main/java/com/windchat/common/command/CommandResponse.java b/windchat-common/src/main/java/com/windchat/common/command/CommandResponse.java index 3f470d1..a40ac1b 100755 --- a/windchat-common/src/main/java/com/windchat/common/command/CommandResponse.java +++ b/windchat-common/src/main/java/com/windchat/common/command/CommandResponse.java @@ -18,8 +18,8 @@ package com.windchat.common.command; import java.util.HashMap; import java.util.Map; -import com.akaxin.common.constant.ErrorCode2; -import com.akaxin.common.constant.IErrorCode; +import com.windchat.common.constant.ErrorCode2; +import com.windchat.common.constant.IErrorCode; /** * diff --git a/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException.java b/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException.java index 30b6cc9..d3bd788 100755 --- a/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException.java +++ b/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException.java @@ -15,7 +15,7 @@ */ package com.windchat.common.exceptions; -import com.akaxin.common.constant.IErrorCode; +import com.windchat.common.constant.IErrorCode; import com.windchat.common.constant.IErrorCode; /** diff --git a/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException2.java b/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException2.java index 2999cab..d7aeaee 100755 --- a/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException2.java +++ b/windchat-common/src/main/java/com/windchat/common/exceptions/ZalyException2.java @@ -15,7 +15,7 @@ */ package com.windchat.common.exceptions; -import com.akaxin.common.constant.IErrorCode; +import com.windchat.common.constant.IErrorCode; import com.windchat.common.constant.IErrorCode; /** diff --git a/windchat-common/src/main/java/com/windchat/common/executor/chain/AbstractHandlerChain.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/AbstractHandlerChain.java index 6abc640..65289c4 100755 --- a/windchat-common/src/main/java/com/windchat/common/executor/chain/AbstractHandlerChain.java +++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/AbstractHandlerChain.java @@ -18,7 +18,7 @@ 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; import com.windchat.common.executor.chain.handler.IHandler; /** diff --git a/windchat-common/src/main/java/com/windchat/common/executor/chain/CustomRHandlerChain.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/CustomRHandlerChain.java index 2a0fa33..58cc60a 100755 --- a/windchat-common/src/main/java/com/windchat/common/executor/chain/CustomRHandlerChain.java +++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/CustomRHandlerChain.java @@ -15,7 +15,7 @@ */ package com.windchat.common.executor.chain; -import com.akaxin.common.executor.chain.handler.IHandler; +import com.windchat.common.executor.chain.handler.IHandler; import com.windchat.common.executor.chain.handler.IHandler; /** diff --git a/windchat-common/src/main/java/com/windchat/common/executor/chain/SimpleHandlerChain.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/SimpleHandlerChain.java index 6227a92..b0db22a 100755 --- a/windchat-common/src/main/java/com/windchat/common/executor/chain/SimpleHandlerChain.java +++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/SimpleHandlerChain.java @@ -15,7 +15,7 @@ */ package com.windchat.common.executor.chain; -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/windchat/common/executor/chain/handler/MethodReflectHandler.java b/windchat-common/src/main/java/com/windchat/common/executor/chain/handler/MethodReflectHandler.java
index d1f6362..3f9f0b9 100755
--- a/windchat-common/src/main/java/com/windchat/common/executor/chain/handler/MethodReflectHandler.java
+++ b/windchat-common/src/main/java/com/windchat/common/executor/chain/handler/MethodReflectHandler.java
@@ -22,7 +22,7 @@ import com.windchat.common.command.Command;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
+import com.windchat.common.command.Command;
 
 /**
  * @author Sam{@link an.guoyue254@gmail.com}
diff --git a/windchat-common/src/main/java/com/windchat/common/logs/LogUtils.java b/windchat-common/src/main/java/com/windchat/common/logs/LogUtils.java
index f664002..9f41d81 100755
--- a/windchat-common/src/main/java/com/windchat/common/logs/LogUtils.java
+++ b/windchat-common/src/main/java/com/windchat/common/logs/LogUtils.java
@@ -22,9 +22,9 @@ import org.slf4j.Logger;
 import org.slf4j.helpers.FormattingTuple;
 import org.slf4j.helpers.MessageFormatter;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.utils.StringHelper;
 
 /**
  * 封装log，针对网络日志以及数据库操作日志
diff --git a/windchat-common/src/main/java/com/windchat/common/netty/IRedisCommandResponse.java b/windchat-common/src/main/java/com/windchat/common/netty/IRedisCommandResponse.java
index 53ffdb6..00dbb7a 100755
--- a/windchat-common/src/main/java/com/windchat/common/netty/IRedisCommandResponse.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/IRedisCommandResponse.java
@@ -15,7 +15,7 @@
  */
 package com.windchat.common.netty;
 
-import com.akaxin.common.command.RedisCommand;
+import com.windchat.common.command.RedisCommand;
 import com.windchat.common.command.RedisCommand;
 
 /**
diff --git a/windchat-common/src/main/java/com/windchat/common/netty/NettyClientHandler.java b/windchat-common/src/main/java/com/windchat/common/netty/NettyClientHandler.java
index 3f1871d..9f920ec 100755
--- a/windchat-common/src/main/java/com/windchat/common/netty/NettyClientHandler.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/NettyClientHandler.java
@@ -20,8 +20,8 @@ import com.windchat.common.command.RedisCommand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
 import com.akaxin.proto.core.CoreProto;
 
 import io.netty.channel.ChannelHandlerContext;
diff --git a/windchat-common/src/main/java/com/windchat/common/netty/PlatformClientHandler.java b/windchat-common/src/main/java/com/windchat/common/netty/PlatformClientHandler.java
index 6243f87..2ce65f0 100755
--- a/windchat-common/src/main/java/com/windchat/common/netty/PlatformClientHandler.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/PlatformClientHandler.java
@@ -20,8 +20,8 @@ import com.windchat.common.command.RedisCommand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
 import com.akaxin.proto.core.CoreProto;
 
 import io.netty.channel.ChannelHandlerContext;
diff --git a/windchat-common/src/main/java/com/windchat/common/netty/RedisCommandResponse.java b/windchat-common/src/main/java/com/windchat/common/netty/RedisCommandResponse.java
index 0406a35..dd41442 100755
--- a/windchat-common/src/main/java/com/windchat/common/netty/RedisCommandResponse.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/RedisCommandResponse.java
@@ -15,7 +15,7 @@
  */
 package com.windchat.common.netty;
 
-import com.akaxin.common.command.RedisCommand;
+import com.windchat.common.command.RedisCommand;
 import com.google.gson.Gson;
 import com.windchat.common.command.RedisCommand;
 
diff --git a/windchat-common/src/main/java/com/windchat/common/netty/codec/MessageEncoder.java b/windchat-common/src/main/java/com/windchat/common/netty/codec/MessageEncoder.java
index badb9c1..b839f71 100755
--- a/windchat-common/src/main/java/com/windchat/common/netty/codec/MessageEncoder.java
+++ b/windchat-common/src/main/java/com/windchat/common/netty/codec/MessageEncoder.java
@@ -21,7 +21,7 @@ import com.windchat.common.command.RedisCommand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.RedisCommand;
+import com.windchat.common.command.RedisCommand;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/windchat-common/src/main/java/com/windchat/common/utils/UserIdUtils.java b/windchat-common/src/main/java/com/windchat/common/utils/UserIdUtils.java
index eb30606..d2fe2d7 100755
--- a/windchat-common/src/main/java/com/windchat/common/utils/UserIdUtils.java
+++ b/windchat-common/src/main/java/com/windchat/common/utils/UserIdUtils.java
@@ -18,7 +18,7 @@ package com.windchat.common.utils;
 import java.util.UUID;
 import java.util.zip.CRC32;
 
-import com.akaxin.common.crypto.HashCrypto;
+import com.windchat.common.crypto.HashCrypto;
 
 /**
  * 
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ChannelConst.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ChannelConst.java
index de9557b..b6182a0 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ChannelConst.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ChannelConst.java
@@ -1,6 +1,6 @@
 package com.windchat.im.connector.codec.parser;
 
-import com.akaxin.common.channel.ChannelSession;
+import com.windchat.common.channel.ChannelSession;
 
 import io.netty.util.AttributeKey;
 
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ProtocolParser.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ProtocolParser.java
index 42c0b8e..3a0e987 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ProtocolParser.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/parser/ProtocolParser.java
@@ -18,9 +18,9 @@ package com.windchat.im.connector.codec.parser;
 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 com.windchat.im.connector.codec.protocol.MessageDecoder;
 import com.windchat.im.connector.codec.protocol.ReplaySignal;
 
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageEncoder.java b/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageEncoder.java
index a402b85..ad598bd 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageEncoder.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/codec/protocol/MessageEncoder.java
@@ -22,9 +22,9 @@ 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.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.RequestAction;
 import com.windchat.im.connector.constant.AkxProject;
 
 import io.netty.buffer.ByteBuf;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/handler/AbstractCommonHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/AbstractCommonHandler.java
index 695b510..9fb6bbd 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/handler/AbstractCommonHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/AbstractCommonHandler.java
@@ -15,10 +15,10 @@
  */
 package com.windchat.im.connector.handler;
 
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
-import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
+import com.windchat.common.executor.chain.handler.IHandler;
 
 import io.netty.channel.Channel;
 
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/handler/ApiRequestHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ApiRequestHandler.java
index 7167199..9660b65 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/handler/ApiRequestHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ApiRequestHandler.java
@@ -22,16 +22,16 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
-import com.akaxin.common.constant.RequestAction;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
+import com.windchat.common.constant.RequestAction;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
-import com.akaxin.site.business.service.ApiRequestService;
+import com.windchat.im.business.service.ApiRequestService;
 import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.storage.api.IUserSessionDao;
 import com.windchat.im.storage.bean.SimpleAuthBean;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/handler/HttpRequestHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/HttpRequestHandler.java
index e6c7016..d70cf6e 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/handler/HttpRequestHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/HttpRequestHandler.java
@@ -21,14 +21,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CharsetCoding;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.crypto.AESCrypto;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CharsetCoding;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.crypto.AESCrypto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.PluginProto;
-import com.akaxin.site.business.service.HttpRequestService;
+import com.windchat.im.business.service.HttpRequestService;
 import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.connector.constant.HttpConst;
 import com.windchat.im.connector.constant.PluginConst;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImMessageHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImMessageHandler.java
index 353c205..ddec5b0 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImMessageHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImMessageHandler.java
@@ -22,18 +22,18 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelManager;
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
-import com.akaxin.common.constant.RequestAction;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.channel.ChannelManager;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
+import com.windchat.common.constant.RequestAction;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
 import com.windchat.im.connector.constant.AkxProject;
-import com.akaxin.site.message.service.ImMessageService;
+import com.windchat.im.message.service.ImMessageService;
 
 /**
  * 这里负责下发消息至message模块进行处理
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImSiteAuthHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImSiteAuthHandler.java
index 363e1f9..caf99ef 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImSiteAuthHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/ImSiteAuthHandler.java
@@ -19,19 +19,19 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelManager;
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.channel.ChannelWriter;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
-import com.akaxin.common.constant.RequestAction;
-import com.akaxin.common.executor.chain.handler.MethodReflectHandler;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.channel.ChannelManager;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.channel.ChannelWriter;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
+import com.windchat.common.constant.RequestAction;
+import com.windchat.common.executor.chain.handler.MethodReflectHandler;
+import com.windchat.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.windchat.im.business.impl.site.SiteConfig;
 import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.connector.session.SessionManager;
 import com.windchat.im.storage.bean.SimpleAuthBean;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/handler/WSRequestHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/handler/WSRequestHandler.java
index 7872790..1726c73 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/handler/WSRequestHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/handler/WSRequestHandler.java
@@ -18,10 +18,10 @@ package com.windchat.im.connector.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
 
 import io.netty.channel.Channel;
 import io.netty.util.concurrent.Future;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/http/HttpServer.java b/windchat-connector/src/main/java/com/windchat/im/connector/http/HttpServer.java
index af3d07e..d60eb9c 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/http/HttpServer.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/http/HttpServer.java
@@ -19,10 +19,10 @@ import com.windchat.im.connector.http.handler.HttpServerHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-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.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.executor.AbstracteExecutor;
+import com.windchat.common.executor.SimpleExecutor;
 import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.connector.exception.HttpServerException;
 
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/http/handler/HttpServerHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/http/handler/HttpServerHandler.java
index f26c02a..faa76e0 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/http/handler/HttpServerHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/http/handler/HttpServerHandler.java
@@ -23,14 +23,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CharsetCoding;
-import com.akaxin.common.constant.HttpUriAction;
-import com.akaxin.common.crypto.AESCrypto;
-import com.akaxin.common.executor.AbstracteExecutor;
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CharsetCoding;
+import com.windchat.common.constant.HttpUriAction;
+import com.windchat.common.crypto.AESCrypto;
+import com.windchat.common.executor.AbstracteExecutor;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.core.PluginProto;
 import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.connector.constant.HttpConst;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/netty/NettyServer.java b/windchat-connector/src/main/java/com/windchat/im/connector/netty/NettyServer.java
index 2c76dbb..89ec940 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/netty/NettyServer.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/netty/NettyServer.java
@@ -21,10 +21,10 @@ import com.windchat.im.connector.codec.protocol.MessageEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-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.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.executor.AbstracteExecutor;
+import com.windchat.common.executor.SimpleExecutor;
 import com.windchat.im.connector.codec.protocol.MessageDecoder;
 import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.connector.exception.TcpServerException;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/netty/handler/NettyServerHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/netty/handler/NettyServerHandler.java
index fc97457..552d92c 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/netty/handler/NettyServerHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/netty/handler/NettyServerHandler.java
@@ -23,15 +23,15 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelManager;
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.RequestAction;
-import com.akaxin.common.executor.AbstracteExecutor;
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.channel.ChannelManager;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.RequestAction;
+import com.windchat.common.executor.AbstracteExecutor;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
 import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.connector.session.SessionManager;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/session/PluginSession.java b/windchat-connector/src/main/java/com/windchat/im/connector/session/PluginSession.java
index 5ae9601..91cd00c 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/session/PluginSession.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/session/PluginSession.java
@@ -18,7 +18,7 @@ package com.windchat.im.connector.session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.utils.StringHelper;
 import com.windchat.im.connector.constant.AkxProject;
 import com.windchat.im.storage.api.IPluginDao;
 import com.windchat.im.storage.bean.PluginBean;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/ws/WsServer.java b/windchat-connector/src/main/java/com/windchat/im/connector/ws/WsServer.java
index c83ba3d..516e898 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/ws/WsServer.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/ws/WsServer.java
@@ -5,10 +5,10 @@ import com.windchat.im.connector.ws.handler.WsServerHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-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.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.executor.AbstracteExecutor;
+import com.windchat.common.executor.SimpleExecutor;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
diff --git a/windchat-connector/src/main/java/com/windchat/im/connector/ws/handler/WsServerHandler.java b/windchat-connector/src/main/java/com/windchat/im/connector/ws/handler/WsServerHandler.java
index 4b59bae..22787db 100755
--- a/windchat-connector/src/main/java/com/windchat/im/connector/ws/handler/WsServerHandler.java
+++ b/windchat-connector/src/main/java/com/windchat/im/connector/ws/handler/WsServerHandler.java
@@ -8,13 +8,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.channel.WebChannelManager;
-import com.akaxin.common.command.Command;
-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.windchat.common.channel.ChannelSession;
+import com.windchat.common.channel.WebChannelManager;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CharsetCoding;
+import com.windchat.common.executor.AbstracteExecutor;
+import com.windchat.im.business.cache.WebSessionCache;
 import com.windchat.im.connector.codec.parser.ChannelConst;
 
 import io.netty.channel.ChannelFuture;
diff --git a/windchat-connector/src/test/java/com/zaly/test/HttpClient.java b/windchat-connector/src/test/java/com/zaly/test/HttpClient.java
index 2e68f80..4911bd7 100755
--- a/windchat-connector/src/test/java/com/zaly/test/HttpClient.java
+++ b/windchat-connector/src/test/java/com/zaly/test/HttpClient.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.akaxin.common.http.ZalyHttpClient;
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.http.ZalyHttpClient;
+import com.windchat.common.utils.GsonUtils;
 import com.squareup.okhttp.FormEncodingBuilder;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.OkHttpClient;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/api/IMessageService.java b/windchat-message/src/main/java/com/windchat/im/message/api/IMessageService.java
index bcf9a5b..dc4abad 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/api/IMessageService.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/api/IMessageService.java
@@ -1,6 +1,6 @@
 package com.windchat.im.message.api;
 
-import com.akaxin.common.command.Command;
+import com.windchat.common.command.Command;
 
 public interface IMessageService {
 	public boolean execute(Command command);
diff --git a/windchat-message/src/main/java/com/windchat/im/message/bean/WebBean.java b/windchat-message/src/main/java/com/windchat/im/message/bean/WebBean.java
index c93d7e0..d8d49b1 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/bean/WebBean.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/bean/WebBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.message.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class WebBean {
 	private String webCode;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java b/windchat-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java
index 78ed253..d52c373 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java
@@ -15,39 +15,39 @@
  */
 package com.windchat.im.message.executor;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.constant.RequestAction;
-import com.akaxin.common.executor.AbstracteExecutor;
-import com.akaxin.common.executor.SimpleExecutor;
-import com.akaxin.common.executor.chain.AbstractHandlerChain;
-import com.akaxin.common.executor.chain.SimpleHandlerChain;
-import com.akaxin.site.message.group.handler.GroupDetectionHandler;
-import com.akaxin.site.message.group.handler.GroupMessageImageHandler;
-import com.akaxin.site.message.group.handler.GroupMessageNoticeHandler;
-import com.akaxin.site.message.group.handler.GroupMessageTextHandler;
-import com.akaxin.site.message.group.handler.GroupMessageVoiceHandler;
-import com.akaxin.site.message.group.handler.GroupMessageWebHandler;
-import com.akaxin.site.message.group.handler.GroupMessageWebNoticeHandler;
-import com.akaxin.site.message.group.handler.GroupPsnHandler;
-import com.akaxin.site.message.group.handler.GroupPushHandler;
-import com.akaxin.site.message.notice.handler.NoticeHandler;
-import com.akaxin.site.message.notice.handler.NoticePushHandler;
-import com.akaxin.site.message.sync.handler.SyncFinishHandler;
-import com.akaxin.site.message.sync.handler.SyncGroupMessageHandler;
-import com.akaxin.site.message.sync.handler.SyncMsgStatusHandler;
-import com.akaxin.site.message.sync.handler.SyncU2MessageHandler;
-import com.akaxin.site.message.user2.handler.U2MessageImageHandler;
-import com.akaxin.site.message.user2.handler.U2MessageImageSecretHandler;
-import com.akaxin.site.message.user2.handler.U2MessageNoticeHandler;
-import com.akaxin.site.message.user2.handler.U2MessageTextHandler;
-import com.akaxin.site.message.user2.handler.U2MessageTextSecretHandler;
-import com.akaxin.site.message.user2.handler.U2MessageVoiceHandler;
-import com.akaxin.site.message.user2.handler.U2MessageVoiceSecretHandler;
-import com.akaxin.site.message.user2.handler.U2MessageWebHandler;
-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.common.command.Command;
+import com.windchat.common.constant.RequestAction;
+import com.windchat.common.executor.AbstracteExecutor;
+import com.windchat.common.executor.SimpleExecutor;
+import com.windchat.common.executor.chain.AbstractHandlerChain;
+import com.windchat.common.executor.chain.SimpleHandlerChain;
+import com.windchat.im.message.group.handler.GroupDetectionHandler;
+import com.windchat.im.message.group.handler.GroupMessageImageHandler;
+import com.windchat.im.message.group.handler.GroupMessageNoticeHandler;
+import com.windchat.im.message.group.handler.GroupMessageTextHandler;
+import com.windchat.im.message.group.handler.GroupMessageVoiceHandler;
+import com.windchat.im.message.group.handler.GroupMessageWebHandler;
+import com.windchat.im.message.group.handler.GroupMessageWebNoticeHandler;
+import com.windchat.im.message.group.handler.GroupPsnHandler;
+import com.windchat.im.message.group.handler.GroupPushHandler;
+import com.windchat.im.message.notice.handler.NoticeHandler;
+import com.windchat.im.message.notice.handler.NoticePushHandler;
+import com.windchat.im.message.sync.handler.SyncFinishHandler;
+import com.windchat.im.message.sync.handler.SyncGroupMessageHandler;
+import com.windchat.im.message.sync.handler.SyncMsgStatusHandler;
+import com.windchat.im.message.sync.handler.SyncU2MessageHandler;
+import com.windchat.im.message.user2.handler.U2MessageImageHandler;
+import com.windchat.im.message.user2.handler.U2MessageImageSecretHandler;
+import com.windchat.im.message.user2.handler.U2MessageNoticeHandler;
+import com.windchat.im.message.user2.handler.U2MessageTextHandler;
+import com.windchat.im.message.user2.handler.U2MessageTextSecretHandler;
+import com.windchat.im.message.user2.handler.U2MessageVoiceHandler;
+import com.windchat.im.message.user2.handler.U2MessageVoiceSecretHandler;
+import com.windchat.im.message.user2.handler.U2MessageWebHandler;
+import com.windchat.im.message.user2.handler.U2MessageWebNoticeHandler;
+import com.windchat.im.message.user2.handler.UserDetectionHandler;
+import com.windchat.im.message.user2.handler.UserPsnHandler;
+import com.windchat.im.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/windchat/im/message/group/handler/AbstractGroupHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java
index b403eab..42f6a67 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java
@@ -17,11 +17,11 @@ package com.windchat.im.message.group.handler;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.akaxin.common.channel.ChannelWriter;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.channel.ChannelWriter;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.executor.chain.handler.IHandler;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java
index 8421c57..0cf5f8c 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java
@@ -21,13 +21,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.UserProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.dao.ImUserGroupDao;
-import com.akaxin.site.message.dao.ImUserProfileDao;
+import com.windchat.im.message.dao.ImUserGroupDao;
+import com.windchat.im.message.dao.ImUserProfileDao;
 import com.windchat.im.storage.bean.GroupProfileBean;
 import com.windchat.im.storage.bean.SimpleUserBean;
 
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java
index c1d5405..0682650 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.group.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java
index 8162775..c66aee8 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java
@@ -15,10 +15,10 @@
  */
 package com.windchat.im.message.group.handler;
 
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java
index 6a516b3..6be0f02 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.group.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java
index 84103e0..e8ceb9d 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.group.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java
index 2a5d50f..c6f18e4 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java
@@ -15,10 +15,10 @@
  */
 package com.windchat.im.message.group.handler;
 
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java
index b1a28f7..26daf83 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.group.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java
index b08a649..865a528 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java
@@ -18,9 +18,9 @@ package com.windchat.im.message.group.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java
index 6a972e0..ca24978 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java
@@ -19,11 +19,11 @@ import com.windchat.im.message.bean.WebBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.bean.WebBean;
+import com.windchat.im.message.bean.WebBean;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.GroupMessageBean;
 import com.windchat.im.storage.service.MessageDaoService;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java
index 436c0df..3472aa0 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java
@@ -19,11 +19,11 @@ import com.windchat.im.message.bean.WebBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.bean.WebBean;
+import com.windchat.im.message.bean.WebBean;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.GroupMessageBean;
 import com.windchat.im.storage.service.MessageDaoService;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java
index 6eb04cf..9b7b8c1 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java
@@ -22,14 +22,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelWriter;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.channel.ChannelWriter;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.client.ImStcPsnProto;
-import com.akaxin.site.message.dao.ImUserSessionDao;
+import com.windchat.im.message.dao.ImUserSessionDao;
 import com.windchat.im.storage.api.IGroupDao;
 import com.windchat.im.storage.service.GroupDaoService;
 
diff --git a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java
index efdd4fe..599f1b4 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java
@@ -26,19 +26,19 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.ConfigProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.PushProto;
 import com.akaxin.proto.platform.ApiPushNotificationsProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.dao.ImUserGroupDao;
-import com.akaxin.site.message.dao.ImUserProfileDao;
-import com.akaxin.site.message.push.PushClient;
-import com.akaxin.site.message.threads.MultiPushThreadExecutor;
-import com.akaxin.site.message.utils.SiteConfigHelper;
+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 com.windchat.im.message.utils.SiteConfigHelper;
 import com.windchat.im.storage.api.IGroupDao;
 import com.windchat.im.storage.bean.GroupProfileBean;
 import com.windchat.im.storage.service.GroupDaoService;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java
index cc22127..982e0d7 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java
@@ -15,7 +15,7 @@
  */
 package com.windchat.im.message.notice.handler;
 
-import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.executor.chain.handler.IHandler;
 
 public abstract class AbstractNoticeHandler implements IHandler {
 
diff --git a/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java
index 85a7cd2..b5eabed 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java
@@ -20,14 +20,14 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelWriter;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.channel.ChannelWriter;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.client.ImStcNoticeProto;
-import com.akaxin.site.message.dao.SessionDeviceDao;
+import com.windchat.im.message.dao.SessionDeviceDao;
 
 /**
  * 在线给客户端下发通知命令
diff --git a/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java
index e7c36c1..0d5bc9f 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java
@@ -21,19 +21,19 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.client.ImStcNoticeProto;
 import com.akaxin.proto.client.ImStcNoticeProto.NoticeType;
 import com.akaxin.proto.core.ConfigProto;
 import com.akaxin.proto.core.PushProto;
 import com.akaxin.proto.platform.ApiPushNotificationProto;
-import com.akaxin.site.message.dao.ImUserFriendDao;
-import com.akaxin.site.message.dao.ImUserProfileDao;
-import com.akaxin.site.message.push.PushClient;
-import com.akaxin.site.message.threads.MultiPushThreadExecutor;
-import com.akaxin.site.message.utils.SiteConfigHelper;
+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 com.windchat.im.message.utils.SiteConfigHelper;
 
 public class NoticePushHandler extends AbstractNoticeHandler {
 	private static final Logger logger = LoggerFactory.getLogger(NoticePushHandler.class);
diff --git a/windchat-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java b/windchat-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java
index 317a8b4..75a9df9 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java
@@ -22,10 +22,10 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.netty.IRedisCommandResponse;
-import com.akaxin.common.netty.PlatformSSLClient;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.netty.IRedisCommandResponse;
+import com.windchat.common.netty.PlatformSSLClient;
 import com.akaxin.proto.core.CoreProto;
 import com.google.protobuf.ByteString;
 
diff --git a/windchat-message/src/main/java/com/windchat/im/message/push/PushClient.java b/windchat-message/src/main/java/com/windchat/im/message/push/PushClient.java
index 0eed0fe..bc4c434 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/push/PushClient.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/push/PushClient.java
@@ -22,10 +22,10 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.netty.IRedisCommandResponse;
-import com.akaxin.common.netty.PlatformSSLClient;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.netty.IRedisCommandResponse;
+import com.windchat.common.netty.PlatformSSLClient;
 import com.akaxin.proto.core.CoreProto;
 import com.google.protobuf.ByteString;
 
diff --git a/windchat-message/src/main/java/com/windchat/im/message/service/ImMessageService.java b/windchat-message/src/main/java/com/windchat/im/message/service/ImMessageService.java
index 71ef742..d529dd1 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/service/ImMessageService.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/service/ImMessageService.java
@@ -15,8 +15,8 @@
  */
 package com.windchat.im.message.service;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.site.message.api.IMessageService;
+import com.windchat.common.command.Command;
+import com.windchat.im.message.api.IMessageService;
 
 /**
  * 负责接受所有从connector下来的业务请求，请负责分发
diff --git a/windchat-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java b/windchat-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java
index 1dbc8a4..b943bcb 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java
@@ -19,13 +19,13 @@ import com.windchat.im.message.executor.MessageExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.constant.RequestAction;
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.command.Command;
+import com.windchat.common.constant.RequestAction;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.executor.MessageExecutor;
+import com.windchat.im.message.executor.MessageExecutor;
 
 public class MessageDispatcher {
 	private static final Logger logger = LoggerFactory.getLogger(MessageDispatcher.class);
diff --git a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java
index d909daf..a191d47 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java
@@ -17,11 +17,11 @@ package com.windchat.im.message.sync.handler;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.akaxin.common.channel.ChannelWriter;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.channel.ChannelWriter;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.executor.chain.handler.IHandler;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java
index 1d35793..e662945 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java
@@ -20,12 +20,12 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelWriter;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.channel.ChannelWriter;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.client.ImStcPsnProto;
 import com.akaxin.proto.site.ImSyncFinishProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java
index 72f371b..5cd5b1c 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java
@@ -24,19 +24,19 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.GsonUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.GsonUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
 import com.akaxin.proto.site.ImSyncMessageProto;
-import com.akaxin.site.message.bean.WebBean;
-import com.akaxin.site.message.utils.NumUtils;
+import com.windchat.im.message.bean.WebBean;
+import com.windchat.im.message.utils.NumUtils;
 import com.windchat.im.storage.api.IGroupDao;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.GroupMessageBean;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java
index cee7692..87b74e5 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java
@@ -20,8 +20,8 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.site.ImSyncMsgStatusProto;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.GroupMessageBean;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java
index 47bdd19..dff811f 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java
@@ -23,17 +23,17 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
 import com.akaxin.proto.site.ImSyncMessageProto;
-import com.akaxin.site.message.utils.NumUtils;
+import com.windchat.im.message.utils.NumUtils;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.U2MessageBean;
 import com.windchat.im.storage.service.MessageDaoService;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java
index a7f9fd2..6264fc1 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java
@@ -24,19 +24,19 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelSession;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.GsonUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.channel.ChannelSession;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.GsonUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
 import com.akaxin.proto.site.ImSyncMessageProto;
-import com.akaxin.site.message.bean.WebBean;
-import com.akaxin.site.message.utils.NumUtils;
+import com.windchat.im.message.bean.WebBean;
+import com.windchat.im.message.utils.NumUtils;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.U2MessageBean;
 import com.windchat.im.storage.service.MessageDaoService;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java
index a013118..2bcdd06 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java
@@ -17,11 +17,11 @@ package com.windchat.im.message.user2.handler;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.akaxin.common.channel.ChannelWriter;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.RedisCommand;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.executor.chain.handler.IHandler;
+import com.windchat.common.channel.ChannelWriter;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.RedisCommand;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.executor.chain.handler.IHandler;
 import com.akaxin.proto.client.ImStcMessageProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.CoreProto.MsgType;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java
index 90ae5a6..0523f29 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.user2.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java
index c8f9bd1..8ad8d7f 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.user2.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java
index cbf8a3a..d5917a0 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java
@@ -19,11 +19,11 @@ import com.windchat.im.message.group.handler.AbstractGroupHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.group.handler.AbstractGroupHandler;
+import com.windchat.im.message.group.handler.AbstractGroupHandler;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.U2MessageBean;
 import com.windchat.im.storage.service.MessageDaoService;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java
index 8197c89..74ddead 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java
@@ -20,8 +20,8 @@ import java.nio.charset.Charset;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java
index e100e51..090ef46 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java
@@ -20,8 +20,8 @@ import java.util.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java
index 224afc6..c102492 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.user2.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java
index bc5efed..7c39118 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.user2.handler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java
index 5add2d3..c31e40a 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java
@@ -19,11 +19,11 @@ import com.windchat.im.message.bean.WebBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.bean.WebBean;
+import com.windchat.im.message.bean.WebBean;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.U2MessageBean;
 import com.windchat.im.storage.service.MessageDaoService;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java
index 3544966..ed43c49 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java
@@ -19,11 +19,11 @@ import com.windchat.im.message.bean.WebBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.bean.WebBean;
+import com.windchat.im.message.bean.WebBean;
 import com.windchat.im.storage.api.IMessageDao;
 import com.windchat.im.storage.bean.U2MessageBean;
 import com.windchat.im.storage.service.MessageDaoService;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java
index 637c054..ccd8080 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java
@@ -20,14 +20,14 @@ import com.windchat.im.message.dao.ImUserProfileDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.UserProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.dao.ImUserFriendDao;
-import com.akaxin.site.message.dao.ImUserProfileDao;
+import com.windchat.im.message.dao.ImUserFriendDao;
+import com.windchat.im.message.dao.ImUserProfileDao;
 import com.windchat.im.storage.bean.SimpleUserBean;
 
 /**
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java
index b97ffd2..569dd16 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java
@@ -21,14 +21,14 @@ import com.windchat.im.message.dao.ImUserSessionDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.channel.ChannelWriter;
-import com.akaxin.common.command.Command;
-import com.akaxin.common.command.CommandResponse;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.constant.ErrorCode2;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.channel.ChannelWriter;
+import com.windchat.common.command.Command;
+import com.windchat.common.command.CommandResponse;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.constant.ErrorCode2;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.client.ImStcPsnProto;
-import com.akaxin.site.message.dao.ImUserSessionDao;
+import com.windchat.im.message.dao.ImUserSessionDao;
 
 public class UserPsnHandler extends AbstractU2Handler {
 	private static final Logger logger = LoggerFactory.getLogger(UserPsnHandler.class);
diff --git a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java
index 772251c..831c183 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java
@@ -26,19 +26,19 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.constant.CommandConst;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.constant.CommandConst;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.ConfigProto;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.PushProto;
 import com.akaxin.proto.platform.ApiPushNotificationProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.dao.ImUserFriendDao;
-import com.akaxin.site.message.dao.ImUserProfileDao;
-import com.akaxin.site.message.push.PushClient;
-import com.akaxin.site.message.threads.MultiPushThreadExecutor;
-import com.akaxin.site.message.utils.SiteConfigHelper;
+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 com.windchat.im.message.utils.SiteConfigHelper;
 import com.windchat.im.storage.bean.SimpleUserBean;
 import com.google.protobuf.ByteString;
 
diff --git a/windchat-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java b/windchat-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java
index c046571..cc90d6b 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java
@@ -22,7 +22,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.akaxin.proto.core.ConfigProto;
-import com.akaxin.site.message.dao.SiteConfigDao;
+import com.windchat.im.message.dao.SiteConfigDao;
 
 /**
  * 管理站点配置相关信息
diff --git a/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java
index f2a0267..68f06a0 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java
@@ -18,8 +18,8 @@ package com.windchat.im.message.web.chat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
 import com.windchat.im.storage.api.IMessageDao;
diff --git a/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java b/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java
index 2e3ae8b..5545d1b 100755
--- a/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java
+++ b/windchat-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java
@@ -20,14 +20,14 @@ import com.windchat.im.message.dao.ImUserProfileDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.command.Command;
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.command.Command;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.core.CoreProto;
 import com.akaxin.proto.core.UserProto;
 import com.akaxin.proto.site.ImCtsMessageProto;
-import com.akaxin.site.message.dao.ImUserFriendDao;
-import com.akaxin.site.message.dao.ImUserProfileDao;
+import com.windchat.im.message.dao.ImUserFriendDao;
+import com.windchat.im.message.dao.ImUserProfileDao;
 import com.windchat.im.storage.bean.SimpleUserBean;
 
 /**
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java
index d41d5f5..0cfa223 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class ApplyFriendBean {
 	private String siteUserId;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java
index b5ade76..a914f9c 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 /**
  * 站点token
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java
index a6218a4..eeab621 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class GroupMessageBean {
 	private int id;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java
index 44bb666..08363e2 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class GroupProfileBean {
 	private int id;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java
index e8eac39..e21c5d7 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class PluginBean {
 	private int id;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java
index f5d38ab..16637a4 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class SimpleAuthBean {
 	private String siteUserId;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java
index d06db7b..9753c3c 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 /**
  * 群对象简单bean
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java
index 1b0371a..d9056a3 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 /**
  * 用户对象
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java
index 610ae01..29032a4 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java
@@ -2,7 +2,7 @@ package com.windchat.im.storage.bean;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class U2MessageBean {
 	private int id;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java
index 7572c4b..19ec0c0 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 /**
  * 用户注册/登陆站点，需要使用的邀请码
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java
index 5e6b8f5..67c8736 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 /**
  * 用户设备信息
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java
index 23fa919..d3ed42c 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class UserFriendBean extends UserProfileBean {
 	private boolean mute;// 是否对该用户设置消息免打扰
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java
index 07ba135..bdeecef 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 /**
  * 用户对应群的bean
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java
index afa1beb..a5325b0 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java
@@ -6,7 +6,7 @@ import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class UserProfileBean extends SimpleUserBean {
 	// private String siteUserId;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java
index 6f1d6eb..0a811d9 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.bean;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 public class UserSessionBean {
 	private String siteUserId;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java
index ff7f14d..9922092 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.logs.LogUtils;
 import com.akaxin.proto.core.ConfigProto;
 import com.windchat.im.storage.connection.DatabaseConnection;
 import com.windchat.im.storage.dao.sql.SQLConst;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java
index 44ff74f..aee248d 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java
@@ -25,7 +25,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.logs.LogUtils;
 import com.windchat.im.storage.bean.ApplyFriendBean;
 import com.windchat.im.storage.bean.ApplyUserBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java
index 5414ac5..56ec326 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java
@@ -26,9 +26,9 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
-import com.akaxin.common.utils.TimeFormats;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
+import com.windchat.common.utils.TimeFormats;
 import com.windchat.im.storage.bean.GroupMessageBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
 import com.windchat.im.storage.dao.sql.SQLConst;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java
index 97ab192..39539ce 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java
@@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.TimeFormats;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.TimeFormats;
 import com.windchat.im.storage.bean.GroupProfileBean;
 import com.windchat.im.storage.bean.SimpleGroupBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java
index 1c549d5..ac93749 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java
@@ -26,8 +26,8 @@ import com.windchat.im.storage.dao.sql.SQLConst;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.windchat.im.storage.bean.PluginBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
 
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java
index 4cb9812..b3b65fc 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.logs.LogUtils;
 import com.windchat.im.storage.bean.ExpireToken;
 import com.windchat.im.storage.connection.DatabaseConnection;
 import com.windchat.im.storage.dao.sql.SQLConst;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java
index 9207600..3e855d8 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java
@@ -26,9 +26,9 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
-import com.akaxin.common.utils.TimeFormats;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
+import com.windchat.common.utils.TimeFormats;
 import com.windchat.im.storage.bean.U2MessageBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
 import com.windchat.im.storage.dao.sql.SQLConst;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java
index 918c8ca..9103db1 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java
@@ -25,8 +25,8 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.windchat.im.storage.bean.UicBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
 import com.windchat.im.storage.dao.sql.SQLConst;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java
index e9bcec9..64fb2c3 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.logs.LogUtils;
 import com.windchat.im.storage.bean.UserDeviceBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
 import com.windchat.im.storage.dao.sql.SQLConst;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java
index ccaab6b..31341c5 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java
@@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.TimeFormats;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.TimeFormats;
 import com.windchat.im.storage.bean.SimpleUserBean;
 import com.windchat.im.storage.bean.UserFriendBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java
index 02a5751..16b09a5 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java
@@ -26,8 +26,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.StringHelper;
 import com.akaxin.proto.core.GroupProto;
 import com.windchat.im.storage.bean.GroupMemberBean;
 import com.windchat.im.storage.bean.SimpleGroupBean;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java
index 049e18d..033c58f 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java
@@ -29,8 +29,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
-import com.akaxin.common.utils.TimeFormats;
+import com.windchat.common.logs.LogUtils;
+import com.windchat.common.utils.TimeFormats;
 import com.akaxin.proto.core.UserProto;
 import com.windchat.im.storage.bean.SimpleUserBean;
 import com.windchat.im.storage.bean.SimpleUserRelationBean;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java
index 55d77b5..cbe83ca 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java
@@ -25,7 +25,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.logs.LogUtils;
 import com.windchat.im.storage.bean.SimpleAuthBean;
 import com.windchat.im.storage.bean.UserSessionBean;
 import com.windchat.im.storage.connection.DatabaseConnection;
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java
index e492bda..90b114f 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java
@@ -25,7 +25,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.logs.LogUtils;
+import com.windchat.common.logs.LogUtils;
 import com.windchat.im.storage.connection.DatabaseConnection;
 import com.windchat.im.storage.dao.sql.SQLConst;
 
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java
index 60ff61a..7c0dafa 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java
@@ -18,7 +18,7 @@ package com.windchat.im.storage.dao.config;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.akaxin.common.utils.GsonUtils;
+import com.windchat.common.utils.GsonUtils;
 
 /**
  * 
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java b/windchat-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java
index 27a8aa9..28a2f11 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.exception;
 
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.utils.StringHelper;
 
 public class MigrateDatabaseException extends Throwable {
 
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java b/windchat-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java
index 6781d26..72a570c 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java
@@ -1,6 +1,6 @@
 package com.windchat.im.storage.exception;
 
-import com.akaxin.common.utils.StringHelper;
+import com.windchat.common.utils.StringHelper;
 
 /**
  * 迁移数据库错误会抛出此异常
diff --git a/windchat-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java b/windchat-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java
index 70db9ec..ae3f3b7 100755
--- a/windchat-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java
+++ b/windchat-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java
@@ -17,7 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.akaxin.common.utils.PrintUtils;
+import com.windchat.common.utils.PrintUtils;
 import com.windchat.im.storage.connection.DatabaseConnection;
 import com.windchat.im.storage.exception.MigrateDatabaseException;
 import com.windchat.im.storage.exception.NeedInitMysqlException;