diff --git a/VOL.Business/Services/School/S_SchoolService.cs b/VOL.Business/Services/School/S_SchoolService.cs index 61dac17..cf78079 100644 --- a/VOL.Business/Services/School/S_SchoolService.cs +++ b/VOL.Business/Services/School/S_SchoolService.cs @@ -267,7 +267,7 @@ namespace VOL.Business.Services.School schoolModel.ModifyDate = DateTime.Now; schoolModel.Modifier = UserContext.Current.UserId; - var user = await _userRepository.FindAsyncFirst(x => x.UserName == paramDto.UserName && x.Role_Id == 2 || x.Role_Id == 4); + var user = await _userRepository.FindAsyncFirst(x => x.UserName == paramDto.UserName && (x.Role_Id == 2 || x.Role_Id == 4)); if (user == null) throw new Exception($"未找到用户名为{paramDto.UserName}的学校"); diff --git a/VOL.Business/Services/Training/I_TrainingDataService.cs b/VOL.Business/Services/Training/I_TrainingDataService.cs index d5e0b8d..8ce011b 100644 --- a/VOL.Business/Services/Training/I_TrainingDataService.cs +++ b/VOL.Business/Services/Training/I_TrainingDataService.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using Castle.Core.Internal; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; diff --git a/VOL.Core/Utilities/Tool.cs b/VOL.Core/Utilities/Tool.cs index a05afb7..58d3db3 100644 --- a/VOL.Core/Utilities/Tool.cs +++ b/VOL.Core/Utilities/Tool.cs @@ -137,7 +137,7 @@ namespace VOL.Core.Utilities { var dataObject = new T(); - for (int col = 1; col <= worksheet.Dimension.End.Column; col++) + for (int col = 1; col <= displayNameToPropertyMap.Count; col++) { var header = headers[col - 1]; if (string.IsNullOrEmpty(header)) diff --git a/VOL.Model/Training/Response/GetClassReportDetailsModel.cs b/VOL.Model/Training/Response/GetClassReportDetailsModel.cs index 220b994..bddc16f 100644 --- a/VOL.Model/Training/Response/GetClassReportDetailsModel.cs +++ b/VOL.Model/Training/Response/GetClassReportDetailsModel.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; diff --git a/VOL.WebApi/Startup.cs b/VOL.WebApi/Startup.cs index 31b827e..a2c80c9 100644 --- a/VOL.WebApi/Startup.cs +++ b/VOL.WebApi/Startup.cs @@ -318,18 +318,18 @@ namespace VOL.WebApi //配置HttpContext app.UseStaticHttpContext(); - app.UseSwagger(); - app.UseSwaggerUI(c => - { - //2个下拉框选项 选择对应的文档 - //c.SwaggerEndpoint("/swagger/v1/swagger.json", "VOL.Core后台Api"); - //c.SwaggerEndpoint("/swagger/v2/swagger.json", "测试第三方Api"); - c.SwaggerEndpoint("/swagger/v3/swagger.json", "SmartSportsServer-Api"); - //c.SwaggerEndpoint("/swagger/v4/swagger.json", "物联网-Api"); - //c.SwaggerEndpoint("/swagger/v5/swagger.json", "Ai-Api"); - c.SwaggerEndpoint("/swagger/v6/swagger.json", "AiApp-Api"); - c.RoutePrefix = ""; - }); + //app.UseSwagger(); + //app.UseSwaggerUI(c => + //{ + // //2个下拉框选项 选择对应的文档 + // //c.SwaggerEndpoint("/swagger/v1/swagger.json", "VOL.Core后台Api"); + // //c.SwaggerEndpoint("/swagger/v2/swagger.json", "测试第三方Api"); + // c.SwaggerEndpoint("/swagger/v3/swagger.json", "SmartSportsServer-Api"); + // //c.SwaggerEndpoint("/swagger/v4/swagger.json", "物联网-Api"); + // //c.SwaggerEndpoint("/swagger/v5/swagger.json", "Ai-Api"); + // c.SwaggerEndpoint("/swagger/v6/swagger.json", "AiApp-Api"); + // c.RoutePrefix = ""; + //}); app.UseRouting(); app.UseCors(); diff --git a/VOL.WebApi/appsettings.json b/VOL.WebApi/appsettings.json index 8d71486..6fb4a1e 100644 --- a/VOL.WebApi/appsettings.json +++ b/VOL.WebApi/appsettings.json @@ -20,7 +20,7 @@ //mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20) "DbConnectionString": "Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;", - // "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", + //"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", //"DbConnectionString": "Server=192.168.10.230;Port=3306;Database=dachentradedb;Uid=root;Pwd=123456;AllowLoadLocalInfile=true;Command Timeout=120;", //"DbConnectionString": "Server=47.101.60.251;Port=3306;Database=smartsports;Uid=root;Pwd=Admin@123;AllowLoadLocalInfile=true;Command Timeout=120;",