Merge branch 'dev' of http://8.153.108.90:3000/YD/YD_YiLu.Api into dev

YD_YiLu.Commons/Dto/DeviceSync/ErrorUserCallbackDto.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace YD_YiLu.Commons.Dto.DeviceSync
+{
+    /// <summary>
+    /// 信息下发失败回调请求
+    /// </summary>
+    public class ErrorUserCallbackRequestDto
+    {
+        public long SyncId { get; set; }
+        public int DeviceType { get; set; }
+        public string DeviceSerial { get; set; }
+        public List<ErrorUserCallbackItemDto> ErrorUsers { get; set; }
+    }
+
+    /// <summary>
+    /// 失败人员信息
+    /// </summary>
+    public class ErrorUserCallbackItemDto
+    {
+        public string UserSerial { get; set; }
+        public string ErrorMessage { get; set; }
+    }
+}

YD_YiLu/Controllers/SettingController.cs

@@ -28,6 +28,21 @@ namespace YD_YiLu.Api.Controllers
             return await _deviceSyncService.AppVerifyAsync(dto);
         }
 
+        /// <summary>
+        /// 信息下发失败回调
+        /// </summary>
+        [HttpPost]
+        [Route("/setting/callback/error_user")]
+        public object ErrorUserCallback([FromBody] ErrorUserCallbackRequestDto dto)
+        {
+            return new
+            {
+                code = 0,
+                msg = "OK",
+                data = 1
+            };
+        }
+
         /// <summary>
         /// 新增app版本
         /// </summary>

YD_YiLu/Program.cs

@@ -19,7 +19,7 @@ namespace YD_YiLu.Api
                        {
                            serverOptions.Limits.MaxRequestBodySize = 10485760;
                        });
-                       webBuilder.UseKestrel().UseUrls("http://*:9996");
+                       webBuilder.UseKestrel().UseUrls("http://*:9997");
                        webBuilder.UseIIS();
                        webBuilder.UseStartup<Startup>();
                    }).UseServiceProviderFactory(new AutofacServiceProviderFactory());

YD_YiLu/appsettings.json

@@ -33,7 +33,7 @@
 
   "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;",
   "SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;",
-  "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9994,http://localhost:9994",
+  "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9997,http://localhost:9997",
 
   "WeChat": {
     "Appid": "xxx",