diff --git a/YD_AllHeartRates.Api/Controllers/DeviceController.cs b/YD_AllHeartRates.Api/Controllers/DeviceController.cs index 9b03094..70af2cb 100644 --- a/YD_AllHeartRates.Api/Controllers/DeviceController.cs +++ b/YD_AllHeartRates.Api/Controllers/DeviceController.cs @@ -15,7 +15,7 @@ namespace YD_AllHeartRates.Api.Controllers /// [ApiVersion("1.0")] [AllowAnonymous] - [Route("[controller]")] + [Route("api/[controller]")] public class DeviceController : ControllerBase { private readonly IDeviceService _deviceService; diff --git a/YD_AllHeartRates.Api/Controllers/HeartRateReportController.cs b/YD_AllHeartRates.Api/Controllers/HeartRateReportController.cs index b05ee36..1071dc7 100644 --- a/YD_AllHeartRates.Api/Controllers/HeartRateReportController.cs +++ b/YD_AllHeartRates.Api/Controllers/HeartRateReportController.cs @@ -13,7 +13,7 @@ namespace YD_AllHeartRates.Api.Controllers /// [ApiVersion("1.0")] [AllowAnonymous] - [Route("[controller]")] + [Route("api/[controller]")] public class HeartRateReportController : ControllerBase { private readonly IHeartRateReportService _rateReportService; diff --git a/YD_AllHeartRates.Api/Controllers/LargeScreenController.cs b/YD_AllHeartRates.Api/Controllers/LargeScreenController.cs index cf20ea4..9c5917c 100644 --- a/YD_AllHeartRates.Api/Controllers/LargeScreenController.cs +++ b/YD_AllHeartRates.Api/Controllers/LargeScreenController.cs @@ -13,7 +13,7 @@ namespace YD_AllHeartRates.Api.Controllers /// [ApiVersion("1.0")] [AllowAnonymous] - [Route("[controller]")] + [Route("api/[controller]")] public class LargeScreenController : ControllerBase { private readonly ILargeScreenService _largeScreenService; diff --git a/YD_AllHeartRates.Api/Controllers/UserController.cs b/YD_AllHeartRates.Api/Controllers/UserController.cs index 4ee9764..2212aa9 100644 --- a/YD_AllHeartRates.Api/Controllers/UserController.cs +++ b/YD_AllHeartRates.Api/Controllers/UserController.cs @@ -13,7 +13,7 @@ namespace YD_AllHeartRates.Api.Controllers /// 用户 /// [ApiVersion("1.0")] - [Route("[controller]")] + [Route("api/[controller]")] [AllowAnonymous] public class UserController : ControllerBase { diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json b/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json index 1a6dd6d..1fdacbf 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json @@ -2,7 +2,7 @@ { "ContainingType": "YD_AllHeartRates.Api.Controllers.DeviceController", "Method": "AddDevice", - "RelativePath": "AddDevice", + "RelativePath": "Device/AddDevice", "HttpMethod": "POST", "IsController": true, "Order": 0, @@ -25,41 +25,10 @@ } ] }, - { - "ContainingType": "YD_AllHeartRates.Api.Controllers.HeartRateReportController", - "Method": "ClassHeartRateReport", - "RelativePath": "ClassHeartRateReport", - "HttpMethod": "GET", - "IsController": true, - "Order": 0, - "Parameters": [ - { - "Name": "classId", - "Type": "System.Int32", - "IsRequired": false - }, - { - "Name": "scoreTime", - "Type": "System.Nullable\u00601[[System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", - "IsRequired": false - } - ], - "ReturnTypes": [ - { - "Type": "YD_AllHeartRates.Commons.Dto.HeartRateRepor.ClassHeartRateReportDataDto", - "MediaTypes": [ - "text/plain", - "application/json", - "text/json" - ], - "StatusCode": 200 - } - ] - }, { "ContainingType": "YD_AllHeartRates.Api.Controllers.DeviceController", "Method": "DeleteDevice", - "RelativePath": "DeleteDevice", + "RelativePath": "Device/DeleteDevice", "HttpMethod": "POST", "IsController": true, "Order": 0, @@ -85,7 +54,7 @@ { "ContainingType": "YD_AllHeartRates.Api.Controllers.DeviceController", "Method": "DeviceNumber", - "RelativePath": "DeviceNumber", + "RelativePath": "Device/DeviceNumber", "HttpMethod": "GET", "IsController": true, "Order": 0, @@ -105,7 +74,7 @@ { "ContainingType": "YD_AllHeartRates.Api.Controllers.DeviceController", "Method": "DevicePageList", - "RelativePath": "DevicePageList", + "RelativePath": "Device/DevicePageList", "HttpMethod": "GET", "IsController": true, "Order": 0, @@ -158,10 +127,93 @@ } ] }, + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.DeviceController", + "Method": "ImportDevice", + "RelativePath": "Device/ImportDevice", + "HttpMethod": "POST", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "file", + "Type": "Microsoft.AspNetCore.Http.IFormFile", + "IsRequired": false + } + ], + "ReturnTypes": [ + { + "Type": "System.Boolean", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.DeviceController", + "Method": "UpdateDevice", + "RelativePath": "Device/UpdateDevice", + "HttpMethod": "POST", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "dto", + "Type": "YD_AllHeartRates.Commons.Dto.Device.AddDeviceDto", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "System.Boolean", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.HeartRateReportController", + "Method": "ClassHeartRateReport", + "RelativePath": "HeartRateReport/ClassHeartRateReport", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "classId", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "scoreTime", + "Type": "System.Nullable\u00601[[System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", + "IsRequired": false + } + ], + "ReturnTypes": [ + { + "Type": "YD_AllHeartRates.Commons.Dto.HeartRateRepor.ClassHeartRateReportDataDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, { "ContainingType": "YD_AllHeartRates.Api.Controllers.HeartRateReportController", "Method": "GradeHeartRateReport", - "RelativePath": "GradeHeartRateReport", + "RelativePath": "HeartRateReport/GradeHeartRateReport", "HttpMethod": "GET", "IsController": true, "Order": 0, @@ -189,93 +241,10 @@ } ] }, - { - "ContainingType": "YD_AllHeartRates.Api.Controllers.LargeScreenController", - "Method": "HeartRateData", - "RelativePath": "HeartRateData", - "HttpMethod": "GET", - "IsController": true, - "Order": 0, - "Parameters": [ - { - "Name": "classId", - "Type": "System.Int32", - "IsRequired": false - } - ], - "ReturnTypes": [ - { - "Type": "YD_AllHeartRates.Commons.Dto.LargeScreen.HeartRateDataDto", - "MediaTypes": [ - "text/plain", - "application/json", - "text/json" - ], - "StatusCode": 200 - } - ] - }, - { - "ContainingType": "YD_AllHeartRates.Api.Controllers.DeviceController", - "Method": "ImportDevice", - "RelativePath": "ImportDevice", - "HttpMethod": "POST", - "IsController": true, - "Order": 0, - "Parameters": [ - { - "Name": "file", - "Type": "Microsoft.AspNetCore.Http.IFormFile", - "IsRequired": false - } - ], - "ReturnTypes": [ - { - "Type": "System.Boolean", - "MediaTypes": [ - "text/plain", - "application/json", - "text/json" - ], - "StatusCode": 200 - } - ] - }, - { - "ContainingType": "YD_AllHeartRates.Api.Controllers.UserController", - "Method": "Login", - "RelativePath": "Login", - "HttpMethod": "POST", - "IsController": true, - "Order": 0, - "Parameters": [ - { - "Name": "UserName", - "Type": "System.String", - "IsRequired": false - }, - { - "Name": "Password", - "Type": "System.String", - "IsRequired": false - } - ], - "ReturnTypes": [ - { - "Type": "YD_AllHeartRates.Commons.UserInfoDto", - "MediaTypes": [ - "text/plain", - "application/json", - "text/json" - ], - "StatusCode": 200 - } - ] - }, { "ContainingType": "YD_AllHeartRates.Api.Controllers.HeartRateReportController", "Method": "SchoolHeartRateReport", - "RelativePath": "SchoolHeartRateReport", + "RelativePath": "HeartRateReport/SchoolHeartRateReport", "HttpMethod": "GET", "IsController": true, "Order": 0, @@ -298,30 +267,10 @@ } ] }, - { - "ContainingType": "YD_AllHeartRates.Api.Controllers.LargeScreenController", - "Method": "SchoolInfo", - "RelativePath": "SchoolInfo", - "HttpMethod": "GET", - "IsController": true, - "Order": 0, - "Parameters": [], - "ReturnTypes": [ - { - "Type": "YD_AllHeartRates.Commons.Dto.LargeScreen.SchoolDto", - "MediaTypes": [ - "text/plain", - "application/json", - "text/json" - ], - "StatusCode": 200 - } - ] - }, { "ContainingType": "YD_AllHeartRates.Api.Controllers.HeartRateReportController", "Method": "StudentHeartRateReport", - "RelativePath": "StudentHeartRateReport", + "RelativePath": "HeartRateReport/StudentHeartRateReport", "HttpMethod": "GET", "IsController": true, "Order": 0, @@ -350,22 +299,68 @@ ] }, { - "ContainingType": "YD_AllHeartRates.Api.Controllers.DeviceController", - "Method": "UpdateDevice", - "RelativePath": "UpdateDevice", + "ContainingType": "YD_AllHeartRates.Api.Controllers.LargeScreenController", + "Method": "HeartRateData", + "RelativePath": "LargeScreen/HeartRateData", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "classId", + "Type": "System.Int32", + "IsRequired": false + } + ], + "ReturnTypes": [ + { + "Type": "YD_AllHeartRates.Commons.Dto.LargeScreen.HeartRateDataDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.LargeScreenController", + "Method": "SchoolInfo", + "RelativePath": "LargeScreen/SchoolInfo", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [], + "ReturnTypes": [ + { + "Type": "YD_AllHeartRates.Commons.Dto.LargeScreen.SchoolDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.UserController", + "Method": "Login", + "RelativePath": "User/Login", "HttpMethod": "POST", "IsController": true, "Order": 0, "Parameters": [ { - "Name": "dto", - "Type": "YD_AllHeartRates.Commons.Dto.Device.AddDeviceDto", + "Name": "loginInfo", + "Type": "YD_AllHeartRates.Commons.LoginInfo", "IsRequired": true } ], "ReturnTypes": [ { - "Type": "System.Boolean", + "Type": "YD_AllHeartRates.Commons.UserInfoDto", "MediaTypes": [ "text/plain", "application/json", @@ -378,7 +373,7 @@ { "ContainingType": "YD_AllHeartRates.Api.Controllers.UserController", "Method": "UserInfo", - "RelativePath": "UserInfo", + "RelativePath": "User/UserInfo", "HttpMethod": "GET", "IsController": true, "Order": 0, diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json b/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json index 97d85e5..c13a1ea 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json @@ -6,7 +6,7 @@ "version": "v1" }, "paths": { - "/DevicePageList": { + "/Device/DevicePageList": { "get": { "tags": [ "Device" @@ -91,7 +91,7 @@ } } }, - "/DeviceNumber": { + "/Device/DeviceNumber": { "get": { "tags": [ "Device" @@ -130,7 +130,7 @@ } } }, - "/AddDevice": { + "/Device/AddDevice": { "post": { "tags": [ "Device" @@ -184,7 +184,7 @@ } } }, - "/UpdateDevice": { + "/Device/UpdateDevice": { "post": { "tags": [ "Device" @@ -238,7 +238,7 @@ } } }, - "/DeleteDevice": { + "/Device/DeleteDevice": { "post": { "tags": [ "Device" @@ -277,7 +277,7 @@ } } }, - "/ImportDevice": { + "/Device/ImportDevice": { "post": { "tags": [ "Device" @@ -327,7 +327,7 @@ } } }, - "/SchoolHeartRateReport": { + "/HeartRateReport/SchoolHeartRateReport": { "get": { "tags": [ "HeartRateReport" @@ -367,7 +367,7 @@ } } }, - "/GradeHeartRateReport": { + "/HeartRateReport/GradeHeartRateReport": { "get": { "tags": [ "HeartRateReport" @@ -415,7 +415,7 @@ } } }, - "/ClassHeartRateReport": { + "/HeartRateReport/ClassHeartRateReport": { "get": { "tags": [ "HeartRateReport" @@ -463,7 +463,7 @@ } } }, - "/StudentHeartRateReport": { + "/HeartRateReport/StudentHeartRateReport": { "get": { "tags": [ "HeartRateReport" @@ -510,7 +510,7 @@ } } }, - "/SchoolInfo": { + "/LargeScreen/SchoolInfo": { "get": { "tags": [ "LargeScreen" @@ -540,7 +540,7 @@ } } }, - "/HeartRateData": { + "/LargeScreen/HeartRateData": { "get": { "tags": [ "LargeScreen" @@ -580,32 +580,36 @@ } } }, - "/Login": { + "/User/Login": { "post": { "tags": [ "User" ], "summary": "登录", - "parameters": [ - { - "name": "UserName", - "in": "query", - "required": true, - "schema": { - "maxLength": 50, - "type": "string" - } - }, - { - "name": "Password", - "in": "query", - "required": true, - "schema": { - "maxLength": 50, - "type": "string" + "requestBody": { + "content": { + "application/json-patch+json": { + "schema": { + "$ref": "#/components/schemas/LoginInfo" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/LoginInfo" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/LoginInfo" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/LoginInfo" + } } } - ], + }, "responses": { "200": { "description": "Success", @@ -630,7 +634,7 @@ } } }, - "/UserInfo": { + "/User/UserInfo": { "get": { "tags": [ "User" @@ -990,6 +994,26 @@ }, "additionalProperties": false }, + "LoginInfo": { + "required": [ + "password", + "userName" + ], + "type": "object", + "properties": { + "userName": { + "maxLength": 50, + "minLength": 1, + "type": "string" + }, + "password": { + "maxLength": 50, + "minLength": 1, + "type": "string" + } + }, + "additionalProperties": false + }, "SchoolDto": { "type": "object", "properties": { diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs index fedc0dd..80837bb 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d6d2020f505a0bb193e3e5458b5eea828a0319bf")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0960259b37650f9dbe52220a21be3ee2d50876e5")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache index 85b0287..22feaa7 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -a530ed2a87c580cfd903afba773c538f851e82dd409265bf8c14464bcc334d6f +6eaa8fd9ba65abf57195f6047cc7ed84d564bea46a6615d74dac543edad782c7 diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll index d055198..7b6ed06 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb index e06819f..5507935 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe b/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe index fe33671..f5e9bb1 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe and b/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll index 7a4c9f3..21fee39 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll index 7a4c9f3..21fee39 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll differ