From c85b53ad46b3e619e6244bc38842ec1a6fce5a90 Mon Sep 17 00:00:00 2001 From: icewint Date: Mon, 24 Jun 2024 09:05:26 +0800 Subject: [PATCH] =?UTF-8?q?[important]=E6=B7=BB=E5=8A=A0=E7=AE=80?= =?UTF-8?q?=E5=8D=95=E9=89=B4=E6=9D=83=EF=BC=8Ctoken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WcsAuthorizationAttribute.cs | 31 +++++++++++++++++++ .../Dto/WcsDto/User/LoginResponse.cs | 6 ++++ .../WcsController/ApiAcceptController.cs | 2 ++ .../WcsController/ApiRequestController.cs | 2 ++ .../WcsController/ConfigController.cs | 2 ++ .../WcsController/ConveyTaskController.cs | 2 ++ .../WcsController/ElTagController.cs | 2 ++ .../WcsController/EquipmentController.cs | 2 ++ .../WcsController/LocationController.cs | 2 ++ .../WcsController/MenuController.cs | 2 ++ .../WcsController/PlcController.cs | 2 ++ .../WcsController/PlcDbController.cs | 2 ++ .../WcsController/RunningInfoController.cs | 2 ++ .../WcsController/ScanController.cs | 2 ++ .../WcsController/SettingController.cs | 4 +++ .../WcsController/SocketController.cs | 2 ++ .../WcsController/StackerController.cs | 2 ++ .../WcsController/UserController.cs | 2 ++ .../WcsController/UserGroupController.cs | 4 +++ .../WcsController/UserRuleController.cs | 2 ++ .../WcsController/WcsTaskController.cs | 2 ++ .../WcsController/WmsTaskController.cs | 2 ++ .../Service/WcsService/UserService.cs | 9 ++++-- WcsMain/appsettings.json | 2 +- 24 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs diff --git a/WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs b/WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs new file mode 100644 index 0000000..b2e8607 --- /dev/null +++ b/WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs @@ -0,0 +1,31 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc.Filters; + +namespace WcsMain.ApiServe.ControllerFilter; + +/// +/// 权限验证 +/// +public class WcsAuthorizationAttribute : Attribute, IAuthorizationFilter +{ + public void OnAuthorization(AuthorizationFilterContext context) + { + try + { + var request = context.HttpContext.Request; + var headers = request.Headers; + var token = headers.Authorization; + if(string.IsNullOrEmpty(token)) + { + context.Result = new Microsoft.AspNetCore.Mvc.UnauthorizedResult(); + return; + } + } + catch(Exception ex) + { + context.Result = new Microsoft.AspNetCore.Mvc.UnauthorizedResult(); + return; + } + + } +} diff --git a/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginResponse.cs b/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginResponse.cs index b800b1a..c314a65 100644 --- a/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginResponse.cs +++ b/WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginResponse.cs @@ -13,6 +13,12 @@ public class LoginResponse [JsonPropertyName("userName")] public string? UserName { get; set; } + /// + /// token + /// + [JsonPropertyName("token")] + public string? Token { get; set; } + /// /// 菜单 /// diff --git a/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs b/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs index 5b4cf60..8afc5b5 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.ApiAccept; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/apiAccept")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class ApiAcceptController(ApiAcceptService apiAcceptService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs b/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs index 3e8ba9d..cf6de94 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.ApiRequest; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/apiRequest")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class ApiRequestController(ApiRequestService apiRequestService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs b/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs index c8d1f2e..1825614 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Config; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/config")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class ConfigController(ConfigService configService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs index 720833e..87a99bf 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Convey; @@ -14,6 +15,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/conveyTask")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class ConveyTaskController(ConveyService conveyService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs b/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs index b424a21..d0c71ac 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag; @@ -16,6 +17,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/elTag")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class ElTagController(ElTagService elTagService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs b/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs index 8503c83..8ef4d53 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.Equipment; @@ -13,6 +14,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/equipment")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class EquipmentController(EquipmentService equipmentService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs b/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs index 9be1fcf..8bfb71a 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Location; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/location")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class LocationController(LocationService locationService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs b/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs index 5664af3..288dc40 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Menu; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/menu")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class MenuController(MenuService menuService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs b/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs index 2efa9a6..e549927 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.PLC; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/plc")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class PlcController(PlcService plcService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs b/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs index 2f7dcd7..e5b1128 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.DB; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/db")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class PlcDbController(PlcDbService plcDbService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs b/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs index c0cdbd9..408edb2 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.SystemController; @@ -9,6 +10,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/runningInfo")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class RunningInfoController(RunningInfoService runningInfoService) : ControllerBase { /// diff --git a/WcsMain/ApiServe/Controllers/WcsController/ScanController.cs b/WcsMain/ApiServe/Controllers/WcsController/ScanController.cs index 4cd480b..b36ee6e 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ScanController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ScanController.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Scan; @@ -14,6 +15,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/scan")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class ScanController(ScanService scanService) : ControllerBase { /// diff --git a/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs b/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs index 0c845b0..e3b176f 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs @@ -1,4 +1,6 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; +using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Settings; using WcsMain.ApiServe.Service.WcsService; @@ -8,6 +10,8 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("/api/wcs/setting")] [ApiController] +[WcsExceptionFilter] +[WcsAuthorization] public class SettingController(SettingService settingService) : ControllerBase { /// diff --git a/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs b/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs index 132a2fd..d37c6e8 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Socket; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/socket")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class SocketController(SocketService socketService) : ControllerBase { /// diff --git a/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs b/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs index e493f10..d7de04d 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Stacker; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/stacker")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class StackerController(StackerService stackerService) : ControllerBase { /// diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserController.cs index 2396724..bb67cc7 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/UserController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.User; @@ -29,6 +30,7 @@ public class UserController(UserService userService) : ControllerBase /// /// [HttpPost("getUserWithPage")] + [WcsAuthorization] public WcsApiResponse> GetUserWithPage([FromBody] GetUserWithPageRequest request) => userService.GetUserWithPage(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs index e0ebe3d..d60082c 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs @@ -1,4 +1,6 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; +using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.UserGroup; using WcsMain.ApiServe.Service.WcsService; @@ -8,6 +10,8 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/userGroup")] [ApiController] +[WcsExceptionFilter] +[WcsAuthorization] public class UserGroupController(UserGroupService userGroupService) : ControllerBase { diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs index c747131..8822f72 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.UserRule; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/userRule")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class UserRuleController(UserRuleService userRuleService) : ControllerBase { /// diff --git a/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs index a074d0e..14574a6 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.WcsTask; @@ -10,6 +11,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/wcsTask")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase { /// diff --git a/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs index 1c52526..f6485f9 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter; using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.WmsTask; @@ -11,6 +12,7 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/wmsTask")] [ApiController] [WcsExceptionFilter] +[WcsAuthorization] public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase { /// diff --git a/WcsMain/ApiServe/Service/WcsService/UserService.cs b/WcsMain/ApiServe/Service/WcsService/UserService.cs index 1d73446..8bf16f8 100644 --- a/WcsMain/ApiServe/Service/WcsService/UserService.cs +++ b/WcsMain/ApiServe/Service/WcsService/UserService.cs @@ -10,7 +10,7 @@ using WcsMain.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; [Service] -public class UserService(AppUserDao appUserDao, AppMenuDao menuDao) +public class UserService(AppUserDao appUserDao, AppMenuDao menuDao, DataService.DataBaseData dataBaseData) { /// /// 登录请求的具体实现 @@ -53,7 +53,12 @@ public class UserService(AppUserDao appUserDao, AppMenuDao menuDao) { return default; } - LoginResponse loginResponse = new() { UserName = user.UserName, Menu = [] }; + LoginResponse loginResponse = new() + { + UserName = user.UserName, + Menu = [], + Token = dataBaseData.GetNewUUID() + }; // ---- 找出主菜单 List<(string Index, string MainMenuName, string ico)> mainMenuInfo = []; foreach (var menu in menus) diff --git a/WcsMain/appsettings.json b/WcsMain/appsettings.json index 3cbf822..c9c447d 100644 --- a/WcsMain/appsettings.json +++ b/WcsMain/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", "Settings": { "DBMysql": "server=192.168.103.200;port=3306;user=developer;password=developer;database=wcs_main;", - "DBMysqlLocal": "server=112.4.208.194;port=3001;user=developer;password=developer;database=wcs_kate_suzhou;", + "DBMysqlLocal": "server=192.168.234.128;port=3306;user=developer;password=developer;database=wcs_kate_suzhou;", "DBMssql": "Data Source=192.168.142.131;Initial Catalog=wcs;User Id=sa;Password=Sa123;", "DBMssqlLocal": "Data Source=192.168.142.131;Initial Catalog=wcs_stacker;User Id=sa;Password=Sa123;",