Merge branch 'master' of http://git.ius.plus:88/Project-Wing/WingDeviceService

Service/ConnectService.cs

@@ -150,7 +150,7 @@ namespace WingDeviceService.Service
         /// <remarks>POST</remarks>
         public async Task<CacheDeviceDTO> GetDeviceByTokenAsync(TokenRequest request)
         {
-            var deviceCode = await ValidateTokenAsync(request.Token);
+            var deviceCode = await GetClientIdByTokenAsync(request.Token);
             var deviceDTO = await _deviceInfoDBServiceProxy.FindDeviceInfoByCodeAsync(deviceCode);
 
             var cacheDeviceInfo = deviceDTO.MappingTo<CacheDeviceDTO>();
@@ -166,7 +166,6 @@ namespace WingDeviceService.Service
         {
             try
             {
-                await ValidateTokenAsync(request.Token);
                 await _authenticationService.LogOffAsync(request);
                 return true;
             }

Service/DeviceService.cs

@@ -76,7 +76,6 @@ namespace WingDeviceService.Service
         /// <returns></returns>
         public async Task<bool> HeartRateAsync(TokenRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             _deviceHeartRateManager.AddOrUpdate(request.Token);
             var result = SetOnlineState(request.Token, true);
             return result;
@@ -96,7 +95,6 @@ namespace WingDeviceService.Service
         {
             var userCodes = request.UserCodes;
             var deviceCode = request.DeviceCode;
-            await ValidateTokenAsync(request.Token);
             //检查设备编码不为空
             if (string.IsNullOrWhiteSpace(request.DeviceCode))
             {
@@ -136,7 +134,6 @@ namespace WingDeviceService.Service
         public async Task<DeviceExtendInfoDTO> GetDeviceInfoAsync(GetDeviceRequest request)
         {
             //验证
-            await ValidateTokenAsync(request.Token);
             if (string.IsNullOrWhiteSpace(request.DeviceCode))
             {
                 throw new RpcException((int)CustomerRpcCode.DeviceCodeEmpty, "DeviceCode empty error", "DeviceCode empty error");
@@ -190,7 +187,6 @@ namespace WingDeviceService.Service
         public async Task<DeviceExtendInfoDTO> GetDeviceByShortCodeAsync(GetDeviceByShortCodeRequest request)
         {
             //验证
-            await ValidateTokenAsync(request.Token);
             if (string.IsNullOrWhiteSpace(request.ShortCode))
             {
                 throw new RpcException((int)CustomerRpcCode.ShortCodeEmpty, "ShortCode empty error", "ShortCode empty error");
@@ -212,7 +208,6 @@ namespace WingDeviceService.Service
         {
             var userCodes = request.UserCodes;
             var deviceCode = request.DeviceCode;
-            await ValidateTokenAsync(request.Token);
             //检查设备编码不为空
             if (string.IsNullOrWhiteSpace(request.DeviceCode))
             {
@@ -268,7 +263,6 @@ namespace WingDeviceService.Service
         public async Task<bool> RemoveDeviceRelevancyAsync(RemoveDeviceRelevancyRequest request)
         {
             //验证
-            await ValidateTokenAsync(request.Token);
             if (string.IsNullOrWhiteSpace(request.DeviceCode) || string.IsNullOrWhiteSpace(request.OrganizationCode))
             {
                 throw new RpcException((int)CustomerRpcCode.DeviceCodeOrOrganizationCodeEmpty, "DeviceCode Or OrganizationCode empty error", "DeviceCode Or OrganizationCode empty error");
@@ -292,16 +286,11 @@ namespace WingDeviceService.Service
             return removeDeviceResult;
         }
 
-        private async Task<string> ValidateTokenAsync(string token)
+        private async Task<string> GetClientIdByTokenAsync(string token)
         {
-            var request = new ValidateTokenRequest() { Token = token };
-            var result = await _authenticationService.ValidateTokenAsync(request);
-            //Check 权限
-            if (result != null && result.Code != CustomerRpcCode.Ok)
-            {
-                ThrowRpcException((int)result.Code, "Permission validation error");
-            }
-            return result.Token.ClientId; //return User code 
+            var request = new TokenRequest() { Token = token };
+            var result = await _authenticationService.GetToken(request);
+            return result.ClientId; //return User code 
         }
         /// <summary>
         /// 查询个人名下所有设备列表接口
@@ -311,7 +300,7 @@ namespace WingDeviceService.Service
         public async Task<PageCollection<DeviceExtendInfoDTO>> GetPersonDeviceListAsync(GetPersonDeviceRequest request)
         {
             //验证
-            var userCode = await ValidateTokenAsync(request.Token);
+            var userCode = await GetClientIdByTokenAsync(request.Token);
             //查询用户是否存在
             var userInfoDO = await _userServiceProxy.FindUserByCodeAsync(userCode);
             if (userInfoDO == null)
@@ -378,7 +367,7 @@ namespace WingDeviceService.Service
         public async Task<bool> BindDeviceAsync(BindDeviceRequest request)
         {
             //验证
-            var userCode = await ValidateTokenAsync(request.Token);
+            var userCode = await GetClientIdByTokenAsync(request.Token);
             //查询用户是否存在
             var userInfoDO = await _userServiceProxy.FindUserByCodeAsync(userCode);
             if (userInfoDO == null)
@@ -452,7 +441,6 @@ namespace WingDeviceService.Service
         /// <returns></returns>
         public async Task<bool> ModifyDeviceAsync(ModifyDeviceRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             var deviceDb = await _deviceInfoDBServiceProxy.FindDeviceInfoByCodeAsync(request.DeviceCode);
             if (deviceDb == null)
             {
@@ -510,7 +498,6 @@ namespace WingDeviceService.Service
         /// <returns></returns>
         public async Task<string> CreateDictionaryItemAsync(CreateDictionaryItemRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             return await _deviceInfoDBServiceProxy.CreateDictionaryItemAsync(new CreateDictionaryItemDBRequest
             {
                 Data = new DictionaryDTO { DictionaryType = request.DictionaryType, Value = request.DictionaryItemValue, ParentCode = request.ParentCode },
@@ -525,7 +512,6 @@ namespace WingDeviceService.Service
         /// <returns></returns>
         public async Task<List<DictionaryDTO>> FindDeviceModelItemsAsync(FindDeviceModelItemsRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             var dictionaryDOList = await _deviceInfoDBServiceProxy.FindDictionaryItemsAsync(new FindDictionaryItemsDBRequest
             {
                 DictionaryType = (int)request.DictionaryType,
@@ -541,7 +527,6 @@ namespace WingDeviceService.Service
         /// <returns></returns>
         public async Task<List<DictionaryDTO>> FindDeviceTypeItemsAsync(FindDeviceTypeItemsRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             var dictionaryDOList = await _deviceInfoDBServiceProxy.FindDictionaryItemsAsync(new FindDictionaryItemsDBRequest
             {
                 DictionaryType = (int)request.DictionaryType
@@ -556,7 +541,6 @@ namespace WingDeviceService.Service
         /// <returns></returns>
         public async Task<List<DeviceExtendInfoDTO>> FindDevicesByOrganizationCodeAsync(FindDevicesByOrganizationCodeRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             var result = new List<DeviceExtendInfoDTO>();
             var deviceInfoDOList = await _deviceInfoDBServiceProxy.FindDeviceInfoListByOrganizationCodeAsync(request.OrganizationCode);
             if (deviceInfoDOList?.Count > 0)
@@ -604,7 +588,7 @@ namespace WingDeviceService.Service
         public async Task<List<SelectItemDTO>> GetPersonDeviceDropdownListAsync(TokenRequest request)
         {
             //验证
-            var userCode = await ValidateTokenAsync(request.Token);
+            var userCode = await GetClientIdByTokenAsync(request.Token);
             //查询用户是否存在
             var userInfoDO = await _userServiceProxy.FindUserByCodeAsync(userCode);
             if (userInfoDO == null)
@@ -641,7 +625,7 @@ namespace WingDeviceService.Service
         /// <returns>服务器配置信息结果:key:字段，value:数据值，复杂类型可为json</returns>
         public async Task<Dictionary<string, string>> QueryServerConfigAsync(TokenRequest request)
         {
-            var deviceCode = await ValidateTokenAsync(request.Token);
+            var deviceCode = await GetClientIdByTokenAsync(request.Token);
             var deviceInfo = await _deviceInfoDBServiceProxy.FindDeviceInfoByCodeAsync(deviceCode);
             if (deviceInfo == null || string.IsNullOrWhiteSpace(deviceInfo.DeviceCode))
             {
@@ -673,7 +657,7 @@ namespace WingDeviceService.Service
         {
             var shortCode = request.UniqueCode;
             #region Params Check
-            var userCode = await ValidateTokenAsync(request.Token);
+            var userCode = await GetClientIdByTokenAsync(request.Token);
             if (string.IsNullOrEmpty(shortCode))
             {
                 ThrowCustomerException(CustomerRpcCode.UniqueCodeIsEmpty, "UniqueCode is empty");
@@ -825,7 +809,6 @@ namespace WingDeviceService.Service
         /// <returns>test01,test02</returns>
         public async Task<List<string>> GetDeviceBindUsersCodesAsync(GetDeviceRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             //检查设备编码不为空
             if (string.IsNullOrWhiteSpace(request.DeviceCode))
             {
@@ -852,7 +835,6 @@ namespace WingDeviceService.Service
         /// <returns>AI应用集合</returns>
         public async Task<List<DiagnosisModuleDTO>> FindDeviceDiagnosisModulesAsync(FindDeviceDiagnosisModulesRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             //检查设备编码不为空
             if (string.IsNullOrWhiteSpace(request.DeviceCode))
             {
@@ -869,7 +851,6 @@ namespace WingDeviceService.Service
         /// <para>DeviceErrorCodeEnum</para>
         public async Task<bool> ModifyDeviceDiagnosisModuleStateAsync(ModifyDeviceDiagnosisModuleStateRequest request)
         {
-            await ValidateTokenAsync(request.Token);
             //检查设备编码不为空
             if (string.IsNullOrWhiteSpace(request.DeviceCode))
             {