Merge branch 'main' of http://123.207.203.228:3000/server/CloudGaming

src/CloudGaming/Api/CloudGaming.Api/appsettings.Development.json

@@ -18,7 +18,7 @@
   "Kestrel": {
     "Endpoints": {
       "Http": {
-        "Url": "http://*:8080"
+        "Url": "http://*:801"
       }
     }
   }

src/CloudGaming/Console/CloudGaming.CreateDataBase/Program.cs

@@ -8,10 +8,13 @@ using Newtonsoft.Json;
 //var jsopn = JsonConvert.SerializeObject(new PhoneLoginParams());
 //Server=192.168.1.17;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;
 var optionsBuilder = new DbContextOptionsBuilder<CloudGamingPhoneContext>();
-var option = optionsBuilder.UseSqlServer("Server=192.168.1.17;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;").Options;
+var option = optionsBuilder.UseSqlServer("Server=192.168.195.6;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;").Options;
 CloudGamingPhoneContext cloudGamingPhoneContext = new CloudGamingPhoneContext(option);
-cloudGamingPhoneContext.Database.EnsureCreated();
+//cloudGamingPhoneContext.Database.EnsureCreated();
 var x = cloudGamingPhoneContext.T_Epg_Cfg.Count();
+var ccc = cloudGamingPhoneContext.T_Epg_Cfg.ToList();
+Console.WriteLine("查询" + x.ToString());
+Console.ReadKey();
 //Server=192.168.1.17;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;
 //var optionsBuilder1 = new DbContextOptionsBuilder<CloudGamingUserContext>();
 //var option1 = optionsBuilder1.UseSqlServer("Server=192.168.1.17;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;").Options;

src/CloudGaming/Model/CloudGaming.GameModel/CodeTemplates/EFCore/DbContext.t4

@@ -119,8 +119,8 @@ public partial class <#= Options.ContextName #> : DbContext
     var useProviderCall = providerCode.GenerateUseProvider(Options.ConnectionString);
     usings.AddRange(useProviderCall.GetRequiredUsings());
 #>
-        => optionsBuilder<#= code.Fragment(useProviderCall, indent: 3) #>;
+      {//  => optionsBuilder<#= code.Fragment(useProviderCall, indent: 3) #>;
-
+      }
 <#
     }
 

src/CloudGaming/Model/CloudGaming.GameModel/Db/Db_Game/CloudGamingGameContext.cs

@@ -70,8 +70,8 @@ public partial class CloudGamingGameContext : DbContext
     public virtual DbSet<T_Game_UserShare> T_Game_UserShare { get; set; }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        => optionsBuilder.UseSqlServer("Server=192.168.1.17;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;");
+      {//  => optionsBuilder.UseSqlServer("Server=192.168.195.6;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;");
-
+      }
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.Entity<T_Game_ChildList>(entity =>

src/CloudGaming/Model/CloudGaming.GameModel/Db/efcore-gen.md

@@ -2,7 +2,12 @@
 ##在API项目里面执行，使用连接字符串名称，生成代码到model项目
 ```sh
 --game
+内网
 dotnet ef dbcontext scaffold "Server=192.168.1.17;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;" Microsoft.EntityFrameworkCore.SqlServer -o Db/Db_Game/  --use-database-names  --no-pluralize  --force 
+内网穿透
+dotnet ef dbcontext scaffold "Server=192.168.195.6;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;" Microsoft.EntityFrameworkCore.SqlServer -o Db/Db_Game/  --use-database-names  --no-pluralize  --force 
 --Ext 
 dotnet ef dbcontext scaffold "Server=192.168.1.17;Database=CloudGamingCBT;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;" Microsoft.EntityFrameworkCore.SqlServer -o Db/Db_Ext/  --use-database-names  --no-pluralize  --force 
+内网穿透
+dotnet ef dbcontext scaffold "Server=192.168.195.6;Database=CloudGamingGame;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;" Microsoft.EntityFrameworkCore.SqlServer -o Db/Db_Game/  --use-database-names  --no-pluralize  --force 
 ```

src/CloudGaming/Model/CloudGaming.Model/CodeTemplates/EFCore/DbContext.t4

@@ -113,7 +113,8 @@ public partial class <#= Options.ContextName #> : MultiTenantDbContext//DbContex
     var useProviderCall = providerCode.GenerateUseProvider(Options.ConnectionString);
     usings.AddRange(useProviderCall.GetRequiredUsings());
 #>
-        => optionsBuilder<#= code.Fragment(useProviderCall, indent: 3) #>;
+     {  // => optionsBuilder<#= code.Fragment(useProviderCall, indent: 3) #>;
+      } 
 
 <#
     }

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

@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+
 using Microsoft.EntityFrameworkCore;
 
 namespace CloudGaming.Model.DbSqlServer.Db_Phone;
@@ -144,7 +145,9 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
     public virtual DbSet<T_Videos> T_Videos { get; set; }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        => optionsBuilder.UseSqlServer("Server=192.168.1.17;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;");
+    // => optionsBuilder.UseSqlServer("Server=192.168.195.6;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;");
+    {
+    }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {

src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs

@@ -89,7 +89,8 @@ public partial class CloudGamingUserContext : MultiTenantDbContext//DbContext
     public virtual DbSet<T_User_Token> T_User_Token { get; set; }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        => optionsBuilder.UseSqlServer("Server=192.168.1.17;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;");
+     {  // => optionsBuilder.UseSqlServer("Server=192.168.195.6;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;");
+      } 
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {

src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/efcore-gen.md

@@ -3,8 +3,10 @@
 ```sh
 --user
 dotnet ef dbcontext scaffold "Server=192.168.1.17;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;" Microsoft.EntityFrameworkCore.SqlServer -o DbSqlServer/Db_User/  --use-database-names  --no-pluralize  --force 
+dotnet ef dbcontext scaffold "Server=192.168.195.6;Database=CloudGamingUser;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;" Microsoft.EntityFrameworkCore.SqlServer -o DbSqlServer/Db_User/  --use-database-names  --no-pluralize  --force 
 
 --CloudGamingPhone
 dotnet ef dbcontext scaffold "Server=192.168.1.17;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;" Microsoft.EntityFrameworkCore.SqlServer -o DbSqlServer/Db_Phone/  --use-database-names  --no-pluralize  --force 
+dotnet ef dbcontext scaffold "Server=192.168.195.6;Database=CloudGamingPhone;User Id=sa;Password=Dbt@com@123;TrustServerCertificate=true;" Microsoft.EntityFrameworkCore.SqlServer -o DbSqlServer/Db_Phone/  --use-database-names  --no-pluralize  --force 
 
 ```