fix com.windchat.im package name
This commit is contained in:
parent
e9656176ba
commit
82ad102648
@ -17,9 +17,9 @@ package com.windchat.im.web.admin.controller;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
|
|
||||||
public class AbstractController {
|
public class AbstractController {
|
||||||
|
|
||||||
|
@ -34,12 +34,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
import com.akaxin.common.logs.AkxLog4jManager;
|
import com.windchat.common.logs.AkxLog4jManager;
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
import com.akaxin.proto.core.ConfigProto;
|
import com.akaxin.proto.core.ConfigProto;
|
||||||
import com.akaxin.proto.core.ConfigProto.ConfigKey;
|
import com.akaxin.proto.core.ConfigProto.ConfigKey;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.web.admin.exception.UserPermissionException;
|
import com.windchat.im.web.admin.exception.UserPermissionException;
|
||||||
import com.google.protobuf.InvalidProtocolBufferException;
|
import com.google.protobuf.InvalidProtocolBufferException;
|
||||||
|
|
||||||
|
@ -36,9 +36,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.windchat.im.storage.bean.GroupMemberBean;
|
import com.windchat.im.storage.bean.GroupMemberBean;
|
||||||
import com.windchat.im.storage.bean.GroupProfileBean;
|
import com.windchat.im.storage.bean.GroupProfileBean;
|
||||||
import com.windchat.im.storage.bean.SimpleGroupBean;
|
import com.windchat.im.storage.bean.SimpleGroupBean;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.windchat.im.web.admin.controller;
|
package com.windchat.im.web.admin.controller;
|
||||||
|
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.windchat.im.storage.bean.MonitorBean;
|
import com.windchat.im.storage.bean.MonitorBean;
|
||||||
import com.windchat.im.web.admin.common.Timeutils;
|
import com.windchat.im.web.admin.common.Timeutils;
|
||||||
|
@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.windchat.im.storage.bean.PluginBean;
|
import com.windchat.im.storage.bean.PluginBean;
|
||||||
import com.google.protobuf.InvalidProtocolBufferException;
|
import com.google.protobuf.InvalidProtocolBufferException;
|
||||||
|
@ -35,9 +35,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.storage.bean.UicBean;
|
import com.windchat.im.storage.bean.UicBean;
|
||||||
|
|
||||||
//邀请码管理
|
//邀请码管理
|
||||||
|
@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.akaxin.proto.core.UserProto.UserStatus;
|
import com.akaxin.proto.core.UserProto.UserStatus;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
|
@ -19,12 +19,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.site.business.dao.UserFriendDao;
|
import com.windchat.im.business.dao.UserFriendDao;
|
||||||
import com.akaxin.site.business.impl.notice.User2Notice;
|
import com.windchat.im.business.impl.notice.User2Notice;
|
||||||
import com.akaxin.site.business.push.PushNotification;
|
import com.windchat.im.business.push.PushNotification;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
import com.windchat.im.storage.bean.UserProfileBean;
|
import com.windchat.im.storage.bean.UserProfileBean;
|
||||||
import com.google.protobuf.InvalidProtocolBufferException;
|
import com.google.protobuf.InvalidProtocolBufferException;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.windchat.im.web.admin.exception;
|
package com.windchat.im.web.admin.exception;
|
||||||
|
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
|
|
||||||
public class ManagerException extends Throwable {
|
public class ManagerException extends Throwable {
|
||||||
/**
|
/**
|
||||||
|
@ -25,8 +25,8 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.akaxin.site.business.dao.SiteConfigDao;
|
import com.windchat.im.business.dao.SiteConfigDao;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.web.utils.ArraysUtils;
|
import com.windchat.im.web.utils.ArraysUtils;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
@ -21,8 +21,8 @@ import java.util.Set;
|
|||||||
import com.windchat.im.web.admin.service.IGroupService;
|
import com.windchat.im.web.admin.service.IGroupService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.akaxin.site.business.dao.UserGroupDao;
|
import com.windchat.im.business.dao.UserGroupDao;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.storage.bean.GroupMemberBean;
|
import com.windchat.im.storage.bean.GroupMemberBean;
|
||||||
import com.windchat.im.storage.bean.GroupProfileBean;
|
import com.windchat.im.storage.bean.GroupProfileBean;
|
||||||
import com.windchat.im.storage.bean.SimpleGroupBean;
|
import com.windchat.im.storage.bean.SimpleGroupBean;
|
||||||
|
@ -6,13 +6,13 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.CoreProto.MsgType;
|
import com.akaxin.proto.core.CoreProto.MsgType;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto;
|
import com.akaxin.proto.site.ImCtsMessageProto;
|
||||||
import com.akaxin.site.message.api.IMessageService;
|
import com.windchat.im.message.api.IMessageService;
|
||||||
import com.akaxin.site.message.service.ImMessageService;
|
import com.windchat.im.message.service.ImMessageService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 后台管理发送消息实现
|
* 后台管理发送消息实现
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.windchat.im.web.admin.service.impl;
|
package com.windchat.im.web.admin.service.impl;
|
||||||
|
|
||||||
import com.akaxin.site.business.dao.MonitorDao;
|
import com.windchat.im.business.dao.MonitorDao;
|
||||||
import com.windchat.im.web.admin.service.IMonitorService;
|
import com.windchat.im.web.admin.service.IMonitorService;
|
||||||
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
@ -20,7 +20,7 @@ import java.util.List;
|
|||||||
import com.windchat.im.web.admin.service.IPluginService;
|
import com.windchat.im.web.admin.service.IPluginService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.akaxin.site.business.dao.SitePluginDao;
|
import com.windchat.im.business.dao.SitePluginDao;
|
||||||
import com.windchat.im.storage.bean.PluginBean;
|
import com.windchat.im.storage.bean.PluginBean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.akaxin.proto.core.UicProto.UicStatus;
|
import com.akaxin.proto.core.UicProto.UicStatus;
|
||||||
import com.akaxin.site.business.dao.SiteUicDao;
|
import com.windchat.im.business.dao.SiteUicDao;
|
||||||
import com.windchat.im.storage.bean.UicBean;
|
import com.windchat.im.storage.bean.UicBean;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
@ -27,10 +27,10 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.akaxin.site.business.dao.UserGroupDao;
|
import com.windchat.im.business.dao.UserGroupDao;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.akaxin.site.business.utils.FilePathUtils;
|
import com.windchat.im.business.utils.FilePathUtils;
|
||||||
import com.windchat.im.storage.api.IGroupDao;
|
import com.windchat.im.storage.api.IGroupDao;
|
||||||
import com.windchat.im.storage.api.IMessageDao;
|
import com.windchat.im.storage.api.IMessageDao;
|
||||||
import com.windchat.im.storage.api.IUserDeviceDao;
|
import com.windchat.im.storage.api.IUserDeviceDao;
|
||||||
|
@ -6,11 +6,11 @@ import java.util.concurrent.TimeUnit;
|
|||||||
|
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.log4j.Logger;
|
||||||
|
|
||||||
import com.akaxin.common.logs.LogCreater;
|
import com.windchat.common.logs.LogCreater;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.ConfigProto;
|
import com.akaxin.proto.core.ConfigProto;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.akaxin.site.message.utils.SiteConfigHelper;
|
import com.windchat.im.message.utils.SiteConfigHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 站点配置监听器,定时更新缓存中数据
|
* 站点配置监听器,定时更新缓存中数据
|
||||||
|
@ -27,21 +27,21 @@ import com.windchat.im.boot.utils.Helper;
|
|||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.log4j.Level;
|
import org.apache.log4j.Level;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.HttpUriAction;
|
import com.windchat.common.constant.HttpUriAction;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.common.executor.AbstracteExecutor;
|
import com.windchat.common.executor.AbstracteExecutor;
|
||||||
import com.akaxin.common.logs.AkxLog4jManager;
|
import com.windchat.common.logs.AkxLog4jManager;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.FileProto.FileType;
|
import com.akaxin.proto.core.FileProto.FileType;
|
||||||
import com.windchat.im.boot.config.AkxProject;
|
import com.windchat.im.boot.config.AkxProject;
|
||||||
import com.windchat.im.boot.config.ConfigHelper;
|
import com.windchat.im.boot.config.ConfigHelper;
|
||||||
import com.windchat.im.boot.config.ConfigKey;
|
import com.windchat.im.boot.config.ConfigKey;
|
||||||
import com.windchat.im.boot.config.ConfigListener;
|
import com.windchat.im.boot.config.ConfigListener;
|
||||||
import com.windchat.im.boot.config.SiteDefaultIcon;
|
import com.windchat.im.boot.config.SiteDefaultIcon;
|
||||||
import com.akaxin.site.business.utils.FilePathUtils;
|
import com.windchat.im.business.utils.FilePathUtils;
|
||||||
import com.akaxin.site.business.utils.FileServerUtils;
|
import com.windchat.im.business.utils.FileServerUtils;
|
||||||
import com.windchat.im.connector.exception.HttpServerException;
|
import com.windchat.im.connector.exception.HttpServerException;
|
||||||
import com.windchat.im.connector.exception.TcpServerException;
|
import com.windchat.im.connector.exception.TcpServerException;
|
||||||
import com.windchat.im.connector.handler.ApiRequestHandler;
|
import com.windchat.im.connector.handler.ApiRequestHandler;
|
||||||
|
@ -24,14 +24,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|||||||
* openzaly支持springboot框架,在启动main中会同样启动springboot
|
* openzaly支持springboot框架,在启动main中会同样启动springboot
|
||||||
*
|
*
|
||||||
* 在maven modules中,springboot会存在启动main中扫描不到其他modules中的package,两种方法解决:
|
* 在maven modules中,springboot会存在启动main中扫描不到其他modules中的package,两种方法解决:
|
||||||
* 其一:@SpringBootApplication(scanBasePackages={"com.akaxin.site.*"})
|
* 其一:@SpringBootApplication(scanBasePackages={"com.windchat.im.*"})
|
||||||
* 其二:SpringApplication.run(Class<?>...clazzs ,args),clazzs 把需要加载的主类添加上
|
* 其二:SpringApplication.run(Class<?>...clazzs ,args),clazzs 把需要加载的主类添加上
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* @author Sam{@link an.guoyue254@gmail.com}
|
* @author Sam{@link an.guoyue254@gmail.com}
|
||||||
* @since 2018-06-05 19:25:55
|
* @since 2018-06-05 19:25:55
|
||||||
*/
|
*/
|
||||||
@SpringBootApplication(scanBasePackages = { "com.akaxin.site.*" })
|
@SpringBootApplication(scanBasePackages = { "com.windchat.im.*" })
|
||||||
public class OpenzalySpringBoot {
|
public class OpenzalySpringBoot {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
@ -17,8 +17,8 @@ import org.apache.commons.cli.ParseException;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.utils.PrintUtils;
|
import com.windchat.common.utils.PrintUtils;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.windchat.im.storage.DataSourceManager;
|
import com.windchat.im.storage.DataSourceManager;
|
||||||
import com.windchat.im.storage.dao.config.DBConfig;
|
import com.windchat.im.storage.dao.config.DBConfig;
|
||||||
import com.windchat.im.storage.dao.config.DBType;
|
import com.windchat.im.storage.dao.config.DBType;
|
||||||
|
@ -2,7 +2,7 @@ package com.windchat.im.boot.test;
|
|||||||
|
|
||||||
import java.util.Base64;
|
import java.util.Base64;
|
||||||
|
|
||||||
import com.akaxin.site.business.utils.FileServerUtils;
|
import com.windchat.im.business.utils.FileServerUtils;
|
||||||
|
|
||||||
public class TestDefaultIcon {
|
public class TestDefaultIcon {
|
||||||
public static void main(String args[]) {
|
public static void main(String args[]) {
|
||||||
|
@ -4,8 +4,8 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.proto.core.FileProto.FileType;
|
import com.akaxin.proto.core.FileProto.FileType;
|
||||||
import com.akaxin.site.business.utils.FilePathUtils;
|
import com.windchat.im.business.utils.FilePathUtils;
|
||||||
import com.akaxin.site.business.utils.FileServerUtils;
|
import com.windchat.im.business.utils.FileServerUtils;
|
||||||
|
|
||||||
public class TestFile {
|
public class TestFile {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(TestFile.class);
|
private static final Logger logger = LoggerFactory.getLogger(TestFile.class);
|
||||||
|
@ -3,8 +3,8 @@ package com.windchat.im.boot.test;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.akaxin.common.http.ZalyHttpClient;
|
import com.windchat.common.http.ZalyHttpClient;
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
|
|
||||||
public class TestHttpClient {
|
public class TestHttpClient {
|
||||||
public static void main(String args[]) throws Exception {
|
public static void main(String args[]) throws Exception {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package com.windchat.im.business.api;
|
package com.windchat.im.business.api;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
|
|
||||||
public interface IRequest {
|
public interface IRequest {
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ package com.windchat.im.business.bean;
|
|||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
|
|
||||||
public class PlatformPhoneBean {
|
public class PlatformPhoneBean {
|
||||||
|
|
||||||
|
@ -24,9 +24,9 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.GroupProto;
|
import com.akaxin.proto.core.GroupProto;
|
||||||
import com.akaxin.site.business.impl.notice.GroupNotice;
|
import com.windchat.im.business.impl.notice.GroupNotice;
|
||||||
import com.windchat.im.storage.api.IGroupDao;
|
import com.windchat.im.storage.api.IGroupDao;
|
||||||
import com.windchat.im.storage.api.IMessageDao;
|
import com.windchat.im.storage.api.IMessageDao;
|
||||||
import com.windchat.im.storage.api.IUserGroupDao;
|
import com.windchat.im.storage.api.IUserGroupDao;
|
||||||
|
@ -17,8 +17,8 @@ package com.windchat.im.business.impl;
|
|||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
import com.akaxin.site.business.dao.UserGroupDao;
|
import com.windchat.im.business.dao.UserGroupDao;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.windchat.im.business.dao.UserGroupDao;
|
import com.windchat.im.business.dao.UserGroupDao;
|
||||||
import com.windchat.im.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.windchat.im.storage.bean.GroupProfileBean;
|
import com.windchat.im.storage.bean.GroupProfileBean;
|
||||||
@ -27,11 +27,11 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package com.windchat.im.business.impl;
|
package com.windchat.im.business.impl;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
|
|
||||||
public interface IRequestService {
|
public interface IRequestService {
|
||||||
public CommandResponse execute(Command command);
|
public CommandResponse execute(Command command);
|
||||||
|
@ -24,22 +24,22 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.proto.plugin.HaiFriendAddProto;
|
import com.akaxin.proto.plugin.HaiFriendAddProto;
|
||||||
import com.akaxin.proto.plugin.HaiFriendApplyProto;
|
import com.akaxin.proto.plugin.HaiFriendApplyProto;
|
||||||
import com.akaxin.proto.plugin.HaiFriendRelationsProto.HaiFriendRelationsRequest;
|
import com.akaxin.proto.plugin.HaiFriendRelationsProto.HaiFriendRelationsRequest;
|
||||||
import com.akaxin.proto.plugin.HaiFriendRelationsProto.HaiFriendRelationsResponse;
|
import com.akaxin.proto.plugin.HaiFriendRelationsProto.HaiFriendRelationsResponse;
|
||||||
import com.akaxin.site.business.dao.UserFriendDao;
|
import com.windchat.im.business.dao.UserFriendDao;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.impl.notice.User2Notice;
|
import com.windchat.im.business.impl.notice.User2Notice;
|
||||||
import com.akaxin.site.business.push.PushNotification;
|
import com.windchat.im.business.push.PushNotification;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -24,12 +24,12 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.GroupProto;
|
import com.akaxin.proto.core.GroupProto;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.proto.plugin.HaiGroupAddMemberProto;
|
import com.akaxin.proto.plugin.HaiGroupAddMemberProto;
|
||||||
@ -41,9 +41,9 @@ import com.akaxin.proto.plugin.HaiGroupNonmembersProto;
|
|||||||
import com.akaxin.proto.plugin.HaiGroupProfileProto;
|
import com.akaxin.proto.plugin.HaiGroupProfileProto;
|
||||||
import com.akaxin.proto.plugin.HaiGroupRemoveMemberProto;
|
import com.akaxin.proto.plugin.HaiGroupRemoveMemberProto;
|
||||||
import com.akaxin.proto.plugin.HaiGroupUpdateProto;
|
import com.akaxin.proto.plugin.HaiGroupUpdateProto;
|
||||||
import com.akaxin.site.business.constant.GroupConfig;
|
import com.windchat.im.business.constant.GroupConfig;
|
||||||
import com.akaxin.site.business.dao.UserGroupDao;
|
import com.windchat.im.business.dao.UserGroupDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.windchat.im.storage.bean.GroupMemberBean;
|
import com.windchat.im.storage.bean.GroupMemberBean;
|
||||||
import com.windchat.im.storage.bean.GroupProfileBean;
|
import com.windchat.im.storage.bean.GroupProfileBean;
|
||||||
import com.windchat.im.storage.bean.SimpleGroupBean;
|
import com.windchat.im.storage.bean.SimpleGroupBean;
|
||||||
|
@ -19,16 +19,16 @@ import com.windchat.im.business.impl.AbstractRequest;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.plugin.HaiMessageProxyProto;
|
import com.akaxin.proto.plugin.HaiMessageProxyProto;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto.ImCtsMessageRequest;
|
import com.akaxin.proto.site.ImCtsMessageProto.ImCtsMessageRequest;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.message.api.IMessageService;
|
import com.windchat.im.message.api.IMessageService;
|
||||||
import com.akaxin.site.message.service.ImMessageService;
|
import com.windchat.im.message.service.ImMessageService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 扩展使用的消息服务
|
* 扩展使用的消息服务
|
||||||
|
@ -22,14 +22,14 @@ import com.windchat.im.business.impl.AbstractRequest;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.plugin.HaiPushNoticesProto.HaiPushNoticesRequest;
|
import com.akaxin.proto.plugin.HaiPushNoticesProto.HaiPushNoticesRequest;
|
||||||
import com.akaxin.site.business.dao.SiteUserDao;
|
import com.windchat.im.business.dao.SiteUserDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.push.PushNotification;
|
import com.windchat.im.business.push.PushNotification;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 扩展使用的PUSH服务
|
* 扩展使用的PUSH服务
|
||||||
|
@ -23,18 +23,18 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CharsetCoding;
|
import com.windchat.common.constant.CharsetCoding;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.crypto.AESCrypto;
|
import com.windchat.common.crypto.AESCrypto;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.proto.plugin.HaiSessionProfileProto;
|
import com.akaxin.proto.plugin.HaiSessionProfileProto;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.windchat.im.storage.api.IUserSessionDao;
|
import com.windchat.im.storage.api.IUserSessionDao;
|
||||||
import com.windchat.im.storage.bean.SimpleAuthBean;
|
import com.windchat.im.storage.bean.SimpleAuthBean;
|
||||||
import com.windchat.im.storage.bean.UserProfileBean;
|
import com.windchat.im.storage.bean.UserProfileBean;
|
||||||
|
@ -21,14 +21,14 @@ import com.windchat.im.business.impl.AbstractRequest;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.ConfigProto;
|
import com.akaxin.proto.core.ConfigProto;
|
||||||
import com.akaxin.proto.plugin.HaiSiteGetConfigProto;
|
import com.akaxin.proto.plugin.HaiSiteGetConfigProto;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* hai接口,提供对站点配置相关操作
|
* hai接口,提供对站点配置相关操作
|
||||||
|
@ -26,12 +26,12 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.GroupProto;
|
import com.akaxin.proto.core.GroupProto;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.proto.plugin.HaiUserAvatarProto;
|
import com.akaxin.proto.plugin.HaiUserAvatarProto;
|
||||||
@ -41,12 +41,12 @@ import com.akaxin.proto.plugin.HaiUserListProto;
|
|||||||
import com.akaxin.proto.plugin.HaiUserPhoneProto;
|
import com.akaxin.proto.plugin.HaiUserPhoneProto;
|
||||||
import com.akaxin.proto.plugin.HaiUserProfileProto;
|
import com.akaxin.proto.plugin.HaiUserProfileProto;
|
||||||
import com.akaxin.proto.plugin.HaiUserUpdateProto;
|
import com.akaxin.proto.plugin.HaiUserUpdateProto;
|
||||||
import com.akaxin.site.business.dao.UserFriendDao;
|
import com.windchat.im.business.dao.UserFriendDao;
|
||||||
import com.akaxin.site.business.dao.UserGroupDao;
|
import com.windchat.im.business.dao.UserGroupDao;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.utils.FilePathUtils;
|
import com.windchat.im.business.utils.FilePathUtils;
|
||||||
import com.akaxin.site.business.utils.FileServerUtils;
|
import com.windchat.im.business.utils.FileServerUtils;
|
||||||
import com.windchat.im.storage.bean.SimpleGroupBean;
|
import com.windchat.im.storage.bean.SimpleGroupBean;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
import com.windchat.im.storage.bean.UserProfileBean;
|
import com.windchat.im.storage.bean.UserProfileBean;
|
||||||
|
@ -23,14 +23,14 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto;
|
import com.akaxin.proto.site.ImCtsMessageProto;
|
||||||
import com.akaxin.site.business.constant.NoticeText;
|
import com.windchat.im.business.constant.NoticeText;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.message.api.IMessageService;
|
import com.windchat.im.message.api.IMessageService;
|
||||||
import com.akaxin.site.message.service.ImMessageService;
|
import com.windchat.im.message.service.ImMessageService;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
import com.google.protobuf.ByteString;
|
import com.google.protobuf.ByteString;
|
||||||
|
|
||||||
|
@ -20,16 +20,16 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.client.ImStcNoticeProto;
|
import com.akaxin.proto.client.ImStcNoticeProto;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.CoreProto.MsgType;
|
import com.akaxin.proto.core.CoreProto.MsgType;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto;
|
import com.akaxin.proto.site.ImCtsMessageProto;
|
||||||
import com.akaxin.site.business.constant.NoticeText;
|
import com.windchat.im.business.constant.NoticeText;
|
||||||
import com.akaxin.site.message.api.IMessageService;
|
import com.windchat.im.message.api.IMessageService;
|
||||||
import com.akaxin.site.message.service.ImMessageService;
|
import com.windchat.im.message.service.ImMessageService;
|
||||||
import com.windchat.im.storage.bean.ApplyFriendBean;
|
import com.windchat.im.storage.bean.ApplyFriendBean;
|
||||||
import com.google.protobuf.ByteString;
|
import com.google.protobuf.ByteString;
|
||||||
|
|
||||||
|
@ -19,10 +19,10 @@ import com.windchat.im.business.bean.PlatformPhoneBean;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.proto.platform.ApiPhoneConfirmTokenProto;
|
import com.akaxin.proto.platform.ApiPhoneConfirmTokenProto;
|
||||||
import com.akaxin.site.business.bean.PlatformPhoneBean;
|
import com.windchat.im.business.bean.PlatformPhoneBean;
|
||||||
import com.akaxin.site.message.platform.PlatformClient;
|
import com.windchat.im.message.platform.PlatformClient;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 当注册方式为:实名用户,此时需要向平台验证手机号码是否正确
|
* 当注册方式为:实名用户,此时需要向平台验证手机号码是否正确
|
||||||
|
@ -29,9 +29,9 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.proto.core.ConfigProto;
|
import com.akaxin.proto.core.ConfigProto;
|
||||||
import com.akaxin.site.business.constant.GroupConfig;
|
import com.windchat.im.business.constant.GroupConfig;
|
||||||
import com.akaxin.site.business.dao.SiteConfigDao;
|
import com.windchat.im.business.dao.SiteConfigDao;
|
||||||
import com.akaxin.site.message.utils.SiteConfigHelper;
|
import com.windchat.im.message.utils.SiteConfigHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 管理站点配置相关信息
|
* 管理站点配置相关信息
|
||||||
|
@ -21,7 +21,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.proto.core.UicProto;
|
import com.akaxin.proto.core.UicProto;
|
||||||
import com.akaxin.site.business.dao.SiteUicDao;
|
import com.windchat.im.business.dao.SiteUicDao;
|
||||||
import com.windchat.im.storage.bean.UicBean;
|
import com.windchat.im.storage.bean.UicBean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -23,16 +23,16 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.DeviceProto;
|
import com.akaxin.proto.core.DeviceProto;
|
||||||
import com.akaxin.proto.site.ApiDeviceBoundListProto;
|
import com.akaxin.proto.site.ApiDeviceBoundListProto;
|
||||||
import com.akaxin.proto.site.ApiDeviceListProto;
|
import com.akaxin.proto.site.ApiDeviceListProto;
|
||||||
import com.akaxin.proto.site.ApiDeviceProfileProto;
|
import com.akaxin.proto.site.ApiDeviceProfileProto;
|
||||||
import com.akaxin.site.business.dao.UserDeviceDao;
|
import com.windchat.im.business.dao.UserDeviceDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.windchat.im.storage.bean.UserDeviceBean;
|
import com.windchat.im.storage.bean.UserDeviceBean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -21,16 +21,16 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.FileProto;
|
import com.akaxin.proto.core.FileProto;
|
||||||
import com.akaxin.proto.site.ApiFileDownloadProto;
|
import com.akaxin.proto.site.ApiFileDownloadProto;
|
||||||
import com.akaxin.proto.site.ApiFileUploadProto;
|
import com.akaxin.proto.site.ApiFileUploadProto;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.utils.FilePathUtils;
|
import com.windchat.im.business.utils.FilePathUtils;
|
||||||
import com.akaxin.site.business.utils.FileServerUtils;
|
import com.windchat.im.business.utils.FileServerUtils;
|
||||||
import com.google.protobuf.ByteString;
|
import com.google.protobuf.ByteString;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -24,14 +24,14 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.proto.site.ApiFriendApplyCountProto;
|
import com.akaxin.proto.site.ApiFriendApplyCountProto;
|
||||||
import com.akaxin.proto.site.ApiFriendApplyListProto;
|
import com.akaxin.proto.site.ApiFriendApplyListProto;
|
||||||
@ -45,12 +45,12 @@ import com.akaxin.proto.site.ApiFriendRemarkProto;
|
|||||||
import com.akaxin.proto.site.ApiFriendSettingProto;
|
import com.akaxin.proto.site.ApiFriendSettingProto;
|
||||||
import com.akaxin.proto.site.ApiFriendUpdateMuteProto;
|
import com.akaxin.proto.site.ApiFriendUpdateMuteProto;
|
||||||
import com.akaxin.proto.site.ApiFriendUpdateSettingProto;
|
import com.akaxin.proto.site.ApiFriendUpdateSettingProto;
|
||||||
import com.akaxin.site.business.dao.UserFriendDao;
|
import com.windchat.im.business.dao.UserFriendDao;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.impl.notice.User2Notice;
|
import com.windchat.im.business.impl.notice.User2Notice;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.akaxin.site.business.push.PushNotification;
|
import com.windchat.im.business.push.PushNotification;
|
||||||
import com.windchat.im.storage.bean.ApplyFriendBean;
|
import com.windchat.im.storage.bean.ApplyFriendBean;
|
||||||
import com.windchat.im.storage.bean.ApplyUserBean;
|
import com.windchat.im.storage.bean.ApplyUserBean;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
|
@ -27,14 +27,14 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.exceptions.ZalyException;
|
import com.windchat.common.exceptions.ZalyException;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.GroupProto;
|
import com.akaxin.proto.core.GroupProto;
|
||||||
import com.akaxin.proto.core.TokenProto;
|
import com.akaxin.proto.core.TokenProto;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
@ -53,12 +53,12 @@ import com.akaxin.proto.site.ApiGroupRemoveMemberProto;
|
|||||||
import com.akaxin.proto.site.ApiGroupSettingProto;
|
import com.akaxin.proto.site.ApiGroupSettingProto;
|
||||||
import com.akaxin.proto.site.ApiGroupUpdateProfileProto;
|
import com.akaxin.proto.site.ApiGroupUpdateProfileProto;
|
||||||
import com.akaxin.proto.site.ApiGroupUpdateSettingProto;
|
import com.akaxin.proto.site.ApiGroupUpdateSettingProto;
|
||||||
import com.akaxin.site.business.constant.GroupConfig;
|
import com.windchat.im.business.constant.GroupConfig;
|
||||||
import com.akaxin.site.business.dao.ExpireTokenDao;
|
import com.windchat.im.business.dao.ExpireTokenDao;
|
||||||
import com.akaxin.site.business.dao.UserGroupDao;
|
import com.windchat.im.business.dao.UserGroupDao;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.storage.bean.ExpireToken;
|
import com.windchat.im.storage.bean.ExpireToken;
|
||||||
import com.windchat.im.storage.bean.GroupMemberBean;
|
import com.windchat.im.storage.bean.GroupMemberBean;
|
||||||
import com.windchat.im.storage.bean.GroupProfileBean;
|
import com.windchat.im.storage.bean.GroupProfileBean;
|
||||||
|
@ -27,24 +27,24 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CharsetCoding;
|
import com.windchat.common.constant.CharsetCoding;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.crypto.AESCrypto;
|
import com.windchat.common.crypto.AESCrypto;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.http.ZalyHttpClient;
|
import com.windchat.common.http.ZalyHttpClient;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.akaxin.proto.site.ApiPluginListProto;
|
import com.akaxin.proto.site.ApiPluginListProto;
|
||||||
import com.akaxin.proto.site.ApiPluginPageProto;
|
import com.akaxin.proto.site.ApiPluginPageProto;
|
||||||
import com.akaxin.proto.site.ApiPluginProxyProto;
|
import com.akaxin.proto.site.ApiPluginProxyProto;
|
||||||
import com.akaxin.site.business.dao.SitePluginDao;
|
import com.windchat.im.business.dao.SitePluginDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.storage.bean.PluginBean;
|
import com.windchat.im.storage.bean.PluginBean;
|
||||||
import com.google.protobuf.ByteString;
|
import com.google.protobuf.ByteString;
|
||||||
|
|
||||||
|
@ -20,16 +20,16 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.ConfigProto;
|
import com.akaxin.proto.core.ConfigProto;
|
||||||
import com.akaxin.proto.core.DeviceProto;
|
import com.akaxin.proto.core.DeviceProto;
|
||||||
import com.akaxin.proto.site.ApiSecretChatApplyU2Proto;
|
import com.akaxin.proto.site.ApiSecretChatApplyU2Proto;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.storage.api.IUserDeviceDao;
|
import com.windchat.im.storage.api.IUserDeviceDao;
|
||||||
import com.windchat.im.storage.bean.UserDeviceBean;
|
import com.windchat.im.storage.bean.UserDeviceBean;
|
||||||
import com.windchat.im.storage.service.DeviceDaoService;
|
import com.windchat.im.storage.service.DeviceDaoService;
|
||||||
|
@ -29,34 +29,34 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.crypto.HashCrypto;
|
import com.windchat.common.crypto.HashCrypto;
|
||||||
import com.akaxin.common.crypto.RSACrypto;
|
import com.windchat.common.crypto.RSACrypto;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.common.utils.UserIdUtils;
|
import com.windchat.common.utils.UserIdUtils;
|
||||||
import com.akaxin.proto.core.ConfigProto;
|
import com.akaxin.proto.core.ConfigProto;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.proto.site.ApiSiteConfigProto;
|
import com.akaxin.proto.site.ApiSiteConfigProto;
|
||||||
import com.akaxin.proto.site.ApiSiteLoginProto;
|
import com.akaxin.proto.site.ApiSiteLoginProto;
|
||||||
import com.akaxin.proto.site.ApiSiteRegisterProto;
|
import com.akaxin.proto.site.ApiSiteRegisterProto;
|
||||||
import com.akaxin.site.business.bean.PlatformPhoneBean;
|
import com.windchat.im.business.bean.PlatformPhoneBean;
|
||||||
import com.akaxin.site.business.dao.SiteConfigDao;
|
import com.windchat.im.business.dao.SiteConfigDao;
|
||||||
import com.akaxin.site.business.dao.SiteLoginDao;
|
import com.windchat.im.business.dao.SiteLoginDao;
|
||||||
import com.akaxin.site.business.dao.UserFriendDao;
|
import com.windchat.im.business.dao.UserFriendDao;
|
||||||
import com.akaxin.site.business.dao.UserGroupDao;
|
import com.windchat.im.business.dao.UserGroupDao;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.akaxin.site.business.impl.notice.User2Notice;
|
import com.windchat.im.business.impl.notice.User2Notice;
|
||||||
import com.akaxin.site.business.impl.site.PlatformUserPhone;
|
import com.windchat.im.business.impl.site.PlatformUserPhone;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.akaxin.site.business.impl.site.UserUic;
|
import com.windchat.im.business.impl.site.UserUic;
|
||||||
import com.windchat.im.storage.api.IUserDeviceDao;
|
import com.windchat.im.storage.api.IUserDeviceDao;
|
||||||
import com.windchat.im.storage.bean.ApplyFriendBean;
|
import com.windchat.im.storage.bean.ApplyFriendBean;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
|
@ -25,24 +25,24 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.exceptions.ZalyException2;
|
import com.windchat.common.exceptions.ZalyException2;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.common.utils.ValidatorPattern;
|
import com.windchat.common.utils.ValidatorPattern;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.proto.site.ApiUserMuteProto;
|
import com.akaxin.proto.site.ApiUserMuteProto;
|
||||||
import com.akaxin.proto.site.ApiUserProfileProto;
|
import com.akaxin.proto.site.ApiUserProfileProto;
|
||||||
import com.akaxin.proto.site.ApiUserSearchProto;
|
import com.akaxin.proto.site.ApiUserSearchProto;
|
||||||
import com.akaxin.proto.site.ApiUserUpdateMuteProto;
|
import com.akaxin.proto.site.ApiUserUpdateMuteProto;
|
||||||
import com.akaxin.proto.site.ApiUserUpdateProfileProto;
|
import com.akaxin.proto.site.ApiUserUpdateProfileProto;
|
||||||
import com.akaxin.site.business.dao.UserFriendDao;
|
import com.windchat.im.business.dao.UserFriendDao;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
import com.windchat.im.storage.bean.UserFriendBean;
|
import com.windchat.im.storage.bean.UserFriendBean;
|
||||||
import com.windchat.im.storage.bean.UserProfileBean;
|
import com.windchat.im.storage.bean.UserProfileBean;
|
||||||
|
|
||||||
|
@ -20,16 +20,16 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.akaxin.common.exceptions.ZalyException;
|
import com.windchat.common.exceptions.ZalyException;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.site.ApiWebAuthProto;
|
import com.akaxin.proto.site.ApiWebAuthProto;
|
||||||
import com.akaxin.site.business.cache.WebSessionCache;
|
import com.windchat.im.business.cache.WebSessionCache;
|
||||||
import com.akaxin.site.business.impl.AbstractRequest;
|
import com.windchat.im.business.impl.AbstractRequest;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* webim服务
|
* webim服务
|
||||||
|
@ -6,15 +6,15 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.ConfigProto;
|
import com.akaxin.proto.core.ConfigProto;
|
||||||
import com.akaxin.proto.core.PushProto;
|
import com.akaxin.proto.core.PushProto;
|
||||||
import com.akaxin.proto.platform.ApiPushNotificationProto;
|
import com.akaxin.proto.platform.ApiPushNotificationProto;
|
||||||
import com.akaxin.site.message.dao.ImUserProfileDao;
|
import com.windchat.im.message.dao.ImUserProfileDao;
|
||||||
import com.akaxin.site.message.push.PushClient;
|
import com.windchat.im.message.push.PushClient;
|
||||||
import com.akaxin.site.message.threads.MultiPushThreadExecutor;
|
import com.windchat.im.message.threads.MultiPushThreadExecutor;
|
||||||
import com.akaxin.site.message.utils.SiteConfigHelper;
|
import com.windchat.im.message.utils.SiteConfigHelper;
|
||||||
|
|
||||||
public class PushNotification {
|
public class PushNotification {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(PushNotification.class);
|
private static final Logger logger = LoggerFactory.getLogger(PushNotification.class);
|
||||||
|
@ -4,9 +4,9 @@ import com.windchat.im.business.dao.UserProfileDao;
|
|||||||
import com.windchat.im.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.site.business.dao.UserProfileDao;
|
import com.windchat.im.business.dao.UserProfileDao;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -19,12 +19,12 @@ import com.windchat.im.business.api.IRequest;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.site.business.api.IRequest;
|
import com.windchat.im.business.api.IRequest;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API处理业务逻辑
|
* API处理业务逻辑
|
||||||
|
@ -18,16 +18,16 @@ package com.windchat.im.business.service;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.site.business.impl.IRequestService;
|
import com.windchat.im.business.impl.IRequestService;
|
||||||
import com.akaxin.site.business.impl.tai.ApiDeviceService;
|
import com.windchat.im.business.impl.tai.ApiDeviceService;
|
||||||
import com.akaxin.site.business.impl.tai.ApiFileService;
|
import com.windchat.im.business.impl.tai.ApiFileService;
|
||||||
import com.akaxin.site.business.impl.tai.ApiFriendService;
|
import com.windchat.im.business.impl.tai.ApiFriendService;
|
||||||
import com.akaxin.site.business.impl.tai.ApiGroupService;
|
import com.windchat.im.business.impl.tai.ApiGroupService;
|
||||||
import com.akaxin.site.business.impl.tai.ApiPluginService;
|
import com.windchat.im.business.impl.tai.ApiPluginService;
|
||||||
import com.akaxin.site.business.impl.tai.ApiSecretChatService;
|
import com.windchat.im.business.impl.tai.ApiSecretChatService;
|
||||||
import com.akaxin.site.business.impl.tai.ApiSiteService;
|
import com.windchat.im.business.impl.tai.ApiSiteService;
|
||||||
import com.akaxin.site.business.impl.tai.ApiUserService;
|
import com.windchat.im.business.impl.tai.ApiUserService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API业务请求,分发工厂
|
* API业务请求,分发工厂
|
||||||
|
@ -19,19 +19,19 @@ import com.windchat.im.business.api.IRequest;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.HttpUriAction;
|
import com.windchat.common.constant.HttpUriAction;
|
||||||
import com.akaxin.site.business.api.IRequest;
|
import com.windchat.im.business.api.IRequest;
|
||||||
import com.akaxin.site.business.impl.hai.HttpFriendService;
|
import com.windchat.im.business.impl.hai.HttpFriendService;
|
||||||
import com.akaxin.site.business.impl.hai.HttpGroupService;
|
import com.windchat.im.business.impl.hai.HttpGroupService;
|
||||||
import com.akaxin.site.business.impl.hai.HttpMessageService;
|
import com.windchat.im.business.impl.hai.HttpMessageService;
|
||||||
import com.akaxin.site.business.impl.hai.HttpPushService;
|
import com.windchat.im.business.impl.hai.HttpPushService;
|
||||||
import com.akaxin.site.business.impl.hai.HttpSessionService;
|
import com.windchat.im.business.impl.hai.HttpSessionService;
|
||||||
import com.akaxin.site.business.impl.hai.HttpSiteService;
|
import com.windchat.im.business.impl.hai.HttpSiteService;
|
||||||
import com.akaxin.site.business.impl.hai.HttpUserService;
|
import com.windchat.im.business.impl.hai.HttpUserService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Http请求服务分发
|
* Http请求服务分发
|
||||||
|
@ -18,7 +18,7 @@ package com.windchat.im.business.utils;
|
|||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import com.akaxin.proto.core.ConfigProto.ConfigKey;
|
import com.akaxin.proto.core.ConfigProto.ConfigKey;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 提供站点服务文件路径位置,路径存放在站点配置表中。<br>
|
* 提供站点服务文件路径位置,路径存放在站点配置表中。<br>
|
||||||
|
@ -2,7 +2,7 @@ package com.windchat.im.business.test;
|
|||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import com.akaxin.common.http.ZalyHttpClient;
|
import com.windchat.common.http.ZalyHttpClient;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
|
|
||||||
public class TestHttpProto {
|
public class TestHttpProto {
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.common.channel;
|
package com.windchat.common.channel;
|
||||||
|
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
|
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
|
|
||||||
|
@ -18,8 +18,8 @@ package com.windchat.common.command;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.common.exceptions;
|
package com.windchat.common.exceptions;
|
||||||
|
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.windchat.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.common.exceptions;
|
package com.windchat.common.exceptions;
|
||||||
|
|
||||||
import com.akaxin.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
import com.windchat.common.constant.IErrorCode;
|
import com.windchat.common.constant.IErrorCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -18,7 +18,7 @@ package com.windchat.common.executor.chain;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.akaxin.common.executor.chain.handler.IHandler;
|
import com.windchat.common.executor.chain.handler.IHandler;
|
||||||
import com.windchat.common.executor.chain.handler.IHandler;
|
import com.windchat.common.executor.chain.handler.IHandler;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.common.executor.chain;
|
package com.windchat.common.executor.chain;
|
||||||
|
|
||||||
import com.akaxin.common.executor.chain.handler.IHandler;
|
import com.windchat.common.executor.chain.handler.IHandler;
|
||||||
import com.windchat.common.executor.chain.handler.IHandler;
|
import com.windchat.common.executor.chain.handler.IHandler;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.common.executor.chain;
|
package com.windchat.common.executor.chain;
|
||||||
|
|
||||||
import com.akaxin.common.executor.chain.handler.IHandler;
|
import com.windchat.common.executor.chain.handler.IHandler;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
|
@ -22,7 +22,7 @@ import com.windchat.common.command.Command;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sam{@link an.guoyue254@gmail.com}
|
* @author Sam{@link an.guoyue254@gmail.com}
|
||||||
|
@ -22,9 +22,9 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.helpers.FormattingTuple;
|
import org.slf4j.helpers.FormattingTuple;
|
||||||
import org.slf4j.helpers.MessageFormatter;
|
import org.slf4j.helpers.MessageFormatter;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 封装log,针对网络日志以及数据库操作日志
|
* 封装log,针对网络日志以及数据库操作日志
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.common.netty;
|
package com.windchat.common.netty;
|
||||||
|
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.windchat.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -20,8 +20,8 @@ import com.windchat.common.command.RedisCommand;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
|
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
@ -20,8 +20,8 @@ import com.windchat.common.command.RedisCommand;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
|
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.common.netty;
|
package com.windchat.common.netty;
|
||||||
|
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.windchat.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ import com.windchat.common.command.RedisCommand;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
@ -18,7 +18,7 @@ package com.windchat.common.utils;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.zip.CRC32;
|
import java.util.zip.CRC32;
|
||||||
|
|
||||||
import com.akaxin.common.crypto.HashCrypto;
|
import com.windchat.common.crypto.HashCrypto;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.windchat.im.connector.codec.parser;
|
package com.windchat.im.connector.codec.parser;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
|
|
||||||
import io.netty.util.AttributeKey;
|
import io.netty.util.AttributeKey;
|
||||||
|
|
||||||
|
@ -18,9 +18,9 @@ package com.windchat.im.connector.codec.parser;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.resp.AbstractParameter;
|
import com.windchat.common.resp.AbstractParameter;
|
||||||
import com.akaxin.common.resp.RedisBytesParameter;
|
import com.windchat.common.resp.RedisBytesParameter;
|
||||||
import com.windchat.im.connector.codec.protocol.MessageDecoder;
|
import com.windchat.im.connector.codec.protocol.MessageDecoder;
|
||||||
import com.windchat.im.connector.codec.protocol.ReplaySignal;
|
import com.windchat.im.connector.codec.protocol.ReplaySignal;
|
||||||
|
|
||||||
|
@ -22,9 +22,9 @@ import com.windchat.im.connector.codec.parser.ChannelConst;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.im.connector.handler;
|
package com.windchat.im.connector.handler;
|
||||||
|
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.executor.chain.handler.IHandler;
|
import com.windchat.common.executor.chain.handler.IHandler;
|
||||||
|
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
|
|
||||||
|
@ -22,16 +22,16 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.site.business.service.ApiRequestService;
|
import com.windchat.im.business.service.ApiRequestService;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.windchat.im.storage.api.IUserSessionDao;
|
import com.windchat.im.storage.api.IUserSessionDao;
|
||||||
import com.windchat.im.storage.bean.SimpleAuthBean;
|
import com.windchat.im.storage.bean.SimpleAuthBean;
|
||||||
|
@ -21,14 +21,14 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CharsetCoding;
|
import com.windchat.common.constant.CharsetCoding;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.crypto.AESCrypto;
|
import com.windchat.common.crypto.AESCrypto;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.akaxin.site.business.service.HttpRequestService;
|
import com.windchat.im.business.service.HttpRequestService;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.windchat.im.connector.constant.HttpConst;
|
import com.windchat.im.connector.constant.HttpConst;
|
||||||
import com.windchat.im.connector.constant.PluginConst;
|
import com.windchat.im.connector.constant.PluginConst;
|
||||||
|
@ -22,18 +22,18 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelManager;
|
import com.windchat.common.channel.ChannelManager;
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.akaxin.site.message.service.ImMessageService;
|
import com.windchat.im.message.service.ImMessageService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 这里负责下发消息至message模块进行处理
|
* 这里负责下发消息至message模块进行处理
|
||||||
|
@ -19,19 +19,19 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelManager;
|
import com.windchat.common.channel.ChannelManager;
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
import com.akaxin.common.channel.ChannelWriter;
|
import com.windchat.common.channel.ChannelWriter;
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.common.executor.chain.handler.MethodReflectHandler;
|
import com.windchat.common.executor.chain.handler.MethodReflectHandler;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.site.ImSiteAuthProto;
|
import com.akaxin.proto.site.ImSiteAuthProto;
|
||||||
import com.akaxin.proto.site.ImSiteHelloProto;
|
import com.akaxin.proto.site.ImSiteHelloProto;
|
||||||
import com.akaxin.site.business.impl.site.SiteConfig;
|
import com.windchat.im.business.impl.site.SiteConfig;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.windchat.im.connector.session.SessionManager;
|
import com.windchat.im.connector.session.SessionManager;
|
||||||
import com.windchat.im.storage.bean.SimpleAuthBean;
|
import com.windchat.im.storage.bean.SimpleAuthBean;
|
||||||
|
@ -18,10 +18,10 @@ package com.windchat.im.connector.handler;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.constant.ErrorCode2;
|
import com.windchat.common.constant.ErrorCode2;
|
||||||
|
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
import io.netty.util.concurrent.Future;
|
import io.netty.util.concurrent.Future;
|
||||||
|
@ -19,10 +19,10 @@ import com.windchat.im.connector.http.handler.HttpServerHandler;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.executor.AbstracteExecutor;
|
import com.windchat.common.executor.AbstracteExecutor;
|
||||||
import com.akaxin.common.executor.SimpleExecutor;
|
import com.windchat.common.executor.SimpleExecutor;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.windchat.im.connector.exception.HttpServerException;
|
import com.windchat.im.connector.exception.HttpServerException;
|
||||||
|
|
||||||
|
@ -23,14 +23,14 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CharsetCoding;
|
import com.windchat.common.constant.CharsetCoding;
|
||||||
import com.akaxin.common.constant.HttpUriAction;
|
import com.windchat.common.constant.HttpUriAction;
|
||||||
import com.akaxin.common.crypto.AESCrypto;
|
import com.windchat.common.crypto.AESCrypto;
|
||||||
import com.akaxin.common.executor.AbstracteExecutor;
|
import com.windchat.common.executor.AbstracteExecutor;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.PluginProto;
|
import com.akaxin.proto.core.PluginProto;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.windchat.im.connector.constant.HttpConst;
|
import com.windchat.im.connector.constant.HttpConst;
|
||||||
|
@ -21,10 +21,10 @@ import com.windchat.im.connector.codec.protocol.MessageEncoder;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.executor.AbstracteExecutor;
|
import com.windchat.common.executor.AbstracteExecutor;
|
||||||
import com.akaxin.common.executor.SimpleExecutor;
|
import com.windchat.common.executor.SimpleExecutor;
|
||||||
import com.windchat.im.connector.codec.protocol.MessageDecoder;
|
import com.windchat.im.connector.codec.protocol.MessageDecoder;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.windchat.im.connector.exception.TcpServerException;
|
import com.windchat.im.connector.exception.TcpServerException;
|
||||||
|
@ -23,15 +23,15 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelManager;
|
import com.windchat.common.channel.ChannelManager;
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.common.executor.AbstracteExecutor;
|
import com.windchat.common.executor.AbstracteExecutor;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.windchat.im.connector.session.SessionManager;
|
import com.windchat.im.connector.session.SessionManager;
|
||||||
|
@ -18,7 +18,7 @@ package com.windchat.im.connector.session;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.utils.StringHelper;
|
import com.windchat.common.utils.StringHelper;
|
||||||
import com.windchat.im.connector.constant.AkxProject;
|
import com.windchat.im.connector.constant.AkxProject;
|
||||||
import com.windchat.im.storage.api.IPluginDao;
|
import com.windchat.im.storage.api.IPluginDao;
|
||||||
import com.windchat.im.storage.bean.PluginBean;
|
import com.windchat.im.storage.bean.PluginBean;
|
||||||
|
@ -5,10 +5,10 @@ import com.windchat.im.connector.ws.handler.WsServerHandler;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.executor.AbstracteExecutor;
|
import com.windchat.common.executor.AbstracteExecutor;
|
||||||
import com.akaxin.common.executor.SimpleExecutor;
|
import com.windchat.common.executor.SimpleExecutor;
|
||||||
|
|
||||||
import io.netty.bootstrap.ServerBootstrap;
|
import io.netty.bootstrap.ServerBootstrap;
|
||||||
import io.netty.channel.ChannelFuture;
|
import io.netty.channel.ChannelFuture;
|
||||||
|
@ -8,13 +8,13 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
import com.akaxin.common.channel.WebChannelManager;
|
import com.windchat.common.channel.WebChannelManager;
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.CommandResponse;
|
import com.windchat.common.command.CommandResponse;
|
||||||
import com.akaxin.common.constant.CharsetCoding;
|
import com.windchat.common.constant.CharsetCoding;
|
||||||
import com.akaxin.common.executor.AbstracteExecutor;
|
import com.windchat.common.executor.AbstracteExecutor;
|
||||||
import com.akaxin.site.business.cache.WebSessionCache;
|
import com.windchat.im.business.cache.WebSessionCache;
|
||||||
import com.windchat.im.connector.codec.parser.ChannelConst;
|
import com.windchat.im.connector.codec.parser.ChannelConst;
|
||||||
|
|
||||||
import io.netty.channel.ChannelFuture;
|
import io.netty.channel.ChannelFuture;
|
||||||
|
@ -4,8 +4,8 @@ import java.io.IOException;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.akaxin.common.http.ZalyHttpClient;
|
import com.windchat.common.http.ZalyHttpClient;
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
import com.squareup.okhttp.FormEncodingBuilder;
|
import com.squareup.okhttp.FormEncodingBuilder;
|
||||||
import com.squareup.okhttp.MediaType;
|
import com.squareup.okhttp.MediaType;
|
||||||
import com.squareup.okhttp.OkHttpClient;
|
import com.squareup.okhttp.OkHttpClient;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.windchat.im.message.api;
|
package com.windchat.im.message.api;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
|
|
||||||
public interface IMessageService {
|
public interface IMessageService {
|
||||||
public boolean execute(Command command);
|
public boolean execute(Command command);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package com.windchat.im.message.bean;
|
package com.windchat.im.message.bean;
|
||||||
|
|
||||||
import com.akaxin.common.utils.GsonUtils;
|
import com.windchat.common.utils.GsonUtils;
|
||||||
|
|
||||||
public class WebBean {
|
public class WebBean {
|
||||||
private String webCode;
|
private String webCode;
|
||||||
|
@ -15,39 +15,39 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.im.message.executor;
|
package com.windchat.im.message.executor;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.constant.RequestAction;
|
import com.windchat.common.constant.RequestAction;
|
||||||
import com.akaxin.common.executor.AbstracteExecutor;
|
import com.windchat.common.executor.AbstracteExecutor;
|
||||||
import com.akaxin.common.executor.SimpleExecutor;
|
import com.windchat.common.executor.SimpleExecutor;
|
||||||
import com.akaxin.common.executor.chain.AbstractHandlerChain;
|
import com.windchat.common.executor.chain.AbstractHandlerChain;
|
||||||
import com.akaxin.common.executor.chain.SimpleHandlerChain;
|
import com.windchat.common.executor.chain.SimpleHandlerChain;
|
||||||
import com.akaxin.site.message.group.handler.GroupDetectionHandler;
|
import com.windchat.im.message.group.handler.GroupDetectionHandler;
|
||||||
import com.akaxin.site.message.group.handler.GroupMessageImageHandler;
|
import com.windchat.im.message.group.handler.GroupMessageImageHandler;
|
||||||
import com.akaxin.site.message.group.handler.GroupMessageNoticeHandler;
|
import com.windchat.im.message.group.handler.GroupMessageNoticeHandler;
|
||||||
import com.akaxin.site.message.group.handler.GroupMessageTextHandler;
|
import com.windchat.im.message.group.handler.GroupMessageTextHandler;
|
||||||
import com.akaxin.site.message.group.handler.GroupMessageVoiceHandler;
|
import com.windchat.im.message.group.handler.GroupMessageVoiceHandler;
|
||||||
import com.akaxin.site.message.group.handler.GroupMessageWebHandler;
|
import com.windchat.im.message.group.handler.GroupMessageWebHandler;
|
||||||
import com.akaxin.site.message.group.handler.GroupMessageWebNoticeHandler;
|
import com.windchat.im.message.group.handler.GroupMessageWebNoticeHandler;
|
||||||
import com.akaxin.site.message.group.handler.GroupPsnHandler;
|
import com.windchat.im.message.group.handler.GroupPsnHandler;
|
||||||
import com.akaxin.site.message.group.handler.GroupPushHandler;
|
import com.windchat.im.message.group.handler.GroupPushHandler;
|
||||||
import com.akaxin.site.message.notice.handler.NoticeHandler;
|
import com.windchat.im.message.notice.handler.NoticeHandler;
|
||||||
import com.akaxin.site.message.notice.handler.NoticePushHandler;
|
import com.windchat.im.message.notice.handler.NoticePushHandler;
|
||||||
import com.akaxin.site.message.sync.handler.SyncFinishHandler;
|
import com.windchat.im.message.sync.handler.SyncFinishHandler;
|
||||||
import com.akaxin.site.message.sync.handler.SyncGroupMessageHandler;
|
import com.windchat.im.message.sync.handler.SyncGroupMessageHandler;
|
||||||
import com.akaxin.site.message.sync.handler.SyncMsgStatusHandler;
|
import com.windchat.im.message.sync.handler.SyncMsgStatusHandler;
|
||||||
import com.akaxin.site.message.sync.handler.SyncU2MessageHandler;
|
import com.windchat.im.message.sync.handler.SyncU2MessageHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageImageHandler;
|
import com.windchat.im.message.user2.handler.U2MessageImageHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageImageSecretHandler;
|
import com.windchat.im.message.user2.handler.U2MessageImageSecretHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageNoticeHandler;
|
import com.windchat.im.message.user2.handler.U2MessageNoticeHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageTextHandler;
|
import com.windchat.im.message.user2.handler.U2MessageTextHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageTextSecretHandler;
|
import com.windchat.im.message.user2.handler.U2MessageTextSecretHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageVoiceHandler;
|
import com.windchat.im.message.user2.handler.U2MessageVoiceHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageVoiceSecretHandler;
|
import com.windchat.im.message.user2.handler.U2MessageVoiceSecretHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageWebHandler;
|
import com.windchat.im.message.user2.handler.U2MessageWebHandler;
|
||||||
import com.akaxin.site.message.user2.handler.U2MessageWebNoticeHandler;
|
import com.windchat.im.message.user2.handler.U2MessageWebNoticeHandler;
|
||||||
import com.akaxin.site.message.user2.handler.UserDetectionHandler;
|
import com.windchat.im.message.user2.handler.UserDetectionHandler;
|
||||||
import com.akaxin.site.message.user2.handler.UserPsnHandler;
|
import com.windchat.im.message.user2.handler.UserPsnHandler;
|
||||||
import com.akaxin.site.message.user2.handler.UserPushHandler;
|
import com.windchat.im.message.user2.handler.UserPushHandler;
|
||||||
import com.windchat.im.message.notice.handler.NoticeHandler;
|
import com.windchat.im.message.notice.handler.NoticeHandler;
|
||||||
import com.windchat.im.message.notice.handler.NoticePushHandler;
|
import com.windchat.im.message.notice.handler.NoticePushHandler;
|
||||||
|
|
||||||
|
@ -17,11 +17,11 @@ package com.windchat.im.message.group.handler;
|
|||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelWriter;
|
import com.windchat.common.channel.ChannelWriter;
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.common.executor.chain.handler.IHandler;
|
import com.windchat.common.executor.chain.handler.IHandler;
|
||||||
import com.akaxin.proto.client.ImStcMessageProto;
|
import com.akaxin.proto.client.ImStcMessageProto;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.CoreProto.MsgType;
|
import com.akaxin.proto.core.CoreProto.MsgType;
|
||||||
|
@ -21,13 +21,13 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.UserProto;
|
import com.akaxin.proto.core.UserProto;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto;
|
import com.akaxin.proto.site.ImCtsMessageProto;
|
||||||
import com.akaxin.site.message.dao.ImUserGroupDao;
|
import com.windchat.im.message.dao.ImUserGroupDao;
|
||||||
import com.akaxin.site.message.dao.ImUserProfileDao;
|
import com.windchat.im.message.dao.ImUserProfileDao;
|
||||||
import com.windchat.im.storage.bean.GroupProfileBean;
|
import com.windchat.im.storage.bean.GroupProfileBean;
|
||||||
import com.windchat.im.storage.bean.SimpleUserBean;
|
import com.windchat.im.storage.bean.SimpleUserBean;
|
||||||
|
|
||||||
|
@ -18,8 +18,8 @@ package com.windchat.im.message.group.handler;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto;
|
import com.akaxin.proto.site.ImCtsMessageProto;
|
||||||
import com.windchat.im.storage.api.IMessageDao;
|
import com.windchat.im.storage.api.IMessageDao;
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.im.message.group.handler;
|
package com.windchat.im.message.group.handler;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.proto.client.ImStcMessageProto;
|
import com.akaxin.proto.client.ImStcMessageProto;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.CoreProto.MsgType;
|
import com.akaxin.proto.core.CoreProto.MsgType;
|
||||||
|
@ -18,8 +18,8 @@ package com.windchat.im.message.group.handler;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto;
|
import com.akaxin.proto.site.ImCtsMessageProto;
|
||||||
import com.windchat.im.storage.api.IMessageDao;
|
import com.windchat.im.storage.api.IMessageDao;
|
||||||
|
@ -18,8 +18,8 @@ package com.windchat.im.message.group.handler;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto;
|
import com.akaxin.proto.site.ImCtsMessageProto;
|
||||||
import com.windchat.im.storage.api.IMessageDao;
|
import com.windchat.im.storage.api.IMessageDao;
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
*/
|
*/
|
||||||
package com.windchat.im.message.group.handler;
|
package com.windchat.im.message.group.handler;
|
||||||
|
|
||||||
import com.akaxin.common.channel.ChannelSession;
|
import com.windchat.common.channel.ChannelSession;
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.proto.client.ImStcMessageProto;
|
import com.akaxin.proto.client.ImStcMessageProto;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.CoreProto.MsgType;
|
import com.akaxin.proto.core.CoreProto.MsgType;
|
||||||
|
@ -18,8 +18,8 @@ package com.windchat.im.message.group.handler;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.logs.LogUtils;
|
import com.windchat.common.logs.LogUtils;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.site.ImCtsMessageProto;
|
import com.akaxin.proto.site.ImCtsMessageProto;
|
||||||
import com.windchat.im.storage.api.IMessageDao;
|
import com.windchat.im.storage.api.IMessageDao;
|
||||||
|
@ -18,9 +18,9 @@ package com.windchat.im.message.group.handler;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.akaxin.common.command.Command;
|
import com.windchat.common.command.Command;
|
||||||
import com.akaxin.common.command.RedisCommand;
|
import com.windchat.common.command.RedisCommand;
|
||||||
import com.akaxin.common.constant.CommandConst;
|
import com.windchat.common.constant.CommandConst;
|
||||||
import com.akaxin.proto.client.ImStcMessageProto;
|
import com.akaxin.proto.client.ImStcMessageProto;
|
||||||
import com.akaxin.proto.core.CoreProto;
|
import com.akaxin.proto.core.CoreProto;
|
||||||
import com.akaxin.proto.core.CoreProto.MsgType;
|
import com.akaxin.proto.core.CoreProto.MsgType;
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user