diff --git a/Server/YD_XinWei.Commons/Dto/Open/AddTrainDto.cs b/Server/YD_XinWei.Commons/Dto/Open/AddTrainDto.cs index 8da8fae..a182355 100644 --- a/Server/YD_XinWei.Commons/Dto/Open/AddTrainDto.cs +++ b/Server/YD_XinWei.Commons/Dto/Open/AddTrainDto.cs @@ -422,6 +422,11 @@ namespace YD_XinWei.Commons.Dto.Open /// public List StudentList { get; set; } = new List(); + /// + /// 训练设置 + /// + public TrainSettingDto TrainSetting { get; set; } = new TrainSettingDto(); + } public class TrainStudentsDto @@ -657,5 +662,97 @@ namespace YD_XinWei.Commons.Dto.Open /// 修改人 /// public string UpdateBy { get; set; } + + public List TrainViolationsBO { get; set; } = new List(); + } + + public class TrainViolationsBODto + { + /// + /// 违规动作编号 + /// + public int? ViolationId { get; set; } + + /// + /// 违规动图地址 + /// + public string PicUrl { get; set; } + + /// + /// 跳绳绊脚次数 + /// + public int? SkipStumblingNumber { get; set; } + + /// + /// 违规动作训练时间 + /// + public string TrainTime { get; set; } + } + + + + public class TrainSettingDto + { + /// + /// 训练ID + /// + public int? TrainId { get; set; } + + /// + /// 圈数 + /// + public int? CircleCount { get; set; } + + /// + /// 每圈时间间隔 + /// + public int? CircleInterval { get; set; } + + /// + /// 首圈是否整圈(1-不完整，2-完整) + /// + public decimal? FirstCircleWhole { get; set; } + + /// + /// 首圈时间间隔 + /// + public int? FirstCircleInterval { get; set; } + + /// + /// 保留秒以下的小数位数（1：保留百分之一秒，0：保留十分之一秒） + /// + public decimal? DecimalPlace { get; set; } + + /// + /// 女生圈数 + /// + public int? CircleCountGirl { get; set; } + + /// + /// 女生每圈时间间隔 + /// + public int? CircleIntervalGirl { get; set; } + + /// + /// 女生首圈是否整圈(1-不完整，2-完整) + /// + public decimal? FirstCircleWholeGirl { get; set; } + + /// + /// 女生首圈时间间隔 + /// + public int? FirstCircleIntervalGirl { get; set; } + + /// + /// 创建时间 + /// + public string CreateTime { get; set; } + + /// + /// 创建人 + /// + public string CreateBy { get; set; } + + public int XW_SportsTestDataId { get; set; } } } diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll index 1e66eec..e509f74 100644 Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb index a4da9c0..445a54e 100644 Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs index 3f07cfe..99c747a 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c1ecf2ee460c2d5bfba31feaf2ed3fd5c32d154f")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d2efe67ac4d1f90ab5cf9ec9cadeb1822dce525d")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache index d90c251..48e6b28 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache @@ -1 +1 @@ -933861a0d7e4fff15901294404628fd93a791fc4e666a23e0b084eec70f8a7d3 +f70f09ef16883c9169f894ddba48aefed4063aacd990643ce566e0aff04c4a79 diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.GeneratedMSBuildEditorConfig.editorconfig b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.GeneratedMSBuildEditorConfig.editorconfig index 85f41c1..ab8429f 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.GeneratedMSBuildEditorConfig.editorconfig +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = YD_XinWei.Commons -build_property.ProjectDir = C:\Users\Administrator\Desktop\XW\Server\YD_XinWei.Commons\ +build_property.ProjectDir = C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei.Commons\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 6.0 diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll index 1e66eec..e509f74 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb index a4da9c0..445a54e 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll index 6120204..573962e 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll index 6120204..573962e 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/YD_XinWei.Commons.csproj.nuget.dgspec.json b/Server/YD_XinWei.Commons/obj/YD_XinWei.Commons.csproj.nuget.dgspec.json index 3115437..c711652 100644 --- a/Server/YD_XinWei.Commons/obj/YD_XinWei.Commons.csproj.nuget.dgspec.json +++ b/Server/YD_XinWei.Commons/obj/YD_XinWei.Commons.csproj.nuget.dgspec.json @@ -1,24 +1,23 @@ { "format": 1, "restore": { - "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": {} + "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": {} }, "projects": { - "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": { + "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", + "projectUniqueName": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", "projectName": "YD_XinWei.Commons", - "projectPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", - "packagesPath": "C:\\Users\\TangLong\\.nuget\\packages\\", - "outputPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\obj\\", + "projectPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\TangLong\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -44,7 +43,7 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "all" + "auditMode": "direct" }, "SdkAnalysisLevel": "9.0.100" }, @@ -89,7 +88,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json" } } } diff --git a/Server/YD_XinWei.Commons/obj/project.assets.json b/Server/YD_XinWei.Commons/obj/project.assets.json index 4931566..cdfabef 100644 --- a/Server/YD_XinWei.Commons/obj/project.assets.json +++ b/Server/YD_XinWei.Commons/obj/project.assets.json @@ -875,25 +875,23 @@ ] }, "packageFolders": { - "C:\\Users\\TangLong\\.nuget\\packages\\": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\Administrator\\.nuget\\packages\\": {}, + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", + "projectUniqueName": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", "projectName": "YD_XinWei.Commons", - "projectPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", - "packagesPath": "C:\\Users\\TangLong\\.nuget\\packages\\", - "outputPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\obj\\", + "projectPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\TangLong\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -919,7 +917,7 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "all" + "auditMode": "direct" }, "SdkAnalysisLevel": "9.0.100" }, @@ -964,20 +962,8 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json" } } - }, - "logs": [ - { - "code": "NU1904", - "level": "Warning", - "warningLevel": 1, - "message": "包 \"System.Text.Encodings.Web\" 4.5.0 具有已知的 严重 严重性漏洞，https://github.com/advisories/GHSA-ghhp-997w-qr28", - "libraryId": "System.Text.Encodings.Web", - "targetGraphs": [ - "net6.0" - ] - } - ] + } } \ No newline at end of file diff --git a/Server/YD_XinWei.Commons/obj/project.nuget.cache b/Server/YD_XinWei.Commons/obj/project.nuget.cache index df51837..b575d42 100644 --- a/Server/YD_XinWei.Commons/obj/project.nuget.cache +++ b/Server/YD_XinWei.Commons/obj/project.nuget.cache @@ -1,43 +1,32 @@ { "version": 2, - "dgSpecHash": "rwI+PjzMEYE=", + "dgSpecHash": "4vl29d1p6Sg=", "success": true, - "projectFilePath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", + "projectFilePath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", "expectedPackageFiles": [ - "C:\\Users\\TangLong\\.nuget\\packages\\aliyun.oss.sdk.netcore\\2.14.1\\aliyun.oss.sdk.netcore.2.14.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\6.0.0\\microsoft.aspnetcore.jsonpatch.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\6.0.0\\microsoft.aspnetcore.mvc.newtonsoftjson.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\8.0.0\\microsoft.bcl.asyncinterfaces.8.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.bcl.timeprovider\\8.0.1\\microsoft.bcl.timeprovider.8.0.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.primitives\\2.2.0\\microsoft.extensions.primitives.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.3.0\\microsoft.identitymodel.abstractions.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.3.0\\microsoft.identitymodel.jsonwebtokens.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.logging\\8.3.0\\microsoft.identitymodel.logging.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.3.0\\microsoft.identitymodel.tokens.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.3.0\\system.identitymodel.tokens.jwt.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.memory\\4.5.1\\system.memory.4.5.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.5.1\\system.runtime.compilerservices.unsafe.4.5.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512" + "C:\\Users\\Administrator\\.nuget\\packages\\aliyun.oss.sdk.netcore\\2.14.1\\aliyun.oss.sdk.netcore.2.14.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\6.0.0\\microsoft.aspnetcore.jsonpatch.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\6.0.0\\microsoft.aspnetcore.mvc.newtonsoftjson.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\8.0.0\\microsoft.bcl.asyncinterfaces.8.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.bcl.timeprovider\\8.0.1\\microsoft.bcl.timeprovider.8.0.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.primitives\\2.2.0\\microsoft.extensions.primitives.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.3.0\\microsoft.identitymodel.abstractions.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.3.0\\microsoft.identitymodel.jsonwebtokens.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.logging\\8.3.0\\microsoft.identitymodel.logging.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.3.0\\microsoft.identitymodel.tokens.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.3.0\\system.identitymodel.tokens.jwt.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.memory\\4.5.1\\system.memory.4.5.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.5.1\\system.runtime.compilerservices.unsafe.4.5.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512" ], - "logs": [ - { - "code": "NU1904", - "level": "Warning", - "warningLevel": 1, - "message": "�� \"System.Text.Encodings.Web\" 4.5.0 ������֪�� ���� ������©����https://github.com/advisories/GHSA-ghhp-997w-qr28", - "libraryId": "System.Text.Encodings.Web", - "targetGraphs": [ - "net6.0" - ] - } - ] + "logs": [] } \ No newline at end of file diff --git a/Server/YD_XinWei/AutoMappers/MappingProfile.cs b/Server/YD_XinWei/AutoMappers/MappingProfile.cs index fc67aee..3b04d4d 100644 --- a/Server/YD_XinWei/AutoMappers/MappingProfile.cs +++ b/Server/YD_XinWei/AutoMappers/MappingProfile.cs @@ -20,6 +20,8 @@ namespace YD_XinWei.Api.AutoMappers CreateMap(); CreateMap(); CreateMap(); + CreateMap(); + CreateMap(); } } } diff --git a/Server/YD_XinWei/Context/SmartSportsContext.cs b/Server/YD_XinWei/Context/SmartSportsContext.cs index cacf106..11771bc 100644 --- a/Server/YD_XinWei/Context/SmartSportsContext.cs +++ b/Server/YD_XinWei/Context/SmartSportsContext.cs @@ -26,5 +26,7 @@ namespace YD_XinWei.Api.Context public DbSet XW_TestingProject { get; set; } public DbSet XW_Device { get; set; } public DbSet XW_SportsTestData { get; set; } + public DbSet XW_TrainSetting { get; set; } + public DbSet XW_TrainViolationsBO { get; set; } } } diff --git a/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user b/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user index a10d36c..d3d579e 100644 --- a/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>C:\Users\Administrator\Desktop\web - True|2025-02-24T09:36:36.0385118Z||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||; + True|2025-02-25T07:05:56.3704383Z||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||; \ No newline at end of file diff --git a/Server/YD_XinWei/Services/Impl/XinWeiService.cs b/Server/YD_XinWei/Services/Impl/XinWeiService.cs index 8f27cdf..dd4b7f0 100644 --- a/Server/YD_XinWei/Services/Impl/XinWeiService.cs +++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs @@ -1,5 +1,6 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; +using Newtonsoft.Json; using System.Collections.Generic; using System.Security.Cryptography; using VOL.Entity.DomainModels.XinWei; @@ -219,129 +220,105 @@ namespace YD_XinWei.Api.Services.Impl /// public async Task> ScoreRules(int orgId) { - var scoreRules = await _sportsContext.HealthStandards.Where(x => x.CategoryEnum == "Pull_Up").ToArrayAsync(); - var groupedData = scoreRules.GroupBy(x => x.GradeId).ToList(); + var scoreRules = await _sportsContext.HealthStandards.ToListAsync(); + var projects = await _sportsContext.XW_TestingProject.ToListAsync(); + var projectModels = await _sportsContext.XW_ProjectMode.ToListAsync(); - var result = groupedData.Select(group => new ScoreRuleDto - { - GradeId = group.Key, - ProjectKind = 6, - ProjectName = "引体向上", - MarkType = 1, - ModelType = 13, - OrgId = orgId, - ProjectRuleId = 6, - RuleType = 1, - ProjectId = 6, - Items = group.Select(item => new ScoreRuleItemDto - { - Id = item.Id, - Sex = item.Sex, - Name = "1", - Score = item.Score, - Max = item.MaxValue, - Min = item.MinValue - }).ToList(), - Pluses = new List - { - new ScoreRulePlusDto() - { - Id = group.FirstOrDefault()?.Id ?? 0, - Sex = 1, - Max = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.MaxValue), - Min = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.MinValue), - MaxScore = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.Score), - Score = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.Score) - }, - new ScoreRulePlusDto() - { - Id = group.FirstOrDefault()?.Id ?? 0, - Sex = 2, - Max = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.MaxValue), - Min = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.MinValue), - MaxScore = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.Score), - Score = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.Score) - } - }, - ScoreScopes = new List - { - new ScoreScope() - { - Gender = 1, - MaxScore = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.Score), - MaxCount = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.MaxValue) - }, - new ScoreScope() - { - Gender = 2, - MaxScore = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.Score), - MaxCount = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x.MaxValue) - } - } - }).ToList(); + var scoreRuleItemsByType = scoreRules + .GroupBy(x => x.CategoryEnum) + .ToDictionary(g => g.Key, g => g.ToList()); - var scoreRules1 = await _sportsContext.HealthStandards.Where(x => x.CategoryEnum == "One_Minute_Sit_Up").ToArrayAsync(); - var groupedData1 = scoreRules1.GroupBy(x => x.GradeId).ToList(); - var result1 = groupedData1.Select(group => new ScoreRuleDto + List res = new List(); + + foreach (var projectModel in projectModels) { - GradeId = group.Key, - ProjectKind = 5, - ProjectName = "仰卧起坐", - MarkType = 1, - ModelType = 13, - OrgId = orgId, - ProjectRuleId = 5, - RuleType = 1, - ProjectId = 5, - Items = group.Select(item => new ScoreRuleItemDto + var project = projects.FirstOrDefault(x => x.ProjectId == projectModel.ProjectKind); + if (project == null) continue; // Skip if project doesn't exist + + var scoreRuleTypes = projectModel.CategoryEnum.Split(','); + var scoreRuleItems = scoreRuleTypes.SelectMany(type => scoreRuleItemsByType.GetValueOrDefault(type, new List())).ToList(); + + var groupedItemsData = scoreRuleItems.GroupBy(x => x.GradeId).ToList(); + + foreach (var grouped in groupedItemsData) { - Id = item.Id, - Sex = item.Sex, - Name = "1", - Score = item.Score, - Max = item.MaxValue, - Min = item.MinValue - }).ToList(), - Pluses = new List - { - new ScoreRulePlusDto() - { - Id = group.FirstOrDefault()?.Id ?? 0, - Sex = 1, - Max = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.MaxValue), - Min = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.MinValue), - MaxScore = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.Score), - Score = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.Score) - }, - new ScoreRulePlusDto() - { - Id = group.FirstOrDefault()?.Id ?? 0, - Sex = 2, - Max = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.MaxValue), - Min = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.MinValue), - MaxScore = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.Score), - Score = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.Score) - } - }, - ScoreScopes = new List - { - new ScoreScope() - { - Gender = 1, - MaxScore = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.Score), - MaxCount = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.MaxValue) - }, - new ScoreScope() - { - Gender = 2, - MaxScore = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.Score), - MaxCount = group.Where(x => x.Sex == 1).DefaultIfEmpty().Max(x => x?.MaxValue) - } - } - }).ToList(); - return result.Concat(result1).ToList(); + var maleItems = grouped.Where(x => x.Sex == 1).ToList(); + var femaleItems = grouped.Where(x => x.Sex == 2).ToList(); + + var maleMax = maleItems.DefaultIfEmpty().Max(x => x?.MaxValue ?? 0); + var maleMin = maleItems.DefaultIfEmpty().Max(x => x?.MinValue ?? 0); + var maleMaxScore = maleItems.DefaultIfEmpty().Max(x => x?.Score ?? 0); + + var femaleMax = femaleItems.DefaultIfEmpty().Max(x => x?.MaxValue ?? 0); + var femaleMin = femaleItems.DefaultIfEmpty().Max(x => x?.MinValue ?? 0); + var femaleMaxScore = femaleItems.DefaultIfEmpty().Max(x => x?.Score ?? 0); + + ScoreRuleDto scoreRuleDto = new ScoreRuleDto + { + GradeId = grouped.Key, + OrgId = orgId, + ProjectKind = project.ProjectId, + ProjectName = project.ProjectName, + ModelType = projectModel.Id, + RuleType = 1, + ProjectId = project.ProjectId, + Items = grouped.Select(item => new ScoreRuleItemDto + { + Id = item.Id, + Sex = item.Sex, + Name = "1", + Score = item.Score, + Max = item.MaxValue, + Min = item.MinValue + }).ToList() + }; + + scoreRuleDto.Pluses = new List + { + new ScoreRulePlusDto() + { + Id = grouped.FirstOrDefault()?.Id ?? 0, + Sex = 1, + Max = maleMax, + Min = maleMin, + MaxScore = maleMaxScore, + Score = maleMaxScore + }, + new ScoreRulePlusDto() + { + Id = grouped.FirstOrDefault()?.Id ?? 0, + Sex = 2, + Max = femaleMax, + Min = femaleMin, + MaxScore = femaleMaxScore, + Score = femaleMaxScore + } + }; + + scoreRuleDto.ScoreScopes = new List + { + new ScoreScope() + { + Gender = 1, + MaxScore = maleMaxScore, + MaxCount = maleMax + }, + new ScoreScope() + { + Gender = 2, + MaxScore = femaleMaxScore, + MaxCount = femaleMax + } + }; + + res.Add(scoreRuleDto); + } + } + + return res; } + /// /// 新增训练 /// @@ -351,10 +328,22 @@ namespace YD_XinWei.Api.Services.Impl { var entity = _mapper.Map(dto); + Console.WriteLine(JsonConvert.SerializeObject(entity)); + if (entity != null) { await _sportsContext.XW_SportsTestData.AddAsync(entity); - await _sportsContext.SaveChangesAsync(); + + try + { + await _sportsContext.SaveChangesAsync(); + } + catch (Exception e) + { + Console.WriteLine(e.Message + "/n" + e.InnerException); + } + + Console.WriteLine("新增成功"); } } } diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_ProjectMode.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_ProjectMode.cs index 1aa0c36..4b50ac8 100644 --- a/Server/YD_XinWei/SmartSportsEntitys/XW_ProjectMode.cs +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_ProjectMode.cs @@ -10,7 +10,7 @@ namespace YD_XinWei.Api.SmartSportsEntitys /// 芯未项目模式表 /// [Table("XW_ProjectMode")] - public class XW_ProjectMode : EntityBase + public class XW_ProjectMode { /// /// Id @@ -36,5 +36,13 @@ namespace YD_XinWei.Api.SmartSportsEntitys [Comment("名称")] [Column(TypeName = "nvarchar(100)")] public string Name { get; set; } + + /// + ///枚举 + /// + [Display(Name = "枚举")] + [Comment("枚举")] + [Column(TypeName = "nvarchar(100)")] + public string CategoryEnum { get; set; } } } diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs index 4c55620..f0e3728 100644 --- a/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs @@ -597,8 +597,8 @@ namespace VOL.Entity.DomainModels.XinWei /// /// 训练设置 /// - //[Display(Name = "TrainSetting")] - //[Comment("训练设置")] - //public XW_TrainSetting TrainSetting { get; set; } = new XW_TrainSetting(); + [Display(Name = "TrainSetting")] + [Comment("训练设置")] + public XW_TrainSetting TrainSetting { get; set; } } } diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TestingProject.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TestingProject.cs index e13ed19..f5fcfbb 100644 --- a/Server/YD_XinWei/SmartSportsEntitys/XW_TestingProject.cs +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TestingProject.cs @@ -45,6 +45,14 @@ namespace YD_XinWei.Api.SmartSportsEntitys [Column(TypeName = "nvarchar(100)")] public string ProjectName { get; set; } + /// + ///枚举 + /// + [Display(Name = "枚举")] + [Comment("枚举")] + [Column(TypeName = "nvarchar(100)")] + public string CategoryEnum { get; set; } + /// ///IsOpen /// diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainSetting.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainSetting.cs index 0bf97a9..92c65d4 100644 --- a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainSetting.cs +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainSetting.cs @@ -103,6 +103,6 @@ namespace VOL.Entity.DomainModels.XinWei public int XW_SportsTestDataId { get; set; } - //public XW_SportsTestData XW_SportsTestData { get; set; } + public XW_SportsTestData XW_SportsTestData { get; set; } } } diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs index efca2be..215a5ef 100644 --- a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs @@ -343,5 +343,7 @@ namespace VOL.Entity.DomainModels.XinWei public string UpdateBy { get; set; } public XW_SportsTestData XW_SportsTestData { get; set; } + + public List TrainViolationsBO { get; set; } = new List(); } } diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainViolationsBO.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainViolationsBO.cs new file mode 100644 index 0000000..d857939 --- /dev/null +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainViolationsBO.cs @@ -0,0 +1,53 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace VOL.Entity.DomainModels.XinWei +{ + [Table("XW_TrainViolationsBO")] + public class XW_TrainViolationsBO + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Display(Description = "主键Id")] + [Comment("Id")] + public int? Id { get; set; } + + /// + /// 违规动作编号 + /// + [Display(Name = "ViolationId")] + [Comment("违规动作编号")] + public int? ViolationId { get; set; } + + + /// + /// 违规动图地址 + /// + [Display(Name = "违规动图地址")] + [Comment("违规动图地址")] + public string PicUrl { get; set; } + + /// + /// 跳绳绊脚次数 + /// + [Display(Name = "SkipStumblingNumber")] + [Comment("跳绳绊脚次数")] + public int? SkipStumblingNumber { get; set; } + + /// + /// 违规动作训练时间 + /// + [Display(Name = "违规动作训练时间")] + [Comment("违规动作训练时间")] + public string TrainTime { get; set; } + + + public XW_TrainStudents XW_TrainStudents { get; set; } + } +} diff --git a/Server/YD_XinWei/Startup.cs b/Server/YD_XinWei/Startup.cs index 7579863..052e621 100644 --- a/Server/YD_XinWei/Startup.cs +++ b/Server/YD_XinWei/Startup.cs @@ -217,6 +217,8 @@ namespace YD_XinWei.Api services.AddAutoMapper(typeof(MappingProfile)); + services.AddLogging(); + //设置文件上传大小限制 //设置文件上传大小限制 services.Configure(x => diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll index 6a86733..e53df6f 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb index 5f96e85..750cc0e 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml index a33207c..a884901 100644 --- a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml @@ -776,6 +776,11 @@ 名称 + + + 枚举 + + 芯未体测项目表 @@ -801,6 +806,11 @@ 名称 + + + 枚举 + + IsOpen @@ -1548,6 +1558,11 @@ 学生列表 + + + 训练设置 + + 训练ID @@ -1843,5 +1858,25 @@ 修改人 + + + 违规动作编号 + + + + + 违规动图地址 + + + + + 跳绳绊脚次数 + + + + + 违规动作训练时间 + + diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll index 1e66eec..e509f74 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb index a4da9c0..445a54e 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll index e30b392..3c07295 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb index 3e2352c..f3abe7b 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.xml b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.xml index a33207c..a884901 100644 --- a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.xml @@ -776,6 +776,11 @@ 名称 + + + 枚举 + + 芯未体测项目表 @@ -801,6 +806,11 @@ 名称 + + + 枚举 + + IsOpen @@ -1548,6 +1558,11 @@ 学生列表 + + + 训练设置 + + 训练ID @@ -1843,5 +1858,25 @@ 修改人 + + + 违规动作编号 + + + + + 违规动图地址 + + + + + 跳绳绊脚次数 + + + + + 违规动作训练时间 + + diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll index 1e66eec..e509f74 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb index a4da9c0..445a54e 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json b/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json index 5fb7b3b..7966570 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json @@ -845,6 +845,9 @@ "$ref": "#/components/schemas/TrainStudentsDto" }, "nullable": true + }, + "trainSetting": { + "$ref": "#/components/schemas/TrainSettingDto" } }, "additionalProperties": false @@ -1495,6 +1498,74 @@ }, "additionalProperties": false }, + "TrainSettingDto": { + "type": "object", + "properties": { + "trainId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "circleCount": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "circleInterval": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "firstCircleWhole": { + "type": "number", + "format": "double", + "nullable": true + }, + "firstCircleInterval": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "decimalPlace": { + "type": "number", + "format": "double", + "nullable": true + }, + "circleCountGirl": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "circleIntervalGirl": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "firstCircleWholeGirl": { + "type": "number", + "format": "double", + "nullable": true + }, + "firstCircleIntervalGirl": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "createTime": { + "type": "string", + "nullable": true + }, + "createBy": { + "type": "string", + "nullable": true + }, + "xW_SportsTestDataId": { + "type": "integer", + "format": "int32" + } + }, + "additionalProperties": false + }, "TrainStudentsDto": { "type": "object", "properties": { @@ -1714,6 +1785,37 @@ "updateBy": { "type": "string", "nullable": true + }, + "trainViolationsBO": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TrainViolationsBODto" + }, + "nullable": true + } + }, + "additionalProperties": false + }, + "TrainViolationsBODto": { + "type": "object", + "properties": { + "violationId": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "picUrl": { + "type": "string", + "nullable": true + }, + "skipStumblingNumber": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "trainTime": { + "type": "string", + "nullable": true } }, "additionalProperties": false diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs index 2029ffc..bb1b3e6 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6571b2e7cb0908cb0cc621cb9de0a2d1fe97ac48")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d2efe67ac4d1f90ab5cf9ec9cadeb1822dce525d")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache index ee25868..6369026 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -347cb3ee9929d4a6b0dd3a3f8bb2dd006ef929d398367b0c0365084d8fe25cf6 +086c2885779780b4a2feeb0a94cce26a9341f6bd7f4063b5c4c5b0f38da83175 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.GeneratedMSBuildEditorConfig.editorconfig b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.GeneratedMSBuildEditorConfig.editorconfig index df90066..2646221 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,13 +9,13 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = YD_XinWei.Api build_property.RootNamespace = YD_XinWei.Api -build_property.ProjectDir = C:\Users\TangLong\Desktop\YD_XinWei\YD_XinWei\Server\YD_XinWei\ +build_property.ProjectDir = C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = C:\Users\TangLong\Desktop\YD_XinWei\YD_XinWei\Server\YD_XinWei +build_property.MSBuildProjectDirectory = C:\Users\Administrator\Desktop\xwcode\Server\YD_XinWei build_property._RazorSourceGeneratorDebug = build_property.EffectiveAnalysisLevelStyle = 6.0 build_property.EnableCodeStyleSeverity = diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache index f64e78a..215b817 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache index a1e8cd2..74d43a2 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2e3758047a4422b91e5d2be2ae1a84619661c199bd75be6eb0608ced2c1c4929 +404d3526d46d33ab4d8152eefcc18df2441bbd0cd5b18416bda00ef3b10af635 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll index 6a86733..e53df6f 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb index 5f96e85..750cc0e 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml index a33207c..a884901 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml @@ -776,6 +776,11 @@ 名称 + + + 枚举 + + 芯未体测项目表 @@ -801,6 +806,11 @@ 名称 + + + 枚举 + + IsOpen @@ -1548,6 +1558,11 @@ 学生列表 + + + 训练设置 + + 训练ID @@ -1843,5 +1858,25 @@ 修改人 + + + 违规动作编号 + + + + + 违规动图地址 + + + + + 跳绳绊脚次数 + + + + + 违规动作训练时间 + + diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll index e30b392..3c07295 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb index 3e2352c..f3abe7b 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.xml b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.xml index a33207c..a884901 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.xml @@ -776,6 +776,11 @@ 名称 + + + 枚举 + + 芯未体测项目表 @@ -801,6 +806,11 @@ 名称 + + + 枚举 + + IsOpen @@ -1548,6 +1558,11 @@ 学生列表 + + + 训练设置 + + 训练ID @@ -1843,5 +1858,25 @@ 修改人 + + + 违规动作编号 + + + + + 违规动图地址 + + + + + 跳绳绊脚次数 + + + + + 违规动作训练时间 + + diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll index 1e66eec..e509f74 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb index a4da9c0..445a54e 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache index bc8b4ad..8ebcc76 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.CoreCompileInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.CoreCompileInputs.cache index e4a627a..6ffd881 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.CoreCompileInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e1df809897ae0416839ed76d2251f13c68c482b4ed85b084f5b34be7b95efe03 +2521d21294e73da2d65500283cf4c2d6e2c7caf5d2e84903580f2e54401a9ff5 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll index e30b392..3c07295 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb index 3e2352c..f3abe7b 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll index 0dfb2bb..798fe02 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll index 0dfb2bb..798fe02 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll index 90d3404..0a8722a 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll index 90d3404..0a8722a 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json b/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json index 795c975..352c948 100644 --- a/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json +++ b/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json @@ -1,24 +1,23 @@ { "format": 1, "restore": { - "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj": {} + "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\YD_XinWei.Api.csproj": {} }, "projects": { - "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": { + "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", + "projectUniqueName": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", "projectName": "YD_XinWei.Commons", - "projectPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", - "packagesPath": "C:\\Users\\TangLong\\.nuget\\packages\\", - "outputPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\obj\\", + "projectPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\TangLong\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -44,7 +43,7 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "all" + "auditMode": "direct" }, "SdkAnalysisLevel": "9.0.100" }, @@ -89,25 +88,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json" } } }, - "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj": { + "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\YD_XinWei.Api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", + "projectUniqueName": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", "projectName": "YD_XinWei.Api", - "projectPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", - "packagesPath": "C:\\Users\\TangLong\\.nuget\\packages\\", - "outputPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\obj\\", + "projectPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\TangLong\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -123,8 +121,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": { - "projectPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj" + "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": { + "projectPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj" } } } @@ -137,7 +135,7 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "all" + "auditMode": "direct" }, "SdkAnalysisLevel": "9.0.100" }, @@ -213,7 +211,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json" } } } diff --git a/Server/YD_XinWei/obj/project.assets.json b/Server/YD_XinWei/obj/project.assets.json index 2f767da..b65e7e0 100644 --- a/Server/YD_XinWei/obj/project.assets.json +++ b/Server/YD_XinWei/obj/project.assets.json @@ -3156,25 +3156,23 @@ ] }, "packageFolders": { - "C:\\Users\\TangLong\\.nuget\\packages\\": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Users\\Administrator\\.nuget\\packages\\": {}, + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", + "projectUniqueName": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", "projectName": "YD_XinWei.Api", - "projectPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", - "packagesPath": "C:\\Users\\TangLong\\.nuget\\packages\\", - "outputPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\obj\\", + "projectPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\TangLong\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -3190,8 +3188,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": { - "projectPath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj" + "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj": { + "projectPath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj" } } } @@ -3204,7 +3202,7 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "all" + "auditMode": "direct" }, "SdkAnalysisLevel": "9.0.100" }, @@ -3280,50 +3278,8 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json" } } - }, - "logs": [ - { - "code": "NU1903", - "level": "Warning", - "warningLevel": 1, - "message": "包 \"Microsoft.Data.SqlClient\" 2.1.4 具有已知的 高 严重性漏洞，https://github.com/advisories/GHSA-98g6-xh36-x2p7", - "libraryId": "Microsoft.Data.SqlClient", - "targetGraphs": [ - "net6.0" - ] - }, - { - "code": "NU1903", - "level": "Warning", - "warningLevel": 1, - "message": "包 \"Microsoft.Extensions.Caching.Memory\" 6.0.0 具有已知的 高 严重性漏洞，https://github.com/advisories/GHSA-qj66-m88j-hmgj", - "libraryId": "Microsoft.Extensions.Caching.Memory", - "targetGraphs": [ - "net6.0" - ] - }, - { - "code": "NU1904", - "level": "Warning", - "warningLevel": 1, - "message": "包 \"System.Drawing.Common\" 4.7.0 具有已知的 严重 严重性漏洞，https://github.com/advisories/GHSA-rxg9-xrhp-64gj", - "libraryId": "System.Drawing.Common", - "targetGraphs": [ - "net6.0" - ] - }, - { - "code": "NU1904", - "level": "Warning", - "warningLevel": 1, - "message": "包 \"System.Text.Encodings.Web\" 4.5.0 具有已知的 严重 严重性漏洞，https://github.com/advisories/GHSA-ghhp-997w-qr28", - "libraryId": "System.Text.Encodings.Web", - "targetGraphs": [ - "net6.0" - ] - } - ] + } } \ No newline at end of file diff --git a/Server/YD_XinWei/obj/project.nuget.cache b/Server/YD_XinWei/obj/project.nuget.cache index bc842e3..421b7a6 100644 --- a/Server/YD_XinWei/obj/project.nuget.cache +++ b/Server/YD_XinWei/obj/project.nuget.cache @@ -1,119 +1,78 @@ { "version": 2, - "dgSpecHash": "svEHF0kinhI=", + "dgSpecHash": "h5GeVzhogng=", "success": true, - "projectFilePath": "C:\\Users\\TangLong\\Desktop\\YD_XinWei\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", + "projectFilePath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", "expectedPackageFiles": [ - "C:\\Users\\TangLong\\.nuget\\packages\\aliyun.oss.sdk.netcore\\2.14.1\\aliyun.oss.sdk.netcore.2.14.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\autofac\\8.1.0\\autofac.8.1.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\autofac.extensions.dependencyinjection\\10.0.0\\autofac.extensions.dependencyinjection.10.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\automapper\\13.0.0\\automapper.13.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\automapper.collection\\10.0.0\\automapper.collection.10.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\humanizer.core\\2.8.26\\humanizer.core.2.8.26.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\6.0.0\\microsoft.aspnetcore.authentication.jwtbearer.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\6.0.0\\microsoft.aspnetcore.jsonpatch.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\6.0.0\\microsoft.aspnetcore.mvc.newtonsoftjson.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.mvc.versioning\\5.1.0\\microsoft.aspnetcore.mvc.versioning.5.1.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\8.0.0\\microsoft.bcl.asyncinterfaces.8.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.bcl.timeprovider\\8.0.1\\microsoft.bcl.timeprovider.8.0.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.entityframeworkcore\\6.0.0\\microsoft.entityframeworkcore.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\6.0.0\\microsoft.entityframeworkcore.abstractions.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\6.0.0\\microsoft.entityframeworkcore.analyzers.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.entityframeworkcore.design\\6.0.0\\microsoft.entityframeworkcore.design.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\6.0.0\\microsoft.entityframeworkcore.relational.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.entityframeworkcore.sqlserver\\6.0.0\\microsoft.entityframeworkcore.sqlserver.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.entityframeworkcore.tools\\6.0.0\\microsoft.entityframeworkcore.tools.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\6.0.0\\microsoft.extensions.caching.abstractions.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.caching.memory\\6.0.0\\microsoft.extensions.caching.memory.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\6.0.0\\microsoft.extensions.configuration.abstractions.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\6.0.0\\microsoft.extensions.dependencyinjection.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.1\\microsoft.extensions.dependencyinjection.abstractions.8.0.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.logging\\6.0.0\\microsoft.extensions.logging.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\6.0.0\\microsoft.extensions.logging.abstractions.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.options\\6.0.0\\microsoft.extensions.options.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.extensions.primitives\\6.0.0\\microsoft.extensions.primitives.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.3.0\\microsoft.identitymodel.abstractions.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.3.0\\microsoft.identitymodel.jsonwebtokens.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.logging\\8.3.0\\microsoft.identitymodel.logging.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.10.0\\microsoft.identitymodel.protocols.6.10.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.10.0\\microsoft.identitymodel.protocols.openidconnect.6.10.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.3.0\\microsoft.identitymodel.tokens.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.0\\microsoft.netcore.platforms.3.1.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\microsoft.win32.systemevents\\4.7.0\\microsoft.win32.systemevents.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\swashbuckle.aspnetcore\\6.5.0\\swashbuckle.aspnetcore.6.5.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.collections.immutable\\6.0.0\\system.collections.immutable.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.configuration.configurationmanager\\4.7.0\\system.configuration.configurationmanager.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.diagnostics.diagnosticsource\\8.0.1\\system.diagnostics.diagnosticsource.8.0.1.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.drawing.common\\4.7.0\\system.drawing.common.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.3.0\\system.identitymodel.tokens.jwt.8.3.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.security.accesscontrol\\4.7.0\\system.security.accesscontrol.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.7.0\\system.security.cryptography.protecteddata.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.security.permissions\\4.7.0\\system.security.permissions.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.text.encoding.codepages\\4.7.0\\system.text.encoding.codepages.4.7.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", - "C:\\Users\\TangLong\\.nuget\\packages\\system.windows.extensions\\4.7.0\\system.windows.extensions.4.7.0.nupkg.sha512" + "C:\\Users\\Administrator\\.nuget\\packages\\aliyun.oss.sdk.netcore\\2.14.1\\aliyun.oss.sdk.netcore.2.14.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\autofac\\8.1.0\\autofac.8.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\autofac.extensions.dependencyinjection\\10.0.0\\autofac.extensions.dependencyinjection.10.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\automapper\\13.0.0\\automapper.13.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\automapper.collection\\10.0.0\\automapper.collection.10.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\humanizer.core\\2.8.26\\humanizer.core.2.8.26.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\6.0.0\\microsoft.aspnetcore.authentication.jwtbearer.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\6.0.0\\microsoft.aspnetcore.jsonpatch.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\6.0.0\\microsoft.aspnetcore.mvc.newtonsoftjson.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.mvc.versioning\\5.1.0\\microsoft.aspnetcore.mvc.versioning.5.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\8.0.0\\microsoft.bcl.asyncinterfaces.8.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.bcl.timeprovider\\8.0.1\\microsoft.bcl.timeprovider.8.0.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.entityframeworkcore\\6.0.0\\microsoft.entityframeworkcore.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\6.0.0\\microsoft.entityframeworkcore.abstractions.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\6.0.0\\microsoft.entityframeworkcore.analyzers.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.entityframeworkcore.design\\6.0.0\\microsoft.entityframeworkcore.design.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\6.0.0\\microsoft.entityframeworkcore.relational.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.entityframeworkcore.sqlserver\\6.0.0\\microsoft.entityframeworkcore.sqlserver.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.entityframeworkcore.tools\\6.0.0\\microsoft.entityframeworkcore.tools.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\6.0.0\\microsoft.extensions.caching.abstractions.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.caching.memory\\6.0.0\\microsoft.extensions.caching.memory.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\6.0.0\\microsoft.extensions.configuration.abstractions.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\6.0.0\\microsoft.extensions.dependencyinjection.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.1\\microsoft.extensions.dependencyinjection.abstractions.8.0.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.logging\\6.0.0\\microsoft.extensions.logging.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\6.0.0\\microsoft.extensions.logging.abstractions.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.options\\6.0.0\\microsoft.extensions.options.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.primitives\\6.0.0\\microsoft.extensions.primitives.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.abstractions\\8.3.0\\microsoft.identitymodel.abstractions.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\8.3.0\\microsoft.identitymodel.jsonwebtokens.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.logging\\8.3.0\\microsoft.identitymodel.logging.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.10.0\\microsoft.identitymodel.protocols.6.10.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.10.0\\microsoft.identitymodel.protocols.openidconnect.6.10.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.tokens\\8.3.0\\microsoft.identitymodel.tokens.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.0\\microsoft.netcore.platforms.3.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.win32.systemevents\\4.7.0\\microsoft.win32.systemevents.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\swashbuckle.aspnetcore\\6.5.0\\swashbuckle.aspnetcore.6.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.collections.immutable\\6.0.0\\system.collections.immutable.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.configuration.configurationmanager\\4.7.0\\system.configuration.configurationmanager.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.diagnostics.diagnosticsource\\8.0.1\\system.diagnostics.diagnosticsource.8.0.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.drawing.common\\4.7.0\\system.drawing.common.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.identitymodel.tokens.jwt\\8.3.0\\system.identitymodel.tokens.jwt.8.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.accesscontrol\\4.7.0\\system.security.accesscontrol.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.7.0\\system.security.cryptography.protecteddata.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.permissions\\4.7.0\\system.security.permissions.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.text.encoding.codepages\\4.7.0\\system.text.encoding.codepages.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.windows.extensions\\4.7.0\\system.windows.extensions.4.7.0.nupkg.sha512" ], - "logs": [ - { - "code": "NU1903", - "level": "Warning", - "warningLevel": 1, - "message": "�� \"Microsoft.Data.SqlClient\" 2.1.4 ������֪�� �� ������©����https://github.com/advisories/GHSA-98g6-xh36-x2p7", - "libraryId": "Microsoft.Data.SqlClient", - "targetGraphs": [ - "net6.0" - ] - }, - { - "code": "NU1903", - "level": "Warning", - "warningLevel": 1, - "message": "�� \"Microsoft.Extensions.Caching.Memory\" 6.0.0 ������֪�� �� ������©����https://github.com/advisories/GHSA-qj66-m88j-hmgj", - "libraryId": "Microsoft.Extensions.Caching.Memory", - "targetGraphs": [ - "net6.0" - ] - }, - { - "code": "NU1904", - "level": "Warning", - "warningLevel": 1, - "message": "�� \"System.Drawing.Common\" 4.7.0 ������֪�� ���� ������©����https://github.com/advisories/GHSA-rxg9-xrhp-64gj", - "libraryId": "System.Drawing.Common", - "targetGraphs": [ - "net6.0" - ] - }, - { - "code": "NU1904", - "level": "Warning", - "warningLevel": 1, - "message": "�� \"System.Text.Encodings.Web\" 4.5.0 ������֪�� ���� ������©����https://github.com/advisories/GHSA-ghhp-997w-qr28", - "libraryId": "System.Text.Encodings.Web", - "targetGraphs": [ - "net6.0" - ] - } - ] + "logs": [] } \ No newline at end of file