<add>[important]添加简单鉴权，token

WcsMain/ApiServe/ControllerFilter/WcsAuthorizationAttribute.cs

@@ -0,0 +1,31 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace WcsMain.ApiServe.ControllerFilter;
+
+/// <summary>
+/// 权限验证
+/// </summary>
+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;
+        }
+        
+    }
+}

WcsMain/ApiServe/Controllers/Dto/WcsDto/User/LoginResponse.cs

@@ -13,6 +13,12 @@ public class LoginResponse
     [JsonPropertyName("userName")]
     public string? UserName { get; set; }
 
+    /// <summary>
+    /// token
+    /// </summary>
+    [JsonPropertyName("token")]
+    public string? Token { get; set; }
+
     /// <summary>
     /// 菜单
     /// </summary>

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
 {
 

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
 {
 

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
 {
 

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
 {
 

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
 {
 

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
 {
 

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
 {
 

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
 {
 

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
 {
 

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
 {
 

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpPost("getUserWithPage")]
+    [WcsAuthorization]
     public WcsApiResponse<List<AppUser>> GetUserWithPage([FromBody] GetUserWithPageRequest request) => userService.GetUserWithPage(request);
 
 }

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
 {
 

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
 {
     /// <summary>

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
 {
     /// <summary>

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
 {
     /// <summary>

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)
 {
     /// <summary>
     /// 登录请求的具体实现
@@ -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)

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;",