Skip to content

IoTSharp
IoTSharp

IoTSharp / IoTSharp
11 个月 前同步成功

通知 15
Star 2
Fork 0
IoTSharp
IoTSharp

体验新版 GitCode，发现更多精彩内容 >>

提交 67b78734 编写于 作者: W wq1234wq
浏览文件
操作

Merge branch 'master' of https://github.com/IoTSharp/IoTSharp

上级 cadb270a f826c609
展开全部 隐藏空白更改
内联 并排
Showing with 21678 addition and 10780 deletion
IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj
浏览文件 @ 67b78734
......@@ -6,13 +6,13 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\IoTSharp.Data\IoTSharp.Data.csproj" />
......
IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj
浏览文件 @ 67b78734
......@@ -8,12 +8,12 @@
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="6.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.MySql.Storage" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
<PackageReference Include="EFCore.Sharding.MySql" Version="6.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="6.0.1" />
......
IoTSharp.Data.MySQL/Migrations/20220204061936_add.cs 已删除 100644 → 0
浏览文件 @ cadb270a
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IoTSharp.Data.MySql.Migrations
{
public partial class add : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_DeviceIdentities_Device_DeviceId",
table: "DeviceIdentities");
migrationBuilder.DropIndex(
name: "IX_DeviceIdentities_DeviceId",
table: "DeviceIdentities");
migrationBuilder.AlterColumn<int>(
name: "Type",
table: "TelemetryData",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("Relational:ColumnOrder", 5);
migrationBuilder.AlterColumn<int>(
name: "DataSide",
table: "TelemetryData",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("Relational:ColumnOrder", 4);
migrationBuilder.AlterColumn<DateTime>(
name: "DateTime",
table: "TelemetryData",
type: "timestamp",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp")
.Annotation("Relational:ColumnOrder", 3);
migrationBuilder.AlterColumn<string>(
name: "KeyName",
table: "TelemetryData",
type: "varchar(255)",
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(255)")
.Annotation("MySql:CharSet", "utf8mb4")
.Annotation("Relational:ColumnOrder", 2)
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<Guid>(
name: "DeviceId",
table: "TelemetryData",
type: "char(36)",
nullable: false,
collation: "ascii_general_ci",
oldClrType: typeof(Guid),
oldType: "char(36)")
.Annotation("Relational:ColumnOrder", 1)
.OldAnnotation("Relational:Collation", "ascii_general_ci");
migrationBuilder.AlterColumn<Guid>(
name: "DeviceId",
table: "DeviceIdentities",
type: "char(36)",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
collation: "ascii_general_ci",
oldClrType: typeof(Guid),
oldType: "char(36)",
oldNullable: true)
.OldAnnotation("Relational:Collation", "ascii_general_ci");
migrationBuilder.AlterColumn<int>(
name: "Type",
table: "DataStorage",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("Relational:ColumnOrder", 5);
migrationBuilder.AlterColumn<DateTime>(
name: "DateTime",
table: "DataStorage",
type: "timestamp",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp")
.Annotation("Relational:ColumnOrder", 3);
migrationBuilder.AlterColumn<int>(
name: "DataSide",
table: "DataStorage",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("Relational:ColumnOrder", 4);
migrationBuilder.AlterColumn<string>(
name: "KeyName",
table: "DataStorage",
type: "varchar(255)",
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(255)")
.Annotation("MySql:CharSet", "utf8mb4")
.Annotation("Relational:ColumnOrder", 2)
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<Guid>(
name: "DeviceId",
table: "DataStorage",
type: "char(36)",
nullable: false,
collation: "ascii_general_ci",
oldClrType: typeof(Guid),
oldType: "char(36)")
.Annotation("Relational:ColumnOrder", 1)
.OldAnnotation("Relational:Collation", "ascii_general_ci");
migrationBuilder.AlterColumn<int>(
name: "Catalog",
table: "DataStorage",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("Relational:ColumnOrder", 0);
migrationBuilder.CreateIndex(
name: "IX_DeviceIdentities_DeviceId",
table: "DeviceIdentities",
column: "DeviceId",
unique: true);
migrationBuilder.AddForeignKey(
name: "FK_DeviceIdentities_Device_DeviceId",
table: "DeviceIdentities",
column: "DeviceId",
principalTable: "Device",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_DeviceIdentities_Device_DeviceId",
table: "DeviceIdentities");
migrationBuilder.DropIndex(
name: "IX_DeviceIdentities_DeviceId",
table: "DeviceIdentities");
migrationBuilder.AlterColumn<int>(
name: "Type",
table: "TelemetryData",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.OldAnnotation("Relational:ColumnOrder", 5);
migrationBuilder.AlterColumn<int>(
name: "DataSide",
table: "TelemetryData",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.OldAnnotation("Relational:ColumnOrder", 4);
migrationBuilder.AlterColumn<DateTime>(
name: "DateTime",
table: "TelemetryData",
type: "timestamp",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp")
.OldAnnotation("Relational:ColumnOrder", 3);
migrationBuilder.AlterColumn<string>(
name: "KeyName",
table: "TelemetryData",
type: "varchar(255)",
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(255)")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("Relational:ColumnOrder", 2);
migrationBuilder.AlterColumn<Guid>(
name: "DeviceId",
table: "TelemetryData",
type: "char(36)",
nullable: false,
collation: "ascii_general_ci",
oldClrType: typeof(Guid),
oldType: "char(36)")
.OldAnnotation("Relational:Collation", "ascii_general_ci")
.OldAnnotation("Relational:ColumnOrder", 1);
migrationBuilder.AlterColumn<Guid>(
name: "DeviceId",
table: "DeviceIdentities",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci",
oldClrType: typeof(Guid),
oldType: "char(36)")
.OldAnnotation("Relational:Collation", "ascii_general_ci");
migrationBuilder.AlterColumn<int>(
name: "Type",
table: "DataStorage",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.OldAnnotation("Relational:ColumnOrder", 5);
migrationBuilder.AlterColumn<DateTime>(
name: "DateTime",
table: "DataStorage",
type: "timestamp",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp")
.OldAnnotation("Relational:ColumnOrder", 3);
migrationBuilder.AlterColumn<int>(
name: "DataSide",
table: "DataStorage",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.OldAnnotation("Relational:ColumnOrder", 4);
migrationBuilder.AlterColumn<string>(
name: "KeyName",
table: "DataStorage",
type: "varchar(255)",
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(255)")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("Relational:ColumnOrder", 2);
migrationBuilder.AlterColumn<Guid>(
name: "DeviceId",
table: "DataStorage",
type: "char(36)",
nullable: false,
collation: "ascii_general_ci",
oldClrType: typeof(Guid),
oldType: "char(36)")
.OldAnnotation("Relational:Collation", "ascii_general_ci")
.OldAnnotation("Relational:ColumnOrder", 1);
migrationBuilder.AlterColumn<int>(
name: "Catalog",
table: "DataStorage",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.OldAnnotation("Relational:ColumnOrder", 0);
migrationBuilder.CreateIndex(
name: "IX_DeviceIdentities_DeviceId",
table: "DeviceIdentities",
column: "DeviceId");
migrationBuilder.AddForeignKey(
name: "FK_DeviceIdentities_Device_DeviceId",
table: "DeviceIdentities",
column: "DeviceId",
principalTable: "Device",
principalColumn: "Id");
}
}
}
IoTSharp.Data.MySQL/Migrations/20220209043947_addtelantinfo.cs 已删除 100644 → 0
浏览文件 @ cadb270a
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IoTSharp.Data.MySql.Migrations
{
public partial class addtelantinfo : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
}
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
IoTSharp.Data.MySQL/Migrations/20220210032430_RefreshToken.Designer.cs → IoTSharp.Data.MySQL/Migrations/20220209182518_refreshtoken.Designer.cs
浏览文件 @ 67b78734
......@@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace IoTSharp.Data.MySql.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20220210032430_RefreshToken")]
partial class RefreshToken
[Migration("20220209182518_refreshtoken")]
partial class refreshtoken
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
......
IoTSharp.Data.MySQL/Migrations/20220210032430_RefreshToken.cs → IoTSharp.Data.MySQL/Migrations/20220209182518_refreshtoken.cs
浏览文件 @ 67b78734
......@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace IoTSharp.Data.MySql.Migrations
{
public partial class RefreshToken : Migration
public partial class refreshtoken : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
......
IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
浏览文件 @ 67b78734
......@@ -9,9 +9,9 @@
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.2" />
<PackageReference Include="EFCore.Sharding.Oracle" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.2" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
......
IoTSharp.Data.Oracle/OracleModelBuilderOptions.cs
浏览文件 @ 67b78734
......@@ -24,6 +24,7 @@ namespace IoTSharp.Data.Oracle
//https://docs.oracle.com/en/database/oracle/oracle-data-access-components/19.3.2/odpnt/EFCoreIdentifier.html#GUID-FA43F1A1-EDA2-462F-8844-45D49EF67607
//Setting maximum identifier length to 30 characters; By default, it's set to 128.
modelBuilder.Model.SetMaxIdentifierLength(30);
}
}
}
\ No newline at end of file
IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
浏览文件 @ 67b78734
......@@ -8,12 +8,12 @@
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.PostgreSQL.Storage" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.2" />
<PackageReference Include="Npgsql" Version="6.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
<PackageReference Include="EFCore.Sharding.PostgreSql" Version="6.0.2" />
......
IoTSharp.Data.PostgreSQL/Migrations/20190903070558_ReDesingerDataStorage.cs
浏览文件 @ 67b78734
......@@ -66,15 +66,10 @@ namespace IoTSharp.Migrations
oldClrType: typeof(Guid),
oldNullable: true);
//migrationBuilder.AddPrimaryKey(
// name: "PK_DataStorage",
// table: "DataStorage",
// columns: new[] { "Catalog", "DeviceId", "KeyName", "DateTime" });
// jy 修复表设计
migrationBuilder.AddPrimaryKey(
name: "PK_DataStorage",
table: "DataStorage",
columns: new[] { "Catalog", "DeviceId", "KeyName" });
columns: new[] { "Catalog", "DeviceId", "KeyName", "DateTime" });
migrationBuilder.CreateIndex(
name: "IX_DataStorage_Catalog",
......
IoTSharp.Data.PostgreSQL/Migrations/20211029031319_addexecfield.cs 已删除 100644 → 0
浏览文件 @ cadb270a
using Microsoft.EntityFrameworkCore.Migrations;
namespace IoTSharp.Migrations
{
public partial class addexecfield : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
}
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
IoTSharp.Data.PostgreSQL/Migrations/20211029031830_renametableeexecutor.cs 已删除 100644 → 0
浏览文件 @ cadb270a
using Microsoft.EntityFrameworkCore.Migrations;
namespace IoTSharp.Migrations
{
public partial class renametableeexecutor : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
}
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
IoTSharp.Data.PostgreSQL/Migrations/20211103101343_modifyrulemounttype.cs 已删除 100644 → 0
浏览文件 @ cadb270a
using Microsoft.EntityFrameworkCore.Migrations;
namespace IoTSharp.Migrations
{
public partial class modifyrulemounttype : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
}
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
IoTSharp.Data.PostgreSQL/Migrations/20220212025708_AddTenantInfoAndToken.cs 0 → 100644
浏览文件 @ 67b78734
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IoTSharp.Migrations
{
public partial class AddTenantInfoAndToken : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_BaseEvents_Customer_CustomerId",
table: "BaseEvents");
migrationBuilder.DropForeignKey(
name: "FK_BaseEvents_Tenant_TenantId",
table: "BaseEvents");
migrationBuilder.AlterColumn<Guid>(
name: "TenantId",
table: "BaseEvents",
type: "uuid",
nullable: true,
oldClrType: typeof(Guid),
oldType: "uuid");
migrationBuilder.AlterColumn<Guid>(
name: "CustomerId",
table: "BaseEvents",
type: "uuid",
nullable: true,
oldClrType: typeof(Guid),
oldType: "uuid");
migrationBuilder.AddForeignKey(
name: "FK_BaseEvents_Customer_CustomerId",
table: "BaseEvents",
column: "CustomerId",
principalTable: "Customer",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_BaseEvents_Tenant_TenantId",
table: "BaseEvents",
column: "TenantId",
principalTable: "Tenant",
principalColumn: "Id");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_BaseEvents_Customer_CustomerId",
table: "BaseEvents");
migrationBuilder.DropForeignKey(
name: "FK_BaseEvents_Tenant_TenantId",
table: "BaseEvents");
migrationBuilder.AlterColumn<Guid>(
name: "TenantId",
table: "BaseEvents",
type: "uuid",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
oldClrType: typeof(Guid),
oldType: "uuid",
oldNullable: true);
migrationBuilder.AlterColumn<Guid>(
name: "CustomerId",
table: "BaseEvents",
type: "uuid",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
oldClrType: typeof(Guid),
oldType: "uuid",
oldNullable: true);
migrationBuilder.AddForeignKey(
name: "FK_BaseEvents_Customer_CustomerId",
table: "BaseEvents",
column: "CustomerId",
principalTable: "Customer",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_BaseEvents_Tenant_TenantId",
table: "BaseEvents",
column: "TenantId",
principalTable: "Tenant",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}
IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj
浏览文件 @ 67b78734
......@@ -9,11 +9,15 @@
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="6.0.2" />
<PackageReference Include="EFCore.Sharding.SqlServer" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\IoTSharp.Data\IoTSharp.Data.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Migrations\" />
</ItemGroup>
</Project>
IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj
浏览文件 @ 67b78734
......@@ -7,13 +7,13 @@
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="6.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Sqlite.Storage" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.2" />
<PackageReference Include="EFCore.Sharding.SQLite" Version="6.0.2" />
</ItemGroup>
<ItemGroup>
......
IoTSharp.Data.Sqlite/Migrations/20220212030026_AddTenantInfoAndToken.cs 0 → 100644
浏览文件 @ 67b78734
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IoTSharp.Data.Sqlite.Migrations
{
public partial class AddTenantInfoAndToken : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_BaseEvents_Customer_CustomerId",
table: "BaseEvents");
migrationBuilder.DropForeignKey(
name: "FK_BaseEvents_Tenant_TenantId",
table: "BaseEvents");
migrationBuilder.AlterColumn<Guid>(
name: "TenantId",
table: "BaseEvents",
type: "TEXT",
nullable: true,
oldClrType: typeof(Guid),
oldType: "TEXT");
migrationBuilder.AlterColumn<Guid>(
name: "CustomerId",
table: "BaseEvents",
type: "TEXT",
nullable: true,
oldClrType: typeof(Guid),
oldType: "TEXT");
migrationBuilder.AddForeignKey(
name: "FK_BaseEvents_Customer_CustomerId",
table: "BaseEvents",
column: "CustomerId",
principalTable: "Customer",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_BaseEvents_Tenant_TenantId",
table: "BaseEvents",
column: "TenantId",
principalTable: "Tenant",
principalColumn: "Id");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_BaseEvents_Customer_CustomerId",
table: "BaseEvents");
migrationBuilder.DropForeignKey(
name: "FK_BaseEvents_Tenant_TenantId",
table: "BaseEvents");
migrationBuilder.AlterColumn<Guid>(
name: "TenantId",
table: "BaseEvents",
type: "TEXT",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
oldClrType: typeof(Guid),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<Guid>(
name: "CustomerId",
table: "BaseEvents",
type: "TEXT",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
oldClrType: typeof(Guid),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AddForeignKey(
name: "FK_BaseEvents_Customer_CustomerId",
table: "BaseEvents",
column: "CustomerId",
principalTable: "Customer",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_BaseEvents_Tenant_TenantId",
table: "BaseEvents",
column: "TenantId",
principalTable: "Tenant",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}
IoTSharp.Data/BaseEvent.cs
浏览文件 @ 67b78734
......@@ -25,9 +25,7 @@ namespace IoTSharp.Data
public string BizData { get; set; }
public Tenant Tenant { get; set; }
public Guid TenantId { get; set; }
public Guid CustomerId { get; set; }
public Customer Customer { get; set; }
......
IoTSharp.Data/DeviceDiagram.cs
浏览文件 @ 67b78734
......@@ -7,23 +7,21 @@ using System.Threading.Tasks;
namespace IoTSharp.Data
{
public class DeviceDiagram
public class DeviceDiagram: IJustMy
{
[Key]
public Guid DiagramId { get; set; }
public string DiagramName { get; set; }
public string DiagramDesc { get; set; }
public int? DiagramStatus { get; set; }
public int DiagramStatus { get; set; }
public Guid Creator { get; set; }
public DateTimeOffset? CreateDate { get; set; }
public string DiagramImage { get; set; }
public bool? IsDefault { get; set; }
public bool IsDefault { get; set; }
public Tenant Tenant { get; set; }
public Guid TenantId { get; set; }
public Guid CustomerId { get; set; }
public Customer Customer { get; set; }
}
......
IoTSharp.Data/DeviceGraph.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/DeviceGraphToolBox.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/DeviceModel.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/DeviceModelCommand.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/DevicePort.cs
浏览文件 @ 67b78734
......@@ -14,12 +14,12 @@ namespace IoTSharp.Data
public string PortName { get; set; }
public string PortDesc { get; set; }
public string PortPic { get; set; }
public int? PortType { get; set; }
public int? PortPhyType { get; set; }
public int? PortStatus { get; set; }
public int PortType { get; set; }
public int PortPhyType { get; set; }
public int PortStatus { get; set; }
public Guid DeviceId { get; set; }
public DateTime? CreateDate { get; set; }
public long? Creator { get; set; }
public long Creator { get; set; }
public string PortElementId { get; set; }
}
}
IoTSharp.Data/DevicePortMapping.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/DeviceRule.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/DynamicFormInfo.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/Flow.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/FlowOperation.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/FlowRule.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/IoTSharp.Data.csproj
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/RuleTaskExecutor.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.Data/SubscriptionEvent.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp.sln
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp/AppSettings.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp/Clients/RpcClient.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp/Controllers/Models/IotSharpUser.cs 已删除 100644 → 0
浏览文件 @ cadb270a
此差异已折叠。
IoTSharp/IoTSharp.csproj
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp/IoTSharp.xml
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp/Models/UserProfile.cs
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp/appsettings.MySql.json
浏览文件 @ 67b78734
此差异已折叠。
IoTSharp/appsettings.SQLServer.json
浏览文件 @ 67b78734
此差异已折叠。
appsettings.Development.json
浏览文件 @ 67b78734
此差异已折叠。
docker-compose.yml
浏览文件 @ 67b78734
此差异已折叠。
launchSettings.json
浏览文件 @ 67b78734
此差异已折叠。
tools/ef_mg_remove.cmd 0 → 100644
浏览文件 @ 67b78734
echo off
cls
echo remove a migration from IoTSharp.Data.%1
set ASPNETCORE_ENVIRONMENT=%1
dotnet ef migrations remove --context IoTSharp.Data.ApplicationDbContext --startup-project ..\IoTSharp\IoTSharp.csproj --project ..\IoTSharp.Data.%1\IoTSharp.Data.%1.csproj
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或