diff --git a/YD_AllHeartRates.Api/Controllers/UserController.cs b/YD_AllHeartRates.Api/Controllers/UserController.cs index f55a508..5420255 100644 --- a/YD_AllHeartRates.Api/Controllers/UserController.cs +++ b/YD_AllHeartRates.Api/Controllers/UserController.cs @@ -32,5 +32,16 @@ namespace YD_AllHeartRates.Api.Controllers var res = await _userService.Login(loginInfo); return res; } + + /// + /// 获取个人信息 + /// + /// + [HttpGet(nameof(UserInfo))] + public async Task UserInfo() + { + var res = await _userService.UserInfo(); + return res; + } } } diff --git a/YD_AllHeartRates.Api/Services/Impl/UserService.cs b/YD_AllHeartRates.Api/Services/Impl/UserService.cs index 893b72c..343fbab 100644 --- a/YD_AllHeartRates.Api/Services/Impl/UserService.cs +++ b/YD_AllHeartRates.Api/Services/Impl/UserService.cs @@ -15,13 +15,18 @@ namespace YD_AllHeartRates.Api.Services.Impl public class UserService : IUserService { public SmartSportsContext _sportsContext; + private readonly LoginContext _loginContext; + private string schoolCode; /// /// 构造 /// - public UserService(SmartSportsContext sportsContext) + public UserService(SmartSportsContext sportsContext, LoginContext loginContext) { _sportsContext = sportsContext; + _loginContext = loginContext; + + schoolCode = _loginContext.SchoolCode; } /// @@ -61,6 +66,43 @@ namespace YD_AllHeartRates.Api.Services.Impl }; } + + /// + /// 获取个人信息 + /// + /// + public async Task UserInfo() + { + var user = await _sportsContext.Sys_Users.Where(x => x.SchoolCode==schoolCode).FirstOrDefaultAsync(); + + if (user == null) + throw new Exception("无效 Token"); + + string token = JwtHelper.IssueJwt(new UserInfoDto() + { + User_Id = user.User_Id, + UserName = user.UserName, + Role_Id = user.Role_Id, + PhoneNo = user.PhoneNo ?? "", + UserTrueName = user.UserTrueName ?? "", + RoleName = user.RoleName ?? "", + SchoolCode = user.SchoolCode, + }); + + return new UserInfoDto() + { + User_Id = user.User_Id, + UserName = user.UserName, + PhoneNo = user.PhoneNo, + SchoolCode = user.SchoolCode, + Enable = user.Enable == 1, + RoleName = user.RoleName, + Role_Id = user.Role_Id, + UserTrueName = user.UserTrueName, + Token = token + }; + } + /// /// 刷新Token /// diff --git a/YD_AllHeartRates.Api/Services/Interface/IUserService.cs b/YD_AllHeartRates.Api/Services/Interface/IUserService.cs index 99d8299..2562da5 100644 --- a/YD_AllHeartRates.Api/Services/Interface/IUserService.cs +++ b/YD_AllHeartRates.Api/Services/Interface/IUserService.cs @@ -15,6 +15,12 @@ namespace YD_AllHeartRates.Api.Services.Interface /// Task Login(LoginInfo loginInfo); + /// + /// 获取个人信息 + /// + /// + Task UserInfo(); + /// /// 刷新Token /// diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json b/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json index 09dfc33..a4eeac3 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/ApiEndpoints.json @@ -75,8 +75,8 @@ "Order": 0, "Parameters": [ { - "Name": "deviceId", - "Type": "System.Int32", + "Name": "code", + "Type": "System.String", "IsRequired": false } ], @@ -394,5 +394,25 @@ "StatusCode": 200 } ] + }, + { + "ContainingType": "YD_AllHeartRates.Api.Controllers.UserController", + "Method": "UserInfo", + "RelativePath": "UserInfo", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [], + "ReturnTypes": [ + { + "Type": "YD_AllHeartRates.Commons.UserInfoDto", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] } ] \ No newline at end of file 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 99505a6..19a4fe8 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 @@ -246,11 +246,10 @@ "summary": "删除设备", "parameters": [ { - "name": "deviceId", + "name": "code", "in": "query", "schema": { - "type": "integer", - "format": "int32" + "type": "string" } } ], @@ -630,6 +629,36 @@ } } } + }, + "/UserInfo": { + "get": { + "tags": [ + "User" + ], + "summary": "获取个人信息", + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/UserInfoDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserInfoDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/UserInfoDto" + } + } + } + } + } + } } }, "components": { 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 dbc5f86..fe1e1ed 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+d8a77cfbaf3548e4732854d92784d08a66af29c0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ca4f50d69bba8921fcde48f9805fda04cb9a5d39")] [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 3afd3b5..950fcec 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 @@ -8412c63f2d0a14e0c01b3d46ba06802fe5ea3b5741acf0d71e042a2986a98b00 +1957e0448c6d2fc171081f51ec48674d925bec19c5fe391f9ee6f1044b9df337 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 19f7c09..98581fa 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 4dcdd05..8681d1b 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/YD_AllHeartRates.Api.xml b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.xml index 14e2e05..e54f33a 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.xml +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.xml @@ -125,6 +125,12 @@ + + + 获取个人信息 + + + 数据库实体父类 @@ -549,7 +555,7 @@ 用户 - + 构造 @@ -561,6 +567,12 @@ + + + 获取个人信息 + + + 刷新Token @@ -666,6 +678,12 @@ + + + 获取个人信息 + + + 刷新Token diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe b/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe index 5c2335f..ff1466b 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 b6d119d..95079ad 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 b6d119d..95079ad 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