diff --git a/.gitignore b/.gitignore index 4eb5e46..27fd2ba 100755 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ stdout.log openzaly-server.jar site-file/ site-logs/ +openzaly-server.config diff --git a/openzaly-business/pom.xml b/openzaly-business/pom.xml deleted file mode 100755 index f7b60f1..0000000 --- a/openzaly-business/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - 4.0.0 - - com.windchat.im - windchat - 0.0.1 - - com.akaxin.site - openzaly-business - 0.0.1-RELEASE - - - 1.6 - 1.6 - - - - - com.akaxin.common - openzaly-common - 0.0.1-RELEASE - - - - com.akaxin.proto - openzaly-protobuf - 0.0.1-RELEASE - - - - com.akaxin.site - openzaly-storage - 0.0.1-RELEASE - - - - com.akaxin.site - openzaly-message - 0.0.1-RELEASE - - - - - \ No newline at end of file diff --git a/openzaly-message/pom.xml b/openzaly-message/pom.xml deleted file mode 100755 index bbab5fe..0000000 --- a/openzaly-message/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - 4.0.0 - - com.windchat.im - windchat - 0.0.1 - - com.akaxin.site - openzaly-message - 0.0.1-RELEASE - - - 1.6 - 1.6 - - - - - com.akaxin.common - openzaly-common - 0.0.1-RELEASE - - - - com.akaxin.proto - openzaly-protobuf - 0.0.1-RELEASE - - - - com.akaxin.site - openzaly-storage - 0.0.1-RELEASE - - - - org.json - json - 20090211 - - - - org.apache.httpcomponents - httpclient - - - - - - commons-logging - commons-logging - 1.2 - - - - - - \ No newline at end of file diff --git a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java deleted file mode 100755 index 773855c..0000000 --- a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebGroupTextBean.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.windchat.im.message.web.bean; - -public class WebGroupTextBean { - -} diff --git a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java deleted file mode 100755 index 9af2b07..0000000 --- a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebResponseBean.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.windchat.im.message.web.bean; - -public class WebResponseBean { - -} diff --git a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java b/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java deleted file mode 100755 index 27038e3..0000000 --- a/openzaly-message/src/main/java/com/windchat/im/message/web/bean/WebU2TextBean.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.windchat.im.message.web.bean; - -public class WebU2TextBean { - -} diff --git a/pom.xml b/pom.xml index 3188db7..2060324 100755 --- a/pom.xml +++ b/pom.xml @@ -12,14 +12,14 @@ - openzaly-boot - openzaly-connector - openzaly-business - openzaly-message - openzaly-protobuf - openzaly-storage - openzaly-common - openzaly-admin + windchat-boot + windchat-connector + windchat-business + windchat-message + windchat-protobuf + windchat-storage + windchat-common + windchat-admin diff --git a/openzaly-admin/pom.xml b/windchat-admin/pom.xml similarity index 94% rename from openzaly-admin/pom.xml rename to windchat-admin/pom.xml index 664ed8e..d1acf08 100755 --- a/openzaly-admin/pom.xml +++ b/windchat-admin/pom.xml @@ -7,11 +7,10 @@ windchat 0.0.1 - com.akaxin.site - openzaly-admin + com.windchat.im + windchat-admin 0.0.1-RELEASE jar - openzaly-admin diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/OpenzalyAdminApplication.java b/windchat-admin/src/main/java/com/akaxin/site/web/OpenzalyAdminApplication.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/OpenzalyAdminApplication.java rename to windchat-admin/src/main/java/com/akaxin/site/web/OpenzalyAdminApplication.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/bean/WebMessageBean.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/bean/WebMessageBean.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/bean/WebMessageBean.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/bean/WebMessageBean.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/common/MsgUtils.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/common/MsgUtils.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/common/MsgUtils.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/common/MsgUtils.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/common/Timeutils.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/common/Timeutils.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/common/Timeutils.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/common/Timeutils.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/AbstractController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/AbstractController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/AbstractController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/AbstractController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/CommomController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/CommomController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/CommomController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/CommomController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/ConfigManageController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/ConfigManageController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/ConfigManageController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/ConfigManageController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/exception/ManagerException.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/ManagerException.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/exception/ManagerException.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/ManagerException.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/exception/UserPermissionException.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/UserPermissionException.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/exception/UserPermissionException.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/exception/UserPermissionException.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IConfigService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IConfigService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IConfigService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IConfigService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IMessageManageService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMessageManageService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IMessageManageService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMessageManageService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IMonitorService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMonitorService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IMonitorService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IMonitorService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/ConfigManageService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/ConfigManageService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/ConfigManageService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/ConfigManageService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MessageManageService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MessageManageService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MessageManageService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MessageManageService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MonitorService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MonitorService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MonitorService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/MonitorService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java b/windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java rename to windchat-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/utils/ArraysUtils.java b/windchat-admin/src/main/java/com/akaxin/site/web/utils/ArraysUtils.java similarity index 100% rename from openzaly-admin/src/main/java/com/akaxin/site/web/utils/ArraysUtils.java rename to windchat-admin/src/main/java/com/akaxin/site/web/utils/ArraysUtils.java diff --git a/openzaly-admin/src/main/resources/application.properties b/windchat-admin/src/main/resources/application.properties similarity index 100% rename from openzaly-admin/src/main/resources/application.properties rename to windchat-admin/src/main/resources/application.properties diff --git a/openzaly-admin/src/main/resources/webapp/static/Public/css/style.css b/windchat-admin/src/main/resources/webapp/static/Public/css/style.css similarity index 100% rename from openzaly-admin/src/main/resources/webapp/static/Public/css/style.css rename to windchat-admin/src/main/resources/webapp/static/Public/css/style.css diff --git a/openzaly-admin/src/main/resources/webapp/static/Public/images/group.png b/windchat-admin/src/main/resources/webapp/static/Public/images/group.png similarity index 100% rename from openzaly-admin/src/main/resources/webapp/static/Public/images/group.png rename to windchat-admin/src/main/resources/webapp/static/Public/images/group.png diff --git a/openzaly-admin/src/main/resources/webapp/static/Public/images/invite.png b/windchat-admin/src/main/resources/webapp/static/Public/images/invite.png similarity index 100% rename from openzaly-admin/src/main/resources/webapp/static/Public/images/invite.png rename to windchat-admin/src/main/resources/webapp/static/Public/images/invite.png diff --git a/openzaly-admin/src/main/resources/webapp/static/Public/images/monitor.png b/windchat-admin/src/main/resources/webapp/static/Public/images/monitor.png similarity index 100% rename from openzaly-admin/src/main/resources/webapp/static/Public/images/monitor.png rename to windchat-admin/src/main/resources/webapp/static/Public/images/monitor.png diff --git a/openzaly-admin/src/main/resources/webapp/static/Public/images/plugin.png b/windchat-admin/src/main/resources/webapp/static/Public/images/plugin.png similarity index 100% rename from openzaly-admin/src/main/resources/webapp/static/Public/images/plugin.png rename to windchat-admin/src/main/resources/webapp/static/Public/images/plugin.png diff --git a/openzaly-admin/src/main/resources/webapp/static/Public/images/setting.png b/windchat-admin/src/main/resources/webapp/static/Public/images/setting.png similarity index 100% rename from openzaly-admin/src/main/resources/webapp/static/Public/images/setting.png rename to windchat-admin/src/main/resources/webapp/static/Public/images/setting.png diff --git a/openzaly-admin/src/main/resources/webapp/static/Public/images/user.png b/windchat-admin/src/main/resources/webapp/static/Public/images/user.png similarity index 100% rename from openzaly-admin/src/main/resources/webapp/static/Public/images/user.png rename to windchat-admin/src/main/resources/webapp/static/Public/images/user.png diff --git a/openzaly-admin/src/main/resources/webapp/views/admin.html b/windchat-admin/src/main/resources/webapp/views/admin.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/admin.html rename to windchat-admin/src/main/resources/webapp/views/admin.html diff --git a/openzaly-admin/src/main/resources/webapp/views/basic/config.html b/windchat-admin/src/main/resources/webapp/views/basic/config.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/basic/config.html rename to windchat-admin/src/main/resources/webapp/views/basic/config.html diff --git a/openzaly-admin/src/main/resources/webapp/views/error.html b/windchat-admin/src/main/resources/webapp/views/error.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/error.html rename to windchat-admin/src/main/resources/webapp/views/error.html diff --git a/openzaly-admin/src/main/resources/webapp/views/group/addMember.html b/windchat-admin/src/main/resources/webapp/views/group/addMember.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/group/addMember.html rename to windchat-admin/src/main/resources/webapp/views/group/addMember.html diff --git a/openzaly-admin/src/main/resources/webapp/views/group/index.html b/windchat-admin/src/main/resources/webapp/views/group/index.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/group/index.html rename to windchat-admin/src/main/resources/webapp/views/group/index.html diff --git a/openzaly-admin/src/main/resources/webapp/views/group/manage.html b/windchat-admin/src/main/resources/webapp/views/group/manage.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/group/manage.html rename to windchat-admin/src/main/resources/webapp/views/group/manage.html diff --git a/openzaly-admin/src/main/resources/webapp/views/group/memberList.html b/windchat-admin/src/main/resources/webapp/views/group/memberList.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/group/memberList.html rename to windchat-admin/src/main/resources/webapp/views/group/memberList.html diff --git a/openzaly-admin/src/main/resources/webapp/views/group/profile.html b/windchat-admin/src/main/resources/webapp/views/group/profile.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/group/profile.html rename to windchat-admin/src/main/resources/webapp/views/group/profile.html diff --git a/openzaly-admin/src/main/resources/webapp/views/jump/jump.html b/windchat-admin/src/main/resources/webapp/views/jump/jump.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/jump/jump.html rename to windchat-admin/src/main/resources/webapp/views/jump/jump.html diff --git a/openzaly-admin/src/main/resources/webapp/views/monitor/index.html b/windchat-admin/src/main/resources/webapp/views/monitor/index.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/monitor/index.html rename to windchat-admin/src/main/resources/webapp/views/monitor/index.html diff --git a/openzaly-admin/src/main/resources/webapp/views/plugin/add.html b/windchat-admin/src/main/resources/webapp/views/plugin/add.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/plugin/add.html rename to windchat-admin/src/main/resources/webapp/views/plugin/add.html diff --git a/openzaly-admin/src/main/resources/webapp/views/plugin/error.html b/windchat-admin/src/main/resources/webapp/views/plugin/error.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/plugin/error.html rename to windchat-admin/src/main/resources/webapp/views/plugin/error.html diff --git a/openzaly-admin/src/main/resources/webapp/views/plugin/index.html b/windchat-admin/src/main/resources/webapp/views/plugin/index.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/plugin/index.html rename to windchat-admin/src/main/resources/webapp/views/plugin/index.html diff --git a/openzaly-admin/src/main/resources/webapp/views/plugin/list.html b/windchat-admin/src/main/resources/webapp/views/plugin/list.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/plugin/list.html rename to windchat-admin/src/main/resources/webapp/views/plugin/list.html diff --git a/openzaly-admin/src/main/resources/webapp/views/plugin/update.html b/windchat-admin/src/main/resources/webapp/views/plugin/update.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/plugin/update.html rename to windchat-admin/src/main/resources/webapp/views/plugin/update.html diff --git a/openzaly-admin/src/main/resources/webapp/views/siteMember/error.html b/windchat-admin/src/main/resources/webapp/views/siteMember/error.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/siteMember/error.html rename to windchat-admin/src/main/resources/webapp/views/siteMember/error.html diff --git a/openzaly-admin/src/main/resources/webapp/views/siteMember/siteMember.html b/windchat-admin/src/main/resources/webapp/views/siteMember/siteMember.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/siteMember/siteMember.html rename to windchat-admin/src/main/resources/webapp/views/siteMember/siteMember.html diff --git a/openzaly-admin/src/main/resources/webapp/views/uic/index.html b/windchat-admin/src/main/resources/webapp/views/uic/index.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/uic/index.html rename to windchat-admin/src/main/resources/webapp/views/uic/index.html diff --git a/openzaly-admin/src/main/resources/webapp/views/uic/unused_list.html b/windchat-admin/src/main/resources/webapp/views/uic/unused_list.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/uic/unused_list.html rename to windchat-admin/src/main/resources/webapp/views/uic/unused_list.html diff --git a/openzaly-admin/src/main/resources/webapp/views/uic/used_list.html b/windchat-admin/src/main/resources/webapp/views/uic/used_list.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/uic/used_list.html rename to windchat-admin/src/main/resources/webapp/views/uic/used_list.html diff --git a/openzaly-admin/src/main/resources/webapp/views/user/error.html b/windchat-admin/src/main/resources/webapp/views/user/error.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/user/error.html rename to windchat-admin/src/main/resources/webapp/views/user/error.html diff --git a/openzaly-admin/src/main/resources/webapp/views/user/index.html b/windchat-admin/src/main/resources/webapp/views/user/index.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/user/index.html rename to windchat-admin/src/main/resources/webapp/views/user/index.html diff --git a/openzaly-admin/src/main/resources/webapp/views/user/profile.html b/windchat-admin/src/main/resources/webapp/views/user/profile.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/user/profile.html rename to windchat-admin/src/main/resources/webapp/views/user/profile.html diff --git a/openzaly-admin/src/main/resources/webapp/views/webMsg/test.html b/windchat-admin/src/main/resources/webapp/views/webMsg/test.html similarity index 100% rename from openzaly-admin/src/main/resources/webapp/views/webMsg/test.html rename to windchat-admin/src/main/resources/webapp/views/webMsg/test.html diff --git a/openzaly-boot/.gitignore b/windchat-boot/.gitignore similarity index 100% rename from openzaly-boot/.gitignore rename to windchat-boot/.gitignore diff --git a/openzaly-boot/openzaly-server.config b/windchat-boot/openzaly-server.config similarity index 100% rename from openzaly-boot/openzaly-server.config rename to windchat-boot/openzaly-server.config diff --git a/openzaly-boot/pom.xml b/windchat-boot/pom.xml similarity index 94% rename from openzaly-boot/pom.xml rename to windchat-boot/pom.xml index 97b20ff..358deed 100755 --- a/openzaly-boot/pom.xml +++ b/windchat-boot/pom.xml @@ -76,14 +76,14 @@ - com.akaxin.site - openzaly-connector + com.windchat.im + windchat-connector 0.0.1-RELEASE - com.akaxin.site - openzaly-admin + com.windchat.im + windchat-admin 0.0.1-RELEASE diff --git a/openzaly-boot/src/assembly-zip.xml b/windchat-boot/src/assembly-zip.xml similarity index 100% rename from openzaly-boot/src/assembly-zip.xml rename to windchat-boot/src/assembly-zip.xml diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/config/AkxProject.java b/windchat-boot/src/main/java/com/akaxin/site/boot/config/AkxProject.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/config/AkxProject.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/config/AkxProject.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/config/ConfigHelper.java b/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigHelper.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/config/ConfigHelper.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigHelper.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/config/ConfigKey.java b/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigKey.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/config/ConfigKey.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigKey.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/config/ConfigListener.java b/windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigListener.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/config/ConfigListener.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/config/ConfigListener.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/config/SiteDefaultIcon.java b/windchat-boot/src/main/java/com/akaxin/site/boot/config/SiteDefaultIcon.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/config/SiteDefaultIcon.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/config/SiteDefaultIcon.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java b/windchat-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/spring/CustomizationWebServerBean.java b/windchat-boot/src/main/java/com/akaxin/site/boot/spring/CustomizationWebServerBean.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/spring/CustomizationWebServerBean.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/spring/CustomizationWebServerBean.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalyConfiguration.java b/windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalyConfiguration.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalyConfiguration.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalyConfiguration.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalySpringBoot.java b/windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalySpringBoot.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalySpringBoot.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/spring/OpenzalySpringBoot.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/utils/BootLog.java b/windchat-boot/src/main/java/com/akaxin/site/boot/utils/BootLog.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/utils/BootLog.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/utils/BootLog.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java b/windchat-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/utils/PropertiesUtils.java b/windchat-boot/src/main/java/com/akaxin/site/boot/utils/PropertiesUtils.java similarity index 100% rename from openzaly-boot/src/main/java/com/akaxin/site/boot/utils/PropertiesUtils.java rename to windchat-boot/src/main/java/com/akaxin/site/boot/utils/PropertiesUtils.java diff --git a/openzaly-boot/src/main/resources/application.properties b/windchat-boot/src/main/resources/application.properties similarity index 100% rename from openzaly-boot/src/main/resources/application.properties rename to windchat-boot/src/main/resources/application.properties diff --git a/openzaly-boot/src/main/resources/log4j.properties b/windchat-boot/src/main/resources/log4j.properties similarity index 100% rename from openzaly-boot/src/main/resources/log4j.properties rename to windchat-boot/src/main/resources/log4j.properties diff --git a/openzaly-boot/src/main/resources/logo.txt b/windchat-boot/src/main/resources/logo.txt similarity index 100% rename from openzaly-boot/src/main/resources/logo.txt rename to windchat-boot/src/main/resources/logo.txt diff --git a/openzaly-boot/src/main/resources/openzaly-server.config b/windchat-boot/src/main/resources/openzaly-server.config similarity index 100% rename from openzaly-boot/src/main/resources/openzaly-server.config rename to windchat-boot/src/main/resources/openzaly-server.config diff --git a/openzaly-boot/src/test/java/com/akaxin/site/boot/test/TestDefaultIcon.java b/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestDefaultIcon.java similarity index 100% rename from openzaly-boot/src/test/java/com/akaxin/site/boot/test/TestDefaultIcon.java rename to windchat-boot/src/test/java/com/akaxin/site/boot/test/TestDefaultIcon.java diff --git a/openzaly-boot/src/test/java/com/akaxin/site/boot/test/TestFile.java b/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestFile.java similarity index 100% rename from openzaly-boot/src/test/java/com/akaxin/site/boot/test/TestFile.java rename to windchat-boot/src/test/java/com/akaxin/site/boot/test/TestFile.java diff --git a/openzaly-boot/src/test/java/com/akaxin/site/boot/test/TestHttpClient.java b/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestHttpClient.java similarity index 100% rename from openzaly-boot/src/test/java/com/akaxin/site/boot/test/TestHttpClient.java rename to windchat-boot/src/test/java/com/akaxin/site/boot/test/TestHttpClient.java diff --git a/openzaly-boot/src/test/java/com/akaxin/site/boot/test/TestSystemPro.java b/windchat-boot/src/test/java/com/akaxin/site/boot/test/TestSystemPro.java similarity index 100% rename from openzaly-boot/src/test/java/com/akaxin/site/boot/test/TestSystemPro.java rename to windchat-boot/src/test/java/com/akaxin/site/boot/test/TestSystemPro.java diff --git a/openzaly-business/.gitignore b/windchat-business/.gitignore similarity index 100% rename from openzaly-business/.gitignore rename to windchat-business/.gitignore diff --git a/openzaly-connector/pom.xml b/windchat-business/pom.xml similarity index 52% rename from openzaly-connector/pom.xml rename to windchat-business/pom.xml index ba0bf74..491b443 100755 --- a/openzaly-connector/pom.xml +++ b/windchat-business/pom.xml @@ -6,37 +6,32 @@ windchat 0.0.1 - com.akaxin.site - openzaly-connector + com.windchat.im + windchat-business 0.0.1-RELEASE - 1.6 - 1.6 + 1.8 + 1.8 + - com.akaxin.common - openzaly-common + com.windchat.im + windchat-storage 0.0.1-RELEASE - com.akaxin.site - openzaly-message + com.windchat.im + windchat-message 0.0.1-RELEASE - com.akaxin.site - openzaly-business - 0.0.1-RELEASE - - - - com.akaxin.site - openzaly-storage + com.windchat.proto + windchat-protobuf 0.0.1-RELEASE diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/api/IRequest.java b/windchat-business/src/main/java/com/akaxin/site/business/api/IRequest.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/api/IRequest.java rename to windchat-business/src/main/java/com/akaxin/site/business/api/IRequest.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/bean/MsgNoticeBean.java b/windchat-business/src/main/java/com/akaxin/site/business/bean/MsgNoticeBean.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/bean/MsgNoticeBean.java rename to windchat-business/src/main/java/com/akaxin/site/business/bean/MsgNoticeBean.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/bean/PlatformPhoneBean.java b/windchat-business/src/main/java/com/akaxin/site/business/bean/PlatformPhoneBean.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/bean/PlatformPhoneBean.java rename to windchat-business/src/main/java/com/akaxin/site/business/bean/PlatformPhoneBean.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/cache/WebSessionCache.java b/windchat-business/src/main/java/com/akaxin/site/business/cache/WebSessionCache.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/cache/WebSessionCache.java rename to windchat-business/src/main/java/com/akaxin/site/business/cache/WebSessionCache.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/constant/AkxProject.java b/windchat-business/src/main/java/com/akaxin/site/business/constant/AkxProject.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/constant/AkxProject.java rename to windchat-business/src/main/java/com/akaxin/site/business/constant/AkxProject.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/constant/GroupConfig.java b/windchat-business/src/main/java/com/akaxin/site/business/constant/GroupConfig.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/constant/GroupConfig.java rename to windchat-business/src/main/java/com/akaxin/site/business/constant/GroupConfig.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/constant/NoticeText.java b/windchat-business/src/main/java/com/akaxin/site/business/constant/NoticeText.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/constant/NoticeText.java rename to windchat-business/src/main/java/com/akaxin/site/business/constant/NoticeText.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java b/windchat-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java rename to windchat-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/IRequestService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/IRequestService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/IRequestService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/IRequestService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpMessageService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpMessageService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpMessageService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpMessageService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpPushService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpPushService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpPushService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpPushService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSiteService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSiteService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSiteService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSiteService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/site/PlatformUserPhone.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/site/PlatformUserPhone.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/site/PlatformUserPhone.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/site/PlatformUserPhone.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/site/SiteConfig.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/site/SiteConfig.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/site/SiteConfig.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/site/SiteConfig.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFileService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFileService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFileService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFileService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiWebService.java b/windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiWebService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiWebService.java rename to windchat-business/src/main/java/com/akaxin/site/business/impl/tai/ApiWebService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/push/PushNotification.java b/windchat-business/src/main/java/com/akaxin/site/business/push/PushNotification.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/push/PushNotification.java rename to windchat-business/src/main/java/com/akaxin/site/business/push/PushNotification.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/push/PushText.java b/windchat-business/src/main/java/com/akaxin/site/business/push/PushText.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/push/PushText.java rename to windchat-business/src/main/java/com/akaxin/site/business/push/PushText.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/service/ApiRequestService.java b/windchat-business/src/main/java/com/akaxin/site/business/service/ApiRequestService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/service/ApiRequestService.java rename to windchat-business/src/main/java/com/akaxin/site/business/service/ApiRequestService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/service/ApiServiceFactory.java b/windchat-business/src/main/java/com/akaxin/site/business/service/ApiServiceFactory.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/service/ApiServiceFactory.java rename to windchat-business/src/main/java/com/akaxin/site/business/service/ApiServiceFactory.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/service/HttpRequestService.java b/windchat-business/src/main/java/com/akaxin/site/business/service/HttpRequestService.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/service/HttpRequestService.java rename to windchat-business/src/main/java/com/akaxin/site/business/service/HttpRequestService.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/utils/FilePathUtils.java b/windchat-business/src/main/java/com/akaxin/site/business/utils/FilePathUtils.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/utils/FilePathUtils.java rename to windchat-business/src/main/java/com/akaxin/site/business/utils/FilePathUtils.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/utils/FileServerUtils.java b/windchat-business/src/main/java/com/akaxin/site/business/utils/FileServerUtils.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/utils/FileServerUtils.java rename to windchat-business/src/main/java/com/akaxin/site/business/utils/FileServerUtils.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/utils/HexUtils.java b/windchat-business/src/main/java/com/akaxin/site/business/utils/HexUtils.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/utils/HexUtils.java rename to windchat-business/src/main/java/com/akaxin/site/business/utils/HexUtils.java diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/utils/StringRandomUtils.java b/windchat-business/src/main/java/com/akaxin/site/business/utils/StringRandomUtils.java similarity index 100% rename from openzaly-business/src/main/java/com/akaxin/site/business/utils/StringRandomUtils.java rename to windchat-business/src/main/java/com/akaxin/site/business/utils/StringRandomUtils.java diff --git a/openzaly-business/src/test/java/com/akaxin/site/business/test/TestHttpProto.java b/windchat-business/src/test/java/com/akaxin/site/business/test/TestHttpProto.java similarity index 100% rename from openzaly-business/src/test/java/com/akaxin/site/business/test/TestHttpProto.java rename to windchat-business/src/test/java/com/akaxin/site/business/test/TestHttpProto.java diff --git a/openzaly-common/.gitignore b/windchat-common/.gitignore similarity index 100% rename from openzaly-common/.gitignore rename to windchat-common/.gitignore diff --git a/openzaly-common/pom.xml b/windchat-common/pom.xml similarity index 87% rename from openzaly-common/pom.xml rename to windchat-common/pom.xml index 428203c..f10e969 100755 --- a/openzaly-common/pom.xml +++ b/windchat-common/pom.xml @@ -6,8 +6,8 @@ windchat 0.0.1 - com.akaxin.common - openzaly-common + com.windchat.common + windchat-common 0.0.1-RELEASE @@ -27,8 +27,8 @@ - com.akaxin.proto - openzaly-protobuf + com.windchat.proto + windchat-protobuf 0.0.1-RELEASE diff --git a/openzaly-common/src/main/java/com/akaxin/common/channel/ChannelManager.java b/windchat-common/src/main/java/com/akaxin/common/channel/ChannelManager.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/channel/ChannelManager.java rename to windchat-common/src/main/java/com/akaxin/common/channel/ChannelManager.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/channel/ChannelSession.java b/windchat-common/src/main/java/com/akaxin/common/channel/ChannelSession.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/channel/ChannelSession.java rename to windchat-common/src/main/java/com/akaxin/common/channel/ChannelSession.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/channel/ChannelWriter.java b/windchat-common/src/main/java/com/akaxin/common/channel/ChannelWriter.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/channel/ChannelWriter.java rename to windchat-common/src/main/java/com/akaxin/common/channel/ChannelWriter.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/channel/WebChannelManager.java b/windchat-common/src/main/java/com/akaxin/common/channel/WebChannelManager.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/channel/WebChannelManager.java rename to windchat-common/src/main/java/com/akaxin/common/channel/WebChannelManager.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/command/Command.java b/windchat-common/src/main/java/com/akaxin/common/command/Command.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/command/Command.java rename to windchat-common/src/main/java/com/akaxin/common/command/Command.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/command/CommandResponse.java b/windchat-common/src/main/java/com/akaxin/common/command/CommandResponse.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/command/CommandResponse.java rename to windchat-common/src/main/java/com/akaxin/common/command/CommandResponse.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/command/RedisCommand.java b/windchat-common/src/main/java/com/akaxin/common/command/RedisCommand.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/command/RedisCommand.java rename to windchat-common/src/main/java/com/akaxin/common/command/RedisCommand.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/constant/CharsetCoding.java b/windchat-common/src/main/java/com/akaxin/common/constant/CharsetCoding.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/constant/CharsetCoding.java rename to windchat-common/src/main/java/com/akaxin/common/constant/CharsetCoding.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/constant/CommandConst.java b/windchat-common/src/main/java/com/akaxin/common/constant/CommandConst.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/constant/CommandConst.java rename to windchat-common/src/main/java/com/akaxin/common/constant/CommandConst.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/constant/ConfigConst.java b/windchat-common/src/main/java/com/akaxin/common/constant/ConfigConst.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/constant/ConfigConst.java rename to windchat-common/src/main/java/com/akaxin/common/constant/ConfigConst.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/constant/ErrorCode2.java b/windchat-common/src/main/java/com/akaxin/common/constant/ErrorCode2.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/constant/ErrorCode2.java rename to windchat-common/src/main/java/com/akaxin/common/constant/ErrorCode2.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/constant/HttpUriAction.java b/windchat-common/src/main/java/com/akaxin/common/constant/HttpUriAction.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/constant/HttpUriAction.java rename to windchat-common/src/main/java/com/akaxin/common/constant/HttpUriAction.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/constant/IErrorCode.java b/windchat-common/src/main/java/com/akaxin/common/constant/IErrorCode.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/constant/IErrorCode.java rename to windchat-common/src/main/java/com/akaxin/common/constant/IErrorCode.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/constant/RequestAction.java b/windchat-common/src/main/java/com/akaxin/common/constant/RequestAction.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/constant/RequestAction.java rename to windchat-common/src/main/java/com/akaxin/common/constant/RequestAction.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/crypto/AESCrypto.java b/windchat-common/src/main/java/com/akaxin/common/crypto/AESCrypto.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/crypto/AESCrypto.java rename to windchat-common/src/main/java/com/akaxin/common/crypto/AESCrypto.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/crypto/HashCrypto.java b/windchat-common/src/main/java/com/akaxin/common/crypto/HashCrypto.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/crypto/HashCrypto.java rename to windchat-common/src/main/java/com/akaxin/common/crypto/HashCrypto.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/crypto/RSACrypto.java b/windchat-common/src/main/java/com/akaxin/common/crypto/RSACrypto.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/crypto/RSACrypto.java rename to windchat-common/src/main/java/com/akaxin/common/crypto/RSACrypto.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/exceptions/ZalyException.java b/windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/exceptions/ZalyException.java rename to windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/exceptions/ZalyException2.java b/windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException2.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/exceptions/ZalyException2.java rename to windchat-common/src/main/java/com/akaxin/common/exceptions/ZalyException2.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/executor/AbstracteExecutor.java b/windchat-common/src/main/java/com/akaxin/common/executor/AbstracteExecutor.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/executor/AbstracteExecutor.java rename to windchat-common/src/main/java/com/akaxin/common/executor/AbstracteExecutor.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/executor/IExecutor.java b/windchat-common/src/main/java/com/akaxin/common/executor/IExecutor.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/executor/IExecutor.java rename to windchat-common/src/main/java/com/akaxin/common/executor/IExecutor.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/executor/SimpleExecutor.java b/windchat-common/src/main/java/com/akaxin/common/executor/SimpleExecutor.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/executor/SimpleExecutor.java rename to windchat-common/src/main/java/com/akaxin/common/executor/SimpleExecutor.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/executor/chain/AbstractHandlerChain.java b/windchat-common/src/main/java/com/akaxin/common/executor/chain/AbstractHandlerChain.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/executor/chain/AbstractHandlerChain.java rename to windchat-common/src/main/java/com/akaxin/common/executor/chain/AbstractHandlerChain.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/executor/chain/CustomRHandlerChain.java b/windchat-common/src/main/java/com/akaxin/common/executor/chain/CustomRHandlerChain.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/executor/chain/CustomRHandlerChain.java rename to windchat-common/src/main/java/com/akaxin/common/executor/chain/CustomRHandlerChain.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/executor/chain/SimpleHandlerChain.java b/windchat-common/src/main/java/com/akaxin/common/executor/chain/SimpleHandlerChain.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/executor/chain/SimpleHandlerChain.java rename to windchat-common/src/main/java/com/akaxin/common/executor/chain/SimpleHandlerChain.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/executor/chain/handler/IHandler.java b/windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/IHandler.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/executor/chain/handler/IHandler.java rename to windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/IHandler.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/executor/chain/handler/MethodReflectHandler.java b/windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/MethodReflectHandler.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/executor/chain/handler/MethodReflectHandler.java rename to windchat-common/src/main/java/com/akaxin/common/executor/chain/handler/MethodReflectHandler.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/http/ZalyHttpClient.java b/windchat-common/src/main/java/com/akaxin/common/http/ZalyHttpClient.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/http/ZalyHttpClient.java rename to windchat-common/src/main/java/com/akaxin/common/http/ZalyHttpClient.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/logs/AkxLog4jManager.java b/windchat-common/src/main/java/com/akaxin/common/logs/AkxLog4jManager.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/logs/AkxLog4jManager.java rename to windchat-common/src/main/java/com/akaxin/common/logs/AkxLog4jManager.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/logs/LogCreater.java b/windchat-common/src/main/java/com/akaxin/common/logs/LogCreater.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/logs/LogCreater.java rename to windchat-common/src/main/java/com/akaxin/common/logs/LogCreater.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/logs/LogUtils.java b/windchat-common/src/main/java/com/akaxin/common/logs/LogUtils.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/logs/LogUtils.java rename to windchat-common/src/main/java/com/akaxin/common/logs/LogUtils.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/IRedisCommandResponse.java b/windchat-common/src/main/java/com/akaxin/common/netty/IRedisCommandResponse.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/IRedisCommandResponse.java rename to windchat-common/src/main/java/com/akaxin/common/netty/IRedisCommandResponse.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/NettyClient2.java b/windchat-common/src/main/java/com/akaxin/common/netty/NettyClient2.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/NettyClient2.java rename to windchat-common/src/main/java/com/akaxin/common/netty/NettyClient2.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/NettyClientHandler.java b/windchat-common/src/main/java/com/akaxin/common/netty/NettyClientHandler.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/NettyClientHandler.java rename to windchat-common/src/main/java/com/akaxin/common/netty/NettyClientHandler.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/PlatformClientHandler.java b/windchat-common/src/main/java/com/akaxin/common/netty/PlatformClientHandler.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/PlatformClientHandler.java rename to windchat-common/src/main/java/com/akaxin/common/netty/PlatformClientHandler.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/PlatformSSLClient.java b/windchat-common/src/main/java/com/akaxin/common/netty/PlatformSSLClient.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/PlatformSSLClient.java rename to windchat-common/src/main/java/com/akaxin/common/netty/PlatformSSLClient.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/RedisCommandResponse.java b/windchat-common/src/main/java/com/akaxin/common/netty/RedisCommandResponse.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/RedisCommandResponse.java rename to windchat-common/src/main/java/com/akaxin/common/netty/RedisCommandResponse.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/codec/MessageDecoder.java b/windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageDecoder.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/codec/MessageDecoder.java rename to windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageDecoder.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/codec/MessageEncoder.java b/windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageEncoder.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/codec/MessageEncoder.java rename to windchat-common/src/main/java/com/akaxin/common/netty/codec/MessageEncoder.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/codec/ProtocolParser.java b/windchat-common/src/main/java/com/akaxin/common/netty/codec/ProtocolParser.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/codec/ProtocolParser.java rename to windchat-common/src/main/java/com/akaxin/common/netty/codec/ProtocolParser.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/netty/codec/ReplaySignal.java b/windchat-common/src/main/java/com/akaxin/common/netty/codec/ReplaySignal.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/netty/codec/ReplaySignal.java rename to windchat-common/src/main/java/com/akaxin/common/netty/codec/ReplaySignal.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/resp/AbstractParameter.java b/windchat-common/src/main/java/com/akaxin/common/resp/AbstractParameter.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/resp/AbstractParameter.java rename to windchat-common/src/main/java/com/akaxin/common/resp/AbstractParameter.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/resp/RedisBytesParameter.java b/windchat-common/src/main/java/com/akaxin/common/resp/RedisBytesParameter.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/resp/RedisBytesParameter.java rename to windchat-common/src/main/java/com/akaxin/common/resp/RedisBytesParameter.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/resp/RedisDoubleParameter.java b/windchat-common/src/main/java/com/akaxin/common/resp/RedisDoubleParameter.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/resp/RedisDoubleParameter.java rename to windchat-common/src/main/java/com/akaxin/common/resp/RedisDoubleParameter.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/resp/RedisIntegerParameter.java b/windchat-common/src/main/java/com/akaxin/common/resp/RedisIntegerParameter.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/resp/RedisIntegerParameter.java rename to windchat-common/src/main/java/com/akaxin/common/resp/RedisIntegerParameter.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/resp/RedisStringParameter.java b/windchat-common/src/main/java/com/akaxin/common/resp/RedisStringParameter.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/resp/RedisStringParameter.java rename to windchat-common/src/main/java/com/akaxin/common/resp/RedisStringParameter.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/ssl/ZalySSLContext.java b/windchat-common/src/main/java/com/akaxin/common/ssl/ZalySSLContext.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/ssl/ZalySSLContext.java rename to windchat-common/src/main/java/com/akaxin/common/ssl/ZalySSLContext.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/ssl/ZalyTrustManagerFactory.java b/windchat-common/src/main/java/com/akaxin/common/ssl/ZalyTrustManagerFactory.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/ssl/ZalyTrustManagerFactory.java rename to windchat-common/src/main/java/com/akaxin/common/ssl/ZalyTrustManagerFactory.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/GsonUtils.java b/windchat-common/src/main/java/com/akaxin/common/utils/GsonUtils.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/GsonUtils.java rename to windchat-common/src/main/java/com/akaxin/common/utils/GsonUtils.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/IpUtils.java b/windchat-common/src/main/java/com/akaxin/common/utils/IpUtils.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/IpUtils.java rename to windchat-common/src/main/java/com/akaxin/common/utils/IpUtils.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/PrintUtils.java b/windchat-common/src/main/java/com/akaxin/common/utils/PrintUtils.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/PrintUtils.java rename to windchat-common/src/main/java/com/akaxin/common/utils/PrintUtils.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/ServerAddress.java b/windchat-common/src/main/java/com/akaxin/common/utils/ServerAddress.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/ServerAddress.java rename to windchat-common/src/main/java/com/akaxin/common/utils/ServerAddress.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/ServerAddressUtils.java b/windchat-common/src/main/java/com/akaxin/common/utils/ServerAddressUtils.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/ServerAddressUtils.java rename to windchat-common/src/main/java/com/akaxin/common/utils/ServerAddressUtils.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/StringHelper.java b/windchat-common/src/main/java/com/akaxin/common/utils/StringHelper.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/StringHelper.java rename to windchat-common/src/main/java/com/akaxin/common/utils/StringHelper.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/TimeFormats.java b/windchat-common/src/main/java/com/akaxin/common/utils/TimeFormats.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/TimeFormats.java rename to windchat-common/src/main/java/com/akaxin/common/utils/TimeFormats.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/URLRegexUtils.java b/windchat-common/src/main/java/com/akaxin/common/utils/URLRegexUtils.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/URLRegexUtils.java rename to windchat-common/src/main/java/com/akaxin/common/utils/URLRegexUtils.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/UserIdUtils.java b/windchat-common/src/main/java/com/akaxin/common/utils/UserIdUtils.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/UserIdUtils.java rename to windchat-common/src/main/java/com/akaxin/common/utils/UserIdUtils.java diff --git a/openzaly-common/src/main/java/com/akaxin/common/utils/ValidatorPattern.java b/windchat-common/src/main/java/com/akaxin/common/utils/ValidatorPattern.java similarity index 100% rename from openzaly-common/src/main/java/com/akaxin/common/utils/ValidatorPattern.java rename to windchat-common/src/main/java/com/akaxin/common/utils/ValidatorPattern.java diff --git a/openzaly-common/src/test/java/com/akaxin/common/test/TestInetAddress.java b/windchat-common/src/test/java/com/akaxin/common/test/TestInetAddress.java similarity index 100% rename from openzaly-common/src/test/java/com/akaxin/common/test/TestInetAddress.java rename to windchat-common/src/test/java/com/akaxin/common/test/TestInetAddress.java diff --git a/openzaly-connector/.gitignore b/windchat-connector/.gitignore similarity index 100% rename from openzaly-connector/.gitignore rename to windchat-connector/.gitignore diff --git a/openzaly-connector/bin/src/main/java/com/zaly/site/connector/client/UserMessage.class b/windchat-connector/bin/src/main/java/com/zaly/site/connector/client/UserMessage.class similarity index 100% rename from openzaly-connector/bin/src/main/java/com/zaly/site/connector/client/UserMessage.class rename to windchat-connector/bin/src/main/java/com/zaly/site/connector/client/UserMessage.class diff --git a/windchat-connector/pom.xml b/windchat-connector/pom.xml new file mode 100755 index 0000000..1f596d3 --- /dev/null +++ b/windchat-connector/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + + com.windchat.im + windchat + 0.0.1 + + com.windchat.im + windchat-connector + 0.0.1-RELEASE + + + 1.8 + 1.8 + + + + + + com.windchat.im + windchat-message + 0.0.1-RELEASE + + + + com.windchat.im + windchat-business + 0.0.1-RELEASE + + + + + \ No newline at end of file diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/cache/PluginCache.java b/windchat-connector/src/main/java/com/akaxin/site/connector/cache/PluginCache.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/cache/PluginCache.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/cache/PluginCache.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/codec/parser/ChannelConst.java b/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ChannelConst.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/codec/parser/ChannelConst.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ChannelConst.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/codec/parser/IProtocolParser.java b/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/IProtocolParser.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/codec/parser/IProtocolParser.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/IProtocolParser.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/codec/parser/ProtocolParser.java b/windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ProtocolParser.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/codec/parser/ProtocolParser.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/codec/parser/ProtocolParser.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageDecoder.java b/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageDecoder.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageDecoder.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageDecoder.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageEncoder.java b/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageEncoder.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageEncoder.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/MessageEncoder.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/codec/protocol/ReplaySignal.java b/windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/ReplaySignal.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/codec/protocol/ReplaySignal.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/codec/protocol/ReplaySignal.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/constant/AkxProject.java b/windchat-connector/src/main/java/com/akaxin/site/connector/constant/AkxProject.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/constant/AkxProject.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/constant/AkxProject.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/constant/HttpConst.java b/windchat-connector/src/main/java/com/akaxin/site/connector/constant/HttpConst.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/constant/HttpConst.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/constant/HttpConst.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/constant/PluginConst.java b/windchat-connector/src/main/java/com/akaxin/site/connector/constant/PluginConst.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/constant/PluginConst.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/constant/PluginConst.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/exception/HttpServerException.java b/windchat-connector/src/main/java/com/akaxin/site/connector/exception/HttpServerException.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/exception/HttpServerException.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/exception/HttpServerException.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/exception/TcpServerException.java b/windchat-connector/src/main/java/com/akaxin/site/connector/exception/TcpServerException.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/exception/TcpServerException.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/exception/TcpServerException.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/AbstractCommonHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/handler/AbstractCommonHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/handler/AbstractCommonHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/handler/AbstractCommonHandler.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/HttpRequestHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/handler/HttpRequestHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/handler/HttpRequestHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/handler/HttpRequestHandler.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ImMessageHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImMessageHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ImMessageHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImMessageHandler.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/WSRequestHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/handler/WSRequestHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/handler/WSRequestHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/handler/WSRequestHandler.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/http/HttpServer.java b/windchat-connector/src/main/java/com/akaxin/site/connector/http/HttpServer.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/http/HttpServer.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/http/HttpServer.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/http/handler/HttpServerHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/http/handler/HttpServerHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/http/handler/HttpServerHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/http/handler/HttpServerHandler.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/netty/NettyServer.java b/windchat-connector/src/main/java/com/akaxin/site/connector/netty/NettyServer.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/netty/NettyServer.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/netty/NettyServer.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/netty/PrefixThreadFactory.java b/windchat-connector/src/main/java/com/akaxin/site/connector/netty/PrefixThreadFactory.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/netty/PrefixThreadFactory.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/netty/PrefixThreadFactory.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/netty/handler/NettyServerHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/netty/handler/NettyServerHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/netty/handler/NettyServerHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/netty/handler/NettyServerHandler.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java b/windchat-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java b/windchat-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java b/windchat-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/ssl/NettySocketSslContext.java b/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/NettySocketSslContext.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/ssl/NettySocketSslContext.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/ssl/NettySocketSslContext.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/ssl/SslKeyStore.java b/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/SslKeyStore.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/ssl/SslKeyStore.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/ssl/SslKeyStore.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/ssl/StreamReader.java b/windchat-connector/src/main/java/com/akaxin/site/connector/ssl/StreamReader.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/ssl/StreamReader.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/ssl/StreamReader.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/utils/HexUtils.java b/windchat-connector/src/main/java/com/akaxin/site/connector/utils/HexUtils.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/utils/HexUtils.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/utils/HexUtils.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/ws/WsServer.java b/windchat-connector/src/main/java/com/akaxin/site/connector/ws/WsServer.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/ws/WsServer.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/ws/WsServer.java diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/ws/handler/WsServerHandler.java b/windchat-connector/src/main/java/com/akaxin/site/connector/ws/handler/WsServerHandler.java similarity index 100% rename from openzaly-connector/src/main/java/com/akaxin/site/connector/ws/handler/WsServerHandler.java rename to windchat-connector/src/main/java/com/akaxin/site/connector/ws/handler/WsServerHandler.java diff --git a/openzaly-connector/src/main/resources/chatchrome1.jks b/windchat-connector/src/main/resources/chatchrome1.jks similarity index 100% rename from openzaly-connector/src/main/resources/chatchrome1.jks rename to windchat-connector/src/main/resources/chatchrome1.jks diff --git a/openzaly-connector/src/test/java/com/zaly/test/HttpClient.java b/windchat-connector/src/test/java/com/zaly/test/HttpClient.java similarity index 100% rename from openzaly-connector/src/test/java/com/zaly/test/HttpClient.java rename to windchat-connector/src/test/java/com/zaly/test/HttpClient.java diff --git a/openzaly-connector/src/test/java/com/zaly/test/HttpTestPost.java b/windchat-connector/src/test/java/com/zaly/test/HttpTestPost.java similarity index 100% rename from openzaly-connector/src/test/java/com/zaly/test/HttpTestPost.java rename to windchat-connector/src/test/java/com/zaly/test/HttpTestPost.java diff --git a/openzaly-connector/src/test/java/com/zaly/test/WSTest.java b/windchat-connector/src/test/java/com/zaly/test/WSTest.java similarity index 100% rename from openzaly-connector/src/test/java/com/zaly/test/WSTest.java rename to windchat-connector/src/test/java/com/zaly/test/WSTest.java diff --git a/openzaly-message/.gitignore b/windchat-message/.gitignore similarity index 100% rename from openzaly-message/.gitignore rename to windchat-message/.gitignore diff --git a/windchat-message/pom.xml b/windchat-message/pom.xml new file mode 100755 index 0000000..50efa06 --- /dev/null +++ b/windchat-message/pom.xml @@ -0,0 +1,59 @@ + + 4.0.0 + + com.windchat.im + windchat + 0.0.1 + + com.windchat.im + windchat-message + 0.0.1-RELEASE + + + 1.8 + 1.8 + + + + + com.windchat.common + windchat-common + 0.0.1-RELEASE + + + + com.windchat.proto + windchat-protobuf + 0.0.1-RELEASE + + + + com.windchat.im + windchat-storage + 0.0.1-RELEASE + + + + org.json + json + 20090211 + + + + org.apache.httpcomponents + httpclient + + + + + + commons-logging + commons-logging + 1.2 + + + + + + \ No newline at end of file diff --git a/openzaly-message/src/main/java/com/windchat/im/message/api/IMessageService.java b/windchat-message/src/main/java/com/akaxin/site/message/api/IMessageService.java similarity index 76% rename from openzaly-message/src/main/java/com/windchat/im/message/api/IMessageService.java rename to windchat-message/src/main/java/com/akaxin/site/message/api/IMessageService.java index bcf9a5b..54d1998 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/api/IMessageService.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/api/IMessageService.java @@ -1,4 +1,4 @@ -package com.windchat.im.message.api; +package com.akaxin.site.message.api; import com.akaxin.common.command.Command; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/bean/WebBean.java b/windchat-message/src/main/java/com/akaxin/site/message/bean/WebBean.java similarity index 94% rename from openzaly-message/src/main/java/com/windchat/im/message/bean/WebBean.java rename to windchat-message/src/main/java/com/akaxin/site/message/bean/WebBean.java index c93d7e0..3992271 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/bean/WebBean.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/bean/WebBean.java @@ -1,4 +1,4 @@ -package com.windchat.im.message.bean; +package com.akaxin.site.message.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserFriendDao.java b/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserFriendDao.java rename to windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java index 21608e0..796f1d6 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserFriendDao.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.dao; +package com.akaxin.site.message.dao; import java.sql.SQLException; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserGroupDao.java b/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserGroupDao.java rename to windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java index 2a9a039..14ce93b 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserGroupDao.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.dao; +package com.akaxin.site.message.dao; import java.sql.SQLException; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserProfileDao.java b/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserProfileDao.java rename to windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java index 311bf12..3e703a8 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserProfileDao.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.dao; +package com.akaxin.site.message.dao; import java.sql.SQLException; import java.util.List; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserSessionDao.java b/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserSessionDao.java rename to windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java index 4d09bd5..23768a2 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/dao/ImUserSessionDao.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.dao; +package com.akaxin.site.message.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/dao/SessionDeviceDao.java b/windchat-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/dao/SessionDeviceDao.java rename to windchat-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java index 72140e4..8b67141 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/dao/SessionDeviceDao.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.dao; +package com.akaxin.site.message.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/dao/SiteConfigDao.java b/windchat-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/dao/SiteConfigDao.java rename to windchat-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java index fb878e3..753b437 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/dao/SiteConfigDao.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.dao; +package com.akaxin.site.message.dao; import java.sql.SQLException; import java.util.Map; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java b/windchat-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java rename to windchat-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java index 78ed253..124764a 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/executor/MessageExecutor.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/executor/MessageExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.executor; +package com.akaxin.site.message.executor; import com.akaxin.common.command.Command; import com.akaxin.common.constant.RequestAction; @@ -48,8 +48,6 @@ import com.akaxin.site.message.user2.handler.U2MessageWebNoticeHandler; import com.akaxin.site.message.user2.handler.UserDetectionHandler; import com.akaxin.site.message.user2.handler.UserPsnHandler; import com.akaxin.site.message.user2.handler.UserPushHandler; -import com.windchat.im.message.notice.handler.NoticeHandler; -import com.windchat.im.message.notice.handler.NoticePushHandler; /** * diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java index b403eab..ff3c582 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/AbstractGroupHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/AbstractGroupHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import org.apache.commons.lang3.StringUtils; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java index 8421c57..d2facfd 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupDetectionHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; -import com.windchat.im.message.dao.ImUserGroupDao; -import com.windchat.im.message.dao.ImUserProfileDao; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java index c1d5405..cb1b14d 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java index 8162775..218488e 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageImageSecretHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import com.akaxin.common.channel.ChannelSession; import com.akaxin.common.command.Command; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java index 6a516b3..43051be 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageNoticeHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java index 84103e0..9552871 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java index 2a5d50f..9c21d94 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageTextSecretHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import com.akaxin.common.channel.ChannelSession; import com.akaxin.common.command.Command; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java index b1a28f7..691e710 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java index b08a649..39fb402 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageVoiceSecretHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java index 6a972e0..e6dd7bb 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; -import com.windchat.im.message.bean.WebBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java index 436c0df..f401061 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupMessageWebNoticeHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; -import com.windchat.im.message.bean.WebBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java index 6eb04cf..9b85fe3 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPsnHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import java.util.List; -import com.windchat.im.message.dao.ImUserSessionDao; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java index efdd4fe..f72b454 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/group/handler/GroupPushHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java @@ -13,15 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.group.handler; +package com.akaxin.site.message.group.handler; import java.nio.charset.Charset; import java.util.List; -import com.windchat.im.message.dao.ImUserGroupDao; -import com.windchat.im.message.dao.ImUserProfileDao; -import com.windchat.im.message.push.PushClient; -import com.windchat.im.message.threads.MultiPushThreadExecutor; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java similarity index 93% rename from openzaly-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java index cc22127..2f5c52c 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/AbstractNoticeHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/AbstractNoticeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.notice.handler; +package com.akaxin.site.message.notice.handler; import com.akaxin.common.executor.chain.handler.IHandler; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java index 85a7cd2..17cc822 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticeHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.notice.handler; +package com.akaxin.site.message.notice.handler; import java.util.List; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java similarity index 99% rename from openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java index e7c36c1..e2cb1f0 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/notice/handler/NoticePushHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/notice/handler/NoticePushHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.notice.handler; +package com.akaxin.site.message.notice.handler; import java.util.List; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java b/windchat-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java similarity index 99% rename from openzaly-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java rename to windchat-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java index 317a8b4..d5f7dfc 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/platform/PlatformClient.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/platform/PlatformClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.platform; +package com.akaxin.site.message.platform; import java.util.HashMap; import java.util.Map; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/push/PushClient.java b/windchat-message/src/main/java/com/akaxin/site/message/push/PushClient.java similarity index 99% rename from openzaly-message/src/main/java/com/windchat/im/message/push/PushClient.java rename to windchat-message/src/main/java/com/akaxin/site/message/push/PushClient.java index 0eed0fe..a858659 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/push/PushClient.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/push/PushClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.push; +package com.akaxin.site.message.push; import java.util.HashMap; import java.util.Map; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/service/ImMessageService.java b/windchat-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java similarity index 95% rename from openzaly-message/src/main/java/com/windchat/im/message/service/ImMessageService.java rename to windchat-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java index 71ef742..18198b5 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/service/ImMessageService.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/service/ImMessageService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.service; +package com.akaxin.site.message.service; import com.akaxin.common.command.Command; import com.akaxin.site.message.api.IMessageService; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java b/windchat-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java rename to windchat-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java index 1dbc8a4..4c061c0 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/service/MessageDispatcher.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/service/MessageDispatcher.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.service; +package com.akaxin.site.message.service; -import com.windchat.im.message.executor.MessageExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java index d909daf..1c6de72 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/AbstractSyncHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/AbstractSyncHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.sync.handler; +package com.akaxin.site.message.sync.handler; import org.apache.commons.lang3.StringUtils; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java index 1d35793..4845273 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncFinishHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.sync.handler; +package com.akaxin.site.message.sync.handler; import java.util.Map; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java similarity index 99% rename from openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java index 72f371b..68b02c7 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncGroupMessageHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.sync.handler; +package com.akaxin.site.message.sync.handler; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.windchat.im.message.bean.WebBean; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java index cee7692..47e125e 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncMsgStatusHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.sync.handler; +package com.akaxin.site.message.sync.handler; import java.util.List; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java similarity index 99% rename from openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java index 47bdd19..318fe3a 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncNoticeHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.sync.handler; +package com.akaxin.site.message.sync.handler; import java.util.Base64; import java.util.HashMap; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java similarity index 99% rename from openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java index a7f9fd2..3a538ea 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/sync/handler/SyncU2MessageHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.sync.handler; +package com.akaxin.site.message.sync.handler; import java.util.Base64; import java.util.HashMap; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/threads/MultiPushThreadExecutor.java b/windchat-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/threads/MultiPushThreadExecutor.java rename to windchat-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java index 862eeed..25aed63 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/threads/MultiPushThreadExecutor.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/threads/MultiPushThreadExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.threads; +package com.akaxin.site.message.threads; import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java index a013118..11defb0 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/AbstractU2Handler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/AbstractU2Handler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import org.apache.commons.lang3.StringUtils; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java index 90ae5a6..bc2d90b 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java index c8f9bd1..b577f58 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageImageSecretHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java index cbf8a3a..dfa36e5 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageNoticeHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; -import com.windchat.im.message.group.handler.AbstractGroupHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java index 8197c89..3861496 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import java.nio.charset.Charset; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java index e100e51..2b08953 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageTextSecretHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import java.util.Base64; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java index 224afc6..fbd696a 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java index bc5efed..08d71c8 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageVoiceSecretHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java index 5add2d3..25dace5 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; -import com.windchat.im.message.bean.WebBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java index 3544966..244239e 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/U2MessageWebNoticeHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; -import com.windchat.im.message.bean.WebBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java similarity index 97% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java index 637c054..5bfdfcc 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserDetectionHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; -import com.windchat.im.message.dao.ImUserFriendDao; -import com.windchat.im.message.dao.ImUserProfileDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java index b97ffd2..05ed7f6 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPsnHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPsnHandler.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import java.util.List; -import com.windchat.im.message.dao.ImUserSessionDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java similarity index 95% rename from openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java index 772251c..c527335 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/user2/handler/UserPushHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java @@ -13,15 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.user2.handler; +package com.akaxin.site.message.user2.handler; import java.nio.charset.Charset; import java.util.List; -import com.windchat.im.message.dao.ImUserFriendDao; -import com.windchat.im.message.dao.ImUserProfileDao; -import com.windchat.im.message.push.PushClient; -import com.windchat.im.message.threads.MultiPushThreadExecutor; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/utils/HexUtils.java b/windchat-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java similarity index 96% rename from openzaly-message/src/main/java/com/windchat/im/message/utils/HexUtils.java rename to windchat-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java index 0eaeb77..09d5dcc 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/utils/HexUtils.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/utils/HexUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.utils; +package com.akaxin.site.message.utils; public class HexUtils { diff --git a/openzaly-message/src/main/java/com/windchat/im/message/utils/NumUtils.java b/windchat-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java similarity index 84% rename from openzaly-message/src/main/java/com/windchat/im/message/utils/NumUtils.java rename to windchat-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java index 1015fd8..b4d5406 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/utils/NumUtils.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/utils/NumUtils.java @@ -1,4 +1,4 @@ -package com.windchat.im.message.utils; +package com.akaxin.site.message.utils; public class NumUtils { diff --git a/openzaly-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java b/windchat-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java similarity index 96% rename from openzaly-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java rename to windchat-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java index c046571..9e9f047 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/utils/SiteConfigHelper.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/utils/SiteConfigHelper.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.utils; +package com.akaxin.site.message.utils; import java.util.Map; -import com.windchat.im.message.dao.SiteConfigDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java new file mode 100755 index 0000000..9c602fd --- /dev/null +++ b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebGroupTextBean.java @@ -0,0 +1,5 @@ +package com.akaxin.site.message.web.bean; + +public class WebGroupTextBean { + +} diff --git a/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java new file mode 100755 index 0000000..14ab954 --- /dev/null +++ b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebResponseBean.java @@ -0,0 +1,5 @@ +package com.akaxin.site.message.web.bean; + +public class WebResponseBean { + +} diff --git a/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java new file mode 100755 index 0000000..4d43edd --- /dev/null +++ b/windchat-message/src/main/java/com/akaxin/site/message/web/bean/WebU2TextBean.java @@ -0,0 +1,5 @@ +package com.akaxin.site.message.web.bean; + +public class WebU2TextBean { + +} diff --git a/openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java similarity index 98% rename from openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java index f2a0267..3eb2927 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatReceiveMessageHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.web.chat; +package com.akaxin.site.message.web.chat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java b/windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java similarity index 96% rename from openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java rename to windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java index 2e3ae8b..51084f1 100755 --- a/openzaly-message/src/main/java/com/windchat/im/message/web/chat/WebChatSendMessageHandler.java +++ b/windchat-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.windchat.im.message.web.chat; +package com.akaxin.site.message.web.chat; -import com.windchat.im.message.dao.ImUserFriendDao; -import com.windchat.im.message.dao.ImUserProfileDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-message/src/main/resources/chatchrome1.jks b/windchat-message/src/main/resources/chatchrome1.jks similarity index 100% rename from openzaly-message/src/main/resources/chatchrome1.jks rename to windchat-message/src/main/resources/chatchrome1.jks diff --git a/openzaly-storage/.gitignore b/windchat-storage/.gitignore similarity index 100% rename from openzaly-storage/.gitignore rename to windchat-storage/.gitignore diff --git a/openzaly-storage/pom.xml b/windchat-storage/pom.xml similarity index 96% rename from openzaly-storage/pom.xml rename to windchat-storage/pom.xml index 8568038..fb60111 100755 --- a/openzaly-storage/pom.xml +++ b/windchat-storage/pom.xml @@ -14,8 +14,8 @@ windchat 0.0.1 - com.akaxin.site - openzaly-storage + com.windchat.im + windchat-storage 0.0.1-RELEASE diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/DataSourceManager.java b/windchat-storage/src/main/java/com/windchat/im/storage/DataSourceManager.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/DataSourceManager.java rename to windchat-storage/src/main/java/com/windchat/im/storage/DataSourceManager.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IFriendApplyDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IFriendApplyDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IFriendApplyDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IFriendApplyDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IGroupDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IGroupDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupProfileDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IGroupProfileDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupProfileDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IGroupProfileDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IMessageDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IMessageDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IMessageDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IMessageDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IPluginDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IPluginDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IPluginDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IPluginDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteConfigDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/ISiteConfigDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteConfigDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/ISiteConfigDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteUsersDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/ISiteUsersDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteUsersDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/ISiteUsersDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/ITokenDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/ITokenDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/ITokenDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/ITokenDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUicDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IUicDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IUicDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IUicDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserDeviceDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IUserDeviceDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserDeviceDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IUserDeviceDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserFriendDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IUserFriendDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserFriendDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IUserFriendDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserGroupDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IUserGroupDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserGroupDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IUserGroupDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserProfileDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IUserProfileDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserProfileDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IUserProfileDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserSessionDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/api/IUserSessionDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserSessionDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/api/IUserSessionDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyUserBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/ApplyUserBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyUserBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/ApplyUserBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMemberBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupMemberBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMemberBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupMemberBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/MonitorBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/MonitorBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/MonitorBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/MonitorBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserRelationBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserRelationBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserRelationBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserRelationBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SiteConfigBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/SiteConfigBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/SiteConfigBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/SiteConfigBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java b/windchat-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java rename to windchat-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/connection/DatabaseConnection.java b/windchat-storage/src/main/java/com/windchat/im/storage/connection/DatabaseConnection.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/connection/DatabaseConnection.java rename to windchat-storage/src/main/java/com/windchat/im/storage/connection/DatabaseConnection.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java diff --git a/openzaly-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 similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBType.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/config/DBType.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBType.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/config/DBType.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/JdbcConst.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/config/JdbcConst.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/JdbcConst.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/config/JdbcConst.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/PrepareSiteConfigData.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/config/PrepareSiteConfigData.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/PrepareSiteConfigData.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/config/PrepareSiteConfigData.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/AbstractPoolManager.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/AbstractPoolManager.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/AbstractPoolManager.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/AbstractPoolManager.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolManager.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolManager.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolManager.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolManager.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolSlaveManager.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolSlaveManager.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolSlaveManager.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolSlaveManager.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/InitDatabaseConnection.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/InitDatabaseConnection.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/InitDatabaseConnection.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/InitDatabaseConnection.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/MysqlManager.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/MysqlManager.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/MysqlManager.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/MysqlManager.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sql/SQLConst.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/sql/SQLConst.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/sql/SQLConst.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/sql/SQLConst.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/PluginArgs.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/PluginArgs.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/PluginArgs.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/PluginArgs.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteJDBCManager.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteJDBCManager.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteJDBCManager.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteJDBCManager.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUnique.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUnique.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUnique.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUnique.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUpgrade.java b/windchat-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUpgrade.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUpgrade.java rename to windchat-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUpgrade.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/exception/InitDatabaseException.java b/windchat-storage/src/main/java/com/windchat/im/storage/exception/InitDatabaseException.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/exception/InitDatabaseException.java rename to windchat-storage/src/main/java/com/windchat/im/storage/exception/InitDatabaseException.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java b/windchat-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java rename to windchat-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/exception/NeedInitMysqlException.java b/windchat-storage/src/main/java/com/windchat/im/storage/exception/NeedInitMysqlException.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/exception/NeedInitMysqlException.java rename to windchat-storage/src/main/java/com/windchat/im/storage/exception/NeedInitMysqlException.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java b/windchat-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java rename to windchat-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/DeviceDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/DeviceDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/DeviceDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/DeviceDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/FriendApplyDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/FriendApplyDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/FriendApplyDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/FriendApplyDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/GroupDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/GroupDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/GroupDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/GroupDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/MessageDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/MessageDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/MessageDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/MessageDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/PluginServiceDao.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/PluginServiceDao.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/PluginServiceDao.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/PluginServiceDao.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteConfigDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/SiteConfigDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteConfigDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/SiteConfigDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteUsersDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/SiteUsersDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteUsersDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/SiteUsersDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/TokenDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/TokenDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/TokenDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/TokenDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/UicDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/UicDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/UicDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/UicDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserFriendDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/UserFriendDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/UserFriendDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/UserFriendDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserGroupDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/UserGroupDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/UserGroupDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/UserGroupDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserProfileDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/UserProfileDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/UserProfileDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/UserProfileDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserSessionDaoService.java b/windchat-storage/src/main/java/com/windchat/im/storage/service/UserSessionDaoService.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/service/UserSessionDaoService.java rename to windchat-storage/src/main/java/com/windchat/im/storage/service/UserSessionDaoService.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/util/FileUtils.java b/windchat-storage/src/main/java/com/windchat/im/storage/util/FileUtils.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/util/FileUtils.java rename to windchat-storage/src/main/java/com/windchat/im/storage/util/FileUtils.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java b/windchat-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java rename to windchat-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlLog.java b/windchat-storage/src/main/java/com/windchat/im/storage/util/SqlLog.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlLog.java rename to windchat-storage/src/main/java/com/windchat/im/storage/util/SqlLog.java diff --git a/openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlUtils.java b/windchat-storage/src/main/java/com/windchat/im/storage/util/SqlUtils.java similarity index 100% rename from openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlUtils.java rename to windchat-storage/src/main/java/com/windchat/im/storage/util/SqlUtils.java diff --git a/openzaly-storage/src/main/resources/log4j.properties b/windchat-storage/src/main/resources/log4j.properties similarity index 100% rename from openzaly-storage/src/main/resources/log4j.properties rename to windchat-storage/src/main/resources/log4j.properties diff --git a/openzaly-storage/src/main/resources/openzaly-mysql.sql b/windchat-storage/src/main/resources/openzaly-mysql.sql similarity index 100% rename from openzaly-storage/src/main/resources/openzaly-mysql.sql rename to windchat-storage/src/main/resources/openzaly-mysql.sql diff --git a/openzaly-storage/src/main/resources/openzaly-sqlite.sql b/windchat-storage/src/main/resources/openzaly-sqlite.sql similarity index 100% rename from openzaly-storage/src/main/resources/openzaly-sqlite.sql rename to windchat-storage/src/main/resources/openzaly-sqlite.sql