CrazyIter_Bin 5 miesięcy temu
rodzic
commit
dcb4d5439f

+ 2 - 2
TEAMModelOS.Function/CosmosDBTriggers/TriggerExam.cs

@@ -363,7 +363,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                     await tasks.TaskPage(10);
 
                                 }
-                                else
+                                /*else
                                 {
                                     //处理单科结算时科目与试卷信息匹配的问题
                                     int gno = 0;
@@ -392,7 +392,7 @@ namespace TEAMModelOS.CosmosDBTriggers
                                         info.average = settlement.score;
                                         await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync<ExamInfo>(info, info.id, new PartitionKey(info.code));
                                     }
-                                }
+                                }*/
                             }
                             catch (Exception e)
                             {

+ 0 - 2
TEAMModelOS.SDK/Extension/Utils.cs

@@ -202,8 +202,6 @@ namespace TEAMModelOS.SDK.Extension
         #endregion
 
 
-
-
         #region private
         private static int SetRandomSeeds(int length)
         {

+ 33 - 0
TEAMModelOS/Dockerfile

@@ -0,0 +1,33 @@
+# 请参阅 https://aka.ms/customizecontainer 以了解如何自定义调试容器,以及 Visual Studio 如何使用此 Dockerfile 生成映像以更快地进行调试。
+
+# 此阶段用于在快速模式(默认为调试配置)下从 VS 运行时
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble AS base
+USER app
+WORKDIR /app
+EXPOSE 8080
+EXPOSE 8081
+
+
+# 此阶段用于生成服务项目
+FROM mcr.microsoft.com/dotnet/sdk:8.0-noble AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["nuget.config", "."]
+COPY ["TEAMModelOS/TEAMModelOS.csproj", "TEAMModelOS/"]
+COPY ["TEAMModelOS.Extension/HTEX.Lib/HTEX.Lib.csproj", "TEAMModelOS.Extension/HTEX.Lib/"]
+COPY ["TEAMModelOS.SDK/TEAMModelOS.SDK.csproj", "TEAMModelOS.SDK/"]
+RUN dotnet restore "./TEAMModelOS/TEAMModelOS.csproj"
+COPY . .
+WORKDIR "/src/TEAMModelOS"
+RUN dotnet build "./TEAMModelOS.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+# 此阶段用于发布要复制到最终阶段的服务项目
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./TEAMModelOS.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+# 此阶段在生产中使用,或在常规模式下从 VS 运行时使用(在不使用调试配置时为默认值)
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "TEAMModelOS.dll"]

+ 3 - 3
TEAMModelOS/Startup.cs

@@ -202,9 +202,9 @@ namespace TEAMModelOS
             services.AddXkwAPIHttpService(Configuration);
             //services.AddHostedService<>
            // services.AddSingleton<ILoggerProvider, BlobLoggerProvider>();
-            services.AddMvcFilter<RequestAuditFilter>();
+           // services.AddMvcFilter<RequestAuditFilter>();
             services.AddNetMail();
-            services.AddSignalR().AddAzureSignalR(o=>o.ConnectionString=Configuration.GetValue<string>("Azure:SignalR:ConnectionString"));
+            //services.AddSignalR().AddAzureSignalR(o=>o.ConnectionString=Configuration.GetValue<string>("Azure:SignalR:ConnectionString"));
             //services.AddSignalR();
 #if !DEBUG
  //第一步: 配置gzip与br的压缩等级为最优
@@ -283,7 +283,7 @@ namespace TEAMModelOS
             app.UseEndpoints(endpoints =>
             {
                 //  endpoints.MapHub<IESHybridCloudHub>("/hub/hybrid-cloud").RequireCors("any");
-                endpoints.MapHub<IESHybridCloudHub>("/hub/hybrid-cloud");
+                //endpoints.MapHub<IESHybridCloudHub>("/hub/hybrid-cloud");
                 endpoints.MapControllers();
                 endpoints.MapServerSentEvents("/service/sse", new ServerSentEventsOptions
                 {

+ 2 - 0
TEAMModelOS/TEAMModelOS.csproj

@@ -9,6 +9,7 @@
 		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
 		<!--<PackageReference Include="JsonPath.Net" Version="1.1.2" />-->
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
 		<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.20.0" />
 		<!--<PackageReference Include="System.Security.Cryptography.Algorithms" Version="3.5.0" />-->
 	</ItemGroup>
@@ -90,6 +91,7 @@
 		<Product>TEAMModelOS</Product>
 		<Copyright>© 2021 HABOOK Group 醍摩豆</Copyright>
 		<PackageProjectUrl>https://www.teammodel.cn</PackageProjectUrl>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">