This commit is contained in:
杨毅 2025-02-16 00:44:37 +08:00
parent d207d89b8e
commit 486826ff75
23 changed files with 194 additions and 8342 deletions

View File

@ -16,6 +16,7 @@
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.8.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.2.0" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
@ -24,7 +25,8 @@
<PackageVersion Include="MrHuo.OAuth.Github" Version="1.1.1" />
<PackageVersion Include="MrHuo.OAuth.Microsoft" Version="1.1.1" />
<PackageVersion Include="NLog" Version="5.2.4" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageVersion Include="Npgsql" Version="9.0.2" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />

View File

@ -2,7 +2,7 @@
{
public class StoreDB
{
public long id { get; set; }
public Guid id { get; set; }
public string Name { get; set; }
public long Price { get; set; }
@ -14,7 +14,7 @@
}
public class StoreinfoDB
{
public long id { get; set; }
public Guid id { get; set; }
public long buyerid { get; set; }
public StoreDB Store { get; set; }

View File

@ -71,6 +71,7 @@ namespace asg_form.Controllers.Store
a.description=storeinfo.description;
a.information=storeinfo.information;
a.Price=storeinfo.Price;
a.Type=storeinfo.Type;
await sb.SaveChangesAsync();
return Ok(storeinfo);
}

View File

@ -125,7 +125,7 @@ namespace asg_form.Controllers
{
using (TestDbContext ctx = new TestDbContext())
{
ctx.news.Add(new T_news { Title = req_News.Title, msg = req_News.msg, Type = req_News.Type, FormName = user.chinaname, time = DateTime.Now.ToString() });
ctx.news.Add(new T_news { Title = req_News.Title, msg = req_News.msg, Type = req_News.type, FormName = user.chinaname, time = DateTime.Now.ToString() });
await ctx.SaveChangesAsync();
return Ok(new TReturn() { code=200,msg="添加成功!"});
}
@ -172,8 +172,8 @@ namespace asg_form.Controllers
}
qwq.msg=req_News.msg;
qwq.Title=req_News.Title;
qwq.FormName = user.UserName;
qwq.Type = req_News.Type;
qwq.FormName = user.chinaname;
qwq.Type = req_News.type;
ctx.SaveChanges();
}
catch (Exception ex)
@ -219,7 +219,7 @@ public class T_news
/// 内容推荐使用markdown格式
/// </summary>
public string msg { get; set; }
public string Type { get; set; }
public string type { get; set; }
}

File diff suppressed because it is too large Load Diff

View File

@ -1,88 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace asg_form.Migrations
{
/// <inheritdoc />
public partial class qqbot1 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "CreationTime",
table: "AspNetUsers");
migrationBuilder.AddColumn<int>(
name: "com_limit",
table: "F_game",
type: "integer",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<string>(
name: "judge",
table: "F_game",
type: "text",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "person_type",
table: "F_game",
type: "text",
nullable: true);
migrationBuilder.CreateTable(
name: "T_Task",
columns: table => new
{
id = table.Column<long>(type: "bigint", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
chinaname = table.Column<string>(type: "text", nullable: false),
createPerson = table.Column<string>(type: "text", nullable: false),
createUserId = table.Column<long>(type: "bigint", nullable: true),
userId = table.Column<long>(type: "bigint", nullable: false),
taskName = table.Column<string>(type: "text", nullable: false),
taskDescription = table.Column<string>(type: "text", nullable: false),
status = table.Column<string>(type: "text", nullable: false),
money = table.Column<long>(type: "bigint", nullable: false),
createTime = table.Column<string>(type: "text", nullable: false),
lastOperateTime = table.Column<string>(type: "text", nullable: false),
approvalPerson = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_T_Task", x => x.id);
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_Task");
migrationBuilder.DropColumn(
name: "com_limit",
table: "F_game");
migrationBuilder.DropColumn(
name: "judge",
table: "F_game");
migrationBuilder.DropColumn(
name: "person_type",
table: "F_game");
migrationBuilder.AddColumn<DateTime>(
name: "CreationTime",
table: "AspNetUsers",
type: "timestamp with time zone",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,22 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace asg_form.Migrations
{
/// <inheritdoc />
public partial class qqbot2 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,36 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace asg_form.Migrations
{
/// <inheritdoc />
public partial class qqbot3 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "F_qquser",
columns: table => new
{
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
qqid = table.Column<string>(type: "text", nullable: false),
money = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_F_qquser", x => x.Id);
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "F_qquser");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,30 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace asg_form.Migrations
{
/// <inheritdoc />
public partial class qqbot4 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "time",
table: "F_qquser",
type: "timestamp with time zone",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "time",
table: "F_qquser");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,28 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace asg_form.Migrations
{
/// <inheritdoc />
public partial class qqbot5 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "qqnumber",
table: "AspNetUsers",
type: "text",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "qqnumber",
table: "AspNetUsers");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,162 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace asg_form.Migrations
{
/// <inheritdoc />
public partial class sh1 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AspNetUsers_F_Team_myteamId",
table: "AspNetUsers");
migrationBuilder.AlterColumn<string>(
name: "opentime",
table: "F_game",
type: "text",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AddColumn<string>(
name: "final_score",
table: "F_game",
type: "text",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "judge_Id",
table: "F_game",
type: "integer",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "referee_Id",
table: "F_game",
type: "integer",
nullable: true);
migrationBuilder.AlterColumn<int>(
name: "point",
table: "AspNetUsers",
type: "integer",
nullable: true,
oldClrType: typeof(int),
oldType: "integer");
migrationBuilder.AlterColumn<long>(
name: "myteamId",
table: "AspNetUsers",
type: "bigint",
nullable: true,
oldClrType: typeof(long),
oldType: "bigint");
migrationBuilder.AddColumn<string>(
name: "roleListCode",
table: "AspNetUsers",
type: "text",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "roleListName",
table: "AspNetUsers",
type: "text",
nullable: true);
migrationBuilder.AlterColumn<string>(
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");
}
/// <inheritdoc />
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<DateTime>(
name: "opentime",
table: "F_game",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(string),
oldType: "text");
migrationBuilder.AlterColumn<int>(
name: "point",
table: "AspNetUsers",
type: "integer",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "integer",
oldNullable: true);
migrationBuilder.AlterColumn<long>(
name: "myteamId",
table: "AspNetUsers",
type: "bigint",
nullable: false,
defaultValue: 0L,
oldClrType: typeof(long),
oldType: "bigint",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
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);
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,28 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace asg_form.Migrations
{
/// <inheritdoc />
public partial class sh3 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "Remarks",
table: "F_game",
type: "text",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Remarks",
table: "F_game");
}
}
}

View File

@ -12,15 +12,15 @@ using asg_form.Controllers;
namespace asg_form.Migrations
{
[DbContext(typeof(IDBcontext))]
[Migration("20241001164017_pgsql")]
partial class pgsql
[Migration("20250215163639_guid")]
partial class guid
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("ProductVersion", "9.0.2")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@ -128,21 +128,6 @@ namespace asg_form.Migrations
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("T_TeamT_events", b =>
{
b.Property<int>("EventsId")
.HasColumnType("integer");
b.Property<long>("TeamsId")
.HasColumnType("bigint");
b.HasKey("EventsId", "TeamsId");
b.HasIndex("TeamsId");
b.ToTable("T_Teams_Player", (string)null);
});
modelBuilder.Entity("T_news", b =>
{
b.Property<long>("Id")
@ -167,9 +152,9 @@ namespace asg_form.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<DateTime?>("time")
b.Property<string>("time")
.IsRequired()
.HasColumnType("timestamp with time zone");
.HasColumnType("text");
b.HasKey("Id");
@ -205,11 +190,9 @@ namespace asg_form.Migrations
modelBuilder.Entity("asg_form.Controllers.Store.StoreDB", b =>
{
b.Property<long>("id")
b.Property<Guid>("id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("id"));
.HasColumnType("uuid");
b.Property<string>("Name")
.IsRequired()
@ -237,14 +220,12 @@ namespace asg_form.Migrations
modelBuilder.Entity("asg_form.Controllers.Store.StoreinfoDB", b =>
{
b.Property<long>("id")
b.Property<Guid>("id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
.HasColumnType("uuid");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("id"));
b.Property<long>("Storeid")
.HasColumnType("bigint");
b.Property<Guid>("Storeid")
.HasColumnType("uuid");
b.Property<long>("buyerid")
.HasColumnType("bigint");
@ -334,6 +315,9 @@ namespace asg_form.Migrations
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("config")
.HasColumnType("text");
b.Property<string>("events_rule_uri")
.HasColumnType("text");
@ -349,95 +333,71 @@ namespace asg_form.Migrations
b.Property<string>("promChart")
.HasColumnType("text");
b.Property<string>("status")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("F_events", (string)null);
});
modelBuilder.Entity("asg_form.Controllers.Team.T_Player", b =>
modelBuilder.Entity("asg_form.Controllers.TaskDB", b =>
{
b.Property<long>("Id")
b.Property<long>("id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("id"));
b.Property<string>("Common_Roles")
b.Property<string>("approvalPerson")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Game_Name")
b.Property<string>("chinaname")
.IsRequired()
.HasColumnType("text");
b.Property<int?>("Historical_Ranks")
.HasColumnType("integer");
b.Property<string>("Id_Card")
b.Property<string>("createPerson")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Id_Card_Name")
b.Property<string>("createTime")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Phone_Number")
.HasColumnType("text");
b.Property<long>("TeamId")
b.Property<long?>("createUserId")
.HasColumnType("bigint");
b.Property<string>("role_id")
b.Property<string>("lastOperateTime")
.IsRequired()
.HasColumnType("text");
b.Property<string>("role_lin")
.IsRequired()
.HasColumnType("text");
b.Property<string>("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<long>("Id")
.ValueGeneratedOnAdd()
b.Property<long>("money")
.HasColumnType("bigint");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
b.Property<bool>("is_check")
.HasColumnType("boolean");
b.Property<string>("logo_uri")
b.Property<string>("priority")
.IsRequired()
.HasColumnType("text");
b.Property<int>("piaoshu")
.HasColumnType("integer");
b.Property<string>("team_name")
b.Property<string>("status")
.IsRequired()
.HasColumnType("text");
b.Property<string>("team_password")
b.Property<string>("taskDescription")
.IsRequired()
.HasColumnType("text");
b.Property<string>("team_tel")
b.Property<string>("taskName")
.IsRequired()
.HasColumnType("text");
b.Property<long>("time")
b.Property<long>("userId")
.HasColumnType("bigint");
b.HasKey("Id");
b.HasKey("id");
b.ToTable("F_Team", (string)null);
b.ToTable("T_Task", (string)null);
});
modelBuilder.Entity("asg_form.Controllers.comform+com_form", b =>
@ -524,6 +484,29 @@ namespace asg_form.Migrations
b.ToTable("F_form", (string)null);
});
modelBuilder.Entity("asg_form.Controllers.qquser", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("money")
.HasColumnType("integer");
b.Property<string>("qqid")
.IsRequired()
.HasColumnType("text");
b.Property<DateTime>("time")
.HasColumnType("timestamp with time zone");
b.HasKey("Id");
b.ToTable("F_qquser", (string)null);
});
modelBuilder.Entity("asg_form.Controllers.role", b =>
{
b.Property<long>("Id")
@ -609,23 +592,47 @@ namespace asg_form.Migrations
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("id"));
b.Property<string>("Remarks")
.HasColumnType("text");
b.Property<string>("belong")
.HasColumnType("text");
b.Property<string>("bilibiliuri")
.HasColumnType("text");
b.Property<int>("com_limit")
.HasColumnType("integer");
b.Property<string>("commentary")
.IsRequired()
.HasColumnType("text");
b.Property<DateTime>("opentime")
.HasColumnType("timestamp with time zone");
b.Property<string>("final_score")
.HasColumnType("text");
b.Property<string>("referee")
b.Property<int>("isAllowChoose")
.HasColumnType("integer");
b.Property<string>("judge")
.HasColumnType("text");
b.Property<int?>("judge_Id")
.HasColumnType("integer");
b.Property<string>("opentime")
.IsRequired()
.HasColumnType("text");
b.Property<string>("person_type")
.HasColumnType("text");
b.Property<string>("referee")
.HasColumnType("text");
b.Property<int?>("referee_Id")
.HasColumnType("integer");
b.Property<string>("tag")
.HasColumnType("text");
@ -672,7 +679,6 @@ namespace asg_form.Migrations
.HasColumnType("character varying(256)");
b.Property<string>("msg")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
@ -699,9 +705,6 @@ namespace asg_form.Migrations
.IsConcurrencyToken()
.HasColumnType("text");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp with time zone");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
@ -757,15 +760,21 @@ namespace asg_form.Migrations
b.Property<bool?>("isbooking")
.HasColumnType("boolean");
b.Property<long>("myteamId")
.HasColumnType("bigint");
b.Property<string>("officium")
.HasColumnType("text");
b.Property<int>("point")
b.Property<int?>("point")
.HasColumnType("integer");
b.Property<string>("qqnumber")
.HasColumnType("text");
b.Property<string>("roleListCode")
.HasColumnType("text");
b.Property<string>("roleListName")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
@ -777,8 +786,6 @@ namespace asg_form.Migrations
b.HasIndex("haveformId");
b.HasIndex("myteamId");
b.ToTable("AspNetUsers", (string)null);
});
@ -861,21 +868,6 @@ namespace asg_form.Migrations
.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")
@ -906,17 +898,6 @@ namespace asg_form.Migrations
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")
@ -956,15 +937,7 @@ namespace asg_form.Migrations
.WithMany()
.HasForeignKey("haveformId");
b.HasOne("asg_form.Controllers.Team.T_Team", "myteam")
.WithMany()
.HasForeignKey("myteamId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("haveform");
b.Navigation("myteam");
});
modelBuilder.Entity("asg_form.Controllers.Store.StoreDB", b =>
@ -977,11 +950,6 @@ namespace asg_form.Migrations
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");

View File

@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace asg_form.Migrations
{
/// <inheritdoc />
public partial class pgsql : Migration
public partial class guid : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
@ -18,7 +18,7 @@ namespace asg_form.Migrations
{
Id = table.Column<long>(type: "bigint", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
msg = table.Column<string>(type: "text", nullable: false),
msg = table.Column<string>(type: "text", nullable: true),
Name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
NormalizedName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
ConcurrencyStamp = table.Column<string>(type: "text", nullable: true)
@ -74,7 +74,9 @@ namespace asg_form.Migrations
is_over = table.Column<bool>(type: "boolean", nullable: true),
opentime = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
events_rule_uri = table.Column<string>(type: "text", nullable: true),
promChart = table.Column<string>(type: "text", nullable: true)
promChart = table.Column<string>(type: "text", nullable: true),
status = table.Column<string>(type: "text", nullable: false),
config = table.Column<string>(type: "text", nullable: true)
},
constraints: table =>
{
@ -111,13 +113,21 @@ namespace asg_form.Migrations
team1_piaoshu = table.Column<int>(type: "integer", nullable: false),
team2_name = table.Column<string>(type: "text", nullable: false),
team2_piaoshu = table.Column<int>(type: "integer", nullable: false),
opentime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
opentime = table.Column<string>(type: "text", nullable: false),
commentary = table.Column<string>(type: "text", nullable: false),
referee = table.Column<string>(type: "text", nullable: false),
referee = table.Column<string>(type: "text", nullable: true),
referee_Id = table.Column<int>(type: "integer", nullable: true),
bilibiliuri = table.Column<string>(type: "text", nullable: true),
winteam = table.Column<string>(type: "text", nullable: true),
tag = table.Column<string>(type: "text", nullable: true),
belong = table.Column<string>(type: "text", nullable: true)
belong = table.Column<string>(type: "text", nullable: true),
judge = table.Column<string>(type: "text", nullable: true),
judge_Id = table.Column<int>(type: "integer", nullable: true),
com_limit = table.Column<int>(type: "integer", nullable: false),
person_type = table.Column<string>(type: "text", nullable: true),
final_score = table.Column<string>(type: "text", nullable: true),
Remarks = table.Column<string>(type: "text", nullable: true),
isAllowChoose = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
@ -132,7 +142,7 @@ namespace asg_form.Migrations
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
Title = table.Column<string>(type: "text", nullable: false),
FormName = table.Column<string>(type: "text", nullable: false),
time = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
time = table.Column<string>(type: "text", nullable: false),
msg = table.Column<string>(type: "text", nullable: false),
Type = table.Column<string>(type: "text", nullable: false)
},
@ -142,22 +152,18 @@ namespace asg_form.Migrations
});
migrationBuilder.CreateTable(
name: "F_Team",
name: "F_qquser",
columns: table => new
{
Id = table.Column<long>(type: "bigint", nullable: false)
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
is_check = table.Column<bool>(type: "boolean", nullable: false),
piaoshu = table.Column<int>(type: "integer", nullable: false),
time = table.Column<long>(type: "bigint", nullable: false),
team_name = table.Column<string>(type: "text", nullable: false),
team_password = table.Column<string>(type: "text", nullable: false),
team_tel = table.Column<string>(type: "text", nullable: false),
logo_uri = table.Column<string>(type: "text", nullable: false)
qqid = table.Column<string>(type: "text", nullable: false),
money = table.Column<int>(type: "integer", nullable: false),
time = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_F_Team", x => x.Id);
table.PrimaryKey("PK_F_qquser", x => x.Id);
});
migrationBuilder.CreateTable(
@ -179,8 +185,7 @@ namespace asg_form.Migrations
name: "T_Store",
columns: table => new
{
id = table.Column<long>(type: "bigint", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
id = table.Column<Guid>(type: "uuid", nullable: false),
Name = table.Column<string>(type: "text", nullable: false),
Price = table.Column<long>(type: "bigint", nullable: false),
description = table.Column<string>(type: "text", nullable: false),
@ -192,6 +197,30 @@ namespace asg_form.Migrations
table.PrimaryKey("PK_T_Store", x => x.id);
});
migrationBuilder.CreateTable(
name: "T_Task",
columns: table => new
{
id = table.Column<long>(type: "bigint", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
chinaname = table.Column<string>(type: "text", nullable: false),
createPerson = table.Column<string>(type: "text", nullable: false),
createUserId = table.Column<long>(type: "bigint", nullable: true),
userId = table.Column<long>(type: "bigint", nullable: false),
taskName = table.Column<string>(type: "text", nullable: false),
taskDescription = table.Column<string>(type: "text", nullable: false),
status = table.Column<string>(type: "text", nullable: false),
money = table.Column<long>(type: "bigint", nullable: false),
createTime = table.Column<string>(type: "text", nullable: false),
lastOperateTime = table.Column<string>(type: "text", nullable: false),
approvalPerson = table.Column<string>(type: "text", nullable: false),
priority = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_T_Task", x => x.id);
});
migrationBuilder.CreateTable(
name: "AspNetRoleClaims",
columns: table => new
@ -260,66 +289,13 @@ namespace asg_form.Migrations
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "F_Player",
columns: table => new
{
Id = table.Column<long>(type: "bigint", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
TeamId = table.Column<long>(type: "bigint", nullable: false),
role_id = table.Column<string>(type: "text", nullable: false),
role_name = table.Column<string>(type: "text", nullable: false),
Game_Name = table.Column<string>(type: "text", nullable: true),
role_lin = table.Column<string>(type: "text", nullable: false),
Id_Card = table.Column<string>(type: "text", nullable: true),
Common_Roles = table.Column<string>(type: "text", nullable: true),
Phone_Number = table.Column<string>(type: "text", nullable: true),
Id_Card_Name = table.Column<string>(type: "text", nullable: true),
Historical_Ranks = table.Column<int>(type: "integer", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_F_Player", x => x.Id);
table.ForeignKey(
name: "FK_F_Player_F_Team_TeamId",
column: x => x.TeamId,
principalTable: "F_Team",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "T_Teams_Player",
columns: table => new
{
EventsId = table.Column<int>(type: "integer", nullable: false),
TeamsId = table.Column<long>(type: "bigint", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_T_Teams_Player", x => new { x.EventsId, x.TeamsId });
table.ForeignKey(
name: "FK_T_Teams_Player_F_Team_TeamsId",
column: x => x.TeamsId,
principalTable: "F_Team",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_T_Teams_Player_F_events_EventsId",
column: x => x.EventsId,
principalTable: "F_events",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "T_Storeinfo",
columns: table => new
{
id = table.Column<long>(type: "bigint", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
id = table.Column<Guid>(type: "uuid", nullable: false),
buyerid = table.Column<long>(type: "bigint", nullable: false),
Storeid = table.Column<long>(type: "bigint", nullable: false),
Storeid = table.Column<Guid>(type: "uuid", nullable: false),
isVerification = table.Column<bool>(type: "boolean", nullable: false)
},
constraints: table =>
@ -341,13 +317,14 @@ namespace asg_form.Migrations
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
UserBase64 = table.Column<string>(type: "text", nullable: true),
Integral = table.Column<long>(type: "bigint", nullable: true),
CreationTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
haveformId = table.Column<long>(type: "bigint", nullable: true),
myteamId = table.Column<long>(type: "bigint", nullable: false),
isbooking = table.Column<bool>(type: "boolean", nullable: true),
chinaname = table.Column<string>(type: "text", nullable: true),
officium = table.Column<string>(type: "text", nullable: true),
point = table.Column<int>(type: "integer", nullable: false),
qqnumber = table.Column<string>(type: "text", nullable: true),
point = table.Column<int>(type: "integer", nullable: true),
roleListName = table.Column<string>(type: "text", nullable: true),
roleListCode = table.Column<string>(type: "text", nullable: true),
UserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
NormalizedUserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
Email = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: true),
@ -366,12 +343,6 @@ namespace asg_form.Migrations
constraints: table =>
{
table.PrimaryKey("PK_AspNetUsers", x => x.Id);
table.ForeignKey(
name: "FK_AspNetUsers_F_Team_myteamId",
column: x => x.myteamId,
principalTable: "F_Team",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_AspNetUsers_F_form_haveformId",
column: x => x.haveformId,
@ -555,11 +526,6 @@ namespace asg_form.Migrations
table: "AspNetUsers",
column: "haveformId");
migrationBuilder.CreateIndex(
name: "IX_AspNetUsers_myteamId",
table: "AspNetUsers",
column: "myteamId");
migrationBuilder.CreateIndex(
name: "UserNameIndex",
table: "AspNetUsers",
@ -586,11 +552,6 @@ namespace asg_form.Migrations
table: "F_form",
column: "eventsId");
migrationBuilder.CreateIndex(
name: "IX_F_Player_TeamId",
table: "F_Player",
column: "TeamId");
migrationBuilder.CreateIndex(
name: "IX_F_role_formId",
table: "F_role",
@ -600,11 +561,6 @@ namespace asg_form.Migrations
name: "IX_T_Storeinfo_Storeid",
table: "T_Storeinfo",
column: "Storeid");
migrationBuilder.CreateIndex(
name: "IX_T_Teams_Player_TeamsId",
table: "T_Teams_Player",
column: "TeamsId");
}
/// <inheritdoc />
@ -644,7 +600,7 @@ namespace asg_form.Migrations
name: "F_news");
migrationBuilder.DropTable(
name: "F_Player");
name: "F_qquser");
migrationBuilder.DropTable(
name: "F_role");
@ -656,7 +612,7 @@ namespace asg_form.Migrations
name: "T_Storeinfo");
migrationBuilder.DropTable(
name: "T_Teams_Player");
name: "T_Task");
migrationBuilder.DropTable(
name: "AspNetRoles");
@ -670,9 +626,6 @@ namespace asg_form.Migrations
migrationBuilder.DropTable(
name: "T_Store");
migrationBuilder.DropTable(
name: "F_Team");
migrationBuilder.DropTable(
name: "F_form");

View File

@ -17,7 +17,7 @@ namespace asg_form.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("ProductVersion", "9.0.2")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@ -125,21 +125,6 @@ namespace asg_form.Migrations
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("T_TeamT_events", b =>
{
b.Property<int>("EventsId")
.HasColumnType("integer");
b.Property<long>("TeamsId")
.HasColumnType("bigint");
b.HasKey("EventsId", "TeamsId");
b.HasIndex("TeamsId");
b.ToTable("T_Teams_Player", (string)null);
});
modelBuilder.Entity("T_news", b =>
{
b.Property<long>("Id")
@ -164,9 +149,9 @@ namespace asg_form.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<DateTime?>("time")
b.Property<string>("time")
.IsRequired()
.HasColumnType("timestamp with time zone");
.HasColumnType("text");
b.HasKey("Id");
@ -202,11 +187,9 @@ namespace asg_form.Migrations
modelBuilder.Entity("asg_form.Controllers.Store.StoreDB", b =>
{
b.Property<long>("id")
b.Property<Guid>("id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("id"));
.HasColumnType("uuid");
b.Property<string>("Name")
.IsRequired()
@ -234,14 +217,12 @@ namespace asg_form.Migrations
modelBuilder.Entity("asg_form.Controllers.Store.StoreinfoDB", b =>
{
b.Property<long>("id")
b.Property<Guid>("id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
.HasColumnType("uuid");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("id"));
b.Property<long>("Storeid")
.HasColumnType("bigint");
b.Property<Guid>("Storeid")
.HasColumnType("uuid");
b.Property<long>("buyerid")
.HasColumnType("bigint");
@ -331,6 +312,9 @@ namespace asg_form.Migrations
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("config")
.HasColumnType("text");
b.Property<string>("events_rule_uri")
.HasColumnType("text");
@ -346,6 +330,10 @@ namespace asg_form.Migrations
b.Property<string>("promChart")
.HasColumnType("text");
b.Property<string>("status")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("F_events", (string)null);
@ -385,6 +373,10 @@ namespace asg_form.Migrations
b.Property<long>("money")
.HasColumnType("bigint");
b.Property<string>("priority")
.IsRequired()
.HasColumnType("text");
b.Property<string>("status")
.IsRequired()
.HasColumnType("text");
@ -405,92 +397,6 @@ namespace asg_form.Migrations
b.ToTable("T_Task", (string)null);
});
modelBuilder.Entity("asg_form.Controllers.Team.T_Player", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
b.Property<string>("Common_Roles")
.HasColumnType("text");
b.Property<string>("Game_Name")
.HasColumnType("text");
b.Property<int?>("Historical_Ranks")
.HasColumnType("integer");
b.Property<string>("Id_Card")
.HasColumnType("text");
b.Property<string>("Id_Card_Name")
.HasColumnType("text");
b.Property<string>("Phone_Number")
.HasColumnType("text");
b.Property<long>("TeamId")
.HasColumnType("bigint");
b.Property<string>("role_id")
.IsRequired()
.HasColumnType("text");
b.Property<string>("role_lin")
.IsRequired()
.HasColumnType("text");
b.Property<string>("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<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
b.Property<bool>("is_check")
.HasColumnType("boolean");
b.Property<string>("logo_uri")
.IsRequired()
.HasColumnType("text");
b.Property<int>("piaoshu")
.HasColumnType("integer");
b.Property<string>("team_name")
.IsRequired()
.HasColumnType("text");
b.Property<string>("team_password")
.IsRequired()
.HasColumnType("text");
b.Property<string>("team_tel")
.IsRequired()
.HasColumnType("text");
b.Property<long>("time")
.HasColumnType("bigint");
b.HasKey("Id");
b.ToTable("F_Team", (string)null);
});
modelBuilder.Entity("asg_form.Controllers.comform+com_form", b =>
{
b.Property<long>("Id")
@ -702,6 +608,9 @@ namespace asg_form.Migrations
b.Property<string>("final_score")
.HasColumnType("text");
b.Property<int>("isAllowChoose")
.HasColumnType("integer");
b.Property<string>("judge")
.HasColumnType("text");
@ -716,7 +625,6 @@ namespace asg_form.Migrations
.HasColumnType("text");
b.Property<string>("referee")
.IsRequired()
.HasColumnType("text");
b.Property<int?>("referee_Id")
@ -849,9 +757,6 @@ namespace asg_form.Migrations
b.Property<bool?>("isbooking")
.HasColumnType("boolean");
b.Property<long?>("myteamId")
.HasColumnType("bigint");
b.Property<string>("officium")
.HasColumnType("text");
@ -878,8 +783,6 @@ namespace asg_form.Migrations
b.HasIndex("haveformId");
b.HasIndex("myteamId");
b.ToTable("AspNetUsers", (string)null);
});
@ -962,21 +865,6 @@ namespace asg_form.Migrations
.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")
@ -1007,17 +895,6 @@ namespace asg_form.Migrations
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")
@ -1057,13 +934,7 @@ namespace asg_form.Migrations
.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 =>
@ -1076,11 +947,6 @@ namespace asg_form.Migrations
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");

View File

@ -39,12 +39,17 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
<PackageReference Include="Mirai.Net" />
<PackageReference Include="MrHuo.OAuth.Core" />
<PackageReference Include="MrHuo.OAuth.Github" />
<PackageReference Include="MrHuo.OAuth.Microsoft" />
<PackageReference Include="NLog" />
<PackageReference Include="Npgsql" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageReference Include="RestSharp" />
<PackageReference Include="Scalar.AspNetCore" />

View File

@ -74,7 +74,7 @@ namespace asg_form
string msg = "为了良好的赛事环境,我们对以下选手进行禁赛处理";
foreach (var b in blacks)
{
msg = $"{msg}\r\n{b.record_time} {b.violator} {b.platform_record} {b.offending_details} {b.processing_result} {b.feature_id}";
msg = $"{msg}\r\n {b.violator} {b.platform_record} {b.offending_details} {b.processing_result} {b.feature_id}";
}
return msg;
}