La123123.
/
im-backed
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

项目更名为盒子IM

master
xie.bx 3 years ago
parent
93558d89c3
commit
3c690a73ab
101 changed files with 317 additions and 471 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 4
      commom/pom.xml
  3. 2
      commom/src/main/java/com/bx/common/contant/Constant.java
  4. 2
      commom/src/main/java/com/bx/common/contant/RedisKey.java
  5. 2
      commom/src/main/java/com/bx/common/enums/FileTypeEnum.java
  6. 2
      commom/src/main/java/com/bx/common/enums/MessageStatusEnum.java
  7. 2
      commom/src/main/java/com/bx/common/enums/MessageTypeEnum.java
  8. 2
      commom/src/main/java/com/bx/common/enums/ResultCode.java
  9. 2
      commom/src/main/java/com/bx/common/enums/WSCmdEnum.java
  10. 6
      commom/src/main/java/com/bx/common/generator/CodeGenerator.java
  11. 2
      commom/src/main/java/com/bx/common/model/im/GroupMessageInfo.java
  12. 2
      commom/src/main/java/com/bx/common/model/im/HeartbeatInfo.java
  13. 2
      commom/src/main/java/com/bx/common/model/im/LoginInfo.java
  14. 2
      commom/src/main/java/com/bx/common/model/im/PrivateMessageInfo.java
  15. 2
      commom/src/main/java/com/bx/common/model/im/SendInfo.java
  16. 2
      commom/src/main/java/com/bx/common/result/Result.java
  17. 4
      commom/src/main/java/com/bx/common/result/ResultUtils.java
  18. 2
      commom/src/main/java/com/bx/common/util/BeanUtils.java
  19. 2
      commom/src/main/java/com/bx/common/util/DateTimeUtils.java
  20. 2
      commom/src/main/java/com/bx/common/util/SpringContextHolder.java
  21. 6
      im-platform/pom.xml
  22. 6
      im-platform/src/main/java/com/bx/implatform/ImplatformApp.java
  23. 2
      im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java
  24. 2
      im-platform/src/main/java/com/bx/implatform/config/MinIoClientConfig.java
  25. 2
      im-platform/src/main/java/com/bx/implatform/config/RedisConfig.java
  26. 2
      im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java
  27. 12
      im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java
  28. 10
      im-platform/src/main/java/com/bx/implatform/controller/FileController.java
  29. 15
      im-platform/src/main/java/com/bx/implatform/controller/FriendController.java
  30. 22
      im-platform/src/main/java/com/bx/implatform/controller/GroupController.java
  31. 12
      im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java
  32. 10
      im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java
  33. 10
      im-platform/src/main/java/com/bx/implatform/controller/RegisterController.java
  34. 18
      im-platform/src/main/java/com/bx/implatform/controller/UserController.java
  35. 2
      im-platform/src/main/java/com/bx/implatform/entity/Friend.java
  36. 3
      im-platform/src/main/java/com/bx/implatform/entity/Group.java
  37. 3
      im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java
  38. 3
      im-platform/src/main/java/com/bx/implatform/entity/GroupMessage.java
  39. 2
      im-platform/src/main/java/com/bx/implatform/entity/PrivateMessage.java
  40. 2
      im-platform/src/main/java/com/bx/implatform/entity/User.java
  41. 4
      im-platform/src/main/java/com/bx/implatform/exception/GlobalException.java
  42. 8
      im-platform/src/main/java/com/bx/implatform/exception/GlobalExceptionHandler.java
  43. 4
      im-platform/src/main/java/com/bx/implatform/mapper/FriendMapper.java
  44. 4
      im-platform/src/main/java/com/bx/implatform/mapper/GroupMapper.java
  45. 4
      im-platform/src/main/java/com/bx/implatform/mapper/GroupMemberMapper.java
  46. 4
      im-platform/src/main/java/com/bx/implatform/mapper/GroupMessageMapper.java
  47. 4
      im-platform/src/main/java/com/bx/implatform/mapper/PrivateMessageMapper.java
  48. 4
      im-platform/src/main/java/com/bx/implatform/mapper/UserMapper.java
  49. 6
      im-platform/src/main/java/com/bx/implatform/service/IFriendService.java
  50. 5
      im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java
  51. 7
      im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java
  52. 10
      im-platform/src/main/java/com/bx/implatform/service/IGroupService.java
  53. 6
      im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java
  54. 8
      im-platform/src/main/java/com/bx/implatform/service/IUserService.java
  55. 24
      im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java
  56. 10
      im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java
  57. 31
      im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
  58. 40
      im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java
  59. 27
      im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
  60. 10
      im-platform/src/main/java/com/bx/implatform/service/impl/SecurityUserDetailsServiceImpl.java
  61. 33
      im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java
  62. 18
      im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java
  63. 2
      im-platform/src/main/java/com/bx/implatform/session/SessionContext.java
  64. 2
      im-platform/src/main/java/com/bx/implatform/session/UserSession.java
  65. 10
      im-platform/src/main/java/com/bx/implatform/task/PullAlreadyReadMessageTask.java
  66. 2
      im-platform/src/main/java/com/bx/implatform/util/FileUtil.java
  67. 2
      im-platform/src/main/java/com/bx/implatform/util/ImageUtil.java
  68. 4
      im-platform/src/main/java/com/bx/implatform/util/MinioUtil.java
  69. 2
      im-platform/src/main/java/com/bx/implatform/vo/FriendVO.java
  70. 2
      im-platform/src/main/java/com/bx/implatform/vo/GroupInviteVO.java
  71. 2
      im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java
  72. 2
      im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java
  73. 2
      im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java
  74. 2
      im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java
  75. 2
      im-platform/src/main/java/com/bx/implatform/vo/RegisterVO.java
  76. 2
      im-platform/src/main/java/com/bx/implatform/vo/UploadImageVO.java
  77. 2
      im-platform/src/main/java/com/bx/implatform/vo/UserVO.java
  78. 69
      im-platform/src/main/java/com/lx/implatform/entity/GroupMessageReadPos.java
  79. 16
      im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageReadPosMapper.java
  80. 16
      im-platform/src/main/java/com/lx/implatform/service/IGroupMessageReadPosService.java
  81. 20
      im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageReadPosServiceImpl.java
  82. 4
      im-platform/src/main/resources/application.yml
  83. 6
      im-server/pom.xml
  84. 6
      im-server/src/main/java/com/bx/imserver/IMServerApp.java
  85. 2
      im-server/src/main/java/com/bx/imserver/config/RedisConfig.java
  86. 2
      im-server/src/main/java/com/bx/imserver/constant/Constant.java
  87. 4
      im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java
  88. 20
      im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java
  89. 17
      im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java
  90. 18
      im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java
  91. 2
      im-server/src/main/java/com/bx/imserver/websocket/WebsocketChannelCtxHloder.java
  92. 10
      im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java
  93. 4
      im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java
  94. 4
      im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java
  95. 12
      im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java
  96. 10
      im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java
  97. 16
      im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java
  98. 2
      im-server/src/main/java/com/bx/imserver/websocket/processor/MessageProcessor.java
  99. 15
      im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java
  100. 6
      im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java

2
.gitignore
View File

@ -1,5 +1,5 @@
/.idea/ /.idea/
/lx-im.iml /box-im.iml
/im-server/im-server.iml /im-server/im-server.iml
/im-platform/im-platform.iml /im-platform/im-platform.iml
/commom/commom.iml /commom/commom.iml

4
commom/pom.xml
View File

@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>lx-im</artifactId> <artifactId>box-im</artifactId>
<groupId>com.lx</groupId> <groupId>com.bx</groupId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
commom/src/main/java/com/lx/common/contant/Constant.java → commom/src/main/java/com/bx/common/contant/Constant.java
View File

@ -1,4 +1,4 @@
package com.lx.common.contant; package com.bx.common.contant;

2
commom/src/main/java/com/lx/common/contant/RedisKey.java → commom/src/main/java/com/bx/common/contant/RedisKey.java
View File

@ -1,4 +1,4 @@
package com.lx.common.contant; package com.bx.common.contant;
public class RedisKey { public class RedisKey {

2
commom/src/main/java/com/lx/common/enums/FileTypeEnum.java → commom/src/main/java/com/bx/common/enums/FileTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.lx.common.enums; package com.bx.common.enums;
public enum FileTypeEnum { public enum FileTypeEnum {

2
commom/src/main/java/com/lx/common/enums/MessageStatusEnum.java → commom/src/main/java/com/bx/common/enums/MessageStatusEnum.java
View File

@ -1,4 +1,4 @@
package com.lx.common.enums; package com.bx.common.enums;
public enum MessageStatusEnum { public enum MessageStatusEnum {

2
commom/src/main/java/com/lx/common/enums/MessageTypeEnum.java → commom/src/main/java/com/bx/common/enums/MessageTypeEnum.java
View File

@ -1,4 +1,4 @@
package com.lx.common.enums; package com.bx.common.enums;
public enum MessageTypeEnum { public enum MessageTypeEnum {

2
commom/src/main/java/com/lx/common/enums/ResultCode.java → commom/src/main/java/com/bx/common/enums/ResultCode.java
View File

@ -1,4 +1,4 @@
package com.lx.common.enums; package com.bx.common.enums;
/** /**
* 响应码枚举 * 响应码枚举

2
commom/src/main/java/com/lx/common/enums/WSCmdEnum.java → commom/src/main/java/com/bx/common/enums/WSCmdEnum.java
View File

@ -1,4 +1,4 @@
package com.lx.common.enums; package com.bx.common.enums;
public enum WSCmdEnum { public enum WSCmdEnum {

6
commom/src/main/java/com/lx/common/generator/CodeGenerator.java → commom/src/main/java/com/bx/common/generator/CodeGenerator.java
View File

@ -1,4 +1,4 @@
package com.lx.common.generator; package com.bx.common.generator;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringPool;
@ -36,7 +36,7 @@ public class CodeGenerator {
// 数据源配置 // 数据源配置
DataSourceConfig dsc = new DataSourceConfig(); DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:mysql://localhost:3306/simple-im?useUnicode=true&characterEncoding=utf-8"); dsc.setUrl("jdbc:mysql://localhost:3306/box-im?useUnicode=true&characterEncoding=utf-8");
dsc.setDriverName("com.mysql.jdbc.Driver"); dsc.setDriverName("com.mysql.jdbc.Driver");
dsc.setUsername("root"); dsc.setUsername("root");
dsc.setPassword("root"); dsc.setPassword("root");
@ -45,7 +45,7 @@ public class CodeGenerator {
// 包配置 // 包配置
PackageConfig pc = new PackageConfig(); PackageConfig pc = new PackageConfig();
pc.setModuleName(""); pc.setModuleName("");
pc.setParent("com.lx"); pc.setParent("com.bx");
mpg.setPackageInfo(pc); mpg.setPackageInfo(pc);
// 如果模板引擎是 velocity // 如果模板引擎是 velocity

2
commom/src/main/java/com/lx/common/model/im/GroupMessageInfo.java → commom/src/main/java/com/bx/common/model/im/GroupMessageInfo.java
View File

@ -1,4 +1,4 @@
package com.lx.common.model.im; package com.bx.common.model.im;
import lombok.Data; import lombok.Data;

2
commom/src/main/java/com/lx/common/model/im/HeartbeatInfo.java → commom/src/main/java/com/bx/common/model/im/HeartbeatInfo.java
View File

@ -1,4 +1,4 @@
package com.lx.common.model.im; package com.bx.common.model.im;
import lombok.Data; import lombok.Data;

2
commom/src/main/java/com/lx/common/model/im/LoginInfo.java → commom/src/main/java/com/bx/common/model/im/LoginInfo.java
View File

@ -1,4 +1,4 @@
package com.lx.common.model.im; package com.bx.common.model.im;
import lombok.Data; import lombok.Data;

2
commom/src/main/java/com/lx/common/model/im/PrivateMessageInfo.java → commom/src/main/java/com/bx/common/model/im/PrivateMessageInfo.java
View File

@ -1,4 +1,4 @@
package com.lx.common.model.im; package com.bx.common.model.im;
import lombok.Data; import lombok.Data;

2
commom/src/main/java/com/lx/common/model/im/SendInfo.java → commom/src/main/java/com/bx/common/model/im/SendInfo.java
View File

@ -1,4 +1,4 @@
package com.lx.common.model.im; package com.bx.common.model.im;
import lombok.Data; import lombok.Data;

2
commom/src/main/java/com/lx/common/result/Result.java → commom/src/main/java/com/bx/common/result/Result.java
View File

@ -1,4 +1,4 @@
package com.lx.common.result; package com.bx.common.result;
import lombok.Data; import lombok.Data;

4
commom/src/main/java/com/lx/common/result/ResultUtils.java → commom/src/main/java/com/bx/common/result/ResultUtils.java
View File

@ -1,7 +1,7 @@
package com.lx.common.result; package com.bx.common.result;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;

2
commom/src/main/java/com/lx/common/util/BeanUtils.java → commom/src/main/java/com/bx/common/util/BeanUtils.java
View File

@ -1,4 +1,4 @@
package com.lx.common.util; package com.bx.common.util;
import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.BeanWrapperImpl;

2
commom/src/main/java/com/lx/common/util/DateTimeUtils.java → commom/src/main/java/com/bx/common/util/DateTimeUtils.java
View File

@ -1,4 +1,4 @@
package com.lx.common.util; package com.bx.common.util;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;

2
commom/src/main/java/com/lx/common/util/SpringContextHolder.java → commom/src/main/java/com/bx/common/util/SpringContextHolder.java
View File

@ -1,4 +1,4 @@
package com.lx.common.util; package com.bx.common.util;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;

6
im-platform/pom.xml
View File

@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>lx-im</artifactId> <artifactId>box-im</artifactId>
<groupId>com.lx</groupId> <groupId>com.bx</groupId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -14,7 +14,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.lx</groupId> <groupId>com.bx</groupId>
<artifactId>commom</artifactId> <artifactId>commom</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>

6
im-platform/src/main/java/com/lx/implatform/ImplatformApp.java → im-platform/src/main/java/com/bx/implatform/ImplatformApp.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform; package com.bx.implatform;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
@ -10,8 +10,8 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
@Slf4j @Slf4j
@EnableAspectJAutoProxy(exposeProxy = true) @EnableAspectJAutoProxy(exposeProxy = true)
@MapperScan(basePackages = {"com.lx.implatform.mapper"}) @MapperScan(basePackages = {"com.bx.implatform.mapper"})
@ComponentScan(basePackages={"com.lx"}) @ComponentScan(basePackages={"com.bx"})
@SpringBootApplication @SpringBootApplication
public class ImplatformApp { public class ImplatformApp {

2
im-platform/src/main/java/com/lx/implatform/config/GlobalCorsConfig.java → im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.config; package com.bx.implatform.config;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

2
im-platform/src/main/java/com/lx/implatform/config/MinIoClientConfig.java → im-platform/src/main/java/com/bx/implatform/config/MinIoClientConfig.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.config; package com.bx.implatform.config;
import io.minio.MinioClient; import io.minio.MinioClient;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;

2
im-platform/src/main/java/com/lx/implatform/config/RedisConfig.java → im-platform/src/main/java/com/bx/implatform/config/RedisConfig.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.config; package com.bx.implatform.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;

2
im-platform/src/main/java/com/lx/implatform/config/SwaggerConfig.java → im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.config; package com.bx.implatform.config;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

12
im-platform/src/main/java/com/lx/implatform/config/WebSecurityConfg.java → im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java
View File

@ -1,12 +1,12 @@
package com.lx.implatform.config; package com.bx.implatform.config;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.bx.implatform.service.IUserService;
import com.bx.implatform.session.UserSession;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import com.lx.implatform.service.IUserService;
import com.lx.implatform.session.UserSession;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;

10
im-platform/src/main/java/com/lx/implatform/controller/FileController.java → im-platform/src/main/java/com/bx/implatform/controller/FileController.java
View File

@ -1,9 +1,9 @@
package com.lx.implatform.controller; package com.bx.implatform.controller;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import com.lx.implatform.service.thirdparty.FileService; import com.bx.implatform.vo.UploadImageVO;
import com.lx.implatform.vo.UploadImageVO; import com.bx.implatform.service.thirdparty.FileService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

15
im-platform/src/main/java/com/lx/implatform/controller/FriendController.java → im-platform/src/main/java/com/bx/implatform/controller/FriendController.java
View File

@ -1,13 +1,12 @@
package com.lx.implatform.controller; package com.bx.implatform.controller;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import com.lx.common.util.BeanUtils; import com.bx.implatform.vo.FriendVO;
import com.lx.implatform.entity.Friend; import com.bx.implatform.entity.Friend;
import com.lx.implatform.service.IFriendService; import com.bx.implatform.service.IFriendService;
import com.lx.implatform.session.SessionContext; import com.bx.implatform.session.SessionContext;
import com.lx.implatform.vo.FriendVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

22
im-platform/src/main/java/com/lx/implatform/controller/GroupController.java → im-platform/src/main/java/com/bx/implatform/controller/GroupController.java
View File

@ -1,15 +1,12 @@
package com.lx.implatform.controller; package com.bx.implatform.controller;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import com.lx.common.util.BeanUtils; import com.bx.implatform.vo.GroupInviteVO;
import com.lx.implatform.entity.Group; import com.bx.implatform.vo.GroupMemberVO;
import com.lx.implatform.service.IGroupService; import com.bx.implatform.vo.GroupVO;
import com.lx.implatform.vo.GroupInviteVO; import com.bx.implatform.service.IGroupService;
import com.lx.implatform.vo.GroupMemberVO;
import com.lx.implatform.vo.GroupVO;
import com.lx.implatform.vo.UserVO;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -18,7 +15,6 @@ import javax.validation.Valid;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
@RestController @RestController

12
im-platform/src/main/java/com/lx/implatform/controller/GroupMessageController.java → im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java
View File

@ -1,12 +1,10 @@
package com.lx.implatform.controller; package com.bx.implatform.controller;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import com.lx.implatform.service.IGroupMemberService; import com.bx.implatform.vo.GroupMessageVO;
import com.lx.implatform.service.IGroupMessageService; import com.bx.implatform.service.IGroupMessageService;
import com.lx.implatform.vo.GroupMessageVO;
import com.lx.implatform.vo.PrivateMessageVO;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;

10
im-platform/src/main/java/com/lx/implatform/controller/PrivateMessageController.java → im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java
View File

@ -1,10 +1,10 @@
package com.lx.implatform.controller; package com.bx.implatform.controller;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import com.lx.implatform.service.IPrivateMessageService; import com.bx.implatform.vo.PrivateMessageVO;
import com.lx.implatform.vo.PrivateMessageVO; import com.bx.implatform.service.IPrivateMessageService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

10
im-platform/src/main/java/com/lx/implatform/controller/RegisterController.java → im-platform/src/main/java/com/bx/implatform/controller/RegisterController.java
View File

@ -1,10 +1,10 @@
package com.lx.implatform.controller; package com.bx.implatform.controller;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import com.lx.implatform.service.IUserService; import com.bx.implatform.vo.RegisterVO;
import com.lx.implatform.vo.RegisterVO; import com.bx.implatform.service.IUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

18
im-platform/src/main/java/com/lx/implatform/controller/UserController.java → im-platform/src/main/java/com/bx/implatform/controller/UserController.java
View File

@ -1,14 +1,14 @@
package com.lx.implatform.controller; package com.bx.implatform.controller;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import com.lx.common.util.BeanUtils; import com.bx.common.util.BeanUtils;
import com.lx.implatform.entity.User; import com.bx.implatform.vo.UserVO;
import com.lx.implatform.service.IUserService; import com.bx.implatform.entity.User;
import com.lx.implatform.session.SessionContext; import com.bx.implatform.service.IUserService;
import com.lx.implatform.session.UserSession; import com.bx.implatform.session.SessionContext;
import com.lx.implatform.vo.UserVO; import com.bx.implatform.session.UserSession;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
im-platform/src/main/java/com/lx/implatform/entity/Friend.java → im-platform/src/main/java/com/bx/implatform/entity/Friend.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.entity; package com.bx.implatform.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

3
im-platform/src/main/java/com/lx/implatform/entity/Group.java → im-platform/src/main/java/com/bx/implatform/entity/Group.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.entity; package com.bx.implatform.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

3
im-platform/src/main/java/com/lx/implatform/entity/GroupMember.java → im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.entity; package com.bx.implatform.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

3
im-platform/src/main/java/com/lx/implatform/entity/GroupMessage.java → im-platform/src/main/java/com/bx/implatform/entity/GroupMessage.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.entity; package com.bx.implatform.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
im-platform/src/main/java/com/lx/implatform/entity/PrivateMessage.java → im-platform/src/main/java/com/bx/implatform/entity/PrivateMessage.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.entity; package com.bx.implatform.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
im-platform/src/main/java/com/lx/implatform/entity/User.java → im-platform/src/main/java/com/bx/implatform/entity/User.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.entity; package com.bx.implatform.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

4
im-platform/src/main/java/com/lx/implatform/exception/GlobalException.java → im-platform/src/main/java/com/bx/implatform/exception/GlobalException.java
View File

@ -1,6 +1,6 @@
package com.lx.implatform.exception; package com.bx.implatform.exception;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;

8
im-platform/src/main/java/com/lx/implatform/exception/GlobalExceptionHandler.java → im-platform/src/main/java/com/bx/implatform/exception/GlobalExceptionHandler.java
View File

@ -1,9 +1,9 @@
package com.lx.implatform.exception; package com.bx.implatform.exception;
import cn.hutool.json.JSONException; import cn.hutool.json.JSONException;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import com.lx.common.result.Result; import com.bx.common.result.Result;
import com.lx.common.result.ResultUtils; import com.bx.common.result.ResultUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotReadableException;

4
im-platform/src/main/java/com/lx/implatform/mapper/FriendMapper.java → im-platform/src/main/java/com/bx/implatform/mapper/FriendMapper.java
View File

@ -1,7 +1,7 @@
package com.lx.implatform.mapper; package com.bx.implatform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lx.implatform.entity.Friend; import com.bx.implatform.entity.Friend;
/** /**
* <p> * <p>

4
im-platform/src/main/java/com/lx/implatform/mapper/GroupMapper.java → im-platform/src/main/java/com/bx/implatform/mapper/GroupMapper.java
View File

@ -1,6 +1,6 @@
package com.lx.implatform.mapper; package com.bx.implatform.mapper;
import com.lx.implatform.entity.Group; import com.bx.implatform.entity.Group;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

4
im-platform/src/main/java/com/lx/implatform/mapper/GroupMemberMapper.java → im-platform/src/main/java/com/bx/implatform/mapper/GroupMemberMapper.java
View File

@ -1,6 +1,6 @@
package com.lx.implatform.mapper; package com.bx.implatform.mapper;
import com.lx.implatform.entity.GroupMember; import com.bx.implatform.entity.GroupMember;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

4
im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageMapper.java → im-platform/src/main/java/com/bx/implatform/mapper/GroupMessageMapper.java
View File

@ -1,6 +1,6 @@
package com.lx.implatform.mapper; package com.bx.implatform.mapper;
import com.lx.implatform.entity.GroupMessage; import com.bx.implatform.entity.GroupMessage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

4
im-platform/src/main/java/com/lx/implatform/mapper/PrivateMessageMapper.java → im-platform/src/main/java/com/bx/implatform/mapper/PrivateMessageMapper.java
View File

@ -1,7 +1,7 @@
package com.lx.implatform.mapper; package com.bx.implatform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lx.implatform.entity.PrivateMessage; import com.bx.implatform.entity.PrivateMessage;
/** /**
* <p> * <p>

4
im-platform/src/main/java/com/lx/implatform/mapper/UserMapper.java → im-platform/src/main/java/com/bx/implatform/mapper/UserMapper.java
View File

@ -1,7 +1,7 @@
package com.lx.implatform.mapper; package com.bx.implatform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lx.implatform.entity.User; import com.bx.implatform.entity.User;
/** /**
* <p> * <p>

6
im-platform/src/main/java/com/lx/implatform/service/IFriendService.java → im-platform/src/main/java/com/bx/implatform/service/IFriendService.java
View File

@ -1,8 +1,8 @@
package com.lx.implatform.service; package com.bx.implatform.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.lx.implatform.entity.Friend; import com.bx.implatform.vo.FriendVO;
import com.lx.implatform.vo.FriendVO; import com.bx.implatform.entity.Friend;
import java.util.List; import java.util.List;

5
im-platform/src/main/java/com/lx/implatform/service/IGroupMemberService.java → im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java
View File

@ -1,9 +1,8 @@
package com.lx.implatform.service; package com.bx.implatform.service;
import com.lx.implatform.entity.GroupMember; import com.bx.implatform.entity.GroupMember;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List; import java.util.List;
/** /**

7
im-platform/src/main/java/com/lx/implatform/service/IGroupMessageService.java → im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java
View File

@ -1,9 +1,8 @@
package com.lx.implatform.service; package com.bx.implatform.service;
import com.lx.implatform.entity.GroupMessage; import com.bx.implatform.vo.GroupMessageVO;
import com.bx.implatform.entity.GroupMessage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.lx.implatform.vo.GroupMessageVO;
import com.lx.implatform.vo.PrivateMessageVO;
public interface IGroupMessageService extends IService<GroupMessage> { public interface IGroupMessageService extends IService<GroupMessage> {

10
im-platform/src/main/java/com/lx/implatform/service/IGroupService.java → im-platform/src/main/java/com/bx/implatform/service/IGroupService.java
View File

@ -1,10 +1,10 @@
package com.lx.implatform.service; package com.bx.implatform.service;
import com.lx.implatform.entity.Group; import com.bx.implatform.vo.GroupInviteVO;
import com.bx.implatform.vo.GroupMemberVO;
import com.bx.implatform.vo.GroupVO;
import com.bx.implatform.entity.Group;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.lx.implatform.vo.GroupInviteVO;
import com.lx.implatform.vo.GroupMemberVO;
import com.lx.implatform.vo.GroupVO;
import java.util.List; import java.util.List;

6
im-platform/src/main/java/com/lx/implatform/service/IPrivateMessageService.java → im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java
View File

@ -1,8 +1,8 @@
package com.lx.implatform.service; package com.bx.implatform.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.lx.implatform.entity.PrivateMessage; import com.bx.implatform.vo.PrivateMessageVO;
import com.lx.implatform.vo.PrivateMessageVO; import com.bx.implatform.entity.PrivateMessage;
public interface IPrivateMessageService extends IService<PrivateMessage> { public interface IPrivateMessageService extends IService<PrivateMessage> {

8
im-platform/src/main/java/com/lx/implatform/service/IUserService.java → im-platform/src/main/java/com/bx/implatform/service/IUserService.java
View File

@ -1,9 +1,9 @@
package com.lx.implatform.service; package com.bx.implatform.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.lx.implatform.entity.User; import com.bx.implatform.vo.RegisterVO;
import com.lx.implatform.vo.RegisterVO; import com.bx.implatform.vo.UserVO;
import com.lx.implatform.vo.UserVO; import com.bx.implatform.entity.User;
import java.util.List; import java.util.List;

24
im-platform/src/main/java/com/lx/implatform/service/impl/FriendServiceImpl.java → im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java
View File

@ -1,18 +1,18 @@
package com.lx.implatform.service.impl; package com.bx.implatform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import com.lx.implatform.entity.Friend; import com.bx.implatform.exception.GlobalException;
import com.lx.implatform.entity.User; import com.bx.implatform.vo.FriendVO;
import com.lx.implatform.exception.GlobalException; import com.bx.implatform.entity.Friend;
import com.lx.implatform.mapper.FriendMapper; import com.bx.implatform.entity.User;
import com.lx.implatform.service.IFriendService; import com.bx.implatform.mapper.FriendMapper;
import com.lx.implatform.service.IUserService; import com.bx.implatform.service.IFriendService;
import com.lx.implatform.session.SessionContext; import com.bx.implatform.service.IUserService;
import com.lx.implatform.session.UserSession; import com.bx.implatform.session.SessionContext;
import com.lx.implatform.vo.FriendVO; import com.bx.implatform.session.UserSession;
import org.springframework.aop.framework.AopContext; import org.springframework.aop.framework.AopContext;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheConfig;

10
im-platform/src/main/java/com/lx/implatform/service/impl/GroupMemberServiceImpl.java → im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java
View File

@ -1,11 +1,11 @@
package com.lx.implatform.service.impl; package com.bx.implatform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.implatform.entity.GroupMember; import com.bx.implatform.entity.GroupMember;
import com.lx.implatform.mapper.GroupMemberMapper; import com.bx.implatform.mapper.GroupMemberMapper;
import com.lx.implatform.service.IGroupMemberService; import com.bx.implatform.service.IGroupMemberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;

31
im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageServiceImpl.java → im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
View File

@ -1,22 +1,21 @@
package com.lx.implatform.service.impl; package com.bx.implatform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import com.lx.common.model.im.GroupMessageInfo; import com.bx.common.model.im.GroupMessageInfo;
import com.lx.common.util.BeanUtils; import com.bx.common.util.BeanUtils;
import com.lx.implatform.entity.Group; import com.bx.implatform.exception.GlobalException;
import com.lx.implatform.entity.GroupMember; import com.bx.implatform.vo.GroupMessageVO;
import com.lx.implatform.entity.GroupMessage; import com.bx.implatform.entity.Group;
import com.lx.implatform.exception.GlobalException; import com.bx.implatform.entity.GroupMember;
import com.lx.implatform.mapper.GroupMessageMapper; import com.bx.implatform.entity.GroupMessage;
import com.lx.implatform.service.IGroupMemberService; import com.bx.implatform.mapper.GroupMessageMapper;
import com.lx.implatform.service.IGroupMessageService; import com.bx.implatform.service.IGroupMemberService;
import com.bx.implatform.service.IGroupMessageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lx.implatform.service.IGroupService; import com.bx.implatform.service.IGroupService;
import com.lx.implatform.session.SessionContext; import com.bx.implatform.session.SessionContext;
import com.lx.implatform.vo.GroupMessageVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

40
im-platform/src/main/java/com/lx/implatform/service/impl/GroupServiceImpl.java → im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java
View File

@ -1,26 +1,26 @@
package com.lx.implatform.service.impl; package com.bx.implatform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.lx.common.contant.Constant; import com.bx.common.contant.Constant;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import com.lx.common.util.BeanUtils; import com.bx.common.util.BeanUtils;
import com.lx.implatform.entity.Friend; import com.bx.implatform.exception.GlobalException;
import com.lx.implatform.entity.Group; import com.bx.implatform.vo.GroupInviteVO;
import com.lx.implatform.entity.GroupMember; import com.bx.implatform.vo.GroupMemberVO;
import com.lx.implatform.entity.User; import com.bx.implatform.vo.GroupVO;
import com.lx.implatform.exception.GlobalException; import com.bx.implatform.entity.Friend;
import com.lx.implatform.mapper.GroupMapper; import com.bx.implatform.entity.Group;
import com.lx.implatform.service.IFriendService; import com.bx.implatform.entity.GroupMember;
import com.lx.implatform.service.IGroupMemberService; import com.bx.implatform.entity.User;
import com.lx.implatform.service.IGroupService; import com.bx.implatform.mapper.GroupMapper;
import com.bx.implatform.service.IFriendService;
import com.bx.implatform.service.IGroupMemberService;
import com.bx.implatform.service.IGroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lx.implatform.service.IUserService; import com.bx.implatform.service.IUserService;
import com.lx.implatform.session.SessionContext; import com.bx.implatform.session.SessionContext;
import com.lx.implatform.session.UserSession; import com.bx.implatform.session.UserSession;
import com.lx.implatform.vo.GroupInviteVO;
import com.lx.implatform.vo.GroupMemberVO;
import com.lx.implatform.vo.GroupVO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheConfig;

27
im-platform/src/main/java/com/lx/implatform/service/impl/PrivateMessageServiceImpl.java → im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
View File

@ -1,20 +1,19 @@
package com.lx.implatform.service.impl; package com.bx.implatform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.MessageStatusEnum; import com.bx.common.enums.MessageStatusEnum;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import com.lx.common.model.im.PrivateMessageInfo; import com.bx.common.model.im.PrivateMessageInfo;
import com.lx.common.util.BeanUtils; import com.bx.common.util.BeanUtils;
import com.lx.implatform.entity.PrivateMessage; import com.bx.implatform.exception.GlobalException;
import com.lx.implatform.exception.GlobalException; import com.bx.implatform.service.IPrivateMessageService;
import com.lx.implatform.mapper.PrivateMessageMapper; import com.bx.implatform.session.SessionContext;
import com.lx.implatform.service.IFriendService; import com.bx.implatform.vo.PrivateMessageVO;
import com.lx.implatform.service.IPrivateMessageService; import com.bx.implatform.entity.PrivateMessage;
import com.lx.implatform.session.SessionContext; import com.bx.implatform.mapper.PrivateMessageMapper;
import com.lx.implatform.vo.PrivateMessageVO; import com.bx.implatform.service.IFriendService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

10
im-platform/src/main/java/com/lx/implatform/service/impl/SecurityUserDetailsServiceImpl.java → im-platform/src/main/java/com/bx/implatform/service/impl/SecurityUserDetailsServiceImpl.java
View File

@ -1,11 +1,11 @@
package com.lx.implatform.service.impl; package com.bx.implatform.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.lx.common.util.BeanUtils; import com.bx.common.util.BeanUtils;
import com.lx.implatform.entity.User; import com.bx.implatform.entity.User;
import com.lx.implatform.service.IUserService; import com.bx.implatform.service.IUserService;
import com.lx.implatform.session.UserSession; import com.bx.implatform.session.UserSession;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority;

33
im-platform/src/main/java/com/lx/implatform/service/impl/UserServiceImpl.java → im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java
View File

@ -1,23 +1,22 @@
package com.lx.implatform.service.impl; package com.bx.implatform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import com.lx.common.util.BeanUtils; import com.bx.common.util.BeanUtils;
import com.lx.implatform.entity.Friend; import com.bx.implatform.exception.GlobalException;
import com.lx.implatform.entity.GroupMember; import com.bx.implatform.service.IUserService;
import com.lx.implatform.entity.User; import com.bx.implatform.session.SessionContext;
import com.lx.implatform.exception.GlobalException; import com.bx.implatform.session.UserSession;
import com.lx.implatform.mapper.UserMapper; import com.bx.implatform.vo.RegisterVO;
import com.lx.implatform.service.IFriendService; import com.bx.implatform.vo.UserVO;
import com.lx.implatform.service.IGroupMemberService; import com.bx.implatform.entity.Friend;
import com.lx.implatform.service.IUserService; import com.bx.implatform.entity.GroupMember;
import com.lx.implatform.session.SessionContext; import com.bx.implatform.entity.User;
import com.lx.implatform.session.UserSession; import com.bx.implatform.mapper.UserMapper;
import com.lx.implatform.vo.RegisterVO; import com.bx.implatform.service.IFriendService;
import com.lx.implatform.vo.UserVO; import com.bx.implatform.service.IGroupMemberService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;

18
im-platform/src/main/java/com/lx/implatform/service/thirdparty/FileService.java → im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java
View File

@ -1,13 +1,13 @@
package com.lx.implatform.service.thirdparty; package com.bx.implatform.service.thirdparty;
import com.lx.common.contant.Constant; import com.bx.common.contant.Constant;
import com.lx.common.enums.FileTypeEnum; import com.bx.common.enums.FileTypeEnum;
import com.lx.common.enums.ResultCode; import com.bx.common.enums.ResultCode;
import com.lx.implatform.exception.GlobalException; import com.bx.implatform.exception.GlobalException;
import com.lx.implatform.util.FileUtil; import com.bx.implatform.vo.UploadImageVO;
import com.lx.implatform.util.ImageUtil; import com.bx.implatform.util.FileUtil;
import com.lx.implatform.util.MinioUtil; import com.bx.implatform.util.ImageUtil;
import com.lx.implatform.vo.UploadImageVO; import com.bx.implatform.util.MinioUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
im-platform/src/main/java/com/lx/implatform/session/SessionContext.java → im-platform/src/main/java/com/bx/implatform/session/SessionContext.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.session; package com.bx.implatform.session;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;

2
im-platform/src/main/java/com/lx/implatform/session/UserSession.java → im-platform/src/main/java/com/bx/implatform/session/UserSession.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.session; package com.bx.implatform.session;
import lombok.Data; import lombok.Data;

10
im-platform/src/main/java/com/lx/implatform/task/PullAlreadyReadMessageTask.java → im-platform/src/main/java/com/bx/implatform/task/PullAlreadyReadMessageTask.java
View File

@ -1,10 +1,10 @@
package com.lx.implatform.task; package com.bx.implatform.task;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.MessageStatusEnum; import com.bx.common.enums.MessageStatusEnum;
import com.lx.implatform.entity.PrivateMessage; import com.bx.implatform.entity.PrivateMessage;
import com.lx.implatform.service.IPrivateMessageService; import com.bx.implatform.service.IPrivateMessageService;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
im-platform/src/main/java/com/lx/implatform/util/FileUtil.java → im-platform/src/main/java/com/bx/implatform/util/FileUtil.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.util; package com.bx.implatform.util;
public class FileUtil { public class FileUtil {

2
im-platform/src/main/java/com/lx/implatform/util/ImageUtil.java → im-platform/src/main/java/com/bx/implatform/util/ImageUtil.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.util; package com.bx.implatform.util;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

4
im-platform/src/main/java/com/lx/implatform/util/MinioUtil.java → im-platform/src/main/java/com/bx/implatform/util/MinioUtil.java
View File

@ -1,7 +1,7 @@
package com.lx.implatform.util; package com.bx.implatform.util;
import com.lx.common.util.DateTimeUtils; import com.bx.common.util.DateTimeUtils;
import io.minio.*; import io.minio.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

2
im-platform/src/main/java/com/lx/implatform/vo/FriendVO.java → im-platform/src/main/java/com/bx/implatform/vo/FriendVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

2
im-platform/src/main/java/com/lx/implatform/vo/GroupInviteVO.java → im-platform/src/main/java/com/bx/implatform/vo/GroupInviteVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
im-platform/src/main/java/com/lx/implatform/vo/GroupMemberVO.java → im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

2
im-platform/src/main/java/com/lx/implatform/vo/GroupMessageVO.java → im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
im-platform/src/main/java/com/lx/implatform/vo/GroupVO.java → im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
im-platform/src/main/java/com/lx/implatform/vo/PrivateMessageVO.java → im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

2
im-platform/src/main/java/com/lx/implatform/vo/RegisterVO.java → im-platform/src/main/java/com/bx/implatform/vo/RegisterVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
im-platform/src/main/java/com/lx/implatform/vo/UploadImageVO.java → im-platform/src/main/java/com/bx/implatform/vo/UploadImageVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
im-platform/src/main/java/com/lx/implatform/vo/UserVO.java → im-platform/src/main/java/com/bx/implatform/vo/UserVO.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.vo; package com.bx.implatform.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

69
im-platform/src/main/java/com/lx/implatform/entity/GroupMessageReadPos.java
View File

@ -1,69 +0,0 @@
package com.lx.implatform.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 群消息读取位置
* </p>
*
* @author blue
* @since 2022-10-31
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("im_group_message_read_pos")
public class GroupMessageReadPos extends Model<GroupMessageReadPos> {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 群id
*/
@TableField("group_id")
private Long groupId;
/**
* 用户id
*/
@TableField("user_id")
private Long userId;
/**
* 已读取消息的最大消息id
*/
@TableField("read_pos")
private Long readPos;
/**
* 最后读取时间
*/
@TableField("last_read_time")
private Date lastReadTime;
@Override
protected Serializable pkVal() {
return this.id;
}
}

16
im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageReadPosMapper.java
View File

@ -1,16 +0,0 @@
package com.lx.implatform.mapper;
import com.lx.implatform.entity.GroupMessageReadPos;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 群消息读取位置 Mapper 接口
* </p>
*
* @author blue
* @since 2022-10-31
*/
public interface GroupMessageReadPosMapper extends BaseMapper<GroupMessageReadPos> {
}

16
im-platform/src/main/java/com/lx/implatform/service/IGroupMessageReadPosService.java
View File

@ -1,16 +0,0 @@
package com.lx.implatform.service;
import com.lx.implatform.entity.GroupMessageReadPos;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 群消息读取位置 服务类
* </p>
*
* @author blue
* @since 2022-10-31
*/
public interface IGroupMessageReadPosService extends IService<GroupMessageReadPos> {
}

20
im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageReadPosServiceImpl.java
View File

@ -1,20 +0,0 @@
package com.lx.implatform.service.impl;
import com.lx.implatform.entity.GroupMessageReadPos;
import com.lx.implatform.mapper.GroupMessageReadPosMapper;
import com.lx.implatform.service.IGroupMessageReadPosService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 群消息读取位置 服务实现类
* </p>
*
* @author blue
* @since 2022-10-31
*/
@Service
public class GroupMessageReadPosServiceImpl extends ServiceImpl<GroupMessageReadPosMapper, GroupMessageReadPos> implements IGroupMessageReadPosService {
}

4
im-platform/src/main/resources/application.yml
View File

@ -5,7 +5,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/simple-im?useUnicode=true&characterEncoding=utf-8 url: jdbc:mysql://localhost:3306/box-im?useUnicode=true&characterEncoding=utf-8
username: root username: root
password: root password: root
@ -33,7 +33,7 @@ minio:
public: http://3xagfu.natappfree.cc/file #外网访问地址 public: http://3xagfu.natappfree.cc/file #外网访问地址
accessKey: admin accessKey: admin
secretKey: 12345678 secretKey: 12345678
bucketName: lx-im bucketName: box-im
imagePath: image imagePath: image
filePath: file filePath: file

6
im-server/pom.xml
View File

@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>lx-im</artifactId> <artifactId>box-im</artifactId>
<groupId>com.lx</groupId> <groupId>com.bx</groupId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -14,7 +14,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.lx</groupId> <groupId>com.bx</groupId>
<artifactId>commom</artifactId> <artifactId>commom</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>

6
im-server/src/main/java/com/lx/implatform/imserver/IMServerApp.java → im-server/src/main/java/com/bx/imserver/IMServerApp.java
View File

@ -1,7 +1,7 @@
package com.lx.implatform.imserver; package com.bx.imserver;
import com.lx.implatform.imserver.websocket.WebsocketServer; import com.bx.imserver.websocket.WebsocketServer;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner; import org.springframework.boot.CommandLineRunner;
@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableAsync @EnableAsync
@EnableScheduling @EnableScheduling
@ComponentScan(basePackages={"com.lx"}) @ComponentScan(basePackages={"com.bx"})
@SpringBootApplication @SpringBootApplication
public class IMServerApp implements CommandLineRunner { public class IMServerApp implements CommandLineRunner {

2
im-server/src/main/java/com/lx/implatform/imserver/config/RedisConfig.java → im-server/src/main/java/com/bx/imserver/config/RedisConfig.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.imserver.config; package com.bx.imserver.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;

2
im-server/src/main/java/com/lx/implatform/imserver/constant/Constant.java → im-server/src/main/java/com/bx/imserver/constant/Constant.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.imserver.constant; package com.bx.imserver.constant;
public class Constant { public class Constant {

4
im-server/src/main/java/com/lx/implatform/imserver/task/AbstractPullMessageTask.java → im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java
View File

@ -1,6 +1,6 @@
package com.lx.implatform.imserver.task; package com.bx.imserver.task;
import com.lx.implatform.imserver.websocket.WebsocketServer; import com.bx.imserver.websocket.WebsocketServer;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

20
im-server/src/main/java/com/lx/implatform/imserver/task/PullUnreadGroupMessageTask.java → im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java
View File

@ -1,18 +1,14 @@
package com.lx.implatform.imserver.task; package com.bx.imserver.task;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.WSCmdEnum; import com.bx.common.enums.WSCmdEnum;
import com.lx.common.model.im.GroupMessageInfo; import com.bx.common.model.im.GroupMessageInfo;
import com.lx.common.model.im.PrivateMessageInfo; import com.bx.imserver.websocket.WebsocketServer;
import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; import com.bx.imserver.websocket.processor.MessageProcessor;
import com.lx.implatform.imserver.websocket.WebsocketServer; import com.bx.imserver.websocket.processor.ProcessorFactory;
import com.lx.implatform.imserver.websocket.processor.MessageProcessor;
import com.lx.implatform.imserver.websocket.processor.ProcessorFactory;
import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;

17
im-server/src/main/java/com/lx/implatform/imserver/task/PullUnreadPrivateMessageTask.java → im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java
View File

@ -1,18 +1,15 @@
package com.lx.implatform.imserver.task; package com.bx.imserver.task;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.WSCmdEnum; import com.bx.common.enums.WSCmdEnum;
import com.lx.common.model.im.PrivateMessageInfo; import com.bx.common.model.im.PrivateMessageInfo;
import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; import com.bx.imserver.websocket.WebsocketServer;
import com.lx.implatform.imserver.websocket.WebsocketServer; import com.bx.imserver.websocket.processor.MessageProcessor;
import com.lx.implatform.imserver.websocket.processor.MessageProcessor; import com.bx.imserver.websocket.processor.ProcessorFactory;
import com.lx.implatform.imserver.websocket.processor.ProcessorFactory;
import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;

18
im-server/src/main/java/com/lx/implatform/imserver/websocket/WebSocketHandler.java → im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java
View File

@ -1,13 +1,11 @@
package com.lx.implatform.imserver.websocket; package com.bx.imserver.websocket;
import cn.hutool.core.bean.BeanUtil; import com.bx.common.contant.RedisKey;
import com.lx.common.contant.RedisKey; import com.bx.common.enums.WSCmdEnum;
import com.lx.common.enums.WSCmdEnum; import com.bx.common.model.im.SendInfo;
import com.lx.common.model.im.HeartbeatInfo; import com.bx.common.util.SpringContextHolder;
import com.lx.common.model.im.SendInfo; import com.bx.imserver.websocket.processor.MessageProcessor;
import com.lx.common.util.SpringContextHolder; import com.bx.imserver.websocket.processor.ProcessorFactory;
import com.lx.implatform.imserver.websocket.processor.MessageProcessor;
import com.lx.implatform.imserver.websocket.processor.ProcessorFactory;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler; import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleState;
@ -16,8 +14,6 @@ import io.netty.util.AttributeKey;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import java.util.HashMap;
/** /**
* WebSocket 长连接下 文本帧的处理器 * WebSocket 长连接下 文本帧的处理器

2
im-server/src/main/java/com/lx/implatform/imserver/websocket/WebsocketChannelCtxHloder.java → im-server/src/main/java/com/bx/imserver/websocket/WebsocketChannelCtxHloder.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.imserver.websocket; package com.bx.imserver.websocket;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;

10
im-server/src/main/java/com/lx/implatform/imserver/websocket/WebsocketServer.java → im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java
View File

@ -1,8 +1,8 @@
package com.lx.implatform.imserver.websocket; package com.bx.imserver.websocket;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.implatform.imserver.websocket.endecode.MessageProtocolDecoder; import com.bx.imserver.websocket.endecode.MessageProtocolDecoder;
import com.lx.implatform.imserver.websocket.endecode.MessageProtocolEncoder; import com.bx.imserver.websocket.endecode.MessageProtocolEncoder;
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.*; import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup;
@ -13,12 +13,10 @@ import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
import io.netty.handler.stream.ChunkedWriteHandler; import io.netty.handler.stream.ChunkedWriteHandler;
import io.netty.handler.timeout.IdleStateHandler; import io.netty.handler.timeout.IdleStateHandler;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@Component @Component

4
im-server/src/main/java/com/lx/implatform/imserver/websocket/endecode/MessageProtocolDecoder.java → im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java
View File

@ -1,7 +1,7 @@
package com.lx.implatform.imserver.websocket.endecode; package com.bx.imserver.websocket.endecode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.lx.common.model.im.SendInfo; import com.bx.common.model.im.SendInfo;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.handler.codec.MessageToMessageDecoder;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;

4
im-server/src/main/java/com/lx/implatform/imserver/websocket/endecode/MessageProtocolEncoder.java → im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java
View File

@ -1,7 +1,7 @@
package com.lx.implatform.imserver.websocket.endecode; package com.bx.imserver.websocket.endecode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.lx.common.model.im.SendInfo; import com.bx.common.model.im.SendInfo;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageEncoder; import io.netty.handler.codec.MessageToMessageEncoder;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;

12
im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/GroupMessageProcessor.java → im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java
View File

@ -1,10 +1,10 @@
package com.lx.implatform.imserver.websocket.processor; package com.bx.imserver.websocket.processor;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.WSCmdEnum; import com.bx.common.enums.WSCmdEnum;
import com.lx.common.model.im.GroupMessageInfo; import com.bx.common.model.im.GroupMessageInfo;
import com.lx.common.model.im.SendInfo; import com.bx.common.model.im.SendInfo;
import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; import com.bx.imserver.websocket.WebsocketChannelCtxHloder;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

10
im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/HeartbeatProcessor.java → im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java
View File

@ -1,10 +1,10 @@
package com.lx.implatform.imserver.websocket.processor; package com.bx.imserver.websocket.processor;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.lx.common.enums.WSCmdEnum; import com.bx.common.enums.WSCmdEnum;
import com.lx.common.model.im.HeartbeatInfo; import com.bx.common.model.im.HeartbeatInfo;
import com.lx.common.model.im.SendInfo; import com.bx.common.model.im.SendInfo;
import com.lx.implatform.imserver.websocket.WebsocketServer; import com.bx.imserver.websocket.WebsocketServer;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

16
im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/LoginProcessor.java → im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java
View File

@ -1,13 +1,12 @@
package com.lx.implatform.imserver.websocket.processor; package com.bx.imserver.websocket.processor;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.WSCmdEnum; import com.bx.common.enums.WSCmdEnum;
import com.lx.common.model.im.HeartbeatInfo; import com.bx.common.model.im.LoginInfo;
import com.lx.common.model.im.LoginInfo; import com.bx.common.model.im.SendInfo;
import com.lx.common.model.im.SendInfo; import com.bx.imserver.websocket.WebsocketChannelCtxHloder;
import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; import com.bx.imserver.websocket.WebsocketServer;
import com.lx.implatform.imserver.websocket.WebsocketServer;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.util.AttributeKey; import io.netty.util.AttributeKey;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -16,7 +15,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.TimeUnit;
@Slf4j @Slf4j
@Component @Component

2
im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/MessageProcessor.java → im-server/src/main/java/com/bx/imserver/websocket/processor/MessageProcessor.java
View File

@ -1,4 +1,4 @@
package com.lx.implatform.imserver.websocket.processor; package com.bx.imserver.websocket.processor;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;

15
im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/PrivateMessageProcessor.java → im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java
View File

@ -1,19 +1,16 @@
package com.lx.implatform.imserver.websocket.processor; package com.bx.imserver.websocket.processor;
import com.lx.common.contant.RedisKey; import com.bx.common.contant.RedisKey;
import com.lx.common.enums.WSCmdEnum; import com.bx.common.enums.WSCmdEnum;
import com.lx.common.model.im.SendInfo; import com.bx.common.model.im.SendInfo;
import com.lx.common.model.im.PrivateMessageInfo; import com.bx.common.model.im.PrivateMessageInfo;
import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; import com.bx.imserver.websocket.WebsocketChannelCtxHloder;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
@Slf4j @Slf4j
@Component @Component
public class PrivateMessageProcessor extends MessageProcessor<PrivateMessageInfo> { public class PrivateMessageProcessor extends MessageProcessor<PrivateMessageInfo> {

6
im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/ProcessorFactory.java → im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java
View File

@ -1,7 +1,7 @@
package com.lx.implatform.imserver.websocket.processor; package com.bx.imserver.websocket.processor;
import com.lx.common.enums.WSCmdEnum; import com.bx.common.enums.WSCmdEnum;
import com.lx.common.util.SpringContextHolder; import com.bx.common.util.SpringContextHolder;
public class ProcessorFactory { public class ProcessorFactory {

Some files were not shown because too many files changed in this diff

Write Preview
Loading…
Cancel
Save