| 
					
				 | 
			
			
				@@ -30,12 +30,13 @@ namespace OASystem.API.Controllers 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private readonly LoginRepository _loginRep; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private readonly MessageRepository _message; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private readonly SystemMenuPermissionRepository _SystemMenuPermissionRepository; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private readonly MessageRepository _messageRep; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private readonly IQiYeWeChatApiService _qiYeWeChatApiServic; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private readonly IHubContext<ServerHub> _hubContext; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper,MessageRepository message, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            SystemMenuPermissionRepository systemMenuPermissionRepository, IQiYeWeChatApiService qiYeWeChatApiService, IHubContext<ServerHub> hubContext) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            SystemMenuPermissionRepository systemMenuPermissionRepository, IQiYeWeChatApiService qiYeWeChatApiService, IHubContext<ServerHub> hubContext, MessageRepository messageRep) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _config = config; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _loginRep = loginRep; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -43,6 +44,7 @@ namespace OASystem.API.Controllers 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _message = message; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _SystemMenuPermissionRepository = systemMenuPermissionRepository; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _qiYeWeChatApiServic = qiYeWeChatApiService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _messageRep = messageRep; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _hubContext = hubContext; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -68,11 +70,13 @@ namespace OASystem.API.Controllers 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Result authData = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             string uName = string.Empty; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int uId = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            int unReadCount = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (userData.Data != null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 uId = (userData.Data as UserLoginInfoView).UserId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 uName = (userData.Data as UserLoginInfoView).CnName; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 authData = _SystemMenuPermissionRepository.QueryMenuLoad(uId, dto.PortType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                unReadCount = await _messageRep.GetUnReadCount(uId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //_hubContext.Login(uId, uName); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -80,6 +84,7 @@ namespace OASystem.API.Controllers 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 UserInfo = userData == null ? null : userData.Data, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 AuthData = authData == null ? null : authData.Data, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                UnReadCount = unReadCount 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             DateTime createZebraTime = DateTime.Now; 
			 |