diff --git a/src/CloudGaming/Api/CloudGaming.Api/CloudGaming.Api.csproj b/src/CloudGaming/Api/CloudGaming.Api/CloudGaming.Api.csproj new file mode 100644 index 0000000..8a0c1f7 --- /dev/null +++ b/src/CloudGaming/Api/CloudGaming.Api/CloudGaming.Api.csproj @@ -0,0 +1,23 @@ + + + + net8.0 + enable + enable + 3936c093-f18d-46a7-91d6-96cc43ffe3b8 + Linux + ..\.. + + + + + + + + + + + + + + diff --git a/src/CloudGaming/Api/CloudGaming.Api/CloudGaming.Api.http b/src/CloudGaming/Api/CloudGaming.Api/CloudGaming.Api.http new file mode 100644 index 0000000..b0f2324 --- /dev/null +++ b/src/CloudGaming/Api/CloudGaming.Api/CloudGaming.Api.http @@ -0,0 +1,6 @@ +@CloudGaming.Api_HostAddress = http://localhost:5110 + +GET {{CloudGaming.Api_HostAddress}}/weatherforecast/ +Accept: application/json + +### diff --git a/src/CloudGaming/CloudGaming/Controllers/WeatherForecastController.cs b/src/CloudGaming/Api/CloudGaming.Api/Controllers/WeatherForecastController.cs similarity index 96% rename from src/CloudGaming/CloudGaming/Controllers/WeatherForecastController.cs rename to src/CloudGaming/Api/CloudGaming.Api/Controllers/WeatherForecastController.cs index 8d4c956..65c131e 100644 --- a/src/CloudGaming/CloudGaming/Controllers/WeatherForecastController.cs +++ b/src/CloudGaming/Api/CloudGaming.Api/Controllers/WeatherForecastController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace CloudGaming.Controllers +namespace CloudGaming.Api.Controllers { [ApiController] [Route("[controller]")] diff --git a/src/CloudGaming/Api/CloudGaming.Api/Dockerfile b/src/CloudGaming/Api/CloudGaming.Api/Dockerfile new file mode 100644 index 0000000..9f8f60f --- /dev/null +++ b/src/CloudGaming/Api/CloudGaming.Api/Dockerfile @@ -0,0 +1,33 @@ +# 请参阅 https://aka.ms/customizecontainer 以了解如何自定义调试容器，以及 Visual Studio 如何使用此 Dockerfile 生成映像以更快地进行调试。 + +# 此阶段用于在快速模式(默认为调试配置)下从 VS 运行时 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +USER app +WORKDIR /app +EXPOSE 8080 +EXPOSE 8081 + + +# 此阶段用于生成服务项目 +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["Api/CloudGaming.Api/CloudGaming.Api.csproj", "Api/CloudGaming.Api/"] +COPY ["Code/CloudGaming.Code/CloudGaming.Code.csproj", "Code/CloudGaming.Code/"] +COPY ["Model/CloudGaming.Model/CloudGaming.Model.csproj", "Model/CloudGaming.Model/"] +COPY ["Utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj", "Utile/HuanMeng.DotNetCore/"] +RUN dotnet restore "./Api/CloudGaming.Api/CloudGaming.Api.csproj" +COPY . . +WORKDIR "/src/Api/CloudGaming.Api" +RUN dotnet build "./CloudGaming.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build + +# 此阶段用于发布要复制到最终阶段的服务项目 +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "./CloudGaming.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +# 此阶段在生产中使用，或在常规模式下从 VS 运行时使用(在不使用调试配置时为默认值) +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "CloudGaming.Api.dll"] \ No newline at end of file diff --git a/src/CloudGaming/CloudGaming/Program.cs b/src/CloudGaming/Api/CloudGaming.Api/Program.cs similarity index 90% rename from src/CloudGaming/CloudGaming/Program.cs rename to src/CloudGaming/Api/CloudGaming.Api/Program.cs index ff1441e..48863a6 100644 --- a/src/CloudGaming/CloudGaming/Program.cs +++ b/src/CloudGaming/Api/CloudGaming.Api/Program.cs @@ -1,4 +1,4 @@ -var builder = WebApplication.CreateBuilder(args); +var builder = WebApplication.CreateBuilder(args); // Add services to the container. diff --git a/src/CloudGaming/CloudGaming/Properties/launchSettings.json b/src/CloudGaming/Api/CloudGaming.Api/Properties/launchSettings.json similarity index 86% rename from src/CloudGaming/CloudGaming/Properties/launchSettings.json rename to src/CloudGaming/Api/CloudGaming.Api/Properties/launchSettings.json index 06e2f4f..1fd840e 100644 --- a/src/CloudGaming/CloudGaming/Properties/launchSettings.json +++ b/src/CloudGaming/Api/CloudGaming.Api/Properties/launchSettings.json @@ -8,7 +8,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": true, - "applicationUrl": "http://localhost:5171" + "applicationUrl": "http://localhost:5110" }, "https": { "commandName": "Project", @@ -18,7 +18,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": true, - "applicationUrl": "https://localhost:7081;http://localhost:5171" + "applicationUrl": "https://localhost:7202;http://localhost:5110" }, "IIS Express": { "commandName": "IISExpress", @@ -45,8 +45,8 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:31403", - "sslPort": 44348 + "applicationUrl": "http://localhost:17353", + "sslPort": 44339 } } } \ No newline at end of file diff --git a/src/CloudGaming/CloudGaming/WeatherForecast.cs b/src/CloudGaming/Api/CloudGaming.Api/WeatherForecast.cs similarity index 90% rename from src/CloudGaming/CloudGaming/WeatherForecast.cs rename to src/CloudGaming/Api/CloudGaming.Api/WeatherForecast.cs index ce39da2..c45b5ac 100644 --- a/src/CloudGaming/CloudGaming/WeatherForecast.cs +++ b/src/CloudGaming/Api/CloudGaming.Api/WeatherForecast.cs @@ -1,4 +1,4 @@ -namespace CloudGaming +namespace CloudGaming.Api { public class WeatherForecast { diff --git a/src/CloudGaming/CloudGaming/appsettings.Development.json b/src/CloudGaming/Api/CloudGaming.Api/appsettings.Development.json similarity index 100% rename from src/CloudGaming/CloudGaming/appsettings.Development.json rename to src/CloudGaming/Api/CloudGaming.Api/appsettings.Development.json diff --git a/src/CloudGaming/CloudGaming/appsettings.json b/src/CloudGaming/Api/CloudGaming.Api/appsettings.json similarity index 100% rename from src/CloudGaming/CloudGaming/appsettings.json rename to src/CloudGaming/Api/CloudGaming.Api/appsettings.json diff --git a/src/CloudGaming/CloudGaming.sln b/src/CloudGaming/CloudGaming.sln index a3017d8..a924c00 100644 --- a/src/CloudGaming/CloudGaming.sln +++ b/src/CloudGaming/CloudGaming.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # 17 VisualStudioVersion = 17.10.35027.167 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudGaming", "CloudGaming\CloudGaming.csproj", "{0465FB68-91F3-408E-BD0E-B4D99D91F857}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1-core", "1-core", "{FCA3CA4B-1993-429A-B2E9-2B05DB44F10E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3-api", "3-api", "{51CB40D2-99F5-43E8-95B4-3A75C91736A6}" @@ -22,9 +20,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2-utlie", "2-utlie", "{46D0820D-4EC3-4C22-986D-E505CDEC52D2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HuanMeng.DotNetCore", "1-utile\HuanMeng.DotNetCore\HuanMeng.DotNetCore.csproj", "{0AEFD698-79ED-4A23-AB45-3BAE39B22E10}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HuanMeng.DotNetCore", "Utile\HuanMeng.DotNetCore\HuanMeng.DotNetCore.csproj", "{53FB866B-D041-4710-90D7-63121F577A3C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudGaming.Model", "CloudGaming.Model\CloudGaming.Model.csproj", "{B0208C8A-63DE-4295-B740-B7A0D556E1E0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudGaming.Api", "Api\CloudGaming.Api\CloudGaming.Api.csproj", "{0E60926E-0405-4A99-A3FF-2A494CCF02EA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudGaming.Model", "Model\CloudGaming.Model\CloudGaming.Model.csproj", "{5DAE20D8-B844-4EF8-ADA6-D7594E8ECCF7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudGaming.Code", "Code\CloudGaming.Code\CloudGaming.Code.csproj", "{5F851D79-E435-4D16-974A-6D5E3A3269A7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -32,26 +34,31 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0465FB68-91F3-408E-BD0E-B4D99D91F857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0465FB68-91F3-408E-BD0E-B4D99D91F857}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0465FB68-91F3-408E-BD0E-B4D99D91F857}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0465FB68-91F3-408E-BD0E-B4D99D91F857}.Release|Any CPU.Build.0 = Release|Any CPU - {0AEFD698-79ED-4A23-AB45-3BAE39B22E10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AEFD698-79ED-4A23-AB45-3BAE39B22E10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AEFD698-79ED-4A23-AB45-3BAE39B22E10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AEFD698-79ED-4A23-AB45-3BAE39B22E10}.Release|Any CPU.Build.0 = Release|Any CPU - {B0208C8A-63DE-4295-B740-B7A0D556E1E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0208C8A-63DE-4295-B740-B7A0D556E1E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0208C8A-63DE-4295-B740-B7A0D556E1E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0208C8A-63DE-4295-B740-B7A0D556E1E0}.Release|Any CPU.Build.0 = Release|Any CPU + {53FB866B-D041-4710-90D7-63121F577A3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53FB866B-D041-4710-90D7-63121F577A3C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53FB866B-D041-4710-90D7-63121F577A3C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53FB866B-D041-4710-90D7-63121F577A3C}.Release|Any CPU.Build.0 = Release|Any CPU + {0E60926E-0405-4A99-A3FF-2A494CCF02EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E60926E-0405-4A99-A3FF-2A494CCF02EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E60926E-0405-4A99-A3FF-2A494CCF02EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E60926E-0405-4A99-A3FF-2A494CCF02EA}.Release|Any CPU.Build.0 = Release|Any CPU + {5DAE20D8-B844-4EF8-ADA6-D7594E8ECCF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DAE20D8-B844-4EF8-ADA6-D7594E8ECCF7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DAE20D8-B844-4EF8-ADA6-D7594E8ECCF7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DAE20D8-B844-4EF8-ADA6-D7594E8ECCF7}.Release|Any CPU.Build.0 = Release|Any CPU + {5F851D79-E435-4D16-974A-6D5E3A3269A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F851D79-E435-4D16-974A-6D5E3A3269A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5F851D79-E435-4D16-974A-6D5E3A3269A7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5F851D79-E435-4D16-974A-6D5E3A3269A7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {0465FB68-91F3-408E-BD0E-B4D99D91F857} = {51CB40D2-99F5-43E8-95B4-3A75C91736A6} - {0AEFD698-79ED-4A23-AB45-3BAE39B22E10} = {46D0820D-4EC3-4C22-986D-E505CDEC52D2} - {B0208C8A-63DE-4295-B740-B7A0D556E1E0} = {A3F00FB0-49D6-48B1-99D9-4619634DF8D9} + {53FB866B-D041-4710-90D7-63121F577A3C} = {46D0820D-4EC3-4C22-986D-E505CDEC52D2} + {0E60926E-0405-4A99-A3FF-2A494CCF02EA} = {51CB40D2-99F5-43E8-95B4-3A75C91736A6} + {5DAE20D8-B844-4EF8-ADA6-D7594E8ECCF7} = {A3F00FB0-49D6-48B1-99D9-4619634DF8D9} + {5F851D79-E435-4D16-974A-6D5E3A3269A7} = {FCA3CA4B-1993-429A-B2E9-2B05DB44F10E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D299D92-FA27-47A0-8D78-43D1FAFE7628} diff --git a/src/CloudGaming/CloudGaming/CloudGaming.csproj b/src/CloudGaming/CloudGaming/CloudGaming.csproj deleted file mode 100644 index c33cc50..0000000 --- a/src/CloudGaming/CloudGaming/CloudGaming.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net8.0 - enable - enable - 60edfd76-b8fa-477a-b105-6e6a7da42295 - Linux - - - - - - - - - diff --git a/src/CloudGaming/CloudGaming/CloudGaming.http b/src/CloudGaming/CloudGaming/CloudGaming.http deleted file mode 100644 index badccdd..0000000 --- a/src/CloudGaming/CloudGaming/CloudGaming.http +++ /dev/null @@ -1,6 +0,0 @@ -@CloudGaming_HostAddress = http://localhost:5171 - -GET {{CloudGaming_HostAddress}}/weatherforecast/ -Accept: application/json - -### diff --git a/src/CloudGaming/CloudGaming/Dockerfile b/src/CloudGaming/CloudGaming/Dockerfile deleted file mode 100644 index b8af673..0000000 --- a/src/CloudGaming/CloudGaming/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base -USER app -WORKDIR /app -EXPOSE 8080 -EXPOSE 8081 - -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build -ARG BUILD_CONFIGURATION=Release -WORKDIR /src -COPY ["CloudGaming/CloudGaming.csproj", "CloudGaming/"] -RUN dotnet restore "./CloudGaming/CloudGaming.csproj" -COPY . . -WORKDIR "/src/CloudGaming" -RUN dotnet build "./CloudGaming.csproj" -c $BUILD_CONFIGURATION -o /app/build - -FROM build AS publish -ARG BUILD_CONFIGURATION=Release -RUN dotnet publish "./CloudGaming.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "CloudGaming.dll"] \ No newline at end of file diff --git a/src/CloudGaming/Code/CloudGaming.Code/Class1.cs b/src/CloudGaming/Code/CloudGaming.Code/Class1.cs new file mode 100644 index 0000000..39a22d6 --- /dev/null +++ b/src/CloudGaming/Code/CloudGaming.Code/Class1.cs @@ -0,0 +1,7 @@ +namespace CloudGaming.Code +{ + public class Class1 + { + + } +} diff --git a/src/CloudGaming/Code/CloudGaming.Code/CloudGaming.Code.csproj b/src/CloudGaming/Code/CloudGaming.Code/CloudGaming.Code.csproj new file mode 100644 index 0000000..9832304 --- /dev/null +++ b/src/CloudGaming/Code/CloudGaming.Code/CloudGaming.Code.csproj @@ -0,0 +1,14 @@ + + + + net8.0 + enable + enable + + + + + + + + diff --git a/src/CloudGaming/CloudGaming.Model/CloudGaming.Model.csproj b/src/CloudGaming/Model/CloudGaming.Model/CloudGaming.Model.csproj similarity index 86% rename from src/CloudGaming/CloudGaming.Model/CloudGaming.Model.csproj rename to src/CloudGaming/Model/CloudGaming.Model/CloudGaming.Model.csproj index 6ae5293..dd1dea5 100644 --- a/src/CloudGaming/CloudGaming.Model/CloudGaming.Model.csproj +++ b/src/CloudGaming/Model/CloudGaming.Model/CloudGaming.Model.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/CloudGaming/CloudGaming.Model/CodeTemplates/EFCore/DbContext.t4 b/src/CloudGaming/Model/CloudGaming.Model/CodeTemplates/EFCore/DbContext.t4 similarity index 100% rename from src/CloudGaming/CloudGaming.Model/CodeTemplates/EFCore/DbContext.t4 rename to src/CloudGaming/Model/CloudGaming.Model/CodeTemplates/EFCore/DbContext.t4 diff --git a/src/CloudGaming/CloudGaming.Model/CodeTemplates/EFCore/EntityType.t4 b/src/CloudGaming/Model/CloudGaming.Model/CodeTemplates/EFCore/EntityType.t4 similarity index 100% rename from src/CloudGaming/CloudGaming.Model/CodeTemplates/EFCore/EntityType.t4 rename to src/CloudGaming/Model/CloudGaming.Model/CodeTemplates/EFCore/EntityType.t4 diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Currency.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Currency.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Currency.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Currency.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Currency_Log.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Currency_Log.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Currency_Log.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Currency_Log.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Data.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Data.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Data.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Data.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_IntentOrder.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_IntentOrder.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_IntentOrder.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_IntentOrder.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_MiniProgram_Account.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_MiniProgram_Account.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_MiniProgram_Account.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_MiniProgram_Account.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Order.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Order.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Order.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Order.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_OrderItems.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_OrderItems.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_OrderItems.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_OrderItems.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Phone_Account.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Phone_Account.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Phone_Account.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Phone_Account.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Token.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Token.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/Db_User/T_User_Token.cs rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_Token.cs diff --git a/src/CloudGaming/CloudGaming.Model/DbSqlServer/efcore-gen.md b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/efcore-gen.md similarity index 100% rename from src/CloudGaming/CloudGaming.Model/DbSqlServer/efcore-gen.md rename to src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/efcore-gen.md diff --git a/src/CloudGaming/CloudGaming.Model/GlobalUsings.cs b/src/CloudGaming/Model/CloudGaming.Model/GlobalUsings.cs similarity index 100% rename from src/CloudGaming/CloudGaming.Model/GlobalUsings.cs rename to src/CloudGaming/Model/CloudGaming.Model/GlobalUsings.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/BLLBase.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/BLLBase.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/BLLBase.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/BLLBase.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/BaseResponse.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/BaseResponse.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/BaseResponse.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/BaseResponse.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/DaoBase.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/DaoBase.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/DaoBase.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/DaoBase.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/EfCoreDaoBase.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/EfCoreDaoBase.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/EfCoreDaoBase.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/EfCoreDaoBase.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/IResponse.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/IResponse.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/IResponse.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/IResponse.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/ResonseCode.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/ResonseCode.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Base/ResonseCode.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Base/ResonseCode.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/CacheHelper/MemoryCacheHelper.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/CustomExtension/CorsExtension.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/CustomExtension/CorsExtension.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/CustomExtension/CorsExtension.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/CustomExtension/CorsExtension.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj b/src/CloudGaming/Utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Json/CustomDateTimeConverter.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Json/CustomDateTimeConverter.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Json/CustomDateTimeConverter.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Json/CustomDateTimeConverter.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/Interface/IJwtAuthManager.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/Interface/IJwtAuthManager.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/Interface/IJwtAuthManager.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/Interface/IJwtAuthManager.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtAuthManager.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtAuthManager.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtAuthManager.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtAuthManager.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtAuthResult.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtAuthResult.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtAuthResult.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtAuthResult.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtRefreshToken.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtRefreshToken.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtRefreshToken.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtRefreshToken.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtTokenConfig.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtTokenConfig.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtTokenConfig.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/JwtInfrastructure/JwtTokenConfig.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MiddlewareExtend/ExceptionMiddleware.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MiddlewareExtend/ExceptionMiddleware.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MiddlewareExtend/ExceptionMiddleware.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MiddlewareExtend/ExceptionMiddleware.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MiddlewareExtend/ExecutionTimeMiddleware.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MiddlewareExtend/ExecutionTimeMiddleware.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MiddlewareExtend/ExecutionTimeMiddleware.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MiddlewareExtend/ExecutionTimeMiddleware.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MiddlewareExtend/MiddlewareExtends.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MiddlewareExtend/MiddlewareExtends.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MiddlewareExtend/MiddlewareExtends.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MiddlewareExtend/MiddlewareExtends.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MiddlewareExtend/SignMiddleware.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MiddlewareExtend/SignMiddleware.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MiddlewareExtend/SignMiddleware.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MiddlewareExtend/SignMiddleware.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenant.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenant.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenant.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenant.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenantDbContext.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenantDbContext.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenantDbContext.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenantDbContext.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenantEntity.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenantEntity.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenantEntity.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/Contract/IMultiTenantEntity.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/Contract/ITenantInfo.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/Contract/ITenantInfo.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/Contract/ITenantInfo.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/Contract/ITenantInfo.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/MultiTenantEntity.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/MultiTenantEntity.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/MultiTenantEntity.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/MultiTenantEntity.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/TenantInfo.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/TenantInfo.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/MultiTenant/TenantInfo.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/MultiTenant/TenantInfo.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Processors/BaseProcessor.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Processors/BaseProcessor.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Processors/BaseProcessor.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Processors/BaseProcessor.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Processors/ITaskProcessor.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Processors/ITaskProcessor.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Processors/ITaskProcessor.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Processors/ITaskProcessor.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Processors/ThreadProcessor.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Processors/ThreadProcessor.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Processors/ThreadProcessor.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Processors/ThreadProcessor.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/CheckTextVerification.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/CheckTextVerification.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/CheckTextVerification.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/CheckTextVerification.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/ITextCensor.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/ITextCensor.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/ITextCensor.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/ITextCensor.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/SensitiveWord/SensitiveWordFilter.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/SensitiveWord/SensitiveWordFilter.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/SensitiveWord/SensitiveWordFilter.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/SensitiveWord/SensitiveWordFilter.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/SensitiveWord/SensitiveWordFilterFrozen.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/SensitiveWord/SensitiveWordFilterFrozen.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/SensitiveWord/SensitiveWordFilterFrozen.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/SensitiveWord/SensitiveWordFilterFrozen.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/TextCensorExtend.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/TextCensorExtend.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/TextCensor/TextCensorExtend.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/TextCensor/TextCensorExtend.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/AssemblyHelper/AssemblyInfo.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/AssemblyHelper/AssemblyInfo.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/AssemblyHelper/AssemblyInfo.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/AssemblyHelper/AssemblyInfo.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/AssemblyHelper/AssemblyInfoHelper.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/AssemblyHelper/AssemblyInfoHelper.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/AssemblyHelper/AssemblyInfoHelper.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/AssemblyHelper/AssemblyInfoHelper.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/DateTimeExtensions.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/DateTimeExtensions.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/DateTimeExtensions.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/DateTimeExtensions.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/HttpContextExtensions.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/HttpContextExtensions.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/HttpContextExtensions.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/HttpContextExtensions.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/MD5Encryption.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/MD5Encryption.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/MD5Encryption.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/MD5Encryption.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/PhoneNumberValidator.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/PhoneNumberValidator.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/Utility/PhoneNumberValidator.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/Utility/PhoneNumberValidator.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/WeChat/MiniProgram.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/WeChat/MiniProgram.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/WeChat/MiniProgram.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/WeChat/MiniProgram.cs diff --git a/src/CloudGaming/1-utile/HuanMeng.DotNetCore/WeChat/WXBizDataCrypt.cs b/src/CloudGaming/Utile/HuanMeng.DotNetCore/WeChat/WXBizDataCrypt.cs similarity index 100% rename from src/CloudGaming/1-utile/HuanMeng.DotNetCore/WeChat/WXBizDataCrypt.cs rename to src/CloudGaming/Utile/HuanMeng.DotNetCore/WeChat/WXBizDataCrypt.cs