diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java index f90fc0c..78a9bd7 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/GroupManageController.java @@ -36,10 +36,10 @@ import org.springframework.web.servlet.ModelAndView; import com.akaxin.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.UserProfileBean; import com.akaxin.site.web.admin.exception.UserPermissionException; import com.akaxin.site.web.admin.service.IConfigService; import com.akaxin.site.web.admin.service.IGroupService; diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java index a229ec8..867b3c6 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/MonitorController.java @@ -2,7 +2,7 @@ package com.akaxin.site.web.admin.controller; import com.akaxin.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; -import com.akaxin.site.storage.bean.MonitorBean; +import com.windchat.im.storage.bean.MonitorBean; import com.akaxin.site.web.admin.common.Timeutils; import com.akaxin.site.web.admin.exception.UserPermissionException; import com.akaxin.site.web.admin.service.IMonitorService; diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java index 58ce377..59804ae 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/PluginManageController.java @@ -34,7 +34,7 @@ import org.springframework.web.servlet.ModelAndView; import com.akaxin.common.utils.StringHelper; import com.akaxin.proto.core.PluginProto; -import com.akaxin.site.storage.bean.PluginBean; +import com.windchat.im.storage.bean.PluginBean; import com.akaxin.site.web.admin.exception.UserPermissionException; import com.akaxin.site.web.admin.service.IPluginService; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java index 4e745cd..545f1f6 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UICManageController.java @@ -37,7 +37,7 @@ import org.springframework.web.servlet.ModelAndView; import com.akaxin.common.utils.GsonUtils; import com.akaxin.proto.core.PluginProto; import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.storage.bean.UicBean; +import com.windchat.im.storage.bean.UicBean; import com.akaxin.site.web.admin.service.IUICService; //邀请码管理 diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java index d9947b2..05e84e8 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserManageController.java @@ -39,8 +39,8 @@ import org.springframework.web.servlet.ModelAndView; import com.akaxin.common.utils.StringHelper; import com.akaxin.proto.core.PluginProto; import com.akaxin.proto.core.UserProto.UserStatus; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserProfileBean; import com.akaxin.site.web.admin.exception.ManagerException; import com.akaxin.site.web.admin.exception.UserPermissionException; import com.akaxin.site.web.admin.service.IConfigService; diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java index c878211..3a277c3 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/controller/UserSquareController.java @@ -24,8 +24,8 @@ import com.akaxin.proto.core.UserProto; import com.akaxin.site.business.dao.UserFriendDao; import com.akaxin.site.business.impl.notice.User2Notice; import com.akaxin.site.business.push.PushNotification; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserProfileBean; import com.akaxin.site.web.admin.service.IUserService; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java index 14cbb12..20fb64d 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IGroupService.java @@ -2,9 +2,9 @@ package com.akaxin.site.web.admin.service; import java.util.List; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; /** * diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java index 0ca78b6..cf95e5f 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IPluginService.java @@ -2,7 +2,7 @@ package com.akaxin.site.web.admin.service; import java.util.List; -import com.akaxin.site.storage.bean.PluginBean; +import com.windchat.im.storage.bean.PluginBean; public interface IPluginService { boolean addNewPlugin(PluginBean bean); diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java index 1c07848..474fe82 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUICService.java @@ -2,7 +2,7 @@ package com.akaxin.site.web.admin.service; import java.util.List; -import com.akaxin.site.storage.bean.UicBean; +import com.windchat.im.storage.bean.UicBean; public interface IUICService { diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java index f9d776f..489dae0 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/IUserService.java @@ -2,8 +2,8 @@ package com.akaxin.site.web.admin.service; import java.util.List; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserProfileBean; public interface IUserService { // 获取用户profile diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java index 63f1b9e..05e0e53 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/GroupManageService.java @@ -22,9 +22,9 @@ import org.springframework.stereotype.Service; import com.akaxin.site.business.dao.UserGroupDao; import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; import com.akaxin.site.web.admin.service.IGroupService; /** diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java index 369398b..9ea28a7 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/PluginManageService.java @@ -20,7 +20,7 @@ import java.util.List; import org.springframework.stereotype.Service; import com.akaxin.site.business.dao.SitePluginDao; -import com.akaxin.site.storage.bean.PluginBean; +import com.windchat.im.storage.bean.PluginBean; import com.akaxin.site.web.admin.service.IPluginService; /** diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java index 1468e60..e0746e7 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UICManageService.java @@ -23,7 +23,7 @@ import org.springframework.stereotype.Service; import com.akaxin.proto.core.UicProto.UicStatus; import com.akaxin.site.business.dao.SiteUicDao; -import com.akaxin.site.storage.bean.UicBean; +import com.windchat.im.storage.bean.UicBean; import com.akaxin.site.web.admin.service.IUICService; @Service diff --git a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java index 8b27e22..0c9ad3c 100755 --- a/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java +++ b/openzaly-admin/src/main/java/com/akaxin/site/web/admin/service/impl/UserManageService.java @@ -30,22 +30,22 @@ import com.akaxin.site.business.dao.UserGroupDao; import com.akaxin.site.business.dao.UserProfileDao; import com.akaxin.site.business.impl.site.SiteConfig; import com.akaxin.site.business.utils.FilePathUtils; -import com.akaxin.site.storage.api.IGroupDao; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.api.IUserDeviceDao; -import com.akaxin.site.storage.api.IUserFriendDao; -import com.akaxin.site.storage.api.IUserProfileDao; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserDeviceBean; -import com.akaxin.site.storage.bean.UserProfileBean; -import com.akaxin.site.storage.service.DeviceDaoService; -import com.akaxin.site.storage.service.GroupDaoService; -import com.akaxin.site.storage.service.MessageDaoService; -import com.akaxin.site.storage.service.UserFriendDaoService; -import com.akaxin.site.storage.service.UserProfileDaoService; -import com.akaxin.site.storage.service.UserSessionDaoService; +import com.windchat.im.storage.api.IGroupDao; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.api.IUserDeviceDao; +import com.windchat.im.storage.api.IUserFriendDao; +import com.windchat.im.storage.api.IUserProfileDao; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserDeviceBean; +import com.windchat.im.storage.bean.UserProfileBean; +import com.windchat.im.storage.service.DeviceDaoService; +import com.windchat.im.storage.service.GroupDaoService; +import com.windchat.im.storage.service.MessageDaoService; +import com.windchat.im.storage.service.UserFriendDaoService; +import com.windchat.im.storage.service.UserProfileDaoService; +import com.windchat.im.storage.service.UserSessionDaoService; import com.akaxin.site.web.admin.service.IUserService; @Service("userManageService") diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java b/openzaly-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java index 067243b..90c1c15 100755 --- a/openzaly-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java +++ b/openzaly-boot/src/main/java/com/akaxin/site/boot/main/Bootstrap.java @@ -52,12 +52,12 @@ import com.akaxin.site.connector.handler.WSRequestHandler; import com.akaxin.site.connector.http.HttpServer; import com.akaxin.site.connector.netty.NettyServer; import com.akaxin.site.connector.ws.WsServer; -import com.akaxin.site.storage.DataSourceManager; -import com.akaxin.site.storage.dao.config.DBConfig; -import com.akaxin.site.storage.dao.sqlite.manager.PluginArgs; -import com.akaxin.site.storage.exception.InitDatabaseException; -import com.akaxin.site.storage.exception.NeedInitMysqlException; -import com.akaxin.site.storage.exception.UpgradeDatabaseException; +import com.windchat.im.storage.DataSourceManager; +import com.windchat.im.storage.dao.config.DBConfig; +import com.windchat.im.storage.dao.sqlite.manager.PluginArgs; +import com.windchat.im.storage.exception.InitDatabaseException; +import com.windchat.im.storage.exception.NeedInitMysqlException; +import com.windchat.im.storage.exception.UpgradeDatabaseException; /** *
diff --git a/openzaly-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java b/openzaly-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java index 9c8734e..e53b522 100755 --- a/openzaly-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java +++ b/openzaly-boot/src/main/java/com/akaxin/site/boot/utils/Helper.java @@ -19,13 +19,13 @@ import com.akaxin.common.utils.PrintUtils; import com.akaxin.common.utils.StringHelper; import com.akaxin.site.boot.config.ConfigHelper; import com.akaxin.site.boot.config.ConfigKey; -import com.akaxin.site.storage.DataSourceManager; -import com.akaxin.site.storage.dao.config.DBConfig; -import com.akaxin.site.storage.dao.config.DBType; -import com.akaxin.site.storage.dao.sql.SQLConst; -import com.akaxin.site.storage.exception.MigrateDatabaseException; -import com.akaxin.site.storage.exception.NeedInitMysqlException; -import com.akaxin.site.storage.exception.UpgradeDatabaseException; +import com.windchat.im.storage.DataSourceManager; +import com.windchat.im.storage.dao.config.DBConfig; +import com.windchat.im.storage.dao.config.DBType; +import com.windchat.im.storage.dao.sql.SQLConst; +import com.windchat.im.storage.exception.MigrateDatabaseException; +import com.windchat.im.storage.exception.NeedInitMysqlException; +import com.windchat.im.storage.exception.UpgradeDatabaseException; public class Helper { private static final Logger logger = LoggerFactory.getLogger(Helper.class); diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java index 7b9b18d..bcce24c 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/ExpireTokenDao.java @@ -20,9 +20,9 @@ import java.sql.SQLException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.ITokenDao; -import com.akaxin.site.storage.bean.ExpireToken; -import com.akaxin.site.storage.service.TokenDaoService; +import com.windchat.im.storage.api.ITokenDao; +import com.windchat.im.storage.bean.ExpireToken; +import com.windchat.im.storage.service.TokenDaoService; /** * 站点相关过期token操作 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java index 1e194c8..568a25e 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/MonitorDao.java @@ -1,11 +1,10 @@ package com.akaxin.site.business.dao; -import com.akaxin.site.storage.api.*; -import com.akaxin.site.storage.service.*; +import com.windchat.im.storage.api.*; +import com.windchat.im.storage.service.*; import org.slf4j.LoggerFactory; import java.sql.SQLException; -import java.time.DayOfWeek; public class MonitorDao { private static final org.slf4j.Logger logger = LoggerFactory.getLogger(UserProfileDao.class); diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java index 0101748..a4563dc 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteConfigDao.java @@ -22,8 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.proto.core.ConfigProto.ConfigKey; -import com.akaxin.site.storage.api.ISiteConfigDao; -import com.akaxin.site.storage.service.SiteConfigDaoService; +import com.windchat.im.storage.api.ISiteConfigDao; +import com.windchat.im.storage.service.SiteConfigDaoService; /** * 站点配置,供业务逻辑使用 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java index 8a55d50..a9a10e5 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteLoginDao.java @@ -20,17 +20,15 @@ import java.sql.SQLException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserDeviceDao; -import com.akaxin.site.storage.api.IUserProfileDao; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.bean.UserDeviceBean; -import com.akaxin.site.storage.bean.UserProfileBean; -import com.akaxin.site.storage.bean.UserSessionBean; -import com.akaxin.site.storage.service.DeviceDaoService; -import com.akaxin.site.storage.service.UserProfileDaoService; -import com.akaxin.site.storage.service.UserSessionDaoService; - -import javax.transaction.TransactionRequiredException; +import com.windchat.im.storage.api.IUserDeviceDao; +import com.windchat.im.storage.api.IUserProfileDao; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.bean.UserDeviceBean; +import com.windchat.im.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.UserSessionBean; +import com.windchat.im.storage.service.DeviceDaoService; +import com.windchat.im.storage.service.UserProfileDaoService; +import com.windchat.im.storage.service.UserSessionDaoService; /** * 用户登陆使用dao,负责用户信息入库 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java index 13dd621..2895c0e 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SitePluginDao.java @@ -22,9 +22,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.proto.core.PluginProto; -import com.akaxin.site.storage.api.IPluginDao; -import com.akaxin.site.storage.bean.PluginBean; -import com.akaxin.site.storage.service.PluginServiceDao; +import com.windchat.im.storage.api.IPluginDao; +import com.windchat.im.storage.bean.PluginBean; +import com.windchat.im.storage.service.PluginServiceDao; public class SitePluginDao { private static final Logger logger = LoggerFactory.getLogger(SitePluginDao.class); diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java index b883496..ad5f584 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUicDao.java @@ -21,9 +21,9 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUicDao; -import com.akaxin.site.storage.bean.UicBean; -import com.akaxin.site.storage.service.UicDaoService; +import com.windchat.im.storage.api.IUicDao; +import com.windchat.im.storage.bean.UicBean; +import com.windchat.im.storage.service.UicDaoService; public class SiteUicDao { private static final Logger logger = LoggerFactory.getLogger(SiteUicDao.class); diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java index e472723..c40dba4 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/SiteUserDao.java @@ -5,8 +5,8 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.ISiteUsersDao; -import com.akaxin.site.storage.service.SiteUsersDaoService; +import com.windchat.im.storage.api.ISiteUsersDao; +import com.windchat.im.storage.service.SiteUsersDaoService; /** * 获取站点数据库信息,例如所有用户 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java index 6081123..3786003 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserDeviceDao.java @@ -21,9 +21,9 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserDeviceDao; -import com.akaxin.site.storage.bean.UserDeviceBean; -import com.akaxin.site.storage.service.DeviceDaoService; +import com.windchat.im.storage.api.IUserDeviceDao; +import com.windchat.im.storage.bean.UserDeviceBean; +import com.windchat.im.storage.service.DeviceDaoService; public class UserDeviceDao { private static final Logger logger = LoggerFactory.getLogger(UserDeviceDao.class); diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java index 0c024e9..24f77d4 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserFriendDao.java @@ -23,14 +23,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.proto.core.UserProto; -import com.akaxin.site.storage.api.IFriendApplyDao; -import com.akaxin.site.storage.api.IUserFriendDao; -import com.akaxin.site.storage.bean.ApplyFriendBean; -import com.akaxin.site.storage.bean.ApplyUserBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserFriendBean; -import com.akaxin.site.storage.service.FriendApplyDaoService; -import com.akaxin.site.storage.service.UserFriendDaoService; +import com.windchat.im.storage.api.IFriendApplyDao; +import com.windchat.im.storage.api.IUserFriendDao; +import com.windchat.im.storage.bean.ApplyFriendBean; +import com.windchat.im.storage.bean.ApplyUserBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserFriendBean; +import com.windchat.im.storage.service.FriendApplyDaoService; +import com.windchat.im.storage.service.UserFriendDaoService; /** * 用户好友相关操作 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java index ac8f3a0..5a7528b 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserGroupDao.java @@ -27,17 +27,17 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.utils.StringHelper; import com.akaxin.proto.core.GroupProto; import com.akaxin.site.business.impl.notice.GroupNotice; -import com.akaxin.site.storage.api.IGroupDao; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.api.IUserGroupDao; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserGroupBean; -import com.akaxin.site.storage.service.GroupDaoService; -import com.akaxin.site.storage.service.MessageDaoService; -import com.akaxin.site.storage.service.UserGroupDaoService; +import com.windchat.im.storage.api.IGroupDao; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.api.IUserGroupDao; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserGroupBean; +import com.windchat.im.storage.service.GroupDaoService; +import com.windchat.im.storage.service.MessageDaoService; +import com.windchat.im.storage.service.UserGroupDaoService; /** * 用户群组群组相关数据源操作 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java index 574b989..97f3d6f 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserProfileDao.java @@ -21,12 +21,12 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserProfileDao; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.SimpleUserRelationBean; -import com.akaxin.site.storage.bean.UserFriendBean; -import com.akaxin.site.storage.bean.UserProfileBean; -import com.akaxin.site.storage.service.UserProfileDaoService; +import com.windchat.im.storage.api.IUserProfileDao; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserRelationBean; +import com.windchat.im.storage.bean.UserFriendBean; +import com.windchat.im.storage.bean.UserProfileBean; +import com.windchat.im.storage.service.UserProfileDaoService; /** * diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java index b0f0835..b6207d3 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/dao/UserSessionDao.java @@ -22,8 +22,8 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.service.UserSessionDaoService; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.service.UserSessionDaoService; public class UserSessionDao { private static final Logger logger = LoggerFactory.getLogger(UserSessionDao.class); diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java index 39a040a..96ed48d 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/AbstractRequest.java @@ -16,18 +16,11 @@ package com.akaxin.site.business.impl; import java.lang.reflect.Method; -import java.sql.SQLException; -import com.akaxin.site.business.dao.SiteUserDao; import com.akaxin.site.business.dao.UserGroupDao; import com.akaxin.site.business.dao.UserProfileDao; -import com.akaxin.site.message.dao.ImUserGroupDao; -import com.akaxin.site.message.dao.ImUserProfileDao; -import com.akaxin.site.storage.api.IUserProfileDao; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserProfileBean; -import com.akaxin.site.storage.service.UserProfileDaoService; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleUserBean; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java index 5340aaf..7b52201 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpFriendService.java @@ -37,7 +37,7 @@ import com.akaxin.site.business.dao.UserProfileDao; import com.akaxin.site.business.impl.AbstractRequest; import com.akaxin.site.business.impl.notice.User2Notice; import com.akaxin.site.business.push.PushNotification; -import com.akaxin.site.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserBean; /** *diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java index 1171493..7e1260a 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpGroupService.java @@ -17,7 +17,6 @@ package com.akaxin.site.business.impl.hai; import java.util.List; -import com.akaxin.site.business.impl.site.SiteConfig; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,9 +41,9 @@ import com.akaxin.proto.plugin.HaiGroupUpdateProto; import com.akaxin.site.business.constant.GroupConfig; import com.akaxin.site.business.dao.UserGroupDao; import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; import com.google.protobuf.ProtocolStringList; /** diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java index 77d94aa..76f2768 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpSessionService.java @@ -33,10 +33,10 @@ import com.akaxin.proto.core.UserProto; import com.akaxin.proto.plugin.HaiSessionProfileProto; import com.akaxin.site.business.dao.UserProfileDao; import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.bean.SimpleAuthBean; -import com.akaxin.site.storage.bean.UserProfileBean; -import com.akaxin.site.storage.service.UserSessionDaoService; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.bean.SimpleAuthBean; +import com.windchat.im.storage.bean.UserProfileBean; +import com.windchat.im.storage.service.UserSessionDaoService; /** *diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java index 0820f35..2de03e3 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/hai/HttpUserService.java @@ -42,9 +42,9 @@ import com.akaxin.site.business.dao.UserProfileDao; import com.akaxin.site.business.impl.AbstractRequest; import com.akaxin.site.business.utils.FilePathUtils; import com.akaxin.site.business.utils.FileServerUtils; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserProfileBean; import com.google.protobuf.ByteString; /** diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java index 4662b3e..b8f15b5 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/GroupNotice.java @@ -29,7 +29,7 @@ import com.akaxin.site.business.constant.NoticeText; import com.akaxin.site.business.dao.UserProfileDao; import com.akaxin.site.message.api.IMessageService; import com.akaxin.site.message.service.ImMessageService; -import com.akaxin.site.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserBean; import com.google.protobuf.ByteString; /** diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java index d766915..7371bf6 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/notice/User2Notice.java @@ -29,7 +29,7 @@ import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.business.constant.NoticeText; import com.akaxin.site.message.api.IMessageService; import com.akaxin.site.message.service.ImMessageService; -import com.akaxin.site.storage.bean.ApplyFriendBean; +import com.windchat.im.storage.bean.ApplyFriendBean; import com.google.protobuf.ByteString; public class User2Notice { diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java index 1a9527a..42286f0 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/site/UserUic.java @@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory; import com.akaxin.proto.core.UicProto; import com.akaxin.site.business.dao.SiteUicDao; -import com.akaxin.site.storage.bean.UicBean; +import com.windchat.im.storage.bean.UicBean; /** * 用户邀请码管理实现 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java index 2b07777..d72288f 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiDeviceService.java @@ -31,7 +31,7 @@ import com.akaxin.proto.site.ApiDeviceListProto; import com.akaxin.proto.site.ApiDeviceProfileProto; import com.akaxin.site.business.dao.UserDeviceDao; import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.storage.bean.UserDeviceBean; +import com.windchat.im.storage.bean.UserDeviceBean; /** * diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java index 7fe88e4..bc3b066 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiFriendService.java @@ -48,10 +48,10 @@ import com.akaxin.site.business.impl.AbstractRequest; import com.akaxin.site.business.impl.notice.User2Notice; import com.akaxin.site.business.impl.site.SiteConfig; import com.akaxin.site.business.push.PushNotification; -import com.akaxin.site.storage.bean.ApplyFriendBean; -import com.akaxin.site.storage.bean.ApplyUserBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserFriendBean; +import com.windchat.im.storage.bean.ApplyFriendBean; +import com.windchat.im.storage.bean.ApplyUserBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserFriendBean; /** *diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java index ffcfa73..f08c623 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiGroupService.java @@ -54,12 +54,12 @@ import com.akaxin.site.business.dao.UserGroupDao; import com.akaxin.site.business.dao.UserProfileDao; import com.akaxin.site.business.impl.AbstractRequest; import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.storage.bean.ExpireToken; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserGroupBean; +import com.windchat.im.storage.bean.ExpireToken; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserGroupBean; import com.google.common.collect.Lists; import com.google.protobuf.ProtocolStringList; diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java index c3aa1b3..6f1ab5b 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiPluginService.java @@ -42,7 +42,7 @@ import com.akaxin.proto.site.ApiPluginProxyProto; import com.akaxin.site.business.dao.SitePluginDao; import com.akaxin.site.business.impl.AbstractRequest; import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.storage.bean.PluginBean; +import com.windchat.im.storage.bean.PluginBean; import com.google.protobuf.ByteString; /** diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java index e081b8c..df61e50 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSecretChatService.java @@ -29,9 +29,9 @@ import com.akaxin.proto.core.DeviceProto; import com.akaxin.proto.site.ApiSecretChatApplyU2Proto; import com.akaxin.site.business.impl.AbstractRequest; import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.storage.api.IUserDeviceDao; -import com.akaxin.site.storage.bean.UserDeviceBean; -import com.akaxin.site.storage.service.DeviceDaoService; +import com.windchat.im.storage.api.IUserDeviceDao; +import com.windchat.im.storage.bean.UserDeviceBean; +import com.windchat.im.storage.service.DeviceDaoService; /** * 用户开启二人/群聊 绝密聊天 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java index c8937b2..5291201 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiSiteService.java @@ -54,13 +54,13 @@ import com.akaxin.site.business.impl.notice.User2Notice; import com.akaxin.site.business.impl.site.PlatformUserPhone; import com.akaxin.site.business.impl.site.SiteConfig; import com.akaxin.site.business.impl.site.UserUic; -import com.akaxin.site.storage.api.IUserDeviceDao; -import com.akaxin.site.storage.bean.ApplyFriendBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserDeviceBean; -import com.akaxin.site.storage.bean.UserProfileBean; -import com.akaxin.site.storage.bean.UserSessionBean; -import com.akaxin.site.storage.service.DeviceDaoService; +import com.windchat.im.storage.api.IUserDeviceDao; +import com.windchat.im.storage.bean.ApplyFriendBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserDeviceBean; +import com.windchat.im.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.UserSessionBean; +import com.windchat.im.storage.service.DeviceDaoService; /** * 获取站点信息
diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java index 0e531bc..709583d 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/impl/tai/ApiUserService.java @@ -30,7 +30,6 @@ import com.akaxin.common.constant.IErrorCode; import com.akaxin.common.exceptions.ZalyException2; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.StringHelper; -import com.akaxin.common.utils.UserIdUtils; import com.akaxin.common.utils.ValidatorPattern; import com.akaxin.proto.core.UserProto; import com.akaxin.proto.site.ApiUserMuteProto; @@ -41,8 +40,8 @@ import com.akaxin.proto.site.ApiUserUpdateProfileProto; import com.akaxin.site.business.dao.UserFriendDao; import com.akaxin.site.business.dao.UserProfileDao; import com.akaxin.site.business.impl.AbstractRequest; -import com.akaxin.site.storage.bean.UserFriendBean; -import com.akaxin.site.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.UserFriendBean; +import com.windchat.im.storage.bean.UserProfileBean; /** * 用户个人自身资料相关功能 diff --git a/openzaly-business/src/main/java/com/akaxin/site/business/push/PushText.java b/openzaly-business/src/main/java/com/akaxin/site/business/push/PushText.java index abd1f88..d21e3ea 100755 --- a/openzaly-business/src/main/java/com/akaxin/site/business/push/PushText.java +++ b/openzaly-business/src/main/java/com/akaxin/site/business/push/PushText.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.StringUtils; import com.akaxin.common.utils.StringHelper; import com.akaxin.site.business.dao.UserProfileDao; import com.akaxin.site.business.impl.site.SiteConfig; -import com.akaxin.site.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserBean; /** * diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java b/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java index 377a2ca..8dd292b 100755 --- a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java +++ b/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ApiRequestHandler.java @@ -33,9 +33,9 @@ import com.akaxin.common.utils.StringHelper; import com.akaxin.proto.core.CoreProto; import com.akaxin.site.business.service.ApiRequestService; import com.akaxin.site.connector.constant.AkxProject; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.bean.SimpleAuthBean; -import com.akaxin.site.storage.service.UserSessionDaoService; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.bean.SimpleAuthBean; +import com.windchat.im.storage.service.UserSessionDaoService; import com.google.protobuf.ByteString; import io.netty.channel.Channel; diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java b/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java index 32793dd..933aee3 100755 --- a/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java +++ b/openzaly-connector/src/main/java/com/akaxin/site/connector/handler/ImSiteAuthHandler.java @@ -34,7 +34,7 @@ import com.akaxin.proto.site.ImSiteHelloProto; import com.akaxin.site.business.impl.site.SiteConfig; import com.akaxin.site.connector.constant.AkxProject; import com.akaxin.site.connector.session.SessionManager; -import com.akaxin.site.storage.bean.SimpleAuthBean; +import com.windchat.im.storage.bean.SimpleAuthBean; import io.netty.channel.Channel; diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java b/openzaly-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java index efc8f20..22be071 100755 --- a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java +++ b/openzaly-connector/src/main/java/com/akaxin/site/connector/session/PluginSession.java @@ -20,9 +20,9 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.utils.StringHelper; import com.akaxin.site.connector.constant.AkxProject; -import com.akaxin.site.storage.api.IPluginDao; -import com.akaxin.site.storage.bean.PluginBean; -import com.akaxin.site.storage.service.PluginServiceDao; +import com.windchat.im.storage.api.IPluginDao; +import com.windchat.im.storage.bean.PluginBean; +import com.windchat.im.storage.service.PluginServiceDao; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java b/openzaly-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java index 22c8930..54d1cff 100755 --- a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java +++ b/openzaly-connector/src/main/java/com/akaxin/site/connector/session/SessionManager.java @@ -15,7 +15,7 @@ */ package com.akaxin.site.connector.session; -import com.akaxin.site.storage.bean.SimpleAuthBean; +import com.windchat.im.storage.bean.SimpleAuthBean; /** * 管理用户session,设置用户在线/离线状态。 diff --git a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java b/openzaly-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java index dad204a..41544df 100755 --- a/openzaly-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java +++ b/openzaly-connector/src/main/java/com/akaxin/site/connector/session/UserSession.java @@ -20,11 +20,11 @@ import java.sql.SQLException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserDeviceDao; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.bean.SimpleAuthBean; -import com.akaxin.site.storage.service.DeviceDaoService; -import com.akaxin.site.storage.service.UserSessionDaoService; +import com.windchat.im.storage.api.IUserDeviceDao; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.bean.SimpleAuthBean; +import com.windchat.im.storage.service.DeviceDaoService; +import com.windchat.im.storage.service.UserSessionDaoService; /** * 负责用户session表数据更新 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java b/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java index 756824d..796f1d6 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserFriendDao.java @@ -20,8 +20,8 @@ import java.sql.SQLException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserFriendDao; -import com.akaxin.site.storage.service.UserFriendDaoService; +import com.windchat.im.storage.api.IUserFriendDao; +import com.windchat.im.storage.service.UserFriendDaoService; /** * IM消息通信过程,判断用户之间的关系操作 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java b/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java index 67551e2..14ce93b 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserGroupDao.java @@ -21,12 +21,12 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IGroupDao; -import com.akaxin.site.storage.api.IUserGroupDao; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.service.GroupDaoService; -import com.akaxin.site.storage.service.UserGroupDaoService; +import com.windchat.im.storage.api.IGroupDao; +import com.windchat.im.storage.api.IUserGroupDao; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.service.GroupDaoService; +import com.windchat.im.storage.service.UserGroupDaoService; public class ImUserGroupDao { private static final Logger logger = LoggerFactory.getLogger(ImUserGroupDao.class); diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java b/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java index aff1e04..3e703a8 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserProfileDao.java @@ -21,11 +21,11 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserDeviceDao; -import com.akaxin.site.storage.api.IUserProfileDao; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.service.DeviceDaoService; -import com.akaxin.site.storage.service.UserProfileDaoService; +import com.windchat.im.storage.api.IUserDeviceDao; +import com.windchat.im.storage.api.IUserProfileDao; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.service.DeviceDaoService; +import com.windchat.im.storage.service.UserProfileDaoService; /** * diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java b/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java index 0b03866..23768a2 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/dao/ImUserSessionDao.java @@ -22,8 +22,8 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.service.UserSessionDaoService; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.service.UserSessionDaoService; public class ImUserSessionDao { private static final Logger logger = LoggerFactory.getLogger(ImUserSessionDao.class); diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java b/openzaly-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java index 3f9ec93..8b67141 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/dao/SessionDeviceDao.java @@ -22,8 +22,8 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.service.UserSessionDaoService; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.service.UserSessionDaoService; /** * diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java b/openzaly-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java index 2a3f656..753b437 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/dao/SiteConfigDao.java @@ -21,8 +21,8 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.api.ISiteConfigDao; -import com.akaxin.site.storage.service.SiteConfigDaoService; +import com.windchat.im.storage.api.ISiteConfigDao; +import com.windchat.im.storage.service.SiteConfigDaoService; /** * 站点配置相关操作 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java index c99207f..d2facfd 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupDetectionHandler.java @@ -26,8 +26,8 @@ import com.akaxin.proto.core.UserProto; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.dao.ImUserGroupDao; import com.akaxin.site.message.dao.ImUserProfileDao; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleUserBean; /** *diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java index 9e7ed62..cb1b14d 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 群图片消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java index 008a5c0..218488e 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageImageSecretHandler.java @@ -23,9 +23,9 @@ import com.akaxin.proto.client.ImStcMessageProto; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.core.CoreProto.MsgType; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; import io.netty.channel.Channel; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java index 99eea4a..43051be 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageNoticeHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 群通知消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java index 929d0e8..9552871 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 群文本消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java index 581de73..9c21d94 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageTextSecretHandler.java @@ -23,9 +23,9 @@ import com.akaxin.proto.client.ImStcMessageProto; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.core.CoreProto.MsgType; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; import io.netty.channel.Channel; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java index 40b132c..691e710 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 群语音消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java index 02fec74..39fb402 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageVoiceSecretHandler.java @@ -25,8 +25,8 @@ import com.akaxin.proto.client.ImStcMessageProto; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.core.CoreProto.MsgType; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.service.MessageDaoService; import io.netty.channel.Channel; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java index 4d82054..e6dd7bb 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebHandler.java @@ -23,9 +23,9 @@ import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.bean.WebBean; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 群web消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java index 93e0a28..f401061 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupMessageWebNoticeHandler.java @@ -23,9 +23,9 @@ import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.bean.WebBean; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 群web通知消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java index a66602b..9b85fe3 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPsnHandler.java @@ -29,8 +29,8 @@ import com.akaxin.common.constant.ErrorCode2; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.client.ImStcPsnProto; import com.akaxin.site.message.dao.ImUserSessionDao; -import com.akaxin.site.storage.api.IGroupDao; -import com.akaxin.site.storage.service.GroupDaoService; +import com.windchat.im.storage.api.IGroupDao; +import com.windchat.im.storage.service.GroupDaoService; public class GroupPsnHandler extends AbstractGroupHandler{ private static final Logger logger = LoggerFactory.getLogger(GroupPsnHandler.class); diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java index c4bce7d..f72b454 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/group/handler/GroupPushHandler.java @@ -35,9 +35,9 @@ import com.akaxin.site.message.dao.ImUserProfileDao; import com.akaxin.site.message.push.PushClient; import com.akaxin.site.message.threads.MultiPushThreadExecutor; import com.akaxin.site.message.utils.SiteConfigHelper; -import com.akaxin.site.storage.api.IGroupDao; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.service.GroupDaoService; +import com.windchat.im.storage.api.IGroupDao; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.service.GroupDaoService; import com.google.protobuf.ByteString; /** diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java index 305eb94..4845273 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncFinishHandler.java @@ -28,8 +28,8 @@ import com.akaxin.common.constant.ErrorCode2; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.client.ImStcPsnProto; import com.akaxin.proto.site.ImSyncFinishProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.service.MessageDaoService; /** * 客户端同步消息完成结束标志 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java index 988b5ae..68b02c7 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncGroupMessageHandler.java @@ -36,11 +36,11 @@ import com.akaxin.proto.core.CoreProto.MsgType; import com.akaxin.proto.site.ImSyncMessageProto; import com.akaxin.site.message.bean.WebBean; import com.akaxin.site.message.utils.NumUtils; -import com.akaxin.site.storage.api.IGroupDao; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.GroupDaoService; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IGroupDao; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.GroupDaoService; +import com.windchat.im.storage.service.MessageDaoService; import com.google.protobuf.ByteString; import io.netty.channel.Channel; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java index 31ce9f8..47e125e 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncMsgStatusHandler.java @@ -23,10 +23,10 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.site.ImSyncMsgStatusProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java index e76cd7d..318fe3a 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncNoticeHandler.java @@ -34,9 +34,9 @@ import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.core.CoreProto.MsgType; import com.akaxin.proto.site.ImSyncMessageProto; import com.akaxin.site.message.utils.NumUtils; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; import com.google.protobuf.ByteString; import io.netty.channel.Channel; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java index e5243f4..3a538ea 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/sync/handler/SyncU2MessageHandler.java @@ -37,9 +37,9 @@ import com.akaxin.proto.core.CoreProto.MsgType; import com.akaxin.proto.site.ImSyncMessageProto; import com.akaxin.site.message.bean.WebBean; import com.akaxin.site.message.utils.NumUtils; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; import com.google.protobuf.ByteString; import io.netty.channel.Channel; diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java index f75a059..bc2d90b 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 二人图片消息处理 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java index 55bcf9c..b577f58 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageImageSecretHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 加密二人图片 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java index 2b7844d..dfa36e5 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageNoticeHandler.java @@ -23,9 +23,9 @@ import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.group.handler.AbstractGroupHandler; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 二人通知消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java index 5bd2fee..3861496 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextHandler.java @@ -24,9 +24,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; import com.google.protobuf.ByteString; /** diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java index 93bc4c1..2b08953 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageTextSecretHandler.java @@ -24,9 +24,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; import com.google.protobuf.ByteString; /** diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java index f3de5cd..fbd696a 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 二人语音消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java index 22f7133..08d71c8 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageVoiceSecretHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * 二人加密语音 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java index bf1e201..25dace5 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebHandler.java @@ -23,9 +23,9 @@ import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.bean.WebBean; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; public class U2MessageWebHandler extends AbstractU2Handler { private static final Logger logger = LoggerFactory.getLogger(U2MessageWebHandler.class); diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java index 647b22e..244239e 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/U2MessageWebNoticeHandler.java @@ -23,9 +23,9 @@ import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.bean.WebBean; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.service.MessageDaoService; public class U2MessageWebNoticeHandler extends AbstractU2Handler { private static final Logger logger = LoggerFactory.getLogger(U2MessageWebNoticeHandler.class); diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java index e80f533..5bfdfcc 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserDetectionHandler.java @@ -26,7 +26,7 @@ import com.akaxin.proto.core.UserProto; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.dao.ImUserFriendDao; import com.akaxin.site.message.dao.ImUserProfileDao; -import com.akaxin.site.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserBean; /** * diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java index 4817b21..c527335 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/user2/handler/UserPushHandler.java @@ -35,7 +35,7 @@ import com.akaxin.site.message.dao.ImUserProfileDao; import com.akaxin.site.message.push.PushClient; import com.akaxin.site.message.threads.MultiPushThreadExecutor; import com.akaxin.site.message.utils.SiteConfigHelper; -import com.akaxin.site.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserBean; import com.google.protobuf.ByteString; public class UserPushHandler extends AbstractU2Handler{ diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java index f7377f0..3eb2927 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatReceiveMessageHandler.java @@ -22,9 +22,9 @@ import com.akaxin.common.command.Command; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.CoreProto; import com.akaxin.proto.site.ImCtsMessageProto; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.service.MessageDaoService; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.service.MessageDaoService; /** * web群聊文本消息 diff --git a/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java b/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java index 66bc85e..51084f1 100755 --- a/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java +++ b/openzaly-message/src/main/java/com/akaxin/site/message/web/chat/WebChatSendMessageHandler.java @@ -26,7 +26,7 @@ import com.akaxin.proto.core.UserProto; import com.akaxin.proto.site.ImCtsMessageProto; import com.akaxin.site.message.dao.ImUserFriendDao; import com.akaxin.site.message.dao.ImUserProfileDao; -import com.akaxin.site.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserBean; /** * web消息检测 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/DataSourceManager.java b/openzaly-storage/src/main/java/com/windchat/im/storage/DataSourceManager.java similarity index 83% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/DataSourceManager.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/DataSourceManager.java index f06ccb2..0e4b8a9 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/DataSourceManager.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/DataSourceManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage; +package com.windchat.im.storage; import java.io.File; import java.io.FileInputStream; @@ -27,19 +27,19 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.dao.config.DBConfig; -import com.akaxin.site.storage.dao.config.DBType; -import com.akaxin.site.storage.dao.config.JdbcConst; -import com.akaxin.site.storage.dao.config.PrepareSiteConfigData; -import com.akaxin.site.storage.dao.mysql.manager.MysqlManager; -import com.akaxin.site.storage.dao.sqlite.manager.SQLiteJDBCManager; -import com.akaxin.site.storage.dao.sqlite.manager.SQLiteUpgrade; -import com.akaxin.site.storage.exception.InitDatabaseException; -import com.akaxin.site.storage.exception.MigrateDatabaseException; -import com.akaxin.site.storage.exception.NeedInitMysqlException; -import com.akaxin.site.storage.exception.UpgradeDatabaseException; -import com.akaxin.site.storage.util.FileUtils; -import com.akaxin.site.storage.util.MigrateUtils; +import com.windchat.im.storage.dao.config.DBConfig; +import com.windchat.im.storage.dao.config.DBType; +import com.windchat.im.storage.dao.config.JdbcConst; +import com.windchat.im.storage.dao.config.PrepareSiteConfigData; +import com.windchat.im.storage.dao.mysql.manager.MysqlManager; +import com.windchat.im.storage.dao.sqlite.manager.SQLiteJDBCManager; +import com.windchat.im.storage.dao.sqlite.manager.SQLiteUpgrade; +import com.windchat.im.storage.exception.InitDatabaseException; +import com.windchat.im.storage.exception.MigrateDatabaseException; +import com.windchat.im.storage.exception.NeedInitMysqlException; +import com.windchat.im.storage.exception.UpgradeDatabaseException; +import com.windchat.im.storage.util.FileUtils; +import com.windchat.im.storage.util.MigrateUtils; /** * 数据源初始化管理,不做具体操作对外提供方法 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IFriendApplyDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IFriendApplyDao.java similarity index 81% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IFriendApplyDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IFriendApplyDao.java index e57ca74..0c8cac9 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IFriendApplyDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IFriendApplyDao.java @@ -1,10 +1,10 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.ApplyFriendBean; -import com.akaxin.site.storage.bean.ApplyUserBean; +import com.windchat.im.storage.bean.ApplyFriendBean; +import com.windchat.im.storage.bean.ApplyUserBean; public interface IFriendApplyDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IGroupDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupDao.java similarity index 90% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IGroupDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupDao.java index cb9ce4d..15b0981 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IGroupDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupDao.java @@ -1,12 +1,12 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.SimpleUserBean; public interface IGroupDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IGroupProfileDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupProfileDao.java similarity index 51% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IGroupProfileDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupProfileDao.java index 03285d0..a38c816 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IGroupProfileDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IGroupProfileDao.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; public interface IGroupProfileDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IMessageDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IMessageDao.java similarity index 92% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IMessageDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IMessageDao.java index 125b61c..86919f7 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IMessageDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IMessageDao.java @@ -1,10 +1,10 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.bean.U2MessageBean; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.bean.U2MessageBean; /** * 处理二人消息,群消息等 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IPluginDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IPluginDao.java similarity index 89% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IPluginDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IPluginDao.java index cabb785..79ad04e 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IPluginDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IPluginDao.java @@ -1,9 +1,9 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.PluginBean; +import com.windchat.im.storage.bean.PluginBean; public interface IPluginDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/ISiteConfigDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteConfigDao.java similarity index 90% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/ISiteConfigDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteConfigDao.java index ae8f2eb..92d3273 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/ISiteConfigDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteConfigDao.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.Map; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/ISiteUsersDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteUsersDao.java similarity index 82% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/ISiteUsersDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteUsersDao.java index d6db085..625eac0 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/ISiteUsersDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/ISiteUsersDao.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/ITokenDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/ITokenDao.java similarity index 75% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/ITokenDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/ITokenDao.java index c0b2fcd..70673af 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/ITokenDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/ITokenDao.java @@ -1,8 +1,8 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; -import com.akaxin.site.storage.bean.ExpireToken; +import com.windchat.im.storage.bean.ExpireToken; public interface ITokenDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUicDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUicDao.java similarity index 86% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUicDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IUicDao.java index 82eb180..bd46c83 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUicDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUicDao.java @@ -1,9 +1,9 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.UicBean; +import com.windchat.im.storage.bean.UicBean; public interface IUicDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserDeviceDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserDeviceDao.java similarity index 91% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserDeviceDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserDeviceDao.java index b60c487..e381194 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserDeviceDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserDeviceDao.java @@ -1,9 +1,9 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.UserDeviceBean; +import com.windchat.im.storage.bean.UserDeviceBean; public interface IUserDeviceDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserFriendDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserFriendDao.java similarity index 91% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserFriendDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserFriendDao.java index 376a097..f9d992f 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserFriendDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserFriendDao.java @@ -1,10 +1,10 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserFriendBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserFriendBean; public interface IUserFriendDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserGroupDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserGroupDao.java similarity index 87% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserGroupDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserGroupDao.java index 6bf696c..87fd778 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserGroupDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserGroupDao.java @@ -1,9 +1,9 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.UserGroupBean; +import com.windchat.im.storage.bean.UserGroupBean; public interface IUserGroupDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserProfileDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserProfileDao.java similarity index 88% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserProfileDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserProfileDao.java index f56b5a7..6119c89 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserProfileDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserProfileDao.java @@ -1,12 +1,12 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.SimpleUserRelationBean; -import com.akaxin.site.storage.bean.UserFriendBean; -import com.akaxin.site.storage.bean.UserProfileBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserRelationBean; +import com.windchat.im.storage.bean.UserFriendBean; +import com.windchat.im.storage.bean.UserProfileBean; public interface IUserProfileDao { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserSessionDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserSessionDao.java similarity index 80% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserSessionDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserSessionDao.java index 8affa09..b093144 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/api/IUserSessionDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/api/IUserSessionDao.java @@ -1,10 +1,10 @@ -package com.akaxin.site.storage.api; +package com.windchat.im.storage.api; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.bean.SimpleAuthBean; -import com.akaxin.site.storage.bean.UserSessionBean; +import com.windchat.im.storage.bean.SimpleAuthBean; +import com.windchat.im.storage.bean.UserSessionBean; public interface IUserSessionDao { public boolean saveUserSession(UserSessionBean bean) throws SQLException; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ApplyFriendBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java similarity index 95% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ApplyFriendBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java index 4cb973e..d41d5f5 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ApplyFriendBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyFriendBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ApplyUserBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyUserBean.java similarity index 91% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ApplyUserBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyUserBean.java index 993b410..4d8e545 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ApplyUserBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ApplyUserBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; public class ApplyUserBean extends SimpleUserBean { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ExpireToken.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ExpireToken.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java index 7669638..b5ade76 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/ExpireToken.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/ExpireToken.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupMemberBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMemberBean.java similarity index 87% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupMemberBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMemberBean.java index 3ea7dd2..6c6d2b7 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupMemberBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMemberBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; /** * 群成员bean diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupMessageBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupMessageBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java index c1137f2..a6218a4 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupMessageBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupMessageBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupProfileBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupProfileBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java index 79b2fde..44bb666 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/GroupProfileBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/GroupProfileBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/MonitorBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/MonitorBean.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/MonitorBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/MonitorBean.java index c976c39..7946cdc 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/MonitorBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/MonitorBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; public class MonitorBean { private int registerNum; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/PluginBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/PluginBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java index 52a8cf3..e8eac39 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/PluginBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/PluginBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleAuthBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java similarity index 92% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleAuthBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java index df57457..f5d38ab 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleAuthBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleAuthBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleGroupBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java similarity index 94% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleGroupBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java index 93cf5f6..d06db7b 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleGroupBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleGroupBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleUserBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleUserBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java index 5b58629..1b0371a 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleUserBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleUserRelationBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserRelationBean.java similarity index 93% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleUserRelationBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserRelationBean.java index b9ff228..4e6959a 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SimpleUserRelationBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SimpleUserRelationBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; /** * 当前用户siteUserId,与继承的用户userId,之间的用户关系 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SiteConfigBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SiteConfigBean.java similarity index 95% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SiteConfigBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/SiteConfigBean.java index d663fff..5d789e2 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/SiteConfigBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/SiteConfigBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; public class SiteConfigBean { private String siteIp; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/U2MessageBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/U2MessageBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java index 6b8e388..610ae01 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/U2MessageBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/U2MessageBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import org.apache.commons.lang3.StringUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UicBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UicBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java index 04b14d7..7572c4b 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UicBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UicBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserDeviceBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserDeviceBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java index 23e9f92..5e6b8f5 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserDeviceBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserDeviceBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserFriendBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java similarity index 89% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserFriendBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java index 441e818..23fa919 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserFriendBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserFriendBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserGroupBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserGroupBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java index 44f56ac..07ba135 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserGroupBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserGroupBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserProfileBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserProfileBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java index 52045ac..afa1beb 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserProfileBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserProfileBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import java.util.zip.CRC32; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserSessionBean.java b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java similarity index 96% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserSessionBean.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java index 1bf4c51..6f1d6eb 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/bean/UserSessionBean.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/bean/UserSessionBean.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.bean; +package com.windchat.im.storage.bean; import com.akaxin.common.utils.GsonUtils; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/connection/DatabaseConnection.java b/openzaly-storage/src/main/java/com/windchat/im/storage/connection/DatabaseConnection.java similarity index 91% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/connection/DatabaseConnection.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/connection/DatabaseConnection.java index efa13b1..3e3aeb3 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/connection/DatabaseConnection.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/connection/DatabaseConnection.java @@ -1,17 +1,16 @@ -package com.akaxin.site.storage.connection; +package com.windchat.im.storage.connection; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import com.windchat.im.storage.dao.config.DBType; +import com.windchat.im.storage.dao.mysql.manager.MysqlManager; +import com.windchat.im.storage.dao.sqlite.manager.SQLiteJDBCManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.dao.config.DBType; -import com.akaxin.site.storage.dao.mysql.manager.MysqlManager; -import com.akaxin.site.storage.dao.sqlite.manager.SQLiteJDBCManager; - /** * 根据项目使用的数据库类型,选择不同的Connection * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteConfigDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteConfigDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java index 17e4620..ff7f14d 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteConfigDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteConfigDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.proto.core.ConfigProto; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteFriendApplyDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java similarity index 96% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteFriendApplyDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java index ae52420..44ff74f 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteFriendApplyDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteFriendApplyDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -26,10 +26,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; -import com.akaxin.site.storage.bean.ApplyFriendBean; -import com.akaxin.site.storage.bean.ApplyUserBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.ApplyFriendBean; +import com.windchat.im.storage.bean.ApplyUserBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * 好友申请相关数据库操作 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteGroupMessageDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteGroupMessageDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java index e24eea3..5414ac5 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteGroupMessageDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupMessageDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -29,9 +29,9 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.StringHelper; import com.akaxin.common.utils.TimeFormats; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * 群消息数据库相关操作 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteGroupProfileDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteGroupProfileDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java index c6b6552..97ab192 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteGroupProfileDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteGroupProfileDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -31,11 +31,11 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.TimeFormats; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; -import com.akaxin.site.storage.util.SqlUtils; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; +import com.windchat.im.storage.util.SqlUtils; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SitePluginDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SitePluginDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java index 6de6a3c..1c549d5 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SitePluginDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SitePluginDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -22,14 +22,14 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import com.windchat.im.storage.dao.sql.SQLConst; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.StringHelper; -import com.akaxin.site.storage.bean.PluginBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.PluginBean; +import com.windchat.im.storage.connection.DatabaseConnection; /** * 站点扩展表相关数据操作 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteTokenDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java similarity index 95% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteTokenDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java index a1abbb1..4cb9812 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteTokenDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteTokenDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -24,9 +24,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; -import com.akaxin.site.storage.bean.ExpireToken; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.ExpireToken; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * 用户邀请码 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteU2MessageDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteU2MessageDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java index df5cd8c..9207600 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteU2MessageDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteU2MessageDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -29,9 +29,9 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.StringHelper; import com.akaxin.common.utils.TimeFormats; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUICDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java similarity index 96% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUICDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java index 996b4f5..918c8ca 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUICDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUICDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -27,10 +27,9 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.StringHelper; -import com.akaxin.site.storage.bean.UicBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; -import com.akaxin.site.storage.dao.sqlite.manager.SQLiteJDBCManager; +import com.windchat.im.storage.bean.UicBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * 用户邀请码 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserDeviceDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserDeviceDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java index a96d791..e9bcec9 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserDeviceDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserDeviceDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -27,9 +27,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; -import com.akaxin.site.storage.bean.UserDeviceBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.UserDeviceBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserFriendDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserFriendDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java index f8efc35..ccaab6b 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserFriendDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserFriendDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -28,10 +28,10 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.TimeFormats; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserFriendBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserFriendBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserGroupDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserGroupDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java index dcf5337..02a5751 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserGroupDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserGroupDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -29,12 +29,12 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.StringHelper; import com.akaxin.proto.core.GroupProto; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserGroupBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserGroupBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * 操作用户表 && 用户-群组表 相关 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserProfileDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserProfileDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java index cb69c63..049e18d 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserProfileDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserProfileDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -32,13 +32,13 @@ import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; import com.akaxin.common.utils.TimeFormats; import com.akaxin.proto.core.UserProto; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.SimpleUserRelationBean; -import com.akaxin.site.storage.bean.UserFriendBean; -import com.akaxin.site.storage.bean.UserProfileBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; -import com.akaxin.site.storage.util.SqlUtils; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserRelationBean; +import com.windchat.im.storage.bean.UserFriendBean; +import com.windchat.im.storage.bean.UserProfileBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; +import com.windchat.im.storage.util.SqlUtils; /** * 用户个人资料表(db_table:site_user_profile)相关操作 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserSessionDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java similarity index 96% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserSessionDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java index e51d1c2..55d77b5 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUserSessionDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUserSessionDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -26,10 +26,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; -import com.akaxin.site.storage.bean.SimpleAuthBean; -import com.akaxin.site.storage.bean.UserSessionBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.bean.SimpleAuthBean; +import com.windchat.im.storage.bean.UserSessionBean; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * session 只从主库中获取session,不做主从分离 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUsersDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java similarity index 93% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUsersDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java index 7a05e32..e492bda 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/SiteUsersDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/SiteUsersDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao; +package com.windchat.im.storage.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -26,8 +26,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.common.logs.LogUtils; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.dao.sql.SQLConst; /** * 获取站点所有用户 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/DBConfig.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java similarity index 98% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/DBConfig.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java index 8f07d3d..60ff61a 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/DBConfig.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao.config; +package com.windchat.im.storage.dao.config; import java.util.HashMap; import java.util.Map; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/DBType.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBType.java similarity index 90% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/DBType.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBType.java index 7fc7546..4026420 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/DBType.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/DBType.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.dao.config; +package com.windchat.im.storage.dao.config; public enum DBType { PERSONAL(1, "personal"), // sqlite diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/JdbcConst.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/JdbcConst.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/JdbcConst.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/JdbcConst.java index b409732..cf4694b 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/JdbcConst.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/JdbcConst.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.dao.config; +package com.windchat.im.storage.dao.config; /** * 数据库配置中的KEY diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/PrepareSiteConfigData.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/PrepareSiteConfigData.java similarity index 94% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/PrepareSiteConfigData.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/PrepareSiteConfigData.java index 204ffcc..3cdd291 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/config/PrepareSiteConfigData.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/config/PrepareSiteConfigData.java @@ -1,21 +1,21 @@ -package com.akaxin.site.storage.dao.config; +package com.windchat.im.storage.dao.config; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Map; +import com.windchat.im.storage.dao.SiteConfigDao; +import com.windchat.im.storage.dao.SiteUICDao; +import com.windchat.im.storage.dao.sqlite.manager.PluginArgs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.proto.core.ConfigProto; import com.akaxin.proto.core.PluginProto; import com.akaxin.proto.core.UicProto; -import com.akaxin.site.storage.bean.UicBean; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.SiteConfigDao; -import com.akaxin.site.storage.dao.SiteUICDao; -import com.akaxin.site.storage.dao.sqlite.manager.PluginArgs; +import com.windchat.im.storage.bean.UicBean; +import com.windchat.im.storage.connection.DatabaseConnection; /** * 初始化数据库以后,完成初始化站点配置工作 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/AbstractPoolManager.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/AbstractPoolManager.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/AbstractPoolManager.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/AbstractPoolManager.java index 3ea60bb..bbe201b 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/AbstractPoolManager.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/AbstractPoolManager.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.dao.mysql.manager; +package com.windchat.im.storage.dao.mysql.manager; import java.sql.SQLException; import java.util.ArrayList; @@ -7,8 +7,8 @@ import java.util.Properties; import org.apache.commons.lang3.StringUtils; -import com.akaxin.site.storage.dao.config.JdbcConst; -import com.akaxin.site.storage.util.SqlLog; +import com.windchat.im.storage.dao.config.JdbcConst; +import com.windchat.im.storage.util.SqlLog; /** * C3P0 连接池塘,公共类 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/C3P0PoolManager.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolManager.java similarity index 90% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/C3P0PoolManager.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolManager.java index 68fac5e..680225b 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/C3P0PoolManager.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolManager.java @@ -1,10 +1,10 @@ -package com.akaxin.site.storage.dao.mysql.manager; +package com.windchat.im.storage.dao.mysql.manager; import java.sql.SQLException; import java.util.Properties; -import com.akaxin.site.storage.dao.config.JdbcConst; -import com.akaxin.site.storage.util.SqlLog; +import com.windchat.im.storage.dao.config.JdbcConst; +import com.windchat.im.storage.util.SqlLog; import com.mchange.v2.c3p0.ComboPooledDataSource; /** diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/C3P0PoolSlaveManager.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolSlaveManager.java similarity index 94% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/C3P0PoolSlaveManager.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolSlaveManager.java index b6082de..6bf30a5 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/C3P0PoolSlaveManager.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/C3P0PoolSlaveManager.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.dao.mysql.manager; +package com.windchat.im.storage.dao.mysql.manager; import java.sql.SQLException; import java.util.ArrayList; @@ -8,8 +8,8 @@ import java.util.Properties; import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.StringUtils; -import com.akaxin.site.storage.dao.config.JdbcConst; -import com.akaxin.site.storage.util.SqlLog; +import com.windchat.im.storage.dao.config.JdbcConst; +import com.windchat.im.storage.util.SqlLog; import com.mchange.v2.c3p0.ComboPooledDataSource; /** diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/InitDatabaseConnection.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/InitDatabaseConnection.java similarity index 94% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/InitDatabaseConnection.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/InitDatabaseConnection.java index 95c7cdf..95a2728 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/InitDatabaseConnection.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/InitDatabaseConnection.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.dao.mysql.manager; +package com.windchat.im.storage.dao.mysql.manager; import java.io.File; import java.io.FileNotFoundException; @@ -12,9 +12,9 @@ import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.support.EncodedResource; import org.springframework.jdbc.datasource.init.ScriptUtils; -import com.akaxin.site.storage.dao.config.JdbcConst; -import com.akaxin.site.storage.util.FileUtils; -import com.akaxin.site.storage.util.SqlLog; +import com.windchat.im.storage.dao.config.JdbcConst; +import com.windchat.im.storage.util.FileUtils; +import com.windchat.im.storage.util.SqlLog; /** * 启动mysql的情形下,需要获取一个连接建数据库,建表操作,只有在初始化数据库情况下才使用 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/MysqlManager.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/MysqlManager.java similarity index 87% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/MysqlManager.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/MysqlManager.java index 058dbaa..32d9d88 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/mysql/manager/MysqlManager.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/mysql/manager/MysqlManager.java @@ -1,11 +1,11 @@ -package com.akaxin.site.storage.dao.mysql.manager; +package com.windchat.im.storage.dao.mysql.manager; import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; -import com.akaxin.site.storage.exception.InitDatabaseException; -import com.akaxin.site.storage.exception.NeedInitMysqlException; +import com.windchat.im.storage.exception.InitDatabaseException; +import com.windchat.im.storage.exception.NeedInitMysqlException; /** * Mysql 连接器管理 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sql/SQLConst.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sql/SQLConst.java similarity index 96% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sql/SQLConst.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/sql/SQLConst.java index 0e0f25a..231a57e 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sql/SQLConst.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sql/SQLConst.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.dao.sql; +package com.windchat.im.storage.dao.sql; /** * SQLite中的表以及建表的SQL语句 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/PluginArgs.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/PluginArgs.java similarity index 82% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/PluginArgs.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/PluginArgs.java index 8df022a..b83b625 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/PluginArgs.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/PluginArgs.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.dao.sqlite.manager; +package com.windchat.im.storage.dao.sqlite.manager; public interface PluginArgs { public String SITE_ADMIN_NAME = "管理后台"; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteJDBCManager.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteJDBCManager.java similarity index 96% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteJDBCManager.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteJDBCManager.java index da007a8..f4263dc 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteJDBCManager.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteJDBCManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.dao.sqlite.manager; +package com.windchat.im.storage.dao.sqlite.manager; import java.sql.Connection; import java.sql.DriverManager; @@ -21,13 +21,13 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import com.windchat.im.storage.dao.config.DBConfig; +import com.windchat.im.storage.dao.sql.SQLConst; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.dao.config.DBConfig; -import com.akaxin.site.storage.dao.sql.SQLConst; -import com.akaxin.site.storage.exception.UpgradeDatabaseException; +import com.windchat.im.storage.exception.UpgradeDatabaseException; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteUnique.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUnique.java similarity index 94% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteUnique.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUnique.java index d3793e1..55fed94 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteUnique.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUnique.java @@ -1,14 +1,14 @@ -package com.akaxin.site.storage.dao.sqlite.manager; +package com.windchat.im.storage.dao.sqlite.manager; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import com.windchat.im.storage.dao.sql.SQLConst; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.sql.SQLConst; +import com.windchat.im.storage.connection.DatabaseConnection; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteUpgrade.java b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUpgrade.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteUpgrade.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUpgrade.java index d509b6f..dc7ce68 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/dao/sqlite/manager/SQLiteUpgrade.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/dao/sqlite/manager/SQLiteUpgrade.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.dao.sqlite.manager; +package com.windchat.im.storage.dao.sqlite.manager; import java.io.BufferedInputStream; import java.io.File; @@ -14,6 +14,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.windchat.im.storage.dao.config.DBConfig; +import com.windchat.im.storage.dao.sql.SQLConst; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,11 +23,9 @@ import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.support.EncodedResource; import org.springframework.jdbc.datasource.init.ScriptUtils; -import com.akaxin.site.storage.dao.config.DBConfig; -import com.akaxin.site.storage.dao.sql.SQLConst; -import com.akaxin.site.storage.exception.UpgradeDatabaseException; -import com.akaxin.site.storage.util.FileUtils; -import com.akaxin.site.storage.util.SqlLog; +import com.windchat.im.storage.exception.UpgradeDatabaseException; +import com.windchat.im.storage.util.FileUtils; +import com.windchat.im.storage.util.SqlLog; /** * sqlite 数据库升级 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/exception/InitDatabaseException.java b/openzaly-storage/src/main/java/com/windchat/im/storage/exception/InitDatabaseException.java similarity index 87% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/exception/InitDatabaseException.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/exception/InitDatabaseException.java index 802837b..ec69efc 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/exception/InitDatabaseException.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/exception/InitDatabaseException.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.exception; +package com.windchat.im.storage.exception; public class InitDatabaseException extends Throwable { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/exception/MigrateDatabaseException.java b/openzaly-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java similarity index 92% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/exception/MigrateDatabaseException.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java index 5842c02..27a8aa9 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/exception/MigrateDatabaseException.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/exception/MigrateDatabaseException.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.exception; +package com.windchat.im.storage.exception; import com.akaxin.common.utils.StringHelper; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/exception/NeedInitMysqlException.java b/openzaly-storage/src/main/java/com/windchat/im/storage/exception/NeedInitMysqlException.java similarity index 87% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/exception/NeedInitMysqlException.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/exception/NeedInitMysqlException.java index 08278c4..23995ad 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/exception/NeedInitMysqlException.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/exception/NeedInitMysqlException.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.exception; +package com.windchat.im.storage.exception; public class NeedInitMysqlException extends Throwable { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/exception/UpgradeDatabaseException.java b/openzaly-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java similarity index 93% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/exception/UpgradeDatabaseException.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java index d25d185..6781d26 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/exception/UpgradeDatabaseException.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/exception/UpgradeDatabaseException.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.exception; +package com.windchat.im.storage.exception; import com.akaxin.common.utils.StringHelper; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/DeviceDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/DeviceDaoService.java similarity index 93% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/DeviceDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/DeviceDaoService.java index bfef962..42c1aeb 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/DeviceDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/DeviceDaoService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IUserDeviceDao; -import com.akaxin.site.storage.bean.UserDeviceBean; -import com.akaxin.site.storage.dao.SiteUserDeviceDao; +import com.windchat.im.storage.api.IUserDeviceDao; +import com.windchat.im.storage.bean.UserDeviceBean; +import com.windchat.im.storage.dao.SiteUserDeviceDao; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/FriendApplyDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/FriendApplyDaoService.java similarity index 88% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/FriendApplyDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/FriendApplyDaoService.java index e4753c5..1a4eddd 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/FriendApplyDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/FriendApplyDaoService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IFriendApplyDao; -import com.akaxin.site.storage.bean.ApplyFriendBean; -import com.akaxin.site.storage.bean.ApplyUserBean; -import com.akaxin.site.storage.dao.SiteFriendApplyDao; +import com.windchat.im.storage.api.IFriendApplyDao; +import com.windchat.im.storage.bean.ApplyFriendBean; +import com.windchat.im.storage.bean.ApplyUserBean; +import com.windchat.im.storage.dao.SiteFriendApplyDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/GroupDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/GroupDaoService.java similarity index 91% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/GroupDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/GroupDaoService.java index a797635..7d00562 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/GroupDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/GroupDaoService.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IGroupDao; -import com.akaxin.site.storage.bean.GroupMemberBean; -import com.akaxin.site.storage.bean.GroupProfileBean; -import com.akaxin.site.storage.bean.SimpleGroupBean; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.dao.SiteGroupProfileDao; -import com.akaxin.site.storage.dao.SiteUserGroupDao; +import com.windchat.im.storage.api.IGroupDao; +import com.windchat.im.storage.bean.GroupMemberBean; +import com.windchat.im.storage.bean.GroupProfileBean; +import com.windchat.im.storage.bean.SimpleGroupBean; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.dao.SiteGroupProfileDao; +import com.windchat.im.storage.dao.SiteUserGroupDao; /** * @@ -90,7 +90,7 @@ public class GroupDaoService implements IGroupDao { @Override public ListgetUserFriendNonGroupMemberList(String siteUserId, String groupId, int pageNum, - int pageSize) throws SQLException { + int pageSize) throws SQLException { return SiteUserGroupDao.getInstance().queryUserFriendNonGroupMemberList(siteUserId, groupId, pageNum, pageSize); } diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/MessageDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/MessageDaoService.java similarity index 93% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/MessageDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/MessageDaoService.java index 67ee43f..3bfa2de 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/MessageDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/MessageDaoService.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.akaxin.site.storage.api.IMessageDao; -import com.akaxin.site.storage.bean.GroupMessageBean; -import com.akaxin.site.storage.bean.U2MessageBean; -import com.akaxin.site.storage.dao.SiteGroupMessageDao; -import com.akaxin.site.storage.dao.SiteU2MessageDao; +import com.windchat.im.storage.api.IMessageDao; +import com.windchat.im.storage.bean.GroupMessageBean; +import com.windchat.im.storage.bean.U2MessageBean; +import com.windchat.im.storage.dao.SiteGroupMessageDao; +import com.windchat.im.storage.dao.SiteU2MessageDao; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/PluginServiceDao.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/PluginServiceDao.java similarity index 92% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/PluginServiceDao.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/PluginServiceDao.java index 341fef6..c2f1f84 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/PluginServiceDao.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/PluginServiceDao.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IPluginDao; -import com.akaxin.site.storage.bean.PluginBean; -import com.akaxin.site.storage.dao.SitePluginDao; +import com.windchat.im.storage.api.IPluginDao; +import com.windchat.im.storage.bean.PluginBean; +import com.windchat.im.storage.dao.SitePluginDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/SiteConfigDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteConfigDaoService.java similarity index 89% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/SiteConfigDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteConfigDaoService.java index c6561cc..be93037 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/SiteConfigDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteConfigDaoService.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; -import java.util.List; import java.util.Map; -import com.akaxin.site.storage.api.ISiteConfigDao; -import com.akaxin.site.storage.dao.SiteConfigDao; +import com.windchat.im.storage.api.ISiteConfigDao; +import com.windchat.im.storage.dao.SiteConfigDao; /** * @author Sam{@link an.guoyue254@gmail.com} diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/SiteUsersDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteUsersDaoService.java similarity index 87% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/SiteUsersDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteUsersDaoService.java index cb54d8a..fe6bbb0 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/SiteUsersDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/SiteUsersDaoService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.ISiteUsersDao; -import com.akaxin.site.storage.dao.SiteUsersDao; +import com.windchat.im.storage.api.ISiteUsersDao; +import com.windchat.im.storage.dao.SiteUsersDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/TokenDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/TokenDaoService.java similarity index 86% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/TokenDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/TokenDaoService.java index 2788a1e..5738661 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/TokenDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/TokenDaoService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; -import com.akaxin.site.storage.api.ITokenDao; -import com.akaxin.site.storage.bean.ExpireToken; -import com.akaxin.site.storage.dao.SiteTokenDao; +import com.windchat.im.storage.api.ITokenDao; +import com.windchat.im.storage.bean.ExpireToken; +import com.windchat.im.storage.dao.SiteTokenDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UicDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UicDaoService.java similarity index 90% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/UicDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/UicDaoService.java index 4a4f545..3d2d393 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UicDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UicDaoService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IUicDao; -import com.akaxin.site.storage.bean.UicBean; -import com.akaxin.site.storage.dao.SiteUICDao; +import com.windchat.im.storage.api.IUicDao; +import com.windchat.im.storage.bean.UicBean; +import com.windchat.im.storage.dao.SiteUICDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserFriendDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserFriendDaoService.java similarity index 93% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserFriendDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/UserFriendDaoService.java index 82bd77a..bd85247 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserFriendDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserFriendDaoService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IUserFriendDao; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.UserFriendBean; -import com.akaxin.site.storage.dao.SiteUserFriendDao; +import com.windchat.im.storage.api.IUserFriendDao; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.UserFriendBean; +import com.windchat.im.storage.dao.SiteUserFriendDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserGroupDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserGroupDaoService.java similarity index 88% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserGroupDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/UserGroupDaoService.java index bda8828..7f9346a 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserGroupDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserGroupDaoService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IUserGroupDao; -import com.akaxin.site.storage.bean.UserGroupBean; -import com.akaxin.site.storage.dao.SiteGroupMessageDao; -import com.akaxin.site.storage.dao.SiteUserGroupDao; +import com.windchat.im.storage.api.IUserGroupDao; +import com.windchat.im.storage.bean.UserGroupBean; +import com.windchat.im.storage.dao.SiteGroupMessageDao; +import com.windchat.im.storage.dao.SiteUserGroupDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserProfileDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserProfileDaoService.java similarity index 93% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserProfileDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/UserProfileDaoService.java index 89e010e..bb29790 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserProfileDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserProfileDaoService.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IUserProfileDao; -import com.akaxin.site.storage.bean.SimpleUserBean; -import com.akaxin.site.storage.bean.SimpleUserRelationBean; -import com.akaxin.site.storage.bean.UserFriendBean; -import com.akaxin.site.storage.bean.UserProfileBean; -import com.akaxin.site.storage.dao.SiteUserProfileDao; +import com.windchat.im.storage.api.IUserProfileDao; +import com.windchat.im.storage.bean.SimpleUserBean; +import com.windchat.im.storage.bean.SimpleUserRelationBean; +import com.windchat.im.storage.bean.UserFriendBean; +import com.windchat.im.storage.bean.UserProfileBean; +import com.windchat.im.storage.dao.SiteUserProfileDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserSessionDaoService.java b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserSessionDaoService.java similarity index 88% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserSessionDaoService.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/service/UserSessionDaoService.java index 2a1cfcc..2d748c4 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/service/UserSessionDaoService.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/service/UserSessionDaoService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.akaxin.site.storage.service; +package com.windchat.im.storage.service; import java.sql.SQLException; import java.util.List; -import com.akaxin.site.storage.api.IUserSessionDao; -import com.akaxin.site.storage.bean.SimpleAuthBean; -import com.akaxin.site.storage.bean.UserSessionBean; -import com.akaxin.site.storage.dao.SiteUserSessionDao; +import com.windchat.im.storage.api.IUserSessionDao; +import com.windchat.im.storage.bean.SimpleAuthBean; +import com.windchat.im.storage.bean.UserSessionBean; +import com.windchat.im.storage.dao.SiteUserSessionDao; /** * diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/util/FileUtils.java b/openzaly-storage/src/main/java/com/windchat/im/storage/util/FileUtils.java similarity index 89% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/util/FileUtils.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/util/FileUtils.java index fc6df8c..e323be7 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/util/FileUtils.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.util; +package com.windchat.im.storage.util; import java.io.BufferedInputStream; import java.io.File; @@ -7,7 +7,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import com.akaxin.site.storage.dao.mysql.manager.MysqlManager; +import com.windchat.im.storage.dao.mysql.manager.MysqlManager; public class FileUtils { diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/util/MigrateUtils.java b/openzaly-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java similarity index 96% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/util/MigrateUtils.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java index 9f015b8..70db9ec 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/util/MigrateUtils.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/util/MigrateUtils.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.util; +package com.windchat.im.storage.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -8,19 +8,19 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; +import com.windchat.im.storage.dao.config.JdbcConst; +import com.windchat.im.storage.dao.mysql.manager.InitDatabaseConnection; +import com.windchat.im.storage.dao.mysql.manager.MysqlManager; +import com.windchat.im.storage.dao.sqlite.manager.SQLiteJDBCManager; +import com.windchat.im.storage.dao.sqlite.manager.SQLiteUnique; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.akaxin.common.utils.PrintUtils; -import com.akaxin.site.storage.connection.DatabaseConnection; -import com.akaxin.site.storage.dao.config.JdbcConst; -import com.akaxin.site.storage.dao.mysql.manager.InitDatabaseConnection; -import com.akaxin.site.storage.dao.mysql.manager.MysqlManager; -import com.akaxin.site.storage.dao.sqlite.manager.SQLiteJDBCManager; -import com.akaxin.site.storage.dao.sqlite.manager.SQLiteUnique; -import com.akaxin.site.storage.exception.MigrateDatabaseException; -import com.akaxin.site.storage.exception.NeedInitMysqlException; +import com.windchat.im.storage.connection.DatabaseConnection; +import com.windchat.im.storage.exception.MigrateDatabaseException; +import com.windchat.im.storage.exception.NeedInitMysqlException; /** * 数据库迁移工具,将sqlite中数据迁移到mysql中 diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/util/SqlLog.java b/openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlLog.java similarity index 94% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/util/SqlLog.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlLog.java index dbc6796..f1d32bd 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/util/SqlLog.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlLog.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.util; +package com.windchat.im.storage.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openzaly-storage/src/main/java/com/akaxin/site/storage/util/SqlUtils.java b/openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlUtils.java similarity index 97% rename from openzaly-storage/src/main/java/com/akaxin/site/storage/util/SqlUtils.java rename to openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlUtils.java index d1796e3..7c043f0 100755 --- a/openzaly-storage/src/main/java/com/akaxin/site/storage/util/SqlUtils.java +++ b/openzaly-storage/src/main/java/com/windchat/im/storage/util/SqlUtils.java @@ -1,4 +1,4 @@ -package com.akaxin.site.storage.util; +package com.windchat.im.storage.util; import java.util.HashMap; import java.util.Map;