修正 重复错误

IoTSharp/Controllers/DevicesController.cs

@@ -62,8 +62,8 @@ namespace IoTSharp.Controllers
         /// </summary>
         /// <param name="customerId"></param>
         /// <returns></returns>
-        // GET: api/Devices
-        [HttpGet("Customers")]
+        // GET: api/Customers/All
+        [HttpGet("Devices/Customers/All")]
         [Authorize(Roles = nameof(UserRole.NormalUser))]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(typeof(ApiResult<Guid>), StatusCodes.Status404NotFound)]
@@ -85,7 +85,7 @@ namespace IoTSharp.Controllers
         /// 获取指定客户的设备列表
         /// </summary>
         /// <returns></returns>
-        // GET: api/Devices
+        // GET: api/Devices/Customers
         [HttpGet("Customers")]
         [Authorize(Roles = nameof(UserRole.NormalUser))]
         [ProducesResponseType(StatusCodes.Status200OK)]
@@ -589,8 +589,6 @@ namespace IoTSharp.Controllers
                 {
                     var attributes = from dev in _context.AttributeLatest where dev.DeviceId == deviceId select dev;
                     var fs = from at in await attributes.ToListAsync() where at.DataSide == dataSide && keys.Split(',', options: StringSplitOptions.RemoveEmptyEntries).Contains(at.KeyName) select at;
-                    return Ok(fs.ToArray());
-
                     return Ok(new ApiResult<AttributeLatest[]>(ApiCode.Success, "Ok", fs.ToArray()));
                 }
                 catch (Exception ex)
@@ -635,9 +633,9 @@ namespace IoTSharp.Controllers
         [HttpGet("SessionStatus")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesDefaultResponseType]
-        public async Task<ActionResult<IList<IMqttSessionStatus>>> GetSessionStatus(Guid deviceId)
+        public async Task<ApiResult<IList<IMqttSessionStatus>>> GetSessionStatus(Guid deviceId)
         {
-            return Ok(new ApiResult<IList<IMqttSessionStatus>>(ApiCode.Success, "OK", await _serverEx.GetSessionStatusAsync()));
+            return new ApiResult<IList<IMqttSessionStatus>>(ApiCode.Success, "OK", await _serverEx.GetSessionStatusAsync());
         }
         /// <summary>
         /// SessionStatus
@@ -648,9 +646,9 @@ namespace IoTSharp.Controllers
         [HttpGet("ClientStatus")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesDefaultResponseType]
-        public async Task<ActionResult<IList<IMqttClientStatus>>> GetClientStatus(Guid deviceId)
+        public async Task<ApiResult<IList<IMqttClientStatus>>> GetClientStatus(Guid deviceId)
         {
-            return Ok(new ApiResult<IList<IMqttClientStatus>>(ApiCode.Success, "OK", await _serverEx.GetClientStatusAsync()));
+            return new ApiResult<IList<IMqttClientStatus>>(ApiCode.Success, "OK", await _serverEx.GetClientStatusAsync());
         }
     }
 }
\ No newline at end of file

IoTSharp/IoTSharp.xml

@@ -95,28 +95,25 @@
             <summary>
             返回用户信息
             </summary>
-            <param name="customerId"></param>
+            <param name="Id"></param>
             <returns></returns>
         </member>
         <member name="M:IoTSharp.Controllers.AccountController.Modify(IoTSharp.Dtos.UserItemDto)">
             <summary>
             修改用户信息
             </summary>
-            <param name="customerId"></param>
             <returns></returns>
         </member>
         <member name="M:IoTSharp.Controllers.AccountController.ModifyMyInfo(IoTSharp.Dtos.UserItemDto)">
             <summary>
             修改当前用户信息
             </summary>
-            <param name="customerId"></param>
             <returns></returns>
         </member>
         <member name="M:IoTSharp.Controllers.AccountController.ModifyMyPassword(IoTSharp.Dtos.UserPassword)">
             <summary>
             修改当前用户信息
             </summary>
-            <param name="customerId"></param>
             <returns></returns>
         </member>
         <member name="T:IoTSharp.Controllers.AuthorizedKeysController">
@@ -146,7 +143,6 @@
             <summary>
             获取指定租户下的所有客户
             </summary>
-            <param name="tenantId">租户</param>
             <returns></returns>
         </member>
         <member name="M:IoTSharp.Controllers.CustomersController.GetCustomer(System.Guid)">