后端:
完善注册页面
This commit is contained in:
@@ -38,7 +38,7 @@ public partial class Group
|
||||
/// <summary>
|
||||
/// 群公告
|
||||
/// </summary>
|
||||
public string? Announcement { get; set; }
|
||||
public string Announcement { get; set; } = "暂无群公告,点击编辑添加。";
|
||||
|
||||
/// <summary>
|
||||
/// 群聊创建时间
|
||||
@@ -56,7 +56,6 @@ public partial class Group
|
||||
public DateTimeOffset LastUpdateTime { get; set; } = DateTime.UtcNow;
|
||||
|
||||
|
||||
public virtual ICollection<GroupInvite> GroupInvites { get; set; } = new List<GroupInvite>();
|
||||
|
||||
public virtual User GroupMasterNavigation { get; set; } = null!;
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
namespace IM_API.Models
|
||||
{
|
||||
public partial class GroupInvite
|
||||
{
|
||||
public GroupInviteState StateEnum
|
||||
{
|
||||
get => (GroupInviteState)State;
|
||||
set => State = (sbyte)value;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
namespace IM_API.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 群邀请状态
|
||||
/// </summary>
|
||||
public enum GroupInviteState
|
||||
{
|
||||
/// <summary>
|
||||
/// 待处理
|
||||
/// </summary>
|
||||
Pending = 0,
|
||||
/// <summary>
|
||||
/// 已同意
|
||||
/// </summary>
|
||||
Passed = 1
|
||||
}
|
||||
}
|
||||
@@ -7,12 +7,20 @@
|
||||
/// </summary>
|
||||
Pending = 0,
|
||||
/// <summary>
|
||||
/// 已拒绝
|
||||
/// 管理员已拒绝
|
||||
/// </summary>
|
||||
Declined = 1,
|
||||
/// <summary>
|
||||
/// 已同意
|
||||
/// 管理员已同意
|
||||
/// </summary>
|
||||
Passed = 2
|
||||
Passed = 2,
|
||||
/// <summary>
|
||||
/// 待对方同意
|
||||
/// </summary>
|
||||
TargetPending = 3,
|
||||
/// <summary>
|
||||
/// 对方拒绝
|
||||
/// </summary>
|
||||
TargetDeclined = 4
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace IM_API.Models;
|
||||
|
||||
public partial class GroupInvite
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 群聊编号
|
||||
/// </summary>
|
||||
public int GroupId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 被邀请用户
|
||||
/// </summary>
|
||||
public int? InvitedUser { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 邀请用户
|
||||
/// </summary>
|
||||
public int? InviteUser { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 当前状态(0:待被邀请人同意
|
||||
/// 1:被邀请人已同意)
|
||||
/// </summary>
|
||||
public sbyte? State { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
public DateTimeOffset? Created { get; set; }
|
||||
|
||||
public virtual Group Group { get; set; } = null!;
|
||||
|
||||
public virtual User? InviteUserNavigation { get; set; }
|
||||
|
||||
public virtual User? InvitedUserNavigation { get; set; }
|
||||
}
|
||||
@@ -19,8 +19,10 @@ public partial class GroupRequest
|
||||
/// </summary>
|
||||
public int UserId { get; set; }
|
||||
|
||||
public int? InviteUserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 申请状态(0:待管理员同意,1:已拒绝,2:已同意)
|
||||
/// 申请状态(0:待管理员同意,1:管理员已拒绝,2:管理员已同意,3:待对方同意,4:对方拒绝)
|
||||
/// </summary>
|
||||
public sbyte State { get; set; }
|
||||
|
||||
|
||||
@@ -49,11 +49,6 @@ namespace IM_API.Models
|
||||
entity.Ignore(e => e.AuhorityEnum);
|
||||
});
|
||||
|
||||
modelBuilder.Entity<GroupInvite>(entity =>
|
||||
{
|
||||
entity.Ignore(e => e.StateEnum);
|
||||
});
|
||||
|
||||
modelBuilder.Entity<GroupMember>(entity =>
|
||||
{
|
||||
entity.Ignore(e => e.RoleEnum);
|
||||
|
||||
@@ -27,7 +27,6 @@ public partial class ImContext : DbContext
|
||||
|
||||
public virtual DbSet<Group> Groups { get; set; }
|
||||
|
||||
public virtual DbSet<GroupInvite> GroupInvites { get; set; }
|
||||
|
||||
public virtual DbSet<GroupMember> GroupMembers { get; set; }
|
||||
|
||||
@@ -362,53 +361,6 @@ public partial class ImContext : DbContext
|
||||
.HasConstraintName("groups_ibfk_1");
|
||||
});
|
||||
|
||||
modelBuilder.Entity<GroupInvite>(entity =>
|
||||
{
|
||||
entity.HasKey(e => e.Id).HasName("PRIMARY");
|
||||
|
||||
entity
|
||||
.ToTable("group_invite")
|
||||
.HasCharSet("utf8mb4")
|
||||
.UseCollation("utf8mb4_general_ci");
|
||||
|
||||
entity.HasIndex(e => e.GroupId, "GroupId");
|
||||
|
||||
entity.HasIndex(e => e.InviteUser, "InviteUser");
|
||||
|
||||
entity.HasIndex(e => e.InvitedUser, "InvitedUser");
|
||||
|
||||
entity.Property(e => e.Id)
|
||||
.HasColumnType("int(11)")
|
||||
.HasColumnName("ID");
|
||||
entity.Property(e => e.Created)
|
||||
.HasComment("创建时间")
|
||||
.HasColumnType("datetime");
|
||||
entity.Property(e => e.GroupId)
|
||||
.HasComment("群聊编号")
|
||||
.HasColumnType("int(11)");
|
||||
entity.Property(e => e.InviteUser)
|
||||
.HasComment("邀请用户")
|
||||
.HasColumnType("int(11)");
|
||||
entity.Property(e => e.InvitedUser)
|
||||
.HasComment("被邀请用户")
|
||||
.HasColumnType("int(11)");
|
||||
entity.Property(e => e.State)
|
||||
.HasComment("当前状态(0:待被邀请人同意\r\n1:被邀请人已同意)")
|
||||
.HasColumnType("tinyint(4)");
|
||||
|
||||
entity.HasOne(d => d.Group).WithMany(p => p.GroupInvites)
|
||||
.HasForeignKey(d => d.GroupId)
|
||||
.OnDelete(DeleteBehavior.ClientSetNull)
|
||||
.HasConstraintName("group_invite_ibfk_2");
|
||||
|
||||
entity.HasOne(d => d.InviteUserNavigation).WithMany(p => p.GroupInviteInviteUserNavigations)
|
||||
.HasForeignKey(d => d.InviteUser)
|
||||
.HasConstraintName("group_invite_ibfk_1");
|
||||
|
||||
entity.HasOne(d => d.InvitedUserNavigation).WithMany(p => p.GroupInviteInvitedUserNavigations)
|
||||
.HasForeignKey(d => d.InvitedUser)
|
||||
.HasConstraintName("group_invite_ibfk_3");
|
||||
});
|
||||
|
||||
modelBuilder.Entity<GroupMember>(entity =>
|
||||
{
|
||||
|
||||
@@ -23,6 +23,18 @@ public partial class User
|
||||
/// 用户昵称
|
||||
/// </summary>
|
||||
public string? NickName { get; set; }
|
||||
/// <summary>
|
||||
/// 用户邮箱
|
||||
/// </summary>
|
||||
public string? Email { get; set; }
|
||||
/// <summary>
|
||||
/// 用户签名
|
||||
/// </summary>
|
||||
public string? Description { get; set; } = "";
|
||||
/// <summary>
|
||||
/// 地区
|
||||
/// </summary>
|
||||
public string? Region { get; set; } = "未知地区";
|
||||
|
||||
/// <summary>
|
||||
/// 用户在线状态
|
||||
@@ -73,10 +85,6 @@ public partial class User
|
||||
[JsonIgnore]
|
||||
public virtual ICollection<Friend> FriendUsers { get; set; } = new List<Friend>();
|
||||
[JsonIgnore]
|
||||
public virtual ICollection<GroupInvite> GroupInviteInviteUserNavigations { get; set; } = new List<GroupInvite>();
|
||||
[JsonIgnore]
|
||||
public virtual ICollection<GroupInvite> GroupInviteInvitedUserNavigations { get; set; } = new List<GroupInvite>();
|
||||
[JsonIgnore]
|
||||
public virtual ICollection<GroupMember> GroupMembers { get; set; } = new List<GroupMember>();
|
||||
[JsonIgnore]
|
||||
public virtual ICollection<GroupRequest> GroupRequests { get; set; } = new List<GroupRequest>();
|
||||
|
||||
Reference in New Issue
Block a user