Jelajahi Sumber

数据库表名调整,集成低代码平台部分修改

Murphy 3 tahun lalu
induk
melakukan
d32ecb819c
23 mengubah file dengan 2023 tambahan dan 769 penghapusan
  1. 1 5
      AuthServer/IdentityServer/AuthServer.Host/AuthServer.Host.csproj
  2. 1 1
      AuthServer/IdentityServer/AuthServer.Host/Migrations/20230129074643_init.Designer.cs
  3. 0 0
      AuthServer/IdentityServer/AuthServer.Host/Migrations/20230129074643_init.cs
  4. 1 2
      BaseService/BaseService.Host/BaseService.Host.csproj
  5. 1 1
      BaseService/BaseService.Host/Migrations/20230129064019_init.Designer.cs
  6. 0 0
      BaseService/BaseService.Host/Migrations/20230129064019_init.cs
  7. 18 18
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs
  8. 712 114
      MicroServices/Business/Business.Host/Migrations/20230129072421_init.Designer.cs
  9. 486 422
      MicroServices/Business/Business.Host/Migrations/20230129072421_init.cs
  10. 785 187
      MicroServices/Business/Business.Host/Migrations/BusinessMigrationDbContextModelSnapshot.cs
  11. 1 1
      MicroServices/Business/Business.Host/appsettings.json
  12. 1 1
      MicroServices/Business/Bussiness.Model/Sale/crm_seorder.cs
  13. 1 1
      MicroServices/Business/Bussiness.Model/Sale/crm_seorderentry.cs
  14. 1 1
      MicroServices/Business/Bussiness.Model/Sale/crm_seorderprog.cs
  15. 1 1
      MicroServices/Business/Bussiness.Model/Sale/crm_seorderreview.cs
  16. 1 1
      MicroServices/Business/Bussiness.Model/SystemData/crm_customer.cs
  17. 1 1
      MicroServices/Business/Bussiness.Model/SystemData/srm_supplier.cs
  18. 6 6
      MicroServices/Business/Bussiness.Model/SystemData/sys_schedule.cs
  19. 1 1
      MicroServices/Business/Bussiness.Model/SystemData/sys_shift_invalid_time.cs
  20. 2 2
      MicroServices/Business/Bussiness.Model/SystemData/sys_shift_schedule.cs
  21. 1 2
      MicroServices/FileStorage/FileStorage.Host/FileStorage.Host.csproj
  22. 1 1
      MicroServices/FileStorage/FileStorage.Host/Migrations/20230129072002_init.Designer.cs
  23. 0 0
      MicroServices/FileStorage/FileStorage.Host/Migrations/20230129072002_init.cs

+ 1 - 5
AuthServer/IdentityServer/AuthServer.Host/AuthServer.Host.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -49,8 +49,4 @@
         <None Remove="Logs\**" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Migrations\" />
-    </ItemGroup>
-
 </Project>

+ 1 - 1
AuthServer/IdentityServer/AuthServer.Host/Migrations/20221225141423_init.Designer.cs → AuthServer/IdentityServer/AuthServer.Host/Migrations/20230129074643_init.Designer.cs

@@ -12,7 +12,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace AuthServer.Host.Migrations
 {
     [DbContext(typeof(AuthServerDbContext))]
-    [Migration("20221225141423_init")]
+    [Migration("20230129074643_init")]
     partial class init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

+ 0 - 0
AuthServer/IdentityServer/AuthServer.Host/Migrations/20221225141423_init.cs → AuthServer/IdentityServer/AuthServer.Host/Migrations/20230129074643_init.cs


+ 1 - 2
BaseService/BaseService.Host/BaseService.Host.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -31,7 +31,6 @@
 
   <ItemGroup>
     <Folder Include="Logs\" />
-    <Folder Include="Migrations\" />
   </ItemGroup>
 
 </Project>

+ 1 - 1
BaseService/BaseService.Host/Migrations/20221225154751_init.Designer.cs → BaseService/BaseService.Host/Migrations/20230129064019_init.Designer.cs

@@ -12,7 +12,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace BaseService.Migrations
 {
     [DbContext(typeof(BaseServiceMigrationDbContext))]
-    [Migration("20221225154751_init")]
+    [Migration("20230129064019_init")]
     partial class init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

+ 0 - 0
BaseService/BaseService.Host/Migrations/20221225154751_init.cs → BaseService/BaseService.Host/Migrations/20230129064019_init.cs


+ 18 - 18
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -33,7 +33,7 @@ namespace Business.EntityFrameworkCore
 
             //    b.Property(x => x.Name).IsRequired();
 
-        
+
             //});
 
             //builder.Entity<PrintTemplate>(b =>
@@ -41,7 +41,7 @@ namespace Business.EntityFrameworkCore
             //    b.ToTable("base_print_template");
 
             //    b.ConfigureByConvention();
-                
+
             //    b.Property(x => x.Name).IsRequired();
             //});
 
@@ -317,30 +317,30 @@ namespace Business.EntityFrameworkCore
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<wms_seorder>(b =>
+            builder.Entity<crm_seorder>(b =>
             {
-                b.ToTable("wms_seorder").HasComment("种忮隆等");
+                b.ToTable("crm_seorder").HasComment("种忮隆等");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<wms_seorderentry>(b =>
+            builder.Entity<crm_seorderentry>(b =>
             {
-                b.ToTable("wms_seorderentry").HasComment("种忮隆等隴牉桶");
+                b.ToTable("crm_seorderentry").HasComment("种忮隆等隴牉桶");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<wms_seorderprog>(b =>
+            builder.Entity<crm_seorderprog>(b =>
             {
-                b.ToTable("wms_seorderprog").HasComment("种忮隆等輛僅桶");
+                b.ToTable("crm_seorderprog").HasComment("种忮隆等輛僅桶");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<wms_seorderreview>(b =>
+            builder.Entity<crm_seorderreview>(b =>
             {
-                b.ToTable("wms_seorderreview").HasComment("种忮隆等丿机桶");
+                b.ToTable("crm_seorderreview").HasComment("种忮隆等丿机桶");
 
                 b.ConfigureByConvention();
             });
@@ -452,16 +452,16 @@ namespace Business.EntityFrameworkCore
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<sys_shiftslice>(b =>
+            builder.Entity<sys_schedule>(b =>
             {
-                b.ToTable("sys_shiftslice").HasComment("啤棒桶");
+                b.ToTable("sys_schedule").HasComment("啤棒桶");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<sys_shift_shiftslice>(b =>
+            builder.Entity<sys_shift_schedule>(b =>
             {
-                b.ToTable("sys_shift_shiftslice").HasComment("啤秶啤棒壽薊桶");
+                b.ToTable("sys_shift_schedule").HasComment("啤秶啤棒壽薊桶");
 
                 b.ConfigureByConvention();
             });
@@ -480,16 +480,16 @@ namespace Business.EntityFrameworkCore
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<wms_customer>(b =>
+            builder.Entity<crm_customer>(b =>
             {
-                b.ToTable("wms_customer").HasComment("諦誧桶");
+                b.ToTable("crm_customer").HasComment("諦誧桶");
 
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<wms_supplier>(b =>
+            builder.Entity<srm_supplier>(b =>
             {
-                b.ToTable("wms_supplier").HasComment("鼎茼妀桶");
+                b.ToTable("srm_supplier").HasComment("鼎茼妀桶");
 
                 b.ConfigureByConvention();
             });

File diff ditekan karena terlalu besar
+ 712 - 114
MicroServices/Business/Business.Host/Migrations/20230129072421_init.Designer.cs


File diff ditekan karena terlalu besar
+ 486 - 422
MicroServices/Business/Business.Host/Migrations/20230129072421_init.cs


File diff ditekan karena terlalu besar
+ 785 - 187
MicroServices/Business/Business.Host/Migrations/BusinessMigrationDbContextModelSnapshot.cs


+ 1 - 1
MicroServices/Business/Business.Host/appsettings.json

@@ -25,7 +25,7 @@
     "Default": {
       "GrantType": "client_credentials",
       "ClientId": "business-app",
-      "ClientSecret": "1q2w3e*",
+      "ClientSecret": "1q2w3E*",
       "Authority": "http://localhost:53362",
       "Scope": "InternalGateway BaseService"
     }

+ 1 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_seorder.cs → MicroServices/Business/Bussiness.Model/Sale/crm_seorder.cs

@@ -9,7 +9,7 @@ namespace Bussiness.Model.Tech
     ///销售订单表
     /// </summary>
     [Description("销售订单表")]
-    public class wms_seorder : BaseEntity
+    public class crm_seorder : BaseEntity
     {
         /// <summary>
         /// 销售订单id

+ 1 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_seorderentry.cs → MicroServices/Business/Bussiness.Model/Sale/crm_seorderentry.cs

@@ -9,7 +9,7 @@ namespace Bussiness.Model.Tech
     ///销售订单明细表
     /// </summary>
     [Description("销售订单明细表")]
-    public class wms_seorderentry : BaseEntity
+    public class crm_seorderentry : BaseEntity
     {
         /// <summary>
         /// 销售订单明细表id

+ 1 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_seorderprog.cs → MicroServices/Business/Bussiness.Model/Sale/crm_seorderprog.cs

@@ -8,7 +8,7 @@ namespace Bussiness.Model.Tech
     ///销售订单进度表
     /// </summary>
     [Description("销售订单进度表")]
-    public class wms_seorderprog : BaseEntity
+    public class crm_seorderprog : BaseEntity
     {
         /// <summary>
         /// 销售订单进度id

+ 1 - 1
MicroServices/Business/Bussiness.Model/Sale/wms_seorderreview.cs → MicroServices/Business/Bussiness.Model/Sale/crm_seorderreview.cs

@@ -8,7 +8,7 @@ namespace Bussiness.Model.Tech
     ///销售订单评审表
     /// </summary>
     [Description("销售订单评审表")]
-    public class wms_seorderreview : BaseEntity
+    public class crm_seorderreview : BaseEntity
     {
         /// <summary>
         /// 销售订单评审id

+ 1 - 1
MicroServices/Business/Bussiness.Model/SystemData/wms_customer.cs → MicroServices/Business/Bussiness.Model/SystemData/crm_customer.cs

@@ -9,7 +9,7 @@ namespace Bussiness.Model.SystemData
     /// 客户
     /// </summary>
     [Description("客户")]
-    public class wms_customer:BaseEntity
+    public class crm_customer:BaseEntity
     {
         /// <summary>
         /// 客户主键id

+ 1 - 1
MicroServices/Business/Bussiness.Model/SystemData/wms_supplier.cs → MicroServices/Business/Bussiness.Model/SystemData/srm_supplier.cs

@@ -9,7 +9,7 @@ namespace Bussiness.Model.SystemData
     /// 供应商
     /// </summary>
     [Description("供应商")]
-    public class wms_supplier: BaseEntity
+    public class srm_supplier: BaseEntity
     {
         /// <summary>
         /// 供应商主键id

+ 6 - 6
MicroServices/Business/Bussiness.Model/SystemData/sys_shiftslice.cs → MicroServices/Business/Bussiness.Model/SystemData/sys_schedule.cs

@@ -8,40 +8,40 @@ namespace Bussiness.Model.SystemData
     /// 班次表
     /// </summary>
     [Description("班制班次关联表")]
-    public class sys_shiftslice: BaseEntity
+    public class sys_schedule: BaseEntity
     {
         /// <summary>
         /// 主键id
         /// </summary>
         [Key]
         [Description("班制班次关联表")]
-        public long slice_id { get; set; }
+        public long schedule_id { get; set; }
 
         /// <summary>
         /// 班次编码
         /// </summary>
         [StringLength(50)]
         [Description("班次编码")]
-        public string? slice_no { get; set; }
+        public string? schedule_no { get; set; }
 
         /// <summary>
         /// 班次名称
         /// </summary>
         [StringLength(255)]
         [Description("班次名称")]
-        public string? slice_name { get; set; }
+        public string? schedule_name { get; set; }
 
         /// <summary>
         /// 起始工作时间
         /// </summary>
         [Description("起始工作时间")]
-        public DateTime? slice_start_time { get; set; }
+        public DateTime? schedule_start_time { get; set; }
 
         /// <summary>
         /// 结束工作时间
         /// </summary>
         [Description("结束工作时间")]
-        public DateTime? slice_end_time { get; set; }
+        public DateTime? schedule_end_time { get; set; }
 
         /// <summary>
         /// 是否跨天 1是 0否

+ 1 - 1
MicroServices/Business/Bussiness.Model/SystemData/sys_shift_invalid_time.cs

@@ -21,7 +21,7 @@ namespace Bussiness.Model.SystemData
         /// 班次id
         /// </summary>
         [Description("班次id")]
-        public long slice_id { get; set; }
+        public long schedule_id { get; set; }
 
 
         /// <summary>

+ 2 - 2
MicroServices/Business/Bussiness.Model/SystemData/sys_shift_shiftslice.cs → MicroServices/Business/Bussiness.Model/SystemData/sys_shift_schedule.cs

@@ -8,7 +8,7 @@ namespace Bussiness.Model.SystemData
     /// 班制班次关联表
     /// </summary>
     [Description("班制班次关联表")]
-    public class sys_shift_shiftslice:BaseEntity
+    public class sys_shift_schedule:BaseEntity
     {
         /// <summary>
         /// 主键id
@@ -29,6 +29,6 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [StringLength(255)]
         [Description("班次id")]
-        public long slice_id { get; set; }
+        public long schedule_id { get; set; }
     }
 }

+ 1 - 2
MicroServices/FileStorage/FileStorage.Host/FileStorage.Host.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -30,7 +30,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Migrations\" />
     <Folder Include="wwwroot\Images\" />
   </ItemGroup>
 

+ 1 - 1
MicroServices/FileStorage/FileStorage.Host/Migrations/20221226032153_init.Designer.cs → MicroServices/FileStorage/FileStorage.Host/Migrations/20230129072002_init.Designer.cs

@@ -12,7 +12,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace FileStorage.Migrations
 {
     [DbContext(typeof(FileStorageMigrationDbContext))]
-    [Migration("20221226032153_init")]
+    [Migration("20230129072002_init")]
     partial class init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

+ 0 - 0
MicroServices/FileStorage/FileStorage.Host/Migrations/20221226032153_init.cs → MicroServices/FileStorage/FileStorage.Host/Migrations/20230129072002_init.cs


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini