修改数据库

src/CloudGaming/Model/CloudGaming.DtoModel/Epg/EpgEnum.cs

@@ -74,33 +74,19 @@ namespace CloudGaming.DtoModel.Epg
             /// <summary>
             /// 对应游戏Id
             /// </summary>
-            游戏 = 4,
+            游戏 = 1,
-            充值界面 = 7,
-            产品充值 = 8,
             /// <summary>
-            /// 对应H5地址
+            /// app页面
             /// </summary>
-            H5页面 = 9,
+            app页面 = 2,
             /// <summary>
-            /// 对应浏览器地址（IOS专用）
+            /// h5
             /// </summary>
-            外部浏览器 = 10,
+            h5 = 3,
             /// <summary>
-            /// 对应游戏id, 跳到游戏房间界面，为空则进联机大厅
+            /// webH5
             /// </summary>
-            对战专区游戏 = 11,
+            webH5 = 4
-            /// <summary>
-            /// 对应H5地址——原生地址
-            /// </summary>
-            H5页面_原生 = 12,
-            /// <summary>
-            /// 对应栏目标识：如SubjectIndex，Task，Activity，History等
-            /// </summary>
-            栏目界面 = 21,
-            /// <summary>
-            /// 对应弹窗Id，显示对应的弹窗
-            /// </summary>
-            弹窗 = 101,
         }
 
 

src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/CloudGamingPhoneContext.cs

@@ -222,11 +222,11 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
 
         modelBuilder.Entity<T_Epg_Cfg>(entity =>
         {
-            entity.HasKey(e => e.EpgId).HasName("PK_T_VL_UI_EPG_CFG");
+            entity.HasKey(e => e.Id).HasName("PK_T_VL_UI_EPG_CFG");
 
             entity.ToTable(tb => tb.HasComment("Epg配置表"));
 
-            entity.Property(e => e.EpgId).HasComment("标识");
+            entity.Property(e => e.Id).HasComment("标识");
             entity.Property(e => e.Channel)
                 .HasMaxLength(50)
                 .IsUnicode(false)
@@ -279,11 +279,6 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
             entity.Property(e => e.StartEnableTime)
                 .HasComment("启用时间")
                 .HasColumnType("datetime");
-            entity.Property(e => e.StyleType)
-                .HasMaxLength(50)
-                .IsUnicode(false)
-                .HasComment("展示样式：more")
-                .UseCollation("Chinese_PRC_CI_AS");
             entity.Property(e => e.Title)
                 .HasMaxLength(50)
                 .HasComment("标题")
@@ -347,7 +342,9 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
 
             entity.Property(e => e.ConsumeDiamondNumHour).HasComment("每小时钻石费用");
             entity.Property(e => e.ConsumeDiamondNumHourVip).HasComment("每小时VIP钻石费用");
-            entity.Property(e => e.CreateTime).HasColumnType("datetime");
+            entity.Property(e => e.CreateTime)
+                .HasComment("创建时间")
+                .HasColumnType("datetime");
             entity.Property(e => e.Desc)
                 .HasMaxLength(200)
                 .HasComment("备注")
@@ -355,13 +352,13 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
             entity.Property(e => e.FriendlyTips)
                 .HasMaxLength(50)
                 .HasComment("启动提示");
-            entity.Property(e => e.GameBgImgId).HasComment("游戏详情也配置背景");
+            entity.Property(e => e.GameBgImgId).HasComment("游戏详情背景");
             entity.Property(e => e.GameGroup).HasComment("游戏分组：0单机，1steam，2网游");
             entity.Property(e => e.GameId)
                 .HasMaxLength(100)
                 .HasComment("游戏Id")
                 .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.GameImageId).HasComment("游戏Icon");
+            entity.Property(e => e.GameImageId).HasComment("游戏库Icon图");
             entity.Property(e => e.GameLoadBgImageId).HasComment("游戏加载图");
             entity.Property(e => e.GameLoadTime).HasComment("Loading时间");
             entity.Property(e => e.GameName)
@@ -390,27 +387,14 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
                 .HasMaxLength(30)
                 .HasComment("评分")
                 .UseCollation("Chinese_PRC_CI_AS");
+            entity.Property(e => e.TenantId).HasComment("租户");
             entity.Property(e => e.Title2)
                 .HasMaxLength(200)
+                .HasComment("副标题")
                 .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.UpdateTime).HasColumnType("datetime");
+            entity.Property(e => e.UpdateTime)
-            entity.Property(e => e.VideoIdentification)
+                .HasComment("修改时间")
-                .HasMaxLength(200)
+                .HasColumnType("datetime");
-                .HasComment("视频标识")
-                .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.VideoUrl)
-                .HasMaxLength(500)
-                .IsUnicode(false)
-                .HasComment("视频地址")
-                .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.VipContinent)
-                .HasMaxLength(1000)
-                .HasComment("洲")
-                .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.VipCountryName)
-                .HasMaxLength(1000)
-                .HasComment("vip国家")
-                .UseCollation("Chinese_PRC_CI_AS");
             entity.Property(e => e.VipTypeLimit)
                 .HasDefaultValue(1)
                 .HasComment("会员等级限制");
@@ -705,46 +689,31 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
 
             entity.ToTable(tb => tb.HasComment("通用弹框配置"));
 
-            entity.Property(e => e.BossId)
+            entity.Property(e => e.BgImageId).HasComment("弹框背景图");
-                .HasMaxLength(20)
+            entity.Property(e => e.Btn_Close).HasComment("关闭按钮");
+            entity.Property(e => e.Btn_OK).HasComment("确认按钮");
+            entity.Property(e => e.Channel)
+                .HasMaxLength(50)
                 .HasComment("上线渠道号")
                 .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.Btn_Bg).HasComment("弹框背景图");
-            entity.Property(e => e.Btn_Close)
-                .HasDefaultValue(0)
-                .HasComment("关闭按钮图片");
-            entity.Property(e => e.Btn_OK)
-                .HasDefaultValue(0)
-                .HasComment("确认按钮图片");
             entity.Property(e => e.CreateTime)
                 .HasComment("创建时间")
                 .HasColumnType("datetime");
             entity.Property(e => e.Desc)
                 .HasMaxLength(100)
+                .HasComment("备注")
                 .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.EndTime)
-                .HasComment("结束时间")
-                .HasColumnType("datetime");
-            entity.Property(e => e.Extend1)
-                .HasMaxLength(200)
-                .HasComment("扩展参数1")
-                .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.ImageId_Text)
-                .HasDefaultValue(0)
-                .HasComment("内容图片Id");
             entity.Property(e => e.IsOnline).HasComment("是否启用");
             entity.Property(e => e.Name)
                 .HasMaxLength(100)
-                .HasComment("弹框名字")
+                .HasComment("弹框名称")
                 .UseCollation("Chinese_PRC_CI_AS");
             entity.Property(e => e.OrderId).HasComment("排序");
             entity.Property(e => e.PlatformId)
                 .HasMaxLength(20)
                 .HasComment("上线平台")
                 .UseCollation("Chinese_PRC_CI_AS");
-            entity.Property(e => e.StartTime)
+            entity.Property(e => e.TenantId).HasComment("租户");
-                .HasComment("开始时间")
-                .HasColumnType("datetime");
             entity.Property(e => e.Text)
                 .HasComment("弹窗显示文字")
                 .UseCollation("Chinese_PRC_CI_AS");

src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_CategoryCfg.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace CloudGaming.Model.DbSqlServer.Db_Phone;
 

src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Epg_Cfg.cs

@@ -12,7 +12,7 @@ public partial class T_Epg_Cfg: MultiTenantEntity
     /// <summary>
     /// 标识
     /// </summary>
-    public virtual int EpgId { get; set; }
+    public virtual int Id { get; set; }
 
     /// <summary>
     /// epg分组
@@ -69,11 +69,6 @@ public partial class T_Epg_Cfg: MultiTenantEntity
     /// </summary>
     public virtual int CornerIconId { get; set; }
 
-    /// <summary>
-    /// 展示样式：more
-    /// </summary>
-    public virtual string? StyleType { get; set; }
-
     /// <summary>
     /// 更新时间
     /// </summary>

src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs

@@ -14,22 +14,22 @@ public partial class T_GameCBT: MultiTenantEntity
     /// <summary>
     /// 游戏Id
     /// </summary>
-    public virtual string? GameId { get; set; }
+    public virtual string GameId { get; set; } = null!;
 
     /// <summary>
-    /// 游戏详情也配置背景
+    /// 游戏详情背景
     /// </summary>
-    public virtual int? GameBgImgId { get; set; }
+    public virtual int GameBgImgId { get; set; }
 
     /// <summary>
-    /// 游戏Icon
+    /// 游戏库Icon图
     /// </summary>
-    public virtual int? GameImageId { get; set; }
+    public virtual int GameImageId { get; set; }
 
     /// <summary>
     /// 是否启用
     /// </summary>
-    public virtual bool? IsOnline { get; set; }
+    public virtual bool IsOnline { get; set; }
 
     /// <summary>
     /// 评分
@@ -39,10 +39,16 @@ public partial class T_GameCBT: MultiTenantEntity
     /// <summary>
     /// 排序
     /// </summary>
-    public virtual int? OrderId { get; set; }
+    public virtual int OrderId { get; set; }
 
+    /// <summary>
+    /// 修改时间
+    /// </summary>
     public virtual DateTime? UpdateTime { get; set; }
 
+    /// <summary>
+    /// 创建时间
+    /// </summary>
     public virtual DateTime? CreateTime { get; set; }
 
     /// <summary>
@@ -53,17 +59,17 @@ public partial class T_GameCBT: MultiTenantEntity
     /// <summary>
     /// 游戏加载图
     /// </summary>
-    public virtual int? GameLoadBgImageId { get; set; }
+    public virtual int GameLoadBgImageId { get; set; }
 
     /// <summary>
     /// 游戏icon
     /// </summary>
-    public virtual int? ImageIconId { get; set; }
+    public virtual int ImageIconId { get; set; }
 
     /// <summary>
     /// 是否测试游戏
     /// </summary>
-    public virtual bool? IsTest { get; set; }
+    public virtual bool IsTest { get; set; }
 
     /// <summary>
     /// VIP专属
@@ -90,6 +96,9 @@ public partial class T_GameCBT: MultiTenantEntity
     /// </summary>
     public virtual int ImageId_TJ { get; set; }
 
+    /// <summary>
+    /// 副标题
+    /// </summary>
     public virtual string? Title2 { get; set; }
 
     /// <summary>
@@ -107,11 +116,6 @@ public partial class T_GameCBT: MultiTenantEntity
     /// </summary>
     public virtual int ImageId_Banner { get; set; }
 
-    /// <summary>
-    /// 视频地址
-    /// </summary>
-    public virtual string? VideoUrl { get; set; }
-
     /// <summary>
     /// 每小时钻石费用
     /// </summary>
@@ -147,21 +151,6 @@ public partial class T_GameCBT: MultiTenantEntity
     /// </summary>
     public virtual string OnlinePlatform { get; set; } = null!;
 
-    /// <summary>
-    /// 视频标识
-    /// </summary>
-    public virtual string? VideoIdentification { get; set; }
-
-    /// <summary>
-    /// vip国家
-    /// </summary>
-    public virtual string? VipCountryName { get; set; }
-
-    /// <summary>
-    /// 洲
-    /// </summary>
-    public virtual string? VipContinent { get; set; }
-
     /// <summary>
     /// 启动提示
     /// </summary>

src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Popup.cs

@@ -11,35 +11,65 @@ public partial class T_Popup: MultiTenantEntity
 
     public virtual int Id { get; set; }
 
+     /// <summary>
+    /// 所属租户
+    /// </summary>
+    public override Guid TenantId { get; set; }
+         
     /// <summary>
     /// 弹框类型
     /// </summary>
     public virtual int Type { get; set; }
 
     /// <summary>
-    /// 弹框名字
+    /// 弹框名称
     /// </summary>
     public virtual string? Name { get; set; }
 
-    /// <summary>
-    /// 弹框背景图
-    /// </summary>
-    public virtual int? Btn_Bg { get; set; }
-
     /// <summary>
     /// 弹窗显示文字
     /// </summary>
     public virtual string? Text { get; set; }
 
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    public virtual bool? IsOnline { get; set; }
-
     /// <summary>
     /// 排序
     /// </summary>
-    public virtual int? OrderId { get; set; }
+    public virtual int OrderId { get; set; }
+
+    /// <summary>
+    /// 弹框背景图
+    /// </summary>
+    public virtual int BgImageId { get; set; }
+
+    /// <summary>
+    /// 确认按钮
+    /// </summary>
+    public virtual int Btn_OK { get; set; }
+
+    /// <summary>
+    /// 关闭按钮
+    /// </summary>
+    public virtual int Btn_Close { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public virtual string? Desc { get; set; }
+
+    /// <summary>
+    /// 上线渠道号
+    /// </summary>
+    public virtual string? Channel { get; set; }
+
+    /// <summary>
+    /// 上线平台
+    /// </summary>
+    public virtual string? PlatformId { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public virtual bool IsOnline { get; set; }
 
     /// <summary>
     /// 创建时间
@@ -50,51 +80,4 @@ public partial class T_Popup: MultiTenantEntity
     /// 修改时间
     /// </summary>
     public virtual DateTime? UpdateTime { get; set; }
-
+}
-    public virtual string? Desc { get; set; }
-
-    /// <summary>
-    /// 开始时间
-    /// </summary>
-    public virtual DateTime? StartTime { get; set; }
-
-    /// <summary>
-    /// 结束时间
-    /// </summary>
-    public virtual DateTime? EndTime { get; set; }
-
-    /// <summary>
-    /// 上线渠道号
-    /// </summary>
-    public virtual string? BossId { get; set; }
-
-    /// <summary>
-    /// 上线平台
-    /// </summary>
-    public virtual string? PlatformId { get; set; }
-
-    /// <summary>
-    /// 确认按钮图片
-    /// </summary>
-    public virtual int? Btn_OK { get; set; }
-
-    /// <summary>
-    /// 关闭按钮图片
-    /// </summary>
-    public virtual int? Btn_Close { get; set; }
-
-    /// <summary>
-    /// 内容图片Id
-    /// </summary>
-    public virtual int? ImageId_Text { get; set; }
-
-    /// <summary>
-    /// 扩展参数1
-    /// </summary>
-    public virtual string? Extend1 { get; set; }
-
-     /// <summary>
-    /// 所属租户
-    /// </summary>
-    public override Guid TenantId { get; set; }
-         }