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

backend/IM_API/Dtos/Auth/AuthDto.cs

@@ -1,4 +1,4 @@
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Auth
 {
     public record RefreshDto(string refreshToken);
 }

backend/IM_API/Dtos/Auth/LoginDto.cs

@@ -1,4 +1,6 @@
-namespace IM_API.Dtos
+using IM_API.Dtos.User;
+
+namespace IM_API.Dtos.Auth
 {
     public class LoginDto
     {
@@ -8,9 +10,9 @@
         public DateTime ExpireAt { get; set; }
         public LoginDto(UserInfoDto userInfo,string token, string refreshToken, DateTime expireAt) { 
             this.userInfo = userInfo;
-            this.Token = token;
-            this.RefreshToken = refreshToken;
-            this.ExpireAt = expireAt;
+            Token = token;
+            RefreshToken = refreshToken;
+            ExpireAt = expireAt;
         }
     }
 }

backend/IM_API/Dtos/Auth/LoginRequestDto.cs

@@ -1,7 +1,7 @@
 using IM_API.Tools;
 using System.ComponentModel.DataAnnotations;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Auth
 {
     public class LoginRequestDto
     {

backend/IM_API/Dtos/Auth/RegisterRequestDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Auth
 {
     public class RegisterRequestDto
     {

backend/IM_API/Dtos/Conversation/ClearConversationsDto.cs

@@ -1,4 +1,4 @@
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Conversation
 {
     public class ClearConversationsDto
     {

backend/IM_API/Dtos/Conversation/ConversationDto.cs

@@ -1,6 +1,6 @@
 using IM_API.Models;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Conversation
 {
     public class ConversationDto
     {

backend/IM_API/Dtos/Friend/FriendDto.cs

@@ -1,7 +1,8 @@
-using IM_API.Models;
+using IM_API.Dtos.User;
+using IM_API.Models;
 using System.ComponentModel.DataAnnotations;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Friend
 {
     public record FriendInfoDto
     {

backend/IM_API/Dtos/Friend/FriendRequestDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Friend
 {
     public class FriendRequestDto
     {

backend/IM_API/Dtos/Friend/FriendRequestResDto.cs

@@ -1,6 +1,6 @@
 using IM_API.Models;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Friend
 {
     public class FriendRequestResDto
     {

backend/IM_API/Dtos/Friend/HandleFriendRequestDto.cs

@@ -1,4 +1,4 @@
-namespace IM_API.Dtos
+namespace IM_API.Dtos.Friend
 {
     public class HandleFriendRequestDto
     {

backend/IM_API/Dtos/Group/GroupCreateDto.cs

@@ -0,0 +1,17 @@
+using IM_API.Models;
+
+namespace IM_API.Dtos.Group
+{
+    public class GroupCreateDto
+    {
+        /// <summary>
+        /// 群聊名称
+        /// </summary>
+        public string Name { get; set; } = null!;
+
+        /// <summary>
+        /// 群头像
+        /// </summary>
+        public string Avatar { get; set; } = null!;
+    }
+}

backend/IM_API/Dtos/Group/GroupInfoDto.cs

@@ -0,0 +1,51 @@
+using IM_API.Models;
+
+namespace IM_API.Dtos.Group
+{
+    public class GroupInfoDto
+    {
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 群聊名称
+        /// </summary>
+        public string Name { get; set; } = null!;
+
+        /// <summary>
+        /// 群主
+        /// </summary>
+        public int GroupMaster { get; set; }
+
+        /// <summary>
+        /// 群权限
+        /// （0：需管理员同意,1：任意人可加群,2：不允许任何人加入）
+        /// </summary>
+        public GroupAuhority Auhority { get; set; }
+
+        /// <summary>
+        /// 全员禁言（0允许发言，2全员禁言）
+        /// </summary>
+        public GroupAllMembersBanned AllMembersBanned { get; set; }
+
+        /// <summary>
+        /// 群聊状态
+        /// (1：正常,2：封禁)
+        /// </summary>
+        public GroupStatus Status { get; set; }
+
+        /// <summary>
+        /// 群公告
+        /// </summary>
+        public string? Announcement { get; set; }
+
+        /// <summary>
+        /// 群聊创建时间
+        /// </summary>
+        public DateTime Created { get; set; }
+
+        /// <summary>
+        /// 群头像
+        /// </summary>
+        public string Avatar { get; set; } = null!;
+    }
+}

backend/IM_API/Dtos/User/UpdateUserDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.User
 {
     public class UpdateUserDto
     {

backend/IM_API/Dtos/User/UserDto.cs

@@ -1,7 +1,7 @@
 using IM_API.Models;
 using System.ComponentModel.DataAnnotations;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.User
 {
     public record PasswordResetDto
     {

backend/IM_API/Dtos/User/UserInfoDto.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IM_API.Dtos
+namespace IM_API.Dtos.User
 {
     public class UserInfoDto
     {