diff --git a/.gitignore b/.gitignore index 64b45c1..1aa5cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /.idea/ -/lx-im.iml +/box-im.iml /im-server/im-server.iml /im-platform/im-platform.iml /commom/commom.iml diff --git a/commom/pom.xml b/commom/pom.xml index 6fae948..c269593 100644 --- a/commom/pom.xml +++ b/commom/pom.xml @@ -3,8 +3,8 @@ 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"> - lx-im - com.lx + box-im + com.bx 1.0.0 4.0.0 diff --git a/commom/src/main/java/com/lx/common/contant/Constant.java b/commom/src/main/java/com/bx/common/contant/Constant.java similarity index 90% rename from commom/src/main/java/com/lx/common/contant/Constant.java rename to commom/src/main/java/com/bx/common/contant/Constant.java index 301a8f6..40d3cf7 100644 --- a/commom/src/main/java/com/lx/common/contant/Constant.java +++ b/commom/src/main/java/com/bx/common/contant/Constant.java @@ -1,4 +1,4 @@ -package com.lx.common.contant; +package com.bx.common.contant; diff --git a/commom/src/main/java/com/lx/common/contant/RedisKey.java b/commom/src/main/java/com/bx/common/contant/RedisKey.java similarity index 97% rename from commom/src/main/java/com/lx/common/contant/RedisKey.java rename to commom/src/main/java/com/bx/common/contant/RedisKey.java index 1fe64fc..ff0c04d 100644 --- a/commom/src/main/java/com/lx/common/contant/RedisKey.java +++ b/commom/src/main/java/com/bx/common/contant/RedisKey.java @@ -1,4 +1,4 @@ -package com.lx.common.contant; +package com.bx.common.contant; public class RedisKey { diff --git a/commom/src/main/java/com/lx/common/enums/FileTypeEnum.java b/commom/src/main/java/com/bx/common/enums/FileTypeEnum.java similarity index 95% rename from commom/src/main/java/com/lx/common/enums/FileTypeEnum.java rename to commom/src/main/java/com/bx/common/enums/FileTypeEnum.java index 23b6b01..35091b1 100644 --- a/commom/src/main/java/com/lx/common/enums/FileTypeEnum.java +++ b/commom/src/main/java/com/bx/common/enums/FileTypeEnum.java @@ -1,4 +1,4 @@ -package com.lx.common.enums; +package com.bx.common.enums; public enum FileTypeEnum { diff --git a/commom/src/main/java/com/lx/common/enums/MessageStatusEnum.java b/commom/src/main/java/com/bx/common/enums/MessageStatusEnum.java similarity index 95% rename from commom/src/main/java/com/lx/common/enums/MessageStatusEnum.java rename to commom/src/main/java/com/bx/common/enums/MessageStatusEnum.java index 72beb5c..1ee5ca6 100644 --- a/commom/src/main/java/com/lx/common/enums/MessageStatusEnum.java +++ b/commom/src/main/java/com/bx/common/enums/MessageStatusEnum.java @@ -1,4 +1,4 @@ -package com.lx.common.enums; +package com.bx.common.enums; public enum MessageStatusEnum { diff --git a/commom/src/main/java/com/lx/common/enums/MessageTypeEnum.java b/commom/src/main/java/com/bx/common/enums/MessageTypeEnum.java similarity index 95% rename from commom/src/main/java/com/lx/common/enums/MessageTypeEnum.java rename to commom/src/main/java/com/bx/common/enums/MessageTypeEnum.java index 77afdf6..f2dc541 100644 --- a/commom/src/main/java/com/lx/common/enums/MessageTypeEnum.java +++ b/commom/src/main/java/com/bx/common/enums/MessageTypeEnum.java @@ -1,4 +1,4 @@ -package com.lx.common.enums; +package com.bx.common.enums; public enum MessageTypeEnum { diff --git a/commom/src/main/java/com/lx/common/enums/ResultCode.java b/commom/src/main/java/com/bx/common/enums/ResultCode.java similarity index 97% rename from commom/src/main/java/com/lx/common/enums/ResultCode.java rename to commom/src/main/java/com/bx/common/enums/ResultCode.java index 63f6a81..ec41f5c 100644 --- a/commom/src/main/java/com/lx/common/enums/ResultCode.java +++ b/commom/src/main/java/com/bx/common/enums/ResultCode.java @@ -1,4 +1,4 @@ -package com.lx.common.enums; +package com.bx.common.enums; /** * 响应码枚举 diff --git a/commom/src/main/java/com/lx/common/enums/WSCmdEnum.java b/commom/src/main/java/com/bx/common/enums/WSCmdEnum.java similarity index 96% rename from commom/src/main/java/com/lx/common/enums/WSCmdEnum.java rename to commom/src/main/java/com/bx/common/enums/WSCmdEnum.java index a5fc25f..587ae04 100644 --- a/commom/src/main/java/com/lx/common/enums/WSCmdEnum.java +++ b/commom/src/main/java/com/bx/common/enums/WSCmdEnum.java @@ -1,4 +1,4 @@ -package com.lx.common.enums; +package com.bx.common.enums; public enum WSCmdEnum { diff --git a/commom/src/main/java/com/lx/common/generator/CodeGenerator.java b/commom/src/main/java/com/bx/common/generator/CodeGenerator.java similarity index 95% rename from commom/src/main/java/com/lx/common/generator/CodeGenerator.java rename to commom/src/main/java/com/bx/common/generator/CodeGenerator.java index b2bacd6..7e94971 100644 --- a/commom/src/main/java/com/lx/common/generator/CodeGenerator.java +++ b/commom/src/main/java/com/bx/common/generator/CodeGenerator.java @@ -1,4 +1,4 @@ -package com.lx.common.generator; +package com.bx.common.generator; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.toolkit.StringPool; @@ -36,7 +36,7 @@ public class CodeGenerator { // 数据源配置 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.setUsername("root"); dsc.setPassword("root"); @@ -45,7 +45,7 @@ public class CodeGenerator { // 包配置 PackageConfig pc = new PackageConfig(); pc.setModuleName(""); - pc.setParent("com.lx"); + pc.setParent("com.bx"); mpg.setPackageInfo(pc); // 如果模板引擎是 velocity diff --git a/commom/src/main/java/com/lx/common/model/im/GroupMessageInfo.java b/commom/src/main/java/com/bx/common/model/im/GroupMessageInfo.java similarity index 90% rename from commom/src/main/java/com/lx/common/model/im/GroupMessageInfo.java rename to commom/src/main/java/com/bx/common/model/im/GroupMessageInfo.java index 524fd47..caaab76 100644 --- a/commom/src/main/java/com/lx/common/model/im/GroupMessageInfo.java +++ b/commom/src/main/java/com/bx/common/model/im/GroupMessageInfo.java @@ -1,4 +1,4 @@ -package com.lx.common.model.im; +package com.bx.common.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/lx/common/model/im/HeartbeatInfo.java b/commom/src/main/java/com/bx/common/model/im/HeartbeatInfo.java similarity index 72% rename from commom/src/main/java/com/lx/common/model/im/HeartbeatInfo.java rename to commom/src/main/java/com/bx/common/model/im/HeartbeatInfo.java index 4671135..55b6c09 100644 --- a/commom/src/main/java/com/lx/common/model/im/HeartbeatInfo.java +++ b/commom/src/main/java/com/bx/common/model/im/HeartbeatInfo.java @@ -1,4 +1,4 @@ -package com.lx.common.model.im; +package com.bx.common.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/lx/common/model/im/LoginInfo.java b/commom/src/main/java/com/bx/common/model/im/LoginInfo.java similarity index 71% rename from commom/src/main/java/com/lx/common/model/im/LoginInfo.java rename to commom/src/main/java/com/bx/common/model/im/LoginInfo.java index b493b32..3636697 100644 --- a/commom/src/main/java/com/lx/common/model/im/LoginInfo.java +++ b/commom/src/main/java/com/bx/common/model/im/LoginInfo.java @@ -1,4 +1,4 @@ -package com.lx.common.model.im; +package com.bx.common.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/lx/common/model/im/PrivateMessageInfo.java b/commom/src/main/java/com/bx/common/model/im/PrivateMessageInfo.java similarity index 88% rename from commom/src/main/java/com/lx/common/model/im/PrivateMessageInfo.java rename to commom/src/main/java/com/bx/common/model/im/PrivateMessageInfo.java index e671a57..fbc4b49 100644 --- a/commom/src/main/java/com/lx/common/model/im/PrivateMessageInfo.java +++ b/commom/src/main/java/com/bx/common/model/im/PrivateMessageInfo.java @@ -1,4 +1,4 @@ -package com.lx.common.model.im; +package com.bx.common.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/lx/common/model/im/SendInfo.java b/commom/src/main/java/com/bx/common/model/im/SendInfo.java similarity index 77% rename from commom/src/main/java/com/lx/common/model/im/SendInfo.java rename to commom/src/main/java/com/bx/common/model/im/SendInfo.java index 831b9e8..794c154 100644 --- a/commom/src/main/java/com/lx/common/model/im/SendInfo.java +++ b/commom/src/main/java/com/bx/common/model/im/SendInfo.java @@ -1,4 +1,4 @@ -package com.lx.common.model.im; +package com.bx.common.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/lx/common/result/Result.java b/commom/src/main/java/com/bx/common/result/Result.java similarity index 81% rename from commom/src/main/java/com/lx/common/result/Result.java rename to commom/src/main/java/com/bx/common/result/Result.java index 4463c48..08006a4 100644 --- a/commom/src/main/java/com/lx/common/result/Result.java +++ b/commom/src/main/java/com/bx/common/result/Result.java @@ -1,4 +1,4 @@ -package com.lx.common.result; +package com.bx.common.result; import lombok.Data; diff --git a/commom/src/main/java/com/lx/common/result/ResultUtils.java b/commom/src/main/java/com/bx/common/result/ResultUtils.java similarity index 97% rename from commom/src/main/java/com/lx/common/result/ResultUtils.java rename to commom/src/main/java/com/bx/common/result/ResultUtils.java index 040ef8d..35a7988 100644 --- a/commom/src/main/java/com/lx/common/result/ResultUtils.java +++ b/commom/src/main/java/com/bx/common/result/ResultUtils.java @@ -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.Executors; diff --git a/commom/src/main/java/com/lx/common/util/BeanUtils.java b/commom/src/main/java/com/bx/common/util/BeanUtils.java similarity index 99% rename from commom/src/main/java/com/lx/common/util/BeanUtils.java rename to commom/src/main/java/com/bx/common/util/BeanUtils.java index 5425757..5914212 100644 --- a/commom/src/main/java/com/lx/common/util/BeanUtils.java +++ b/commom/src/main/java/com/bx/common/util/BeanUtils.java @@ -1,4 +1,4 @@ -package com.lx.common.util; +package com.bx.common.util; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; diff --git a/commom/src/main/java/com/lx/common/util/DateTimeUtils.java b/commom/src/main/java/com/bx/common/util/DateTimeUtils.java similarity index 99% rename from commom/src/main/java/com/lx/common/util/DateTimeUtils.java rename to commom/src/main/java/com/bx/common/util/DateTimeUtils.java index 15d9072..5d79b0f 100644 --- a/commom/src/main/java/com/lx/common/util/DateTimeUtils.java +++ b/commom/src/main/java/com/bx/common/util/DateTimeUtils.java @@ -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.DateUtil; diff --git a/commom/src/main/java/com/lx/common/util/SpringContextHolder.java b/commom/src/main/java/com/bx/common/util/SpringContextHolder.java similarity index 97% rename from commom/src/main/java/com/lx/common/util/SpringContextHolder.java rename to commom/src/main/java/com/bx/common/util/SpringContextHolder.java index de7cfc9..0a980f4 100644 --- a/commom/src/main/java/com/lx/common/util/SpringContextHolder.java +++ b/commom/src/main/java/com/bx/common/util/SpringContextHolder.java @@ -1,4 +1,4 @@ -package com.lx.common.util; +package com.bx.common.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/im-platform/pom.xml b/im-platform/pom.xml index c77d10e..c27f121 100644 --- a/im-platform/pom.xml +++ b/im-platform/pom.xml @@ -3,8 +3,8 @@ 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"> - lx-im - com.lx + box-im + com.bx 1.0.0 4.0.0 @@ -14,7 +14,7 @@ - com.lx + com.bx commom 1.0.0 diff --git a/im-platform/src/main/java/com/lx/implatform/ImplatformApp.java b/im-platform/src/main/java/com/bx/implatform/ImplatformApp.java similarity index 81% rename from im-platform/src/main/java/com/lx/implatform/ImplatformApp.java rename to im-platform/src/main/java/com/bx/implatform/ImplatformApp.java index e7c07b6..3743c93 100644 --- a/im-platform/src/main/java/com/lx/implatform/ImplatformApp.java +++ b/im-platform/src/main/java/com/bx/implatform/ImplatformApp.java @@ -1,4 +1,4 @@ -package com.lx.implatform; +package com.bx.implatform; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; @@ -10,8 +10,8 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; @Slf4j @EnableAspectJAutoProxy(exposeProxy = true) -@MapperScan(basePackages = {"com.lx.implatform.mapper"}) -@ComponentScan(basePackages={"com.lx"}) +@MapperScan(basePackages = {"com.bx.implatform.mapper"}) +@ComponentScan(basePackages={"com.bx"}) @SpringBootApplication public class ImplatformApp { diff --git a/im-platform/src/main/java/com/lx/implatform/config/GlobalCorsConfig.java b/im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java similarity index 98% rename from im-platform/src/main/java/com/lx/implatform/config/GlobalCorsConfig.java rename to im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java index c155836..04b24f7 100644 --- a/im-platform/src/main/java/com/lx/implatform/config/GlobalCorsConfig.java +++ b/im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java @@ -1,4 +1,4 @@ -package com.lx.implatform.config; +package com.bx.implatform.config; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/im-platform/src/main/java/com/lx/implatform/config/MinIoClientConfig.java b/im-platform/src/main/java/com/bx/implatform/config/MinIoClientConfig.java similarity index 95% rename from im-platform/src/main/java/com/lx/implatform/config/MinIoClientConfig.java rename to im-platform/src/main/java/com/bx/implatform/config/MinIoClientConfig.java index e1ed793..837ee8c 100644 --- a/im-platform/src/main/java/com/lx/implatform/config/MinIoClientConfig.java +++ b/im-platform/src/main/java/com/bx/implatform/config/MinIoClientConfig.java @@ -1,4 +1,4 @@ -package com.lx.implatform.config; +package com.bx.implatform.config; import io.minio.MinioClient; import org.springframework.beans.factory.annotation.Value; diff --git a/im-platform/src/main/java/com/lx/implatform/config/RedisConfig.java b/im-platform/src/main/java/com/bx/implatform/config/RedisConfig.java similarity index 99% rename from im-platform/src/main/java/com/lx/implatform/config/RedisConfig.java rename to im-platform/src/main/java/com/bx/implatform/config/RedisConfig.java index 9b9624f..8687cfc 100644 --- a/im-platform/src/main/java/com/lx/implatform/config/RedisConfig.java +++ b/im-platform/src/main/java/com/bx/implatform/config/RedisConfig.java @@ -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.JsonTypeInfo; diff --git a/im-platform/src/main/java/com/lx/implatform/config/SwaggerConfig.java b/im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java similarity index 97% rename from im-platform/src/main/java/com/lx/implatform/config/SwaggerConfig.java rename to im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java index 39a1857..39e37b6 100644 --- a/im-platform/src/main/java/com/lx/implatform/config/SwaggerConfig.java +++ b/im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.lx.implatform.config; +package com.bx.implatform.config; import io.swagger.annotations.ApiOperation; import org.springframework.context.annotation.Bean; diff --git a/im-platform/src/main/java/com/lx/implatform/config/WebSecurityConfg.java b/im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java similarity index 96% rename from im-platform/src/main/java/com/lx/implatform/config/WebSecurityConfg.java rename to im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java index cc1c1a4..f5ec8fd 100644 --- a/im-platform/src/main/java/com/lx/implatform/config/WebSecurityConfg.java +++ b/im-platform/src/main/java/com/bx/implatform/config/WebSecurityConfg.java @@ -1,12 +1,12 @@ -package com.lx.implatform.config; +package com.bx.implatform.config; 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.lx.common.enums.ResultCode; -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; -import com.lx.implatform.service.IUserService; -import com.lx.implatform.session.UserSession; +import com.bx.common.enums.ResultCode; +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/im-platform/src/main/java/com/lx/implatform/controller/FileController.java b/im-platform/src/main/java/com/bx/implatform/controller/FileController.java similarity index 83% rename from im-platform/src/main/java/com/lx/implatform/controller/FileController.java rename to im-platform/src/main/java/com/bx/implatform/controller/FileController.java index 4e39c10..83ff9e3 100644 --- a/im-platform/src/main/java/com/lx/implatform/controller/FileController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/FileController.java @@ -1,9 +1,9 @@ -package com.lx.implatform.controller; +package com.bx.implatform.controller; -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; -import com.lx.implatform.service.thirdparty.FileService; -import com.lx.implatform.vo.UploadImageVO; +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; +import com.bx.implatform.vo.UploadImageVO; +import com.bx.implatform.service.thirdparty.FileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/im-platform/src/main/java/com/lx/implatform/controller/FriendController.java b/im-platform/src/main/java/com/bx/implatform/controller/FriendController.java similarity index 87% rename from im-platform/src/main/java/com/lx/implatform/controller/FriendController.java rename to im-platform/src/main/java/com/bx/implatform/controller/FriendController.java index 792702a..0ab0140 100644 --- a/im-platform/src/main/java/com/lx/implatform/controller/FriendController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/FriendController.java @@ -1,13 +1,12 @@ -package com.lx.implatform.controller; +package com.bx.implatform.controller; -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; -import com.lx.common.util.BeanUtils; -import com.lx.implatform.entity.Friend; -import com.lx.implatform.service.IFriendService; -import com.lx.implatform.session.SessionContext; -import com.lx.implatform.vo.FriendVO; +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; +import com.bx.implatform.vo.FriendVO; +import com.bx.implatform.entity.Friend; +import com.bx.implatform.service.IFriendService; +import com.bx.implatform.session.SessionContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-platform/src/main/java/com/lx/implatform/controller/GroupController.java b/im-platform/src/main/java/com/bx/implatform/controller/GroupController.java similarity index 87% rename from im-platform/src/main/java/com/lx/implatform/controller/GroupController.java rename to im-platform/src/main/java/com/bx/implatform/controller/GroupController.java index bb61baf..e274afb 100644 --- a/im-platform/src/main/java/com/lx/implatform/controller/GroupController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/GroupController.java @@ -1,15 +1,12 @@ -package com.lx.implatform.controller; - - -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; -import com.lx.common.util.BeanUtils; -import com.lx.implatform.entity.Group; -import com.lx.implatform.service.IGroupService; -import com.lx.implatform.vo.GroupInviteVO; -import com.lx.implatform.vo.GroupMemberVO; -import com.lx.implatform.vo.GroupVO; -import com.lx.implatform.vo.UserVO; +package com.bx.implatform.controller; + + +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; +import com.bx.implatform.vo.GroupInviteVO; +import com.bx.implatform.vo.GroupMemberVO; +import com.bx.implatform.vo.GroupVO; +import com.bx.implatform.service.IGroupService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,7 +15,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.List; -import java.util.concurrent.locks.ReentrantLock; @RestController diff --git a/im-platform/src/main/java/com/lx/implatform/controller/GroupMessageController.java b/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java similarity index 77% rename from im-platform/src/main/java/com/lx/implatform/controller/GroupMessageController.java rename to im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java index ce113f7..ca09878 100644 --- a/im-platform/src/main/java/com/lx/implatform/controller/GroupMessageController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java @@ -1,12 +1,10 @@ -package com.lx.implatform.controller; +package com.bx.implatform.controller; -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; -import com.lx.implatform.service.IGroupMemberService; -import com.lx.implatform.service.IGroupMessageService; -import com.lx.implatform.vo.GroupMessageVO; -import com.lx.implatform.vo.PrivateMessageVO; +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; +import com.bx.implatform.vo.GroupMessageVO; +import com.bx.implatform.service.IGroupMessageService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/im-platform/src/main/java/com/lx/implatform/controller/PrivateMessageController.java b/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java similarity index 83% rename from im-platform/src/main/java/com/lx/implatform/controller/PrivateMessageController.java rename to im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java index 1101f3b..c0446e9 100644 --- a/im-platform/src/main/java/com/lx/implatform/controller/PrivateMessageController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java @@ -1,10 +1,10 @@ -package com.lx.implatform.controller; +package com.bx.implatform.controller; -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; -import com.lx.implatform.service.IPrivateMessageService; -import com.lx.implatform.vo.PrivateMessageVO; +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; +import com.bx.implatform.vo.PrivateMessageVO; +import com.bx.implatform.service.IPrivateMessageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-platform/src/main/java/com/lx/implatform/controller/RegisterController.java b/im-platform/src/main/java/com/bx/implatform/controller/RegisterController.java similarity index 78% rename from im-platform/src/main/java/com/lx/implatform/controller/RegisterController.java rename to im-platform/src/main/java/com/bx/implatform/controller/RegisterController.java index 97859cb..df0faf1 100644 --- a/im-platform/src/main/java/com/lx/implatform/controller/RegisterController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/RegisterController.java @@ -1,10 +1,10 @@ -package com.lx.implatform.controller; +package com.bx.implatform.controller; -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; -import com.lx.implatform.service.IUserService; -import com.lx.implatform.vo.RegisterVO; +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; +import com.bx.implatform.vo.RegisterVO; +import com.bx.implatform.service.IUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-platform/src/main/java/com/lx/implatform/controller/UserController.java b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java similarity index 84% rename from im-platform/src/main/java/com/lx/implatform/controller/UserController.java rename to im-platform/src/main/java/com/bx/implatform/controller/UserController.java index 9154ad7..8c016f4 100644 --- a/im-platform/src/main/java/com/lx/implatform/controller/UserController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java @@ -1,14 +1,14 @@ -package com.lx.implatform.controller; +package com.bx.implatform.controller; -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; -import com.lx.common.util.BeanUtils; -import com.lx.implatform.entity.User; -import com.lx.implatform.service.IUserService; -import com.lx.implatform.session.SessionContext; -import com.lx.implatform.session.UserSession; -import com.lx.implatform.vo.UserVO; +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; +import com.bx.common.util.BeanUtils; +import com.bx.implatform.vo.UserVO; +import com.bx.implatform.entity.User; +import com.bx.implatform.service.IUserService; +import com.bx.implatform.session.SessionContext; +import com.bx.implatform.session.UserSession; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-platform/src/main/java/com/lx/implatform/entity/Friend.java b/im-platform/src/main/java/com/bx/implatform/entity/Friend.java similarity index 97% rename from im-platform/src/main/java/com/lx/implatform/entity/Friend.java rename to im-platform/src/main/java/com/bx/implatform/entity/Friend.java index 97ad2ff..ac8a5e2 100644 --- a/im-platform/src/main/java/com/lx/implatform/entity/Friend.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/Friend.java @@ -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.TableField; diff --git a/im-platform/src/main/java/com/lx/implatform/entity/Group.java b/im-platform/src/main/java/com/bx/implatform/entity/Group.java similarity index 94% rename from im-platform/src/main/java/com/lx/implatform/entity/Group.java rename to im-platform/src/main/java/com/bx/implatform/entity/Group.java index 7749dd9..feec161 100644 --- a/im-platform/src/main/java/com/lx/implatform/entity/Group.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/Group.java @@ -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.IdType; @@ -6,7 +6,6 @@ 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; diff --git a/im-platform/src/main/java/com/lx/implatform/entity/GroupMember.java b/im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java similarity index 94% rename from im-platform/src/main/java/com/lx/implatform/entity/GroupMember.java rename to im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java index 6c8d7fb..f5aac30 100644 --- a/im-platform/src/main/java/com/lx/implatform/entity/GroupMember.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java @@ -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.IdType; @@ -6,7 +6,6 @@ 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; diff --git a/im-platform/src/main/java/com/lx/implatform/entity/GroupMessage.java b/im-platform/src/main/java/com/bx/implatform/entity/GroupMessage.java similarity index 93% rename from im-platform/src/main/java/com/lx/implatform/entity/GroupMessage.java rename to im-platform/src/main/java/com/bx/implatform/entity/GroupMessage.java index 138d0f9..59e876d 100644 --- a/im-platform/src/main/java/com/lx/implatform/entity/GroupMessage.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/GroupMessage.java @@ -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.IdType; @@ -6,7 +6,6 @@ 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; diff --git a/im-platform/src/main/java/com/lx/implatform/entity/PrivateMessage.java b/im-platform/src/main/java/com/bx/implatform/entity/PrivateMessage.java similarity index 97% rename from im-platform/src/main/java/com/lx/implatform/entity/PrivateMessage.java rename to im-platform/src/main/java/com/bx/implatform/entity/PrivateMessage.java index af1188b..991dc78 100644 --- a/im-platform/src/main/java/com/lx/implatform/entity/PrivateMessage.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/PrivateMessage.java @@ -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.TableField; diff --git a/im-platform/src/main/java/com/lx/implatform/entity/User.java b/im-platform/src/main/java/com/bx/implatform/entity/User.java similarity index 97% rename from im-platform/src/main/java/com/lx/implatform/entity/User.java rename to im-platform/src/main/java/com/bx/implatform/entity/User.java index 7f934c7..83a638d 100644 --- a/im-platform/src/main/java/com/lx/implatform/entity/User.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/User.java @@ -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.TableField; diff --git a/im-platform/src/main/java/com/lx/implatform/exception/GlobalException.java b/im-platform/src/main/java/com/bx/implatform/exception/GlobalException.java similarity index 91% rename from im-platform/src/main/java/com/lx/implatform/exception/GlobalException.java rename to im-platform/src/main/java/com/bx/implatform/exception/GlobalException.java index 80cb7d2..b3deac0 100644 --- a/im-platform/src/main/java/com/lx/implatform/exception/GlobalException.java +++ b/im-platform/src/main/java/com/bx/implatform/exception/GlobalException.java @@ -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 java.io.Serializable; diff --git a/im-platform/src/main/java/com/lx/implatform/exception/GlobalExceptionHandler.java b/im-platform/src/main/java/com/bx/implatform/exception/GlobalExceptionHandler.java similarity index 96% rename from im-platform/src/main/java/com/lx/implatform/exception/GlobalExceptionHandler.java rename to im-platform/src/main/java/com/bx/implatform/exception/GlobalExceptionHandler.java index b001fb7..693ff39 100644 --- a/im-platform/src/main/java/com/lx/implatform/exception/GlobalExceptionHandler.java +++ b/im-platform/src/main/java/com/bx/implatform/exception/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ -package com.lx.implatform.exception; +package com.bx.implatform.exception; import cn.hutool.json.JSONException; -import com.lx.common.enums.ResultCode; -import com.lx.common.result.Result; -import com.lx.common.result.ResultUtils; +import com.bx.common.enums.ResultCode; +import com.bx.common.result.Result; +import com.bx.common.result.ResultUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.converter.HttpMessageNotReadableException; diff --git a/im-platform/src/main/java/com/lx/implatform/mapper/FriendMapper.java b/im-platform/src/main/java/com/bx/implatform/mapper/FriendMapper.java similarity index 73% rename from im-platform/src/main/java/com/lx/implatform/mapper/FriendMapper.java rename to im-platform/src/main/java/com/bx/implatform/mapper/FriendMapper.java index 9ed8a93..18114f3 100644 --- a/im-platform/src/main/java/com/lx/implatform/mapper/FriendMapper.java +++ b/im-platform/src/main/java/com/bx/implatform/mapper/FriendMapper.java @@ -1,7 +1,7 @@ -package com.lx.implatform.mapper; +package com.bx.implatform.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lx.implatform.entity.Friend; +import com.bx.implatform.entity.Friend; /** *

diff --git a/im-platform/src/main/java/com/lx/implatform/mapper/GroupMapper.java b/im-platform/src/main/java/com/bx/implatform/mapper/GroupMapper.java similarity index 73% rename from im-platform/src/main/java/com/lx/implatform/mapper/GroupMapper.java rename to im-platform/src/main/java/com/bx/implatform/mapper/GroupMapper.java index 93e582d..e0ce5cd 100644 --- a/im-platform/src/main/java/com/lx/implatform/mapper/GroupMapper.java +++ b/im-platform/src/main/java/com/bx/implatform/mapper/GroupMapper.java @@ -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; /** diff --git a/im-platform/src/main/java/com/lx/implatform/mapper/GroupMemberMapper.java b/im-platform/src/main/java/com/bx/implatform/mapper/GroupMemberMapper.java similarity index 73% rename from im-platform/src/main/java/com/lx/implatform/mapper/GroupMemberMapper.java rename to im-platform/src/main/java/com/bx/implatform/mapper/GroupMemberMapper.java index b8fee18..22e2dc2 100644 --- a/im-platform/src/main/java/com/lx/implatform/mapper/GroupMemberMapper.java +++ b/im-platform/src/main/java/com/bx/implatform/mapper/GroupMemberMapper.java @@ -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; /** diff --git a/im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageMapper.java b/im-platform/src/main/java/com/bx/implatform/mapper/GroupMessageMapper.java similarity index 73% rename from im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageMapper.java rename to im-platform/src/main/java/com/bx/implatform/mapper/GroupMessageMapper.java index 1646e4b..8d9a976 100644 --- a/im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageMapper.java +++ b/im-platform/src/main/java/com/bx/implatform/mapper/GroupMessageMapper.java @@ -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; /** diff --git a/im-platform/src/main/java/com/lx/implatform/mapper/PrivateMessageMapper.java b/im-platform/src/main/java/com/bx/implatform/mapper/PrivateMessageMapper.java similarity index 72% rename from im-platform/src/main/java/com/lx/implatform/mapper/PrivateMessageMapper.java rename to im-platform/src/main/java/com/bx/implatform/mapper/PrivateMessageMapper.java index 1d1199a..dd264a0 100644 --- a/im-platform/src/main/java/com/lx/implatform/mapper/PrivateMessageMapper.java +++ b/im-platform/src/main/java/com/bx/implatform/mapper/PrivateMessageMapper.java @@ -1,7 +1,7 @@ -package com.lx.implatform.mapper; +package com.bx.implatform.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lx.implatform.entity.PrivateMessage; +import com.bx.implatform.entity.PrivateMessage; /** *

diff --git a/im-platform/src/main/java/com/lx/implatform/mapper/UserMapper.java b/im-platform/src/main/java/com/bx/implatform/mapper/UserMapper.java similarity index 73% rename from im-platform/src/main/java/com/lx/implatform/mapper/UserMapper.java rename to im-platform/src/main/java/com/bx/implatform/mapper/UserMapper.java index 7d88b05..bd3cb70 100644 --- a/im-platform/src/main/java/com/lx/implatform/mapper/UserMapper.java +++ b/im-platform/src/main/java/com/bx/implatform/mapper/UserMapper.java @@ -1,7 +1,7 @@ -package com.lx.implatform.mapper; +package com.bx.implatform.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lx.implatform.entity.User; +import com.bx.implatform.entity.User; /** *

diff --git a/im-platform/src/main/java/com/lx/implatform/service/IFriendService.java b/im-platform/src/main/java/com/bx/implatform/service/IFriendService.java similarity index 80% rename from im-platform/src/main/java/com/lx/implatform/service/IFriendService.java rename to im-platform/src/main/java/com/bx/implatform/service/IFriendService.java index 3d16fb4..583cba9 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/IFriendService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IFriendService.java @@ -1,8 +1,8 @@ -package com.lx.implatform.service; +package com.bx.implatform.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.lx.implatform.entity.Friend; -import com.lx.implatform.vo.FriendVO; +import com.bx.implatform.vo.FriendVO; +import com.bx.implatform.entity.Friend; import java.util.List; diff --git a/im-platform/src/main/java/com/lx/implatform/service/IGroupMemberService.java b/im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java similarity index 86% rename from im-platform/src/main/java/com/lx/implatform/service/IGroupMemberService.java rename to im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java index 71bc429..4ca8526 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/IGroupMemberService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java @@ -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 java.util.Collection; import java.util.List; /** diff --git a/im-platform/src/main/java/com/lx/implatform/service/IGroupMessageService.java b/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java similarity index 55% rename from im-platform/src/main/java/com/lx/implatform/service/IGroupMessageService.java rename to im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java index d805dca..5cfee30 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/IGroupMessageService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java @@ -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.lx.implatform.vo.GroupMessageVO; -import com.lx.implatform.vo.PrivateMessageVO; public interface IGroupMessageService extends IService { diff --git a/im-platform/src/main/java/com/lx/implatform/service/IGroupService.java b/im-platform/src/main/java/com/bx/implatform/service/IGroupService.java similarity index 76% rename from im-platform/src/main/java/com/lx/implatform/service/IGroupService.java rename to im-platform/src/main/java/com/bx/implatform/service/IGroupService.java index 895870f..be611fc 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/IGroupService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IGroupService.java @@ -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.lx.implatform.vo.GroupInviteVO; -import com.lx.implatform.vo.GroupMemberVO; -import com.lx.implatform.vo.GroupVO; import java.util.List; diff --git a/im-platform/src/main/java/com/lx/implatform/service/IPrivateMessageService.java b/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java similarity index 62% rename from im-platform/src/main/java/com/lx/implatform/service/IPrivateMessageService.java rename to im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java index 012f78f..d4630fb 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/IPrivateMessageService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java @@ -1,8 +1,8 @@ -package com.lx.implatform.service; +package com.bx.implatform.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.lx.implatform.entity.PrivateMessage; -import com.lx.implatform.vo.PrivateMessageVO; +import com.bx.implatform.vo.PrivateMessageVO; +import com.bx.implatform.entity.PrivateMessage; public interface IPrivateMessageService extends IService { diff --git a/im-platform/src/main/java/com/lx/implatform/service/IUserService.java b/im-platform/src/main/java/com/bx/implatform/service/IUserService.java similarity index 74% rename from im-platform/src/main/java/com/lx/implatform/service/IUserService.java rename to im-platform/src/main/java/com/bx/implatform/service/IUserService.java index 07c74af..f5b3388 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/IUserService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IUserService.java @@ -1,9 +1,9 @@ -package com.lx.implatform.service; +package com.bx.implatform.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.lx.implatform.entity.User; -import com.lx.implatform.vo.RegisterVO; -import com.lx.implatform.vo.UserVO; +import com.bx.implatform.vo.RegisterVO; +import com.bx.implatform.vo.UserVO; +import com.bx.implatform.entity.User; import java.util.List; diff --git a/im-platform/src/main/java/com/lx/implatform/service/impl/FriendServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java similarity index 90% rename from im-platform/src/main/java/com/lx/implatform/service/impl/FriendServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java index aba682d..903022d 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/impl/FriendServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java @@ -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.extension.service.impl.ServiceImpl; -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.ResultCode; -import com.lx.implatform.entity.Friend; -import com.lx.implatform.entity.User; -import com.lx.implatform.exception.GlobalException; -import com.lx.implatform.mapper.FriendMapper; -import com.lx.implatform.service.IFriendService; -import com.lx.implatform.service.IUserService; -import com.lx.implatform.session.SessionContext; -import com.lx.implatform.session.UserSession; -import com.lx.implatform.vo.FriendVO; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.ResultCode; +import com.bx.implatform.exception.GlobalException; +import com.bx.implatform.vo.FriendVO; +import com.bx.implatform.entity.Friend; +import com.bx.implatform.entity.User; +import com.bx.implatform.mapper.FriendMapper; +import com.bx.implatform.service.IFriendService; +import com.bx.implatform.service.IUserService; +import com.bx.implatform.session.SessionContext; +import com.bx.implatform.session.UserSession; import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheConfig; diff --git a/im-platform/src/main/java/com/lx/implatform/service/impl/GroupMemberServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java similarity index 94% rename from im-platform/src/main/java/com/lx/implatform/service/impl/GroupMemberServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java index 86b2292..852e58b 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/impl/GroupMemberServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMemberServiceImpl.java @@ -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.update.UpdateWrapper; -import com.lx.common.contant.RedisKey; -import com.lx.implatform.entity.GroupMember; -import com.lx.implatform.mapper.GroupMemberMapper; -import com.lx.implatform.service.IGroupMemberService; +import com.bx.common.contant.RedisKey; +import com.bx.implatform.entity.GroupMember; +import com.bx.implatform.mapper.GroupMemberMapper; +import com.bx.implatform.service.IGroupMemberService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; diff --git a/im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java similarity index 86% rename from im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java index 99e0147..4cec062 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java @@ -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.lx.common.contant.RedisKey; -import com.lx.common.enums.ResultCode; -import com.lx.common.model.im.GroupMessageInfo; -import com.lx.common.util.BeanUtils; -import com.lx.implatform.entity.Group; -import com.lx.implatform.entity.GroupMember; -import com.lx.implatform.entity.GroupMessage; -import com.lx.implatform.exception.GlobalException; -import com.lx.implatform.mapper.GroupMessageMapper; -import com.lx.implatform.service.IGroupMemberService; -import com.lx.implatform.service.IGroupMessageService; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.ResultCode; +import com.bx.common.model.im.GroupMessageInfo; +import com.bx.common.util.BeanUtils; +import com.bx.implatform.exception.GlobalException; +import com.bx.implatform.vo.GroupMessageVO; +import com.bx.implatform.entity.Group; +import com.bx.implatform.entity.GroupMember; +import com.bx.implatform.entity.GroupMessage; +import com.bx.implatform.mapper.GroupMessageMapper; +import com.bx.implatform.service.IGroupMemberService; +import com.bx.implatform.service.IGroupMessageService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.lx.implatform.service.IGroupService; -import com.lx.implatform.session.SessionContext; -import com.lx.implatform.vo.GroupMessageVO; -import org.apache.commons.lang3.StringUtils; +import com.bx.implatform.service.IGroupService; +import com.bx.implatform.session.SessionContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/im-platform/src/main/java/com/lx/implatform/service/impl/GroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java similarity index 92% rename from im-platform/src/main/java/com/lx/implatform/service/impl/GroupServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java index ecaa2ba..26d6d1b 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/impl/GroupServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java @@ -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.lx.common.contant.Constant; -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.ResultCode; -import com.lx.common.util.BeanUtils; -import com.lx.implatform.entity.Friend; -import com.lx.implatform.entity.Group; -import com.lx.implatform.entity.GroupMember; -import com.lx.implatform.entity.User; -import com.lx.implatform.exception.GlobalException; -import com.lx.implatform.mapper.GroupMapper; -import com.lx.implatform.service.IFriendService; -import com.lx.implatform.service.IGroupMemberService; -import com.lx.implatform.service.IGroupService; +import com.bx.common.contant.Constant; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.ResultCode; +import com.bx.common.util.BeanUtils; +import com.bx.implatform.exception.GlobalException; +import com.bx.implatform.vo.GroupInviteVO; +import com.bx.implatform.vo.GroupMemberVO; +import com.bx.implatform.vo.GroupVO; +import com.bx.implatform.entity.Friend; +import com.bx.implatform.entity.Group; +import com.bx.implatform.entity.GroupMember; +import com.bx.implatform.entity.User; +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.lx.implatform.service.IUserService; -import com.lx.implatform.session.SessionContext; -import com.lx.implatform.session.UserSession; -import com.lx.implatform.vo.GroupInviteVO; -import com.lx.implatform.vo.GroupMemberVO; -import com.lx.implatform.vo.GroupVO; +import com.bx.implatform.service.IUserService; +import com.bx.implatform.session.SessionContext; +import com.bx.implatform.session.UserSession; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheConfig; diff --git a/im-platform/src/main/java/com/lx/implatform/service/impl/PrivateMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java similarity index 83% rename from im-platform/src/main/java/com/lx/implatform/service/impl/PrivateMessageServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java index b176a01..8c4a663 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/impl/PrivateMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java @@ -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.extension.service.impl.ServiceImpl; -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.MessageStatusEnum; -import com.lx.common.enums.ResultCode; -import com.lx.common.model.im.PrivateMessageInfo; -import com.lx.common.util.BeanUtils; -import com.lx.implatform.entity.PrivateMessage; -import com.lx.implatform.exception.GlobalException; -import com.lx.implatform.mapper.PrivateMessageMapper; -import com.lx.implatform.service.IFriendService; -import com.lx.implatform.service.IPrivateMessageService; -import com.lx.implatform.session.SessionContext; -import com.lx.implatform.vo.PrivateMessageVO; -import org.apache.commons.lang3.StringUtils; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.MessageStatusEnum; +import com.bx.common.enums.ResultCode; +import com.bx.common.model.im.PrivateMessageInfo; +import com.bx.common.util.BeanUtils; +import com.bx.implatform.exception.GlobalException; +import com.bx.implatform.service.IPrivateMessageService; +import com.bx.implatform.session.SessionContext; +import com.bx.implatform.vo.PrivateMessageVO; +import com.bx.implatform.entity.PrivateMessage; +import com.bx.implatform.mapper.PrivateMessageMapper; +import com.bx.implatform.service.IFriendService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/im-platform/src/main/java/com/lx/implatform/service/impl/SecurityUserDetailsServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/SecurityUserDetailsServiceImpl.java similarity index 88% rename from im-platform/src/main/java/com/lx/implatform/service/impl/SecurityUserDetailsServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/SecurityUserDetailsServiceImpl.java index 765cdc7..4d3e8a7 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/impl/SecurityUserDetailsServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/SecurityUserDetailsServiceImpl.java @@ -1,11 +1,11 @@ -package com.lx.implatform.service.impl; +package com.bx.implatform.service.impl; import com.alibaba.fastjson.JSON; -import com.lx.common.util.BeanUtils; -import com.lx.implatform.entity.User; -import com.lx.implatform.service.IUserService; -import com.lx.implatform.session.UserSession; +import com.bx.common.util.BeanUtils; +import com.bx.implatform.entity.User; +import com.bx.implatform.service.IUserService; +import com.bx.implatform.session.UserSession; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/im-platform/src/main/java/com/lx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java similarity index 85% rename from im-platform/src/main/java/com/lx/implatform/service/impl/UserServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index 45fe371..8aa0a01 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -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.extension.service.impl.ServiceImpl; -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.ResultCode; -import com.lx.common.util.BeanUtils; -import com.lx.implatform.entity.Friend; -import com.lx.implatform.entity.GroupMember; -import com.lx.implatform.entity.User; -import com.lx.implatform.exception.GlobalException; -import com.lx.implatform.mapper.UserMapper; -import com.lx.implatform.service.IFriendService; -import com.lx.implatform.service.IGroupMemberService; -import com.lx.implatform.service.IUserService; -import com.lx.implatform.session.SessionContext; -import com.lx.implatform.session.UserSession; -import com.lx.implatform.vo.RegisterVO; -import com.lx.implatform.vo.UserVO; -import org.apache.commons.lang3.StringUtils; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.ResultCode; +import com.bx.common.util.BeanUtils; +import com.bx.implatform.exception.GlobalException; +import com.bx.implatform.service.IUserService; +import com.bx.implatform.session.SessionContext; +import com.bx.implatform.session.UserSession; +import com.bx.implatform.vo.RegisterVO; +import com.bx.implatform.vo.UserVO; +import com.bx.implatform.entity.Friend; +import com.bx.implatform.entity.GroupMember; +import com.bx.implatform.entity.User; +import com.bx.implatform.mapper.UserMapper; +import com.bx.implatform.service.IFriendService; +import com.bx.implatform.service.IGroupMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/im-platform/src/main/java/com/lx/implatform/service/thirdparty/FileService.java b/im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java similarity index 90% rename from im-platform/src/main/java/com/lx/implatform/service/thirdparty/FileService.java rename to im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java index 7555a91..ecf2114 100644 --- a/im-platform/src/main/java/com/lx/implatform/service/thirdparty/FileService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java @@ -1,13 +1,13 @@ -package com.lx.implatform.service.thirdparty; +package com.bx.implatform.service.thirdparty; -import com.lx.common.contant.Constant; -import com.lx.common.enums.FileTypeEnum; -import com.lx.common.enums.ResultCode; -import com.lx.implatform.exception.GlobalException; -import com.lx.implatform.util.FileUtil; -import com.lx.implatform.util.ImageUtil; -import com.lx.implatform.util.MinioUtil; -import com.lx.implatform.vo.UploadImageVO; +import com.bx.common.contant.Constant; +import com.bx.common.enums.FileTypeEnum; +import com.bx.common.enums.ResultCode; +import com.bx.implatform.exception.GlobalException; +import com.bx.implatform.vo.UploadImageVO; +import com.bx.implatform.util.FileUtil; +import com.bx.implatform.util.ImageUtil; +import com.bx.implatform.util.MinioUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-platform/src/main/java/com/lx/implatform/session/SessionContext.java b/im-platform/src/main/java/com/bx/implatform/session/SessionContext.java similarity index 94% rename from im-platform/src/main/java/com/lx/implatform/session/SessionContext.java rename to im-platform/src/main/java/com/bx/implatform/session/SessionContext.java index c7acfeb..d21cf81 100644 --- a/im-platform/src/main/java/com/lx/implatform/session/SessionContext.java +++ b/im-platform/src/main/java/com/bx/implatform/session/SessionContext.java @@ -1,4 +1,4 @@ -package com.lx.implatform.session; +package com.bx.implatform.session; import com.alibaba.fastjson.JSON; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/im-platform/src/main/java/com/lx/implatform/session/UserSession.java b/im-platform/src/main/java/com/bx/implatform/session/UserSession.java similarity index 79% rename from im-platform/src/main/java/com/lx/implatform/session/UserSession.java rename to im-platform/src/main/java/com/bx/implatform/session/UserSession.java index a8896d5..0e7c81f 100644 --- a/im-platform/src/main/java/com/lx/implatform/session/UserSession.java +++ b/im-platform/src/main/java/com/bx/implatform/session/UserSession.java @@ -1,4 +1,4 @@ -package com.lx.implatform.session; +package com.bx.implatform.session; import lombok.Data; diff --git a/im-platform/src/main/java/com/lx/implatform/task/PullAlreadyReadMessageTask.java b/im-platform/src/main/java/com/bx/implatform/task/PullAlreadyReadMessageTask.java similarity index 90% rename from im-platform/src/main/java/com/lx/implatform/task/PullAlreadyReadMessageTask.java rename to im-platform/src/main/java/com/bx/implatform/task/PullAlreadyReadMessageTask.java index 5009592..9bd022d 100644 --- a/im-platform/src/main/java/com/lx/implatform/task/PullAlreadyReadMessageTask.java +++ b/im-platform/src/main/java/com/bx/implatform/task/PullAlreadyReadMessageTask.java @@ -1,10 +1,10 @@ -package com.lx.implatform.task; +package com.bx.implatform.task; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.MessageStatusEnum; -import com.lx.implatform.entity.PrivateMessage; -import com.lx.implatform.service.IPrivateMessageService; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.MessageStatusEnum; +import com.bx.implatform.entity.PrivateMessage; +import com.bx.implatform.service.IPrivateMessageService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-platform/src/main/java/com/lx/implatform/util/FileUtil.java b/im-platform/src/main/java/com/bx/implatform/util/FileUtil.java similarity index 96% rename from im-platform/src/main/java/com/lx/implatform/util/FileUtil.java rename to im-platform/src/main/java/com/bx/implatform/util/FileUtil.java index 69cbb83..b83d45d 100644 --- a/im-platform/src/main/java/com/lx/implatform/util/FileUtil.java +++ b/im-platform/src/main/java/com/bx/implatform/util/FileUtil.java @@ -1,4 +1,4 @@ -package com.lx.implatform.util; +package com.bx.implatform.util; public class FileUtil { diff --git a/im-platform/src/main/java/com/lx/implatform/util/ImageUtil.java b/im-platform/src/main/java/com/bx/implatform/util/ImageUtil.java similarity index 98% rename from im-platform/src/main/java/com/lx/implatform/util/ImageUtil.java rename to im-platform/src/main/java/com/bx/implatform/util/ImageUtil.java index 140bdad..0cb5550 100644 --- a/im-platform/src/main/java/com/lx/implatform/util/ImageUtil.java +++ b/im-platform/src/main/java/com/bx/implatform/util/ImageUtil.java @@ -1,4 +1,4 @@ -package com.lx.implatform.util; +package com.bx.implatform.util; import lombok.extern.slf4j.Slf4j; diff --git a/im-platform/src/main/java/com/lx/implatform/util/MinioUtil.java b/im-platform/src/main/java/com/bx/implatform/util/MinioUtil.java similarity index 98% rename from im-platform/src/main/java/com/lx/implatform/util/MinioUtil.java rename to im-platform/src/main/java/com/bx/implatform/util/MinioUtil.java index 5ce0d65..bf4f1cd 100644 --- a/im-platform/src/main/java/com/lx/implatform/util/MinioUtil.java +++ b/im-platform/src/main/java/com/bx/implatform/util/MinioUtil.java @@ -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 lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/FriendVO.java b/im-platform/src/main/java/com/bx/implatform/vo/FriendVO.java similarity index 94% rename from im-platform/src/main/java/com/lx/implatform/vo/FriendVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/FriendVO.java index 6b8a230..4276998 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/FriendVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/FriendVO.java @@ -1,4 +1,4 @@ -package com.lx.implatform.vo; +package com.bx.implatform.vo; import io.swagger.annotations.ApiModel; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/GroupInviteVO.java b/im-platform/src/main/java/com/bx/implatform/vo/GroupInviteVO.java similarity index 94% rename from im-platform/src/main/java/com/lx/implatform/vo/GroupInviteVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/GroupInviteVO.java index 9e17ff7..1d1f38d 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/GroupInviteVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/GroupInviteVO.java @@ -1,4 +1,4 @@ -package com.lx.implatform.vo; +package com.bx.implatform.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/GroupMemberVO.java b/im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java similarity index 94% rename from im-platform/src/main/java/com/lx/implatform/vo/GroupMemberVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java index 59d913f..7428985 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/GroupMemberVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java @@ -1,4 +1,4 @@ -package com.lx.implatform.vo; +package com.bx.implatform.vo; import io.swagger.annotations.ApiModel; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/GroupMessageVO.java b/im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java similarity index 96% rename from im-platform/src/main/java/com/lx/implatform/vo/GroupMessageVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java index 297a418..c6f349a 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/GroupMessageVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/GroupMessageVO.java @@ -1,4 +1,4 @@ -package com.lx.implatform.vo; +package com.bx.implatform.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/GroupVO.java b/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java similarity index 98% rename from im-platform/src/main/java/com/lx/implatform/vo/GroupVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java index 102fbbe..a211039 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/GroupVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java @@ -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.TableField; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/PrivateMessageVO.java b/im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java similarity index 96% rename from im-platform/src/main/java/com/lx/implatform/vo/PrivateMessageVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java index ac4f0e0..d1e5e1f 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/PrivateMessageVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/PrivateMessageVO.java @@ -1,4 +1,4 @@ -package com.lx.implatform.vo; +package com.bx.implatform.vo; import io.swagger.annotations.ApiModel; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/RegisterVO.java b/im-platform/src/main/java/com/bx/implatform/vo/RegisterVO.java similarity index 96% rename from im-platform/src/main/java/com/lx/implatform/vo/RegisterVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/RegisterVO.java index 27faf82..0113a00 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/RegisterVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/RegisterVO.java @@ -1,4 +1,4 @@ -package com.lx.implatform.vo; +package com.bx.implatform.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/UploadImageVO.java b/im-platform/src/main/java/com/bx/implatform/vo/UploadImageVO.java similarity index 91% rename from im-platform/src/main/java/com/lx/implatform/vo/UploadImageVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/UploadImageVO.java index 1234fbc..3c63709 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/UploadImageVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/UploadImageVO.java @@ -1,4 +1,4 @@ -package com.lx.implatform.vo; +package com.bx.implatform.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/im-platform/src/main/java/com/lx/implatform/vo/UserVO.java b/im-platform/src/main/java/com/bx/implatform/vo/UserVO.java similarity index 97% rename from im-platform/src/main/java/com/lx/implatform/vo/UserVO.java rename to im-platform/src/main/java/com/bx/implatform/vo/UserVO.java index d32a9b3..e114e73 100644 --- a/im-platform/src/main/java/com/lx/implatform/vo/UserVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/UserVO.java @@ -1,4 +1,4 @@ -package com.lx.implatform.vo; +package com.bx.implatform.vo; import io.swagger.annotations.ApiModel; diff --git a/im-platform/src/main/java/com/lx/implatform/entity/GroupMessageReadPos.java b/im-platform/src/main/java/com/lx/implatform/entity/GroupMessageReadPos.java deleted file mode 100644 index 8133d59..0000000 --- a/im-platform/src/main/java/com/lx/implatform/entity/GroupMessageReadPos.java +++ /dev/null @@ -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; - -/** - *

- * 群消息读取位置 - *

- * - * @author blue - * @since 2022-10-31 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("im_group_message_read_pos") -public class GroupMessageReadPos extends Model { - - 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; - } - -} diff --git a/im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageReadPosMapper.java b/im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageReadPosMapper.java deleted file mode 100644 index 55d1050..0000000 --- a/im-platform/src/main/java/com/lx/implatform/mapper/GroupMessageReadPosMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lx.implatform.mapper; - -import com.lx.implatform.entity.GroupMessageReadPos; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 群消息读取位置 Mapper 接口 - *

- * - * @author blue - * @since 2022-10-31 - */ -public interface GroupMessageReadPosMapper extends BaseMapper { - -} diff --git a/im-platform/src/main/java/com/lx/implatform/service/IGroupMessageReadPosService.java b/im-platform/src/main/java/com/lx/implatform/service/IGroupMessageReadPosService.java deleted file mode 100644 index f65ee5a..0000000 --- a/im-platform/src/main/java/com/lx/implatform/service/IGroupMessageReadPosService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lx.implatform.service; - -import com.lx.implatform.entity.GroupMessageReadPos; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 群消息读取位置 服务类 - *

- * - * @author blue - * @since 2022-10-31 - */ -public interface IGroupMessageReadPosService extends IService { - -} diff --git a/im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageReadPosServiceImpl.java b/im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageReadPosServiceImpl.java deleted file mode 100644 index d4aae2e..0000000 --- a/im-platform/src/main/java/com/lx/implatform/service/impl/GroupMessageReadPosServiceImpl.java +++ /dev/null @@ -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; - -/** - *

- * 群消息读取位置 服务实现类 - *

- * - * @author blue - * @since 2022-10-31 - */ -@Service -public class GroupMessageReadPosServiceImpl extends ServiceImpl implements IGroupMessageReadPosService { - -} diff --git a/im-platform/src/main/resources/application.yml b/im-platform/src/main/resources/application.yml index a2e77f5..6739f4f 100644 --- a/im-platform/src/main/resources/application.yml +++ b/im-platform/src/main/resources/application.yml @@ -5,7 +5,7 @@ server: spring: datasource: 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 password: root @@ -33,7 +33,7 @@ minio: public: http://3xagfu.natappfree.cc/file #外网访问地址 accessKey: admin secretKey: 12345678 - bucketName: lx-im + bucketName: box-im imagePath: image filePath: file diff --git a/im-server/pom.xml b/im-server/pom.xml index 5553681..3c9b13c 100644 --- a/im-server/pom.xml +++ b/im-server/pom.xml @@ -3,8 +3,8 @@ 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"> - lx-im - com.lx + box-im + com.bx 1.0.0 4.0.0 @@ -14,7 +14,7 @@ - com.lx + com.bx commom 1.0.0 diff --git a/im-server/src/main/java/com/lx/implatform/imserver/IMServerApp.java b/im-server/src/main/java/com/bx/imserver/IMServerApp.java similarity index 86% rename from im-server/src/main/java/com/lx/implatform/imserver/IMServerApp.java rename to im-server/src/main/java/com/bx/imserver/IMServerApp.java index 5e1e907..3cd2947 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/IMServerApp.java +++ b/im-server/src/main/java/com/bx/imserver/IMServerApp.java @@ -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.Value; import org.springframework.boot.CommandLineRunner; @@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableAsync @EnableScheduling -@ComponentScan(basePackages={"com.lx"}) +@ComponentScan(basePackages={"com.bx"}) @SpringBootApplication public class IMServerApp implements CommandLineRunner { diff --git a/im-server/src/main/java/com/lx/implatform/imserver/config/RedisConfig.java b/im-server/src/main/java/com/bx/imserver/config/RedisConfig.java similarity index 98% rename from im-server/src/main/java/com/lx/implatform/imserver/config/RedisConfig.java rename to im-server/src/main/java/com/bx/imserver/config/RedisConfig.java index 37109d4..bc3cc33 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/config/RedisConfig.java +++ b/im-server/src/main/java/com/bx/imserver/config/RedisConfig.java @@ -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.JsonTypeInfo; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/constant/Constant.java b/im-server/src/main/java/com/bx/imserver/constant/Constant.java similarity index 70% rename from im-server/src/main/java/com/lx/implatform/imserver/constant/Constant.java rename to im-server/src/main/java/com/bx/imserver/constant/Constant.java index b7763a4..e83e3e2 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/constant/Constant.java +++ b/im-server/src/main/java/com/bx/imserver/constant/Constant.java @@ -1,4 +1,4 @@ -package com.lx.implatform.imserver.constant; +package com.bx.imserver.constant; public class Constant { diff --git a/im-server/src/main/java/com/lx/implatform/imserver/task/AbstractPullMessageTask.java b/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java similarity index 94% rename from im-server/src/main/java/com/lx/implatform/imserver/task/AbstractPullMessageTask.java rename to im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java index 3a14790..f529a70 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/task/AbstractPullMessageTask.java +++ b/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java @@ -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.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/task/PullUnreadGroupMessageTask.java b/im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java similarity index 62% rename from im-server/src/main/java/com/lx/implatform/imserver/task/PullUnreadGroupMessageTask.java rename to im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java index 8469581..ad29429 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/task/PullUnreadGroupMessageTask.java +++ b/im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java @@ -1,18 +1,14 @@ -package com.lx.implatform.imserver.task; - -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.WSCmdEnum; -import com.lx.common.model.im.GroupMessageInfo; -import com.lx.common.model.im.PrivateMessageInfo; -import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; -import com.lx.implatform.imserver.websocket.WebsocketServer; -import com.lx.implatform.imserver.websocket.processor.MessageProcessor; -import com.lx.implatform.imserver.websocket.processor.ProcessorFactory; -import io.netty.channel.ChannelHandlerContext; +package com.bx.imserver.task; + +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.WSCmdEnum; +import com.bx.common.model.im.GroupMessageInfo; +import com.bx.imserver.websocket.WebsocketServer; +import com.bx.imserver.websocket.processor.MessageProcessor; +import com.bx.imserver.websocket.processor.ProcessorFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.List; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/task/PullUnreadPrivateMessageTask.java b/im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java similarity index 65% rename from im-server/src/main/java/com/lx/implatform/imserver/task/PullUnreadPrivateMessageTask.java rename to im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java index ae2a2e8..914c18c 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/task/PullUnreadPrivateMessageTask.java +++ b/im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java @@ -1,18 +1,15 @@ -package com.lx.implatform.imserver.task; +package com.bx.imserver.task; -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.WSCmdEnum; -import com.lx.common.model.im.PrivateMessageInfo; -import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; -import com.lx.implatform.imserver.websocket.WebsocketServer; -import com.lx.implatform.imserver.websocket.processor.MessageProcessor; -import com.lx.implatform.imserver.websocket.processor.ProcessorFactory; -import io.netty.channel.ChannelHandlerContext; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.WSCmdEnum; +import com.bx.common.model.im.PrivateMessageInfo; +import com.bx.imserver.websocket.WebsocketServer; +import com.bx.imserver.websocket.processor.MessageProcessor; +import com.bx.imserver.websocket.processor.ProcessorFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.List; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/WebSocketHandler.java b/im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java similarity index 85% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/WebSocketHandler.java rename to im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java index 4f757cc..e068883 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/WebSocketHandler.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java @@ -1,13 +1,11 @@ -package com.lx.implatform.imserver.websocket; +package com.bx.imserver.websocket; -import cn.hutool.core.bean.BeanUtil; -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.WSCmdEnum; -import com.lx.common.model.im.HeartbeatInfo; -import com.lx.common.model.im.SendInfo; -import com.lx.common.util.SpringContextHolder; -import com.lx.implatform.imserver.websocket.processor.MessageProcessor; -import com.lx.implatform.imserver.websocket.processor.ProcessorFactory; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.WSCmdEnum; +import com.bx.common.model.im.SendInfo; +import com.bx.common.util.SpringContextHolder; +import com.bx.imserver.websocket.processor.MessageProcessor; +import com.bx.imserver.websocket.processor.ProcessorFactory; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.timeout.IdleState; @@ -16,8 +14,6 @@ import io.netty.util.AttributeKey; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; -import java.util.HashMap; - /** * WebSocket 长连接下 文本帧的处理器 diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/WebsocketChannelCtxHloder.java b/im-server/src/main/java/com/bx/imserver/websocket/WebsocketChannelCtxHloder.java similarity index 93% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/WebsocketChannelCtxHloder.java rename to im-server/src/main/java/com/bx/imserver/websocket/WebsocketChannelCtxHloder.java index dad9360..4ba41ab 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/WebsocketChannelCtxHloder.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/WebsocketChannelCtxHloder.java @@ -1,4 +1,4 @@ -package com.lx.implatform.imserver.websocket; +package com.bx.imserver.websocket; import io.netty.channel.ChannelHandlerContext; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/WebsocketServer.java b/im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java similarity index 93% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/WebsocketServer.java rename to im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java index 7a64946..0b0d34f 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/WebsocketServer.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java @@ -1,8 +1,8 @@ -package com.lx.implatform.imserver.websocket; +package com.bx.imserver.websocket; -import com.lx.common.contant.RedisKey; -import com.lx.implatform.imserver.websocket.endecode.MessageProtocolDecoder; -import com.lx.implatform.imserver.websocket.endecode.MessageProtocolEncoder; +import com.bx.common.contant.RedisKey; +import com.bx.imserver.websocket.endecode.MessageProtocolDecoder; +import com.bx.imserver.websocket.endecode.MessageProtocolEncoder; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; 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.timeout.IdleStateHandler; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import java.util.UUID; import java.util.concurrent.TimeUnit; @Component diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/endecode/MessageProtocolDecoder.java b/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java similarity index 87% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/endecode/MessageProtocolDecoder.java rename to im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java index d7e3e61..c1510e5 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/endecode/MessageProtocolDecoder.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java @@ -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.lx.common.model.im.SendInfo; +import com.bx.common.model.im.SendInfo; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/endecode/MessageProtocolEncoder.java b/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java similarity index 87% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/endecode/MessageProtocolEncoder.java rename to im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java index 170c16d..ee3c03c 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/endecode/MessageProtocolEncoder.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java @@ -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.lx.common.model.im.SendInfo; +import com.bx.common.model.im.SendInfo; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageEncoder; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/GroupMessageProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java similarity index 86% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/GroupMessageProcessor.java rename to im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java index ed429b1..ad3c79f 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/GroupMessageProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java @@ -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.lx.common.enums.WSCmdEnum; -import com.lx.common.model.im.GroupMessageInfo; -import com.lx.common.model.im.SendInfo; -import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.WSCmdEnum; +import com.bx.common.model.im.GroupMessageInfo; +import com.bx.common.model.im.SendInfo; +import com.bx.imserver.websocket.WebsocketChannelCtxHloder; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/HeartbeatProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java similarity index 81% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/HeartbeatProcessor.java rename to im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java index 0f10ce7..69cb8f2 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/HeartbeatProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java @@ -1,10 +1,10 @@ -package com.lx.implatform.imserver.websocket.processor; +package com.bx.imserver.websocket.processor; import cn.hutool.core.bean.BeanUtil; -import com.lx.common.enums.WSCmdEnum; -import com.lx.common.model.im.HeartbeatInfo; -import com.lx.common.model.im.SendInfo; -import com.lx.implatform.imserver.websocket.WebsocketServer; +import com.bx.common.enums.WSCmdEnum; +import com.bx.common.model.im.HeartbeatInfo; +import com.bx.common.model.im.SendInfo; +import com.bx.imserver.websocket.WebsocketServer; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/LoginProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java similarity index 82% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/LoginProcessor.java rename to im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java index 06e0427..1d71334 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/LoginProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java @@ -1,13 +1,12 @@ -package com.lx.implatform.imserver.websocket.processor; +package com.bx.imserver.websocket.processor; import cn.hutool.core.bean.BeanUtil; -import com.lx.common.contant.RedisKey; -import com.lx.common.enums.WSCmdEnum; -import com.lx.common.model.im.HeartbeatInfo; -import com.lx.common.model.im.LoginInfo; -import com.lx.common.model.im.SendInfo; -import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; -import com.lx.implatform.imserver.websocket.WebsocketServer; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.WSCmdEnum; +import com.bx.common.model.im.LoginInfo; +import com.bx.common.model.im.SendInfo; +import com.bx.imserver.websocket.WebsocketChannelCtxHloder; +import com.bx.imserver.websocket.WebsocketServer; import io.netty.channel.ChannelHandlerContext; import io.netty.util.AttributeKey; import lombok.extern.slf4j.Slf4j; @@ -16,7 +15,6 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import java.util.HashMap; -import java.util.concurrent.TimeUnit; @Slf4j @Component diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/MessageProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/MessageProcessor.java similarity index 82% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/MessageProcessor.java rename to im-server/src/main/java/com/bx/imserver/websocket/processor/MessageProcessor.java index 120441a..9b156a9 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/MessageProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/MessageProcessor.java @@ -1,4 +1,4 @@ -package com.lx.implatform.imserver.websocket.processor; +package com.bx.imserver.websocket.processor; import io.netty.channel.ChannelHandlerContext; diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/PrivateMessageProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java similarity index 79% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/PrivateMessageProcessor.java rename to im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java index 8923aac..03efa5f 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/PrivateMessageProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java @@ -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.lx.common.enums.WSCmdEnum; -import com.lx.common.model.im.SendInfo; -import com.lx.common.model.im.PrivateMessageInfo; -import com.lx.implatform.imserver.websocket.WebsocketChannelCtxHloder; +import com.bx.common.contant.RedisKey; +import com.bx.common.enums.WSCmdEnum; +import com.bx.common.model.im.SendInfo; +import com.bx.common.model.im.PrivateMessageInfo; +import com.bx.imserver.websocket.WebsocketChannelCtxHloder; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import java.util.List; - @Slf4j @Component public class PrivateMessageProcessor extends MessageProcessor { diff --git a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/ProcessorFactory.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java similarity index 87% rename from im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/ProcessorFactory.java rename to im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java index 0dfa2a6..7f86cae 100644 --- a/im-server/src/main/java/com/lx/implatform/imserver/websocket/processor/ProcessorFactory.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java @@ -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.lx.common.util.SpringContextHolder; +import com.bx.common.enums.WSCmdEnum; +import com.bx.common.util.SpringContextHolder; public class ProcessorFactory { diff --git a/pom.xml b/pom.xml index 59570e9..fc15ee7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - lx-im - com.lx + box-im + com.bx pom 1.0.0