diff --git a/asg_form/Controllers/Com.cs b/asg_form/Controllers/Com.cs index bcc1729..926ae6a 100644 --- a/asg_form/Controllers/Com.cs +++ b/asg_form/Controllers/Com.cs @@ -113,7 +113,7 @@ namespace asg_form.Controllers [Route("api/v1/com/")] [HttpDelete] [Authorize] - public async Task> com_del(long gameid) + public async Task> com_del(long gameid,string Cancellation_Reason ) { string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; var user = await userManager.FindByIdAsync(id); @@ -141,7 +141,7 @@ namespace asg_form.Controllers await testDb.SaveChangesAsync(); try { - var message = new MessageBuilder().Add(new AtSegment(user.qqnumber ?? "2667210109")).Text($"解说:\r\n{chinaname}\r\n取消了比赛:\r\n{teamgame.team1_name} VS {teamgame.team2_name}").Build(); + var message = new MessageBuilder().Add(new AtSegment(user.qqnumber ?? "2667210109")).Text($"解说:\r\n{chinaname}\r\n取消了比赛:\r\n{teamgame.team1_name} VS {teamgame.team2_name}\r\n原因:{Cancellation_Reason}").Build(); await runbot.runbotr.SendMessageAsync(MessageEnvironment.Channel, "925510646", null, message, "925510646"); diff --git a/asg_form/Controllers/Events.cs b/asg_form/Controllers/Events.cs index df36191..54418d0 100644 --- a/asg_form/Controllers/Events.cs +++ b/asg_form/Controllers/Events.cs @@ -133,7 +133,7 @@ namespace asg_form.Controllers } else { - return BadRequest(new error_mb { code = 400, message = "没P管理员隔着装尼玛呢" }); + return BadRequest(new error_mb { code = 400, message = "没管理员就别调用,嘻嘻" }); } } diff --git a/asg_form/Controllers/schedule.cs b/asg_form/Controllers/schedule.cs index 6bceeba..66b9b9f 100644 --- a/asg_form/Controllers/schedule.cs +++ b/asg_form/Controllers/schedule.cs @@ -406,6 +406,7 @@ namespace asg_form.Controllers /// 裁判的名字 /// public string referee { get; set; } + public int? referee_Id { get; set; } /// /// bilibili录屏路径 /// @@ -416,6 +417,8 @@ namespace asg_form.Controllers public List logs { get; set; } = new List(); public string? judge { get; set; } + + public int? judge_Id { get; set; } public int com_limit { get; set; } = 2; public string? person_type { get; set; } public string? final_score { get; set; } diff --git a/asg_form/Controllers/webhook.cs b/asg_form/Controllers/webhook.cs index 3c94603..a4f11b2 100644 --- a/asg_form/Controllers/webhook.cs +++ b/asg_form/Controllers/webhook.cs @@ -1,9 +1,13 @@ -using Manganese.Text; +using Flandre.Core.Common; +using Flandre.Core.Messaging.Segments; +using Flandre.Core.Messaging; +using Manganese.Text; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using NLog; using RestSharp; using System.Diagnostics; +using static asg_form.Controllers.InviteReferee; namespace asg_form.Controllers { @@ -34,8 +38,48 @@ namespace asg_form.Controllers { return Ok("ok"); } + } + + [Route("api/v1/Codepush/")] + [HttpPost] + public async Task Codepush([FromBody]dynamic date) + { + + try { + var message = new MessageBuilder().Text($"后端推送了新的代码库\r\n详细信息:{date.messages.text}").Build(); + + await runbot.runbotr.SendMessageAsync(MessageEnvironment.Channel, "931217544", null, message, "931217544"); + + + } + catch + { + + } + return "ok"; + } + + + [Route("api/v1/issueadd/")] + [HttpPost] + public async Task issueadd([FromBody] dynamic date) + { + + try + { + var message = new MessageBuilder().Text($"后端有新bug被提交请及时解决!\r\n详细信息:{date.messages.text}").Build(); + + await runbot.runbotr.SendMessageAsync(MessageEnvironment.Channel, "931217544", null, message, "931217544"); + + + } + catch + { + + } + return "ok"; } diff --git a/asg_form/Migrations/20241102154730_sh1.Designer.cs b/asg_form/Migrations/20241102154730_sh1.Designer.cs new file mode 100644 index 0000000..5333d78 --- /dev/null +++ b/asg_form/Migrations/20241102154730_sh1.Designer.cs @@ -0,0 +1,1096 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using asg_form.Controllers; + +#nullable disable + +namespace asg_form.Migrations +{ + [DbContext(typeof(IDBcontext))] + [Migration("20241102154730_sh1")] + partial class sh1 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("ProviderKey") + .HasColumnType("text"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("bigint"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("bigint"); + + b.Property("RoleId") + .HasColumnType("bigint"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("bigint"); + + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("T_TeamT_events", b => + { + b.Property("EventsId") + .HasColumnType("integer"); + + b.Property("TeamsId") + .HasColumnType("bigint"); + + b.HasKey("EventsId", "TeamsId"); + + b.HasIndex("TeamsId"); + + b.ToTable("T_Teams_Player", (string)null); + }); + + modelBuilder.Entity("T_news", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("FormName") + .IsRequired() + .HasColumnType("text"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text"); + + b.Property("Type") + .IsRequired() + .HasColumnType("text"); + + b.Property("msg") + .IsRequired() + .HasColumnType("text"); + + b.Property("time") + .IsRequired() + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.ToTable("F_news", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.Champion+T_Champion", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("eventsId") + .HasColumnType("integer"); + + b.Property("formId") + .HasColumnType("bigint"); + + b.Property("msg") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("eventsId"); + + b.HasIndex("formId"); + + b.ToTable("F_Champion", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.Store.StoreDB", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("Price") + .HasColumnType("bigint"); + + b.Property("Type") + .IsRequired() + .HasColumnType("text"); + + b.Property("description") + .IsRequired() + .HasColumnType("text"); + + b.Property("information") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("id"); + + b.ToTable("T_Store", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.Store.StoreinfoDB", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("id")); + + b.Property("Storeid") + .HasColumnType("bigint"); + + b.Property("buyerid") + .HasColumnType("bigint"); + + b.Property("isVerification") + .HasColumnType("boolean"); + + b.HasKey("id"); + + b.HasIndex("Storeid"); + + b.ToTable("T_Storeinfo", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.T_Friend", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("id")); + + b.Property("account") + .IsRequired() + .HasColumnType("text"); + + b.Property("comMsg") + .IsRequired() + .HasColumnType("text"); + + b.Property("comTime") + .HasColumnType("timestamp with time zone"); + + b.Property("comType") + .IsRequired() + .HasColumnType("text"); + + b.Property("degree") + .HasColumnType("integer"); + + b.Property("headName") + .IsRequired() + .HasColumnType("text"); + + b.Property("headTel") + .IsRequired() + .HasColumnType("text"); + + b.Property("orgName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("id"); + + b.ToTable("F_Friend", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.T_config", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Substance") + .IsRequired() + .HasColumnType("text"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text"); + + b.Property("msg") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("T_Config", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.T_events", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("events_rule_uri") + .HasColumnType("text"); + + b.Property("is_over") + .HasColumnType("boolean"); + + b.Property("name") + .HasColumnType("text"); + + b.Property("opentime") + .HasColumnType("timestamp with time zone"); + + b.Property("promChart") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("F_events", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.TaskDB", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("id")); + + b.Property("approvalPerson") + .IsRequired() + .HasColumnType("text"); + + b.Property("chinaname") + .IsRequired() + .HasColumnType("text"); + + b.Property("createPerson") + .IsRequired() + .HasColumnType("text"); + + b.Property("createTime") + .IsRequired() + .HasColumnType("text"); + + b.Property("createUserId") + .HasColumnType("bigint"); + + b.Property("lastOperateTime") + .IsRequired() + .HasColumnType("text"); + + b.Property("money") + .HasColumnType("bigint"); + + b.Property("status") + .IsRequired() + .HasColumnType("text"); + + b.Property("taskDescription") + .IsRequired() + .HasColumnType("text"); + + b.Property("taskName") + .IsRequired() + .HasColumnType("text"); + + b.Property("userId") + .HasColumnType("bigint"); + + b.HasKey("id"); + + b.ToTable("T_Task", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.Team.T_Player", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Common_Roles") + .HasColumnType("text"); + + b.Property("Game_Name") + .HasColumnType("text"); + + b.Property("Historical_Ranks") + .HasColumnType("integer"); + + b.Property("Id_Card") + .HasColumnType("text"); + + b.Property("Id_Card_Name") + .HasColumnType("text"); + + b.Property("Phone_Number") + .HasColumnType("text"); + + b.Property("TeamId") + .HasColumnType("bigint"); + + b.Property("role_id") + .IsRequired() + .HasColumnType("text"); + + b.Property("role_lin") + .IsRequired() + .HasColumnType("text"); + + b.Property("role_name") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("TeamId"); + + b.ToTable("F_Player", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.Team.T_Team", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("is_check") + .HasColumnType("boolean"); + + b.Property("logo_uri") + .IsRequired() + .HasColumnType("text"); + + b.Property("piaoshu") + .HasColumnType("integer"); + + b.Property("team_name") + .IsRequired() + .HasColumnType("text"); + + b.Property("team_password") + .IsRequired() + .HasColumnType("text"); + + b.Property("team_tel") + .IsRequired() + .HasColumnType("text"); + + b.Property("time") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.ToTable("F_Team", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.comform+com_form", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Com_Cocial_media") + .IsRequired() + .HasColumnType("text"); + + b.Property("Com_qq") + .IsRequired() + .HasColumnType("text"); + + b.Property("Status") + .IsRequired() + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.Property("comSex") + .IsRequired() + .HasColumnType("text"); + + b.Property("createTime") + .IsRequired() + .HasColumnType("text"); + + b.Property("idv_id") + .IsRequired() + .HasColumnType("text"); + + b.Property("introduction") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("F_ComForm", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.form", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("eventsId") + .HasColumnType("integer"); + + b.Property("logo_uri") + .IsRequired() + .HasColumnType("text"); + + b.Property("piaoshu") + .HasColumnType("integer"); + + b.Property("team_name") + .IsRequired() + .HasColumnType("text"); + + b.Property("team_password") + .IsRequired() + .HasColumnType("text"); + + b.Property("team_tel") + .IsRequired() + .HasColumnType("text"); + + b.Property("time") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("eventsId"); + + b.ToTable("F_form", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.qquser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("money") + .HasColumnType("integer"); + + b.Property("qqid") + .IsRequired() + .HasColumnType("text"); + + b.Property("time") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.ToTable("F_qquser", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Common_Roles") + .HasColumnType("text"); + + b.Property("Game_Name") + .HasColumnType("text"); + + b.Property("Historical_Ranks") + .HasColumnType("integer"); + + b.Property("Id_Card") + .HasColumnType("text"); + + b.Property("Id_Card_Name") + .HasColumnType("text"); + + b.Property("Phone_Number") + .HasColumnType("text"); + + b.Property("formId") + .HasColumnType("bigint"); + + b.Property("role_id") + .IsRequired() + .HasColumnType("text"); + + b.Property("role_lin") + .IsRequired() + .HasColumnType("text"); + + b.Property("role_name") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("formId"); + + b.ToTable("F_role", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.schedule+schedule_log", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("chickteam") + .IsRequired() + .HasColumnType("text"); + + b.Property("teamid") + .HasColumnType("bigint"); + + b.Property("userid") + .IsRequired() + .HasColumnType("text"); + + b.Property("win") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.HasIndex("teamid"); + + b.ToTable("F_achlog", (string)null); + }); + + modelBuilder.Entity("asg_form.Controllers.schedule+team_game", b => + { + b.Property("id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("id")); + + b.Property("belong") + .HasColumnType("text"); + + b.Property("bilibiliuri") + .HasColumnType("text"); + + b.Property("com_limit") + .HasColumnType("integer"); + + b.Property("commentary") + .IsRequired() + .HasColumnType("text"); + + b.Property("final_score") + .HasColumnType("text"); + + b.Property("judge") + .HasColumnType("text"); + + b.Property("judge_Id") + .HasColumnType("integer"); + + b.Property("opentime") + .IsRequired() + .HasColumnType("text"); + + b.Property("person_type") + .HasColumnType("text"); + + b.Property("referee") + .IsRequired() + .HasColumnType("text"); + + b.Property("referee_Id") + .HasColumnType("integer"); + + b.Property("tag") + .HasColumnType("text"); + + b.Property("team1_name") + .IsRequired() + .HasColumnType("text"); + + b.Property("team1_piaoshu") + .HasColumnType("integer"); + + b.Property("team2_name") + .IsRequired() + .HasColumnType("text"); + + b.Property("team2_piaoshu") + .HasColumnType("integer"); + + b.Property("winteam") + .HasColumnType("text"); + + b.HasKey("id"); + + b.ToTable("F_game", (string)null); + }); + + modelBuilder.Entity("asg_form.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("msg") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("asg_form.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("Integral") + .HasColumnType("bigint"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserBase64") + .HasColumnType("text"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("chinaname") + .HasColumnType("text"); + + b.Property("haveformId") + .HasColumnType("bigint"); + + b.Property("isbooking") + .HasColumnType("boolean"); + + b.Property("myteamId") + .HasColumnType("bigint"); + + b.Property("officium") + .HasColumnType("text"); + + b.Property("point") + .HasColumnType("integer"); + + b.Property("qqnumber") + .HasColumnType("text"); + + b.Property("roleListCode") + .HasColumnType("text"); + + b.Property("roleListName") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.HasIndex("haveformId"); + + b.HasIndex("myteamId"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("asg_form.blog+blog_db", b => + { + b.Property("ID") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ID")); + + b.Property("formuser") + .IsRequired() + .HasColumnType("text"); + + b.Property("msg") + .IsRequired() + .HasColumnType("text"); + + b.Property("pushtime") + .HasColumnType("timestamp with time zone"); + + b.Property("title") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("ID"); + + b.ToTable("F_blog", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("asg_form.Role", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("asg_form.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("asg_form.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("asg_form.Role", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("asg_form.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("asg_form.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("T_TeamT_events", b => + { + b.HasOne("asg_form.Controllers.T_events", null) + .WithMany() + .HasForeignKey("EventsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("asg_form.Controllers.Team.T_Team", null) + .WithMany() + .HasForeignKey("TeamsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("asg_form.Controllers.Champion+T_Champion", b => + { + b.HasOne("asg_form.Controllers.T_events", "events") + .WithMany() + .HasForeignKey("eventsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("asg_form.Controllers.form", "form") + .WithMany() + .HasForeignKey("formId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("events"); + + b.Navigation("form"); + }); + + modelBuilder.Entity("asg_form.Controllers.Store.StoreinfoDB", b => + { + b.HasOne("asg_form.Controllers.Store.StoreDB", "Store") + .WithMany("buyer") + .HasForeignKey("Storeid") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Store"); + }); + + modelBuilder.Entity("asg_form.Controllers.Team.T_Player", b => + { + b.HasOne("asg_form.Controllers.Team.T_Team", "Team") + .WithMany("role") + .HasForeignKey("TeamId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Team"); + }); + + modelBuilder.Entity("asg_form.Controllers.form", b => + { + b.HasOne("asg_form.Controllers.T_events", "events") + .WithMany("forms") + .HasForeignKey("eventsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("events"); + }); + + modelBuilder.Entity("asg_form.Controllers.role", b => + { + b.HasOne("asg_form.Controllers.form", "form") + .WithMany("role") + .HasForeignKey("formId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("form"); + }); + + modelBuilder.Entity("asg_form.Controllers.schedule+schedule_log", b => + { + b.HasOne("asg_form.Controllers.schedule+team_game", "team") + .WithMany("logs") + .HasForeignKey("teamid") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("team"); + }); + + modelBuilder.Entity("asg_form.User", b => + { + b.HasOne("asg_form.Controllers.form", "haveform") + .WithMany() + .HasForeignKey("haveformId"); + + b.HasOne("asg_form.Controllers.Team.T_Team", "myteam") + .WithMany() + .HasForeignKey("myteamId"); + + b.Navigation("haveform"); + + b.Navigation("myteam"); + }); + + modelBuilder.Entity("asg_form.Controllers.Store.StoreDB", b => + { + b.Navigation("buyer"); + }); + + modelBuilder.Entity("asg_form.Controllers.T_events", b => + { + b.Navigation("forms"); + }); + + modelBuilder.Entity("asg_form.Controllers.Team.T_Team", b => + { + b.Navigation("role"); + }); + + modelBuilder.Entity("asg_form.Controllers.form", b => + { + b.Navigation("role"); + }); + + modelBuilder.Entity("asg_form.Controllers.schedule+team_game", b => + { + b.Navigation("logs"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/asg_form/Migrations/20241102154730_sh1.cs b/asg_form/Migrations/20241102154730_sh1.cs new file mode 100644 index 0000000..93ce9d2 --- /dev/null +++ b/asg_form/Migrations/20241102154730_sh1.cs @@ -0,0 +1,162 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace asg_form.Migrations +{ + /// + public partial class sh1 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_AspNetUsers_F_Team_myteamId", + table: "AspNetUsers"); + + migrationBuilder.AlterColumn( + name: "opentime", + table: "F_game", + type: "text", + nullable: false, + oldClrType: typeof(DateTime), + oldType: "timestamp with time zone"); + + migrationBuilder.AddColumn( + name: "final_score", + table: "F_game", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "judge_Id", + table: "F_game", + type: "integer", + nullable: true); + + migrationBuilder.AddColumn( + name: "referee_Id", + table: "F_game", + type: "integer", + nullable: true); + + migrationBuilder.AlterColumn( + name: "point", + table: "AspNetUsers", + type: "integer", + nullable: true, + oldClrType: typeof(int), + oldType: "integer"); + + migrationBuilder.AlterColumn( + name: "myteamId", + table: "AspNetUsers", + type: "bigint", + nullable: true, + oldClrType: typeof(long), + oldType: "bigint"); + + migrationBuilder.AddColumn( + name: "roleListCode", + table: "AspNetUsers", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "roleListName", + table: "AspNetUsers", + type: "text", + nullable: true); + + migrationBuilder.AlterColumn( + name: "msg", + table: "AspNetRoles", + type: "text", + nullable: true, + oldClrType: typeof(string), + oldType: "text"); + + migrationBuilder.AddForeignKey( + name: "FK_AspNetUsers_F_Team_myteamId", + table: "AspNetUsers", + column: "myteamId", + principalTable: "F_Team", + principalColumn: "Id"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_AspNetUsers_F_Team_myteamId", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "final_score", + table: "F_game"); + + migrationBuilder.DropColumn( + name: "judge_Id", + table: "F_game"); + + migrationBuilder.DropColumn( + name: "referee_Id", + table: "F_game"); + + migrationBuilder.DropColumn( + name: "roleListCode", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "roleListName", + table: "AspNetUsers"); + + migrationBuilder.AlterColumn( + name: "opentime", + table: "F_game", + type: "timestamp with time zone", + nullable: false, + oldClrType: typeof(string), + oldType: "text"); + + migrationBuilder.AlterColumn( + name: "point", + table: "AspNetUsers", + type: "integer", + nullable: false, + defaultValue: 0, + oldClrType: typeof(int), + oldType: "integer", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "myteamId", + table: "AspNetUsers", + type: "bigint", + nullable: false, + defaultValue: 0L, + oldClrType: typeof(long), + oldType: "bigint", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "msg", + table: "AspNetRoles", + type: "text", + nullable: false, + defaultValue: "", + oldClrType: typeof(string), + oldType: "text", + oldNullable: true); + + migrationBuilder.AddForeignKey( + name: "FK_AspNetUsers_F_Team_myteamId", + table: "AspNetUsers", + column: "myteamId", + principalTable: "F_Team", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + } +} diff --git a/asg_form/Migrations/IDBcontextModelSnapshot.cs b/asg_form/Migrations/IDBcontextModelSnapshot.cs index d06c02f..a809931 100644 --- a/asg_form/Migrations/IDBcontextModelSnapshot.cs +++ b/asg_form/Migrations/IDBcontextModelSnapshot.cs @@ -696,11 +696,18 @@ namespace asg_form.Migrations .IsRequired() .HasColumnType("text"); + b.Property("final_score") + .HasColumnType("text"); + b.Property("judge") .HasColumnType("text"); - b.Property("opentime") - .HasColumnType("timestamp with time zone"); + b.Property("judge_Id") + .HasColumnType("integer"); + + b.Property("opentime") + .IsRequired() + .HasColumnType("text"); b.Property("person_type") .HasColumnType("text"); @@ -709,6 +716,9 @@ namespace asg_form.Migrations .IsRequired() .HasColumnType("text"); + b.Property("referee_Id") + .HasColumnType("integer"); + b.Property("tag") .HasColumnType("text"); @@ -755,7 +765,6 @@ namespace asg_form.Migrations .HasColumnType("character varying(256)"); b.Property("msg") - .IsRequired() .HasColumnType("text"); b.HasKey("Id"); @@ -837,18 +846,24 @@ namespace asg_form.Migrations b.Property("isbooking") .HasColumnType("boolean"); - b.Property("myteamId") + b.Property("myteamId") .HasColumnType("bigint"); b.Property("officium") .HasColumnType("text"); - b.Property("point") + b.Property("point") .HasColumnType("integer"); b.Property("qqnumber") .HasColumnType("text"); + b.Property("roleListCode") + .HasColumnType("text"); + + b.Property("roleListName") + .HasColumnType("text"); + b.HasKey("Id"); b.HasIndex("NormalizedEmail") @@ -1041,9 +1056,7 @@ namespace asg_form.Migrations b.HasOne("asg_form.Controllers.Team.T_Team", "myteam") .WithMany() - .HasForeignKey("myteamId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .HasForeignKey("myteamId"); b.Navigation("haveform");