Merge branch 'feature-nxdev' of https://gitea.nxsir.cn/code/IM into feature-nxdev

backend/IM_API/Interface/Services/IDemo.cs

@@ -1,9 +0,0 @@
-using IM_API.Dtos;
-
-namespace IM_API.Interface.Services
-{
-    public interface IDemo
-    {
-        TestDto Test();
-    }
-}

backend/IM_API/Interface/Services/IFriendSerivce.cs

@@ -12,7 +12,7 @@ namespace IM_API.Interface.Services
         /// <param name="page">当前页</param>
         /// <param name="limit">分页大小</param>
         /// <returns></returns>
-        Task<List<UserInfoDto>> GetFriendListAsync(int userId,int page,int limit);
+        Task<List<FriendInfoDto>> GetFriendListAsync(int userId,int page,int limit,bool desc);
         /// <summary>
         /// 新增好友请求
         /// </summary>
@@ -27,7 +27,7 @@ namespace IM_API.Interface.Services
         /// <param name="page"></param>
         /// <param name="limit"></param>
         /// <returns></returns>
-        Task<FriendRequest> GetFriendRequestListAsync(int userId,bool isReceived,int page,int limit);
+        Task<FriendRequest> GetFriendRequestListAsync(int userId,bool isReceived,int page,int limit, bool desc);
         /// <summary>
         /// 处理好友请求
         /// </summary>

backend/IM_API/Interface/Services/IUserService.cs

@@ -22,18 +22,18 @@ namespace IM_API.Interface.Services
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        Task<UserInfoDto> UpdateUserAsync(UpdateUserDto dto);
+        Task<UserInfoDto> UpdateUserAsync(int userId, UpdateUserDto dto);
         /// <summary>
         /// 重置用户密码
         /// </summary>
         /// <param name="password"></param>
         /// <returns></returns>
-        Task<bool> ResetPasswordAsync(string password);
+        Task<bool> ResetPasswordAsync(int userId, string oldPassword, string password);
         /// <summary>
         /// 更新用户在线状态
         /// </summary>
         /// <param name="onlineStatus"></param>
         /// <returns></returns>
-        Task<bool> UpdateOlineStatusAsync(UserOnlineStatus onlineStatus);
+        Task<bool> UpdateOlineStatusAsync(int userId, UserOnlineStatus onlineStatus);
     }
 }