Merge remote-tracking branch 'origin/v_3.0.0' into v_3.0.0

# Conflicts:
#	im-platform/src/main/java/com/bx/implatform/controller/LoginController.java

im-platform/src/main/java/com/bx/implatform/controller/LoginController.java

@@ -1,7 +1,6 @@
 package com.bx.implatform.controller;
 
 import com.bx.implatform.dto.LoginDTO;
-import com.bx.implatform.dto.LogoutDTO;
 import com.bx.implatform.dto.ModifyPwdDTO;
 import com.bx.implatform.dto.RegisterDTO;
 import com.bx.implatform.result.Result;
@@ -22,21 +21,13 @@ public class LoginController {
 
     private final IUserService userService;
 
-
     @PostMapping("/login")
-    @ApiOperation(value = "用户登陆", notes = "用户注册")
+    @ApiOperation(value = "用户登陆", notes = "用户登陆")
     public Result login(@Valid @RequestBody LoginDTO dto) {
         LoginVO vo = userService.login(dto);
         return ResultUtils.success(vo);
     }
 
-    @PostMapping("/logout")
-    @ApiOperation(value = "用户退出登陆", notes = "用户退出登陆")
-    public Result logout(@Valid @RequestBody LogoutDTO dto) {
-        userService.logout(dto);
-        return ResultUtils.success();
-    }
-
 
     @PutMapping("/refreshToken")
     @ApiOperation(value = "刷新token", notes = "用refreshtoken换取新的token")
@@ -55,7 +46,7 @@ public class LoginController {
 
     @PutMapping("/modifyPwd")
     @ApiOperation(value = "修改密码", notes = "修改用户密码")
-    public Result update(@Valid @RequestBody ModifyPwdDTO dto) {
+    public Result modifyPassword(@Valid @RequestBody ModifyPwdDTO dto) {
         userService.modifyPassword(dto);
         return ResultUtils.success();
     }

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

@@ -46,7 +46,7 @@ public class FriendServiceImpl extends ServiceImpl<FriendMapper, Friend> impleme
     @Override
     public void addFriend(Long friendId) {
         long userId = SessionContext.getSession().getUserId();
-        if (userId == friendId) {
+        if (friendId.equals(userId)) {
             throw new GlobalException(ResultCode.PROGRAM_ERROR, "不允许添加自己为好友");
         }
         // 互相绑定好友关系