!20 修复refreshToken赋值错误的bug

Merge pull request !20 from blue/v_1.1.0

im-platform/src/main/java/com/bx/implatform/service/IGroupMemberService.java

@@ -18,8 +18,6 @@ public interface IGroupMemberService extends IService<GroupMember> {
 
     List<Long> findUserIdsByGroupId(Long groupId);
 
-    boolean save(GroupMember member);
-
     boolean saveOrUpdateBatch(Long groupId,List<GroupMember> members);
 
     void removeByGroupId(Long groupId);

im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java

@@ -75,7 +75,7 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
         msg.setSendTime(new Date());
         this.save(msg);
         // 不用发给自己
-        userIds = userIds.stream().filter(id->userId!=id).collect(Collectors.toList());
+        userIds = userIds.stream().filter(id->!userId.equals(id)).collect(Collectors.toList());
         // 群发
         GroupMessageInfo  msgInfo = BeanUtils.copyProperties(msg, GroupMessageInfo.class);
         imClient.sendGroupMessage(userIds,msgInfo);

im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java

@@ -100,7 +100,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         // 校验是不是群主，只有群主能改信息
         Group group = this.getById(vo.getId());
         // 群主有权修改群基本信息
-        if(group.getOwnerId() == session.getId()){
+        if(group.getOwnerId().equals(session.getId())){
             group = BeanUtils.copyProperties(vo,Group.class);
             this.updateById(group);
         }
@@ -129,7 +129,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     public void deleteGroup(Long groupId) {
         UserSession session = SessionContext.getSession();
         Group group = this.getById(groupId);
-        if(group.getOwnerId() != session.getId()){
+        if(!group.getOwnerId().equals(session.getId())){
             throw  new GlobalException(ResultCode.PROGRAM_ERROR,"只有群主才有权限解除群聊");
         }
         // 逻辑删除群数据
@@ -151,7 +151,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     public void quitGroup(Long groupId) {
         Long userId = SessionContext.getSession().getId();
         Group group = this.getById(groupId);
-        if(group.getOwnerId() == userId){
+        if(group.getOwnerId().equals(userId)){
             throw  new GlobalException(ResultCode.PROGRAM_ERROR,"您是群主，不可退出群聊");
         }
         // 删除群聊成员
@@ -171,10 +171,10 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     public void kickGroup(Long groupId, Long userId) {
         UserSession session = SessionContext.getSession();
         Group group = this.getById(groupId);
-        if(group.getOwnerId() != session.getId()){
+        if(!group.getOwnerId().equals(session.getId())){
             throw  new GlobalException(ResultCode.PROGRAM_ERROR,"您不是群主，没有权限踢人");
         }
-        if(userId == session.getId()){
+        if(userId.equals(session.getId())){
             throw  new GlobalException(ResultCode.PROGRAM_ERROR,"亲，不能自己踢自己哟");
         }
         // 删除群聊成员
@@ -276,7 +276,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         // 批量保存成员数据
         List<GroupMember> groupMembers = friendsList.stream()
                 .map(f -> {
-                    Optional<GroupMember> optional =  members.stream().filter(m->m.getUserId()==f.getFriendId()).findFirst();
+                    Optional<GroupMember> optional =  members.stream().filter(m-> m.getUserId().equals(f.getFriendId())).findFirst();
                     GroupMember groupMember = optional.isPresent()? optional.get():new GroupMember();
                     groupMember.setGroupId(vo.getGroupId());
                     groupMember.setUserId(f.getFriendId());

im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java

@@ -76,7 +76,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         UserSession session = BeanUtils.copyProperties(user,UserSession.class);
         String strJson = JSON.toJSONString(session);
         String accessToken = JwtUtil.sign(user.getId(),strJson,jwtProperties.getAccessTokenExpireIn(),jwtProperties.getAccessTokenSecret());
-        String refreshToken = JwtUtil.sign(user.getId(),strJson,jwtProperties.getAccessTokenExpireIn(),jwtProperties.getAccessTokenSecret());
+        String refreshToken = JwtUtil.sign(user.getId(),strJson,jwtProperties.getRefreshTokenExpireIn(),jwtProperties.getRefreshTokenSecret());
         LoginVO vo = new LoginVO();
         vo.setAccessToken(accessToken);
         vo.setAccessTokenExpiresIn(jwtProperties.getAccessTokenExpireIn());
@@ -100,7 +100,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         String strJson = JwtUtil.getInfo(refreshToken);
         Long userId = JwtUtil.getUserId(refreshToken);
         String accessToken = JwtUtil.sign(userId,strJson,jwtProperties.getAccessTokenExpireIn(),jwtProperties.getAccessTokenSecret());
-        String newRefreshToken = JwtUtil.sign(userId,strJson,jwtProperties.getAccessTokenExpireIn(),jwtProperties.getAccessTokenSecret());
+        String newRefreshToken = JwtUtil.sign(userId,strJson,jwtProperties.getRefreshTokenExpireIn(),jwtProperties.getRefreshTokenSecret());
         LoginVO vo =new LoginVO();
         vo.setAccessToken(accessToken);
         vo.setAccessTokenExpiresIn(jwtProperties.getAccessTokenExpireIn());

im-server/src/main/java/com/bx/imserver/IMServerApp.java

@@ -1,7 +1,6 @@
 package com.bx.imserver;
 
 
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
@@ -13,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @ComponentScan(basePackages={"com.bx"})
 @SpringBootApplication
-public class IMServerApp implements CommandLineRunner {
+public class IMServerApp {
 
 
     public static void main(String[] args) {
@@ -21,6 +20,4 @@ public class IMServerApp implements CommandLineRunner {
     }
 
 
-    public void run(String... args) throws Exception {
-    }
 }

im-server/src/main/java/com/bx/imserver/netty/tcp/endecode/MessageProtocolDecoder.java

@@ -13,6 +13,7 @@ import java.util.List;
 @Slf4j
 public class MessageProtocolDecoder  extends ReplayingDecoder {
 
+    @Override
     protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list) throws Exception {
         if(byteBuf.readableBytes()< 4){
             return;